diff options
| -rw-r--r-- | target/linux/cns3xxx/config-3.3 | 2 | ||||
| -rw-r--r-- | target/linux/generic/config-3.3 | 1 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.3/880-gateworks_system_controller.patch (renamed from target/linux/cns3xxx/patches-3.3/110-gateworks_gsp_support.patch) | 18 | ||||
| -rw-r--r-- | target/linux/ixp4xx/config-3.3 | 1 |
4 files changed, 12 insertions, 10 deletions
diff --git a/target/linux/cns3xxx/config-3.3 b/target/linux/cns3xxx/config-3.3 index a6f3bc7040..82f763518e 100644 --- a/target/linux/cns3xxx/config-3.3 +++ b/target/linux/cns3xxx/config-3.3 @@ -154,7 +154,7 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SCSI=y # CONFIG_SCSI_MULTI_LUN is not set CONFIG_SENSORS_AD7418=y -CONFIG_SENSORS_GSP=y +CONFIG_SENSORS_GSC=y CONFIG_SERIAL_8250_NR_UARTS=3 CONFIG_SERIAL_8250_RUNTIME_UARTS=3 CONFIG_SMP=y diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3 index abf499ff26..e21e17f70d 100644 --- a/target/linux/generic/config-3.3 +++ b/target/linux/generic/config-3.3 @@ -2491,6 +2491,7 @@ CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GPIO_FAN is not set +# CONFIG_SENSORS_GSC is not set # CONFIG_SENSORS_HDAPS is not set # CONFIG_SENSORS_I5K_AMB is not set # CONFIG_SENSORS_IT87 is not set diff --git a/target/linux/cns3xxx/patches-3.3/110-gateworks_gsp_support.patch b/target/linux/generic/patches-3.3/880-gateworks_system_controller.patch index 02fbdab6d2..981610dad1 100644 --- a/target/linux/cns3xxx/patches-3.3/110-gateworks_gsp_support.patch +++ b/target/linux/generic/patches-3.3/880-gateworks_system_controller.patch @@ -4,14 +4,14 @@ This driver can also be built as a module. If so, the module will be called gl520sm. -+config SENSORS_GSP -+ tristate "Gateworks System Peripheral" -+ depends on I2C && EXPERIMENTAL ++config SENSORS_GSC ++ tristate "Gateworks System Controller" ++ depends on I2C && (ARCH_DAVINCI || ARCH_CNS3XXX || ARCH_IXP4XX) + help -+ If you say yes here you get support for the Gateworks System Peripherals. ++ If you say yes here you get support for the Gateworks System Controller. + + This driver can also be built as a module. If so, the module -+ will be called gsp. ++ will be called gsc. + config SENSORS_GPIO_FAN tristate "GPIO fan" @@ -22,15 +22,15 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o -+obj-$(CONFIG_SENSORS_GSP) += gsp.o ++obj-$(CONFIG_SENSORS_GSC) += gsc.o obj-$(CONFIG_PMBUS) += pmbus/ --- /dev/null -+++ b/drivers/hwmon/gsp.c ++++ b/drivers/hwmon/gsc.c @@ -0,0 +1,308 @@ +/* -+ * A hwmon driver for the Gateworks System Peripheral ++ * A hwmon driver for the Gateworks System Controller + * Copyright (C) 2009 Gateworks Corporation + * + * Author: Chris Lang <clang@gateworks.com> @@ -333,7 +333,7 @@ +module_exit(gsp_exit); + +MODULE_AUTHOR("Chris Lang <clang@gateworks.com>"); -+MODULE_DESCRIPTION("GSP HWMON driver"); ++MODULE_DESCRIPTION("GSC HWMON driver"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRV_VERSION); + diff --git a/target/linux/ixp4xx/config-3.3 b/target/linux/ixp4xx/config-3.3 index 54a0ebbb4c..20dc4926d9 100644 --- a/target/linux/ixp4xx/config-3.3 +++ b/target/linux/ixp4xx/config-3.3 @@ -169,6 +169,7 @@ CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_X1205=y # CONFIG_SCSI_DMA is not set CONFIG_SENSORS_AD7418=y +CONFIG_SENSORS_GSC=y CONFIG_SENSORS_MAX6650=y CONFIG_SENSORS_W83781D=y CONFIG_SERIAL_8250_NR_UARTS=4 |