diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-01-11 11:55:39 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2009-01-13 18:46:31 -0500 |
| commit | ea0105ea3881b409e362451690184af494bce6e3 (patch) | |
| tree | 13b9cdd8ba2ca4656536c38ac9455782e3cac931 | |
| parent | 6c9789de2a02755101f757789ffcb17312f3fa9b (diff) | |
powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/
This patch is used to help Jean Delvare to get rid of drivers/i2c/chips/
directory. The new location suggested by Kumar Gala: as the driver is
83xx specific it's placed into arch/powerpc/platforms/83xx/.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/platforms/83xx/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c (renamed from drivers/i2c/chips/mcu_mpc8349emitx.c) | 0 | ||||
| -rw-r--r-- | arch/powerpc/platforms/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/i2c/chips/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/i2c/chips/Makefile | 1 |
5 files changed, 12 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile index ba5028e2989..051777c542c 100644 --- a/arch/powerpc/platforms/83xx/Makefile +++ b/arch/powerpc/platforms/83xx/Makefile | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | obj-y := misc.o usb.o | 4 | obj-y := misc.o usb.o |
| 5 | obj-$(CONFIG_SUSPEND) += suspend.o suspend-asm.o | 5 | obj-$(CONFIG_SUSPEND) += suspend.o suspend-asm.o |
| 6 | obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o | ||
| 6 | obj-$(CONFIG_MPC831x_RDB) += mpc831x_rdb.o | 7 | obj-$(CONFIG_MPC831x_RDB) += mpc831x_rdb.o |
| 7 | obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o | 8 | obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o |
| 8 | obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o | 9 | obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o |
diff --git a/drivers/i2c/chips/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c index 82a9bcb858b..82a9bcb858b 100644 --- a/drivers/i2c/chips/mcu_mpc8349emitx.c +++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | |||
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 47fe2bea986..200b9cb900e 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
| @@ -323,4 +323,15 @@ config SIMPLE_GPIO | |||
| 323 | chip-selects, Ethernet/USB PHY's power and various other small | 323 | chip-selects, Ethernet/USB PHY's power and various other small |
| 324 | on-board peripherals. | 324 | on-board peripherals. |
| 325 | 325 | ||
| 326 | config MCU_MPC8349EMITX | ||
| 327 | tristate "MPC8349E-mITX MCU driver" | ||
| 328 | depends on I2C && PPC_83xx | ||
| 329 | select GENERIC_GPIO | ||
| 330 | select ARCH_REQUIRE_GPIOLIB | ||
| 331 | help | ||
| 332 | Say Y here to enable soft power-off functionality on the Freescale | ||
| 333 | boards with the MPC8349E-mITX-compatible MCU chips. This driver will | ||
| 334 | also register MCU GPIOs with the generic GPIO API, so you'll able | ||
| 335 | to use MCU pins as GPIOs. | ||
| 336 | |||
| 326 | endmenu | 337 | endmenu |
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig index 59c3d23f5bd..b9bef04b7be 100644 --- a/drivers/i2c/chips/Kconfig +++ b/drivers/i2c/chips/Kconfig | |||
| @@ -139,15 +139,4 @@ config SENSORS_TSL2550 | |||
| 139 | This driver can also be built as a module. If so, the module | 139 | This driver can also be built as a module. If so, the module |
| 140 | will be called tsl2550. | 140 | will be called tsl2550. |
| 141 | 141 | ||
| 142 | config MCU_MPC8349EMITX | ||
| 143 | tristate "MPC8349E-mITX MCU driver" | ||
| 144 | depends on I2C && PPC_83xx | ||
| 145 | select GENERIC_GPIO | ||
| 146 | select ARCH_REQUIRE_GPIOLIB | ||
| 147 | help | ||
| 148 | Say Y here to enable soft power-off functionality on the Freescale | ||
| 149 | boards with the MPC8349E-mITX-compatible MCU chips. This driver will | ||
| 150 | also register MCU GPIOs with the generic GPIO API, so you'll able | ||
| 151 | to use MCU pins as GPIOs. | ||
| 152 | |||
| 153 | endmenu | 142 | endmenu |
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile index 83accaaf816..00fcb5193ac 100644 --- a/drivers/i2c/chips/Makefile +++ b/drivers/i2c/chips/Makefile | |||
| @@ -19,7 +19,6 @@ obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o | |||
| 19 | obj-$(CONFIG_PCF8575) += pcf8575.o | 19 | obj-$(CONFIG_PCF8575) += pcf8575.o |
| 20 | obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o | 20 | obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o |
| 21 | obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o | 21 | obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o |
| 22 | obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o | ||
| 23 | 22 | ||
| 24 | ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) | 23 | ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) |
| 25 | EXTRA_CFLAGS += -DDEBUG | 24 | EXTRA_CFLAGS += -DDEBUG |
