From a3ce59259466a547229afdfefb053141103f78a9 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Sat, 31 Dec 2016 15:03:41 +0000 Subject: [PATCH] Revert "Platform support patch for the Dell S6000." This reverts commit 40ebb1080b96f91292cd877f01e802ed8a5716fd. --- ...rivers-platform-x86-dell-s6000-s1220.patch | 157 ------------------ 1 file changed, 157 deletions(-) delete mode 100644 packages/base/any/kernels/3.16-lts/patches/drivers-platform-x86-dell-s6000-s1220.patch diff --git a/packages/base/any/kernels/3.16-lts/patches/drivers-platform-x86-dell-s6000-s1220.patch b/packages/base/any/kernels/3.16-lts/patches/drivers-platform-x86-dell-s6000-s1220.patch deleted file mode 100644 index 1fe1d928..00000000 --- a/packages/base/any/kernels/3.16-lts/patches/drivers-platform-x86-dell-s6000-s1220.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -urpN a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig ---- a/drivers/platform/x86/Kconfig 2016-11-20 01:17:41.000000000 +0000 -+++ b/drivers/platform/x86/Kconfig 2016-12-22 20:28:22.048502394 +0000 -@@ -838,4 +838,10 @@ config PVPANIC - a paravirtualized device provided by QEMU; it lets a virtual machine - (guest) communicate panic events to the host. - -+config DELL_S6000_S1220 -+ tristate "Platform Driver for the DELL S6000" -+ ---help--- -+ Support the Dell S6000. -+ -+ - endif # X86_PLATFORM_DEVICES -diff -urpN a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile ---- a/drivers/platform/x86/Makefile 2016-11-20 01:17:41.000000000 +0000 -+++ b/drivers/platform/x86/Makefile 2016-12-22 20:29:50.024504303 +0000 -@@ -57,3 +57,4 @@ obj-$(CONFIG_INTEL_SMARTCONNECT) += inte - - obj-$(CONFIG_PVPANIC) += pvpanic.o - obj-$(CONFIG_ALIENWARE_WMI) += alienware-wmi.o -+obj-$(CONFIG_DELL_S6000_S1220) += dell_s6000_s1220.o -diff -urpN a/drivers/platform/x86/dell_s6000_s1220.c b/drivers/platform/x86/dell_s6000_s1220.c ---- a/drivers/platform/x86/dell_s6000_s1220.c 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/platform/x86/dell_s6000_s1220.c 2016-12-22 20:26:50.728500412 +0000 -@@ -0,0 +1,131 @@ -+/** -+ * Dell S6000 Platform Support. -+ */ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+ -+/************************************************************* -+ * -+ * I2C Bus 0 on the S6000 is muxed via gpio1 and gpio2. -+ * -+ ************************************************************/ -+static const unsigned s6000_gpiomux_gpios[] = { -+ 1, 2 -+}; -+ -+static const unsigned s6000_gpiomux_values[] = { -+ 0, 1, 2, 3 -+}; -+ -+static struct i2c_mux_gpio_platform_data s6000_i2cmux_data = { -+ /* -+ * i2c Bus 0 -+ */ -+ .parent = 0, -+ -+ /* -+ * Start the bus numbers at 10. The first digit -+ * will represent the different bus numbers based -+ * the gpio selector (00, 01, 10, 11): -+ * -+ * i2c-10 --> i2c-0, gpios = 00 -+ * i2c-11 --> i2c-0, gpios = 01 -+ * i2c-12 --> i2c-0, gpios = 10 -+ * i2c-13 --> i2c-0, gpios = 11 -+ */ -+ .base_nr = 10, -+ -+ .values = s6000_gpiomux_values, -+ .n_values = ARRAY_SIZE(s6000_gpiomux_values), -+ .gpios = s6000_gpiomux_gpios, -+ .n_gpios = ARRAY_SIZE(s6000_gpiomux_gpios), -+ .idle = 0, -+}; -+ -+static struct platform_device s6000_i2cmux = { -+ .name = "i2c-mux-gpio", -+ .id = 12, -+ .dev = { -+ .platform_data = &s6000_i2cmux_data, -+ }, -+}; -+ -+/************************************************************* -+ * -+ * Sensors on i2c-11 (See mux data above). -+ * -+ ************************************************************/ -+static struct i2c_board_info s6000_i2c_11_board_info[] = { -+ { I2C_BOARD_INFO("lm75", 0x4c) }, -+ { I2C_BOARD_INFO("lm75", 0x4d) }, -+ { I2C_BOARD_INFO("lm75", 0x4e) }, -+ { I2C_BOARD_INFO("ltc4215", 0x42) }, -+ { I2C_BOARD_INFO("ltc4215", 0x40) }, -+ { I2C_BOARD_INFO("max6620", 0x29) }, -+ { I2C_BOARD_INFO("max6620", 0x2A) }, -+ { I2C_BOARD_INFO("24c02", 0x51) }, -+ { I2C_BOARD_INFO("24c02", 0x52) }, -+ { I2C_BOARD_INFO("24c02", 0x53) }, -+}; -+ -+static int __init dell_s6000_s1220_init(void) -+{ -+ int i; -+ int rv = 0; -+ char const *vendor, *product; -+ struct i2c_adapter * i2ca; -+ -+ vendor = dmi_get_system_info(DMI_SYS_VENDOR); -+ product = dmi_get_system_info(DMI_PRODUCT_NAME); -+ -+ if(strcmp(vendor, "Dell Inc") || -+ (strcmp(product, "S6000 (SI)") && strcmp(product, "S6000-ON") && -+ strcmp(product, "S6000-ON (SI)"))) { -+ /* Not the S6000 */ -+ return -ENODEV; -+ } -+ -+ /** -+ * Register the GPIO mux for bus 0. -+ */ -+ rv = platform_device_register(&s6000_i2cmux); -+ if(rv < 0) { -+ pr_err("%s: platform_device_register() failed: %d", __FUNCTION__, rv); -+ return rv; -+ } -+ -+ /** -+ * Register I2C devices on new buses -+ */ -+ i2ca = i2c_get_adapter(11); -+ for(i = 0; i < ARRAY_SIZE(s6000_i2c_11_board_info); i++) { -+ if(i2c_new_device(i2ca, s6000_i2c_11_board_info+i) == NULL) { -+ pr_err("%s: i2c_new_device for bus 11:0x%x failed.", -+ __FUNCTION__, s6000_i2c_11_board_info[i].addr); -+ } -+ } -+ -+ return 0; -+ -+} -+ -+static void __exit dell_s6000_s1220_cleanup(void) -+{ -+ platform_device_unregister(&s6000_i2cmux); -+} -+ -+module_init(dell_s6000_s1220_init); -+module_exit(dell_s6000_s1220_cleanup); -+ -+MODULE_AUTHOR("Big Switch Networks (support@bigswitch.com)"); -+MODULE_VERSION("1.0"); -+MODULE_DESCRIPTION("Dell S6000"); -+MODULE_LICENSE("GPL");