提交 c68308dd 编写于 作者: W Wolfram Sang 提交者: Anatolij Gustschin

gpio: move mpc8xxx/512x gpio driver to drivers/gpio

Move the driver to the place where it is expected to be nowadays. Also
rename its CONFIG-name to match the rest and adapt the defconfigs.
Finally, move selection of REQUIRE_GPIOLIB or WANTS_OPTIONAL_GPIOLIB to
the platforms, because this option is per-platform and not per-driver.
Signed-off-by: NWolfram Sang <w.sang@pengutronix.de>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: NGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: NAnatolij Gustschin <agust@denx.de>
上级 40dc7e8b
...@@ -24,7 +24,7 @@ CONFIG_P1023_RDS=y ...@@ -24,7 +24,7 @@ CONFIG_P1023_RDS=y
CONFIG_QUICC_ENGINE=y CONFIG_QUICC_ENGINE=y
CONFIG_QE_GPIO=y CONFIG_QE_GPIO=y
CONFIG_CPM2=y CONFIG_CPM2=y
CONFIG_MPC8xxx_GPIO=y CONFIG_GPIO_MPC8XXX=y
CONFIG_HIGHMEM=y CONFIG_HIGHMEM=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
......
...@@ -20,7 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y ...@@ -20,7 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y CONFIG_MODVERSIONS=y
# CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_BSG is not set
CONFIG_XES_MPC85xx=y CONFIG_XES_MPC85xx=y
CONFIG_MPC8xxx_GPIO=y CONFIG_GPIO_MPC8XXX=y
CONFIG_HIGHMEM=y CONFIG_HIGHMEM=y
CONFIG_MATH_EMULATION=y CONFIG_MATH_EMULATION=y
CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_IRQ=y
......
...@@ -41,7 +41,7 @@ CONFIG_TQM8560=y ...@@ -41,7 +41,7 @@ CONFIG_TQM8560=y
CONFIG_SBC8548=y CONFIG_SBC8548=y
CONFIG_QUICC_ENGINE=y CONFIG_QUICC_ENGINE=y
CONFIG_QE_GPIO=y CONFIG_QE_GPIO=y
CONFIG_MPC8xxx_GPIO=y CONFIG_GPIO_MPC8XXX=y
CONFIG_HIGHMEM=y CONFIG_HIGHMEM=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
......
...@@ -42,7 +42,7 @@ CONFIG_TQM8560=y ...@@ -42,7 +42,7 @@ CONFIG_TQM8560=y
CONFIG_SBC8548=y CONFIG_SBC8548=y
CONFIG_QUICC_ENGINE=y CONFIG_QUICC_ENGINE=y
CONFIG_QE_GPIO=y CONFIG_QE_GPIO=y
CONFIG_MPC8xxx_GPIO=y CONFIG_GPIO_MPC8XXX=y
CONFIG_HIGHMEM=y CONFIG_HIGHMEM=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
......
...@@ -70,7 +70,7 @@ CONFIG_TAU_AVERAGE=y ...@@ -70,7 +70,7 @@ CONFIG_TAU_AVERAGE=y
CONFIG_QUICC_ENGINE=y CONFIG_QUICC_ENGINE=y
CONFIG_QE_GPIO=y CONFIG_QE_GPIO=y
CONFIG_PPC_BESTCOMM=y CONFIG_PPC_BESTCOMM=y
CONFIG_MPC8xxx_GPIO=y CONFIG_GPIO_MPC8XXX=y
CONFIG_MCU_MPC8349EMITX=m CONFIG_MCU_MPC8349EMITX=m
CONFIG_HIGHMEM=y CONFIG_HIGHMEM=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
......
...@@ -6,6 +6,7 @@ config PPC_MPC512x ...@@ -6,6 +6,7 @@ config PPC_MPC512x
select PPC_CLOCK select PPC_CLOCK
select PPC_PCI_CHOICE select PPC_PCI_CHOICE
select FSL_PCI if PCI select FSL_PCI if PCI
select ARCH_WANT_OPTIONAL_GPIOLIB
config MPC5121_ADS config MPC5121_ADS
bool "Freescale MPC5121E ADS" bool "Freescale MPC5121E ADS"
......
...@@ -114,18 +114,21 @@ config KMETER1 ...@@ -114,18 +114,21 @@ config KMETER1
endif endif
# used for usb # used for usb & gpio
config PPC_MPC831x config PPC_MPC831x
bool bool
select ARCH_WANT_OPTIONAL_GPIOLIB
# used for math-emu # used for math-emu
config PPC_MPC832x config PPC_MPC832x
bool bool
# used for usb # used for usb & gpio
config PPC_MPC834x config PPC_MPC834x
bool bool
select ARCH_WANT_OPTIONAL_GPIOLIB
# used for usb # used for usb & gpio
config PPC_MPC837x config PPC_MPC837x
bool bool
select ARCH_WANT_OPTIONAL_GPIOLIB
...@@ -177,7 +177,8 @@ config P2040_RDB ...@@ -177,7 +177,8 @@ config P2040_RDB
select PPC_E500MC select PPC_E500MC
select PHYS_64BIT select PHYS_64BIT
select SWIOTLB select SWIOTLB
select MPC8xxx_GPIO select ARCH_REQUIRE_GPIOLIB
select GPIO_MPC8XXX
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC select PPC_EPAPR_HV_PIC
help help
...@@ -189,7 +190,8 @@ config P3041_DS ...@@ -189,7 +190,8 @@ config P3041_DS
select PPC_E500MC select PPC_E500MC
select PHYS_64BIT select PHYS_64BIT
select SWIOTLB select SWIOTLB
select MPC8xxx_GPIO select ARCH_REQUIRE_GPIOLIB
select GPIO_MPC8XXX
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC select PPC_EPAPR_HV_PIC
help help
...@@ -201,7 +203,8 @@ config P4080_DS ...@@ -201,7 +203,8 @@ config P4080_DS
select PPC_E500MC select PPC_E500MC
select PHYS_64BIT select PHYS_64BIT
select SWIOTLB select SWIOTLB
select MPC8xxx_GPIO select ARCH_REQUIRE_GPIOLIB
select GPIO_MPC8XXX
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC select PPC_EPAPR_HV_PIC
help help
...@@ -216,7 +219,8 @@ config P5020_DS ...@@ -216,7 +219,8 @@ config P5020_DS
select PPC_E500MC select PPC_E500MC
select PHYS_64BIT select PHYS_64BIT
select SWIOTLB select SWIOTLB
select MPC8xxx_GPIO select ARCH_REQUIRE_GPIOLIB
select GPIO_MPC8XXX
select HAS_RAPIDIO select HAS_RAPIDIO
select PPC_EPAPR_HV_PIC select PPC_EPAPR_HV_PIC
help help
......
...@@ -4,6 +4,7 @@ menuconfig PPC_86xx ...@@ -4,6 +4,7 @@ menuconfig PPC_86xx
depends on 6xx depends on 6xx
select FSL_SOC select FSL_SOC
select ALTIVEC select ALTIVEC
select ARCH_WANT_OPTIONAL_GPIOLIB
help help
The Freescale E600 SoCs have 74xx cores. The Freescale E600 SoCs have 74xx cores.
......
...@@ -334,16 +334,6 @@ config OF_RTC ...@@ -334,16 +334,6 @@ config OF_RTC
source "arch/powerpc/sysdev/bestcomm/Kconfig" source "arch/powerpc/sysdev/bestcomm/Kconfig"
config MPC8xxx_GPIO
bool "MPC512x/MPC8xxx GPIO support"
depends on PPC_MPC512x || PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || \
FSL_SOC_BOOKE || PPC_86xx
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
help
Say Y here if you're going to use hardware that connects to the
MPC512x/831x/834x/837x/8572/8610 GPIOs.
config SIMPLE_GPIO config SIMPLE_GPIO
bool "Support for simple, memory-mapped GPIO controllers" bool "Support for simple, memory-mapped GPIO controllers"
depends on PPC depends on PPC
......
...@@ -18,7 +18,6 @@ obj-$(CONFIG_FSL_PCI) += fsl_pci.o $(fsl-msi-obj-y) ...@@ -18,7 +18,6 @@ obj-$(CONFIG_FSL_PCI) += fsl_pci.o $(fsl-msi-obj-y)
obj-$(CONFIG_FSL_PMC) += fsl_pmc.o obj-$(CONFIG_FSL_PMC) += fsl_pmc.o
obj-$(CONFIG_FSL_LBC) += fsl_lbc.o obj-$(CONFIG_FSL_LBC) += fsl_lbc.o
obj-$(CONFIG_FSL_GTM) += fsl_gtm.o obj-$(CONFIG_FSL_GTM) += fsl_gtm.o
obj-$(CONFIG_MPC8xxx_GPIO) += mpc8xxx_gpio.o
obj-$(CONFIG_FSL_85XX_CACHE_SRAM) += fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o obj-$(CONFIG_FSL_85XX_CACHE_SRAM) += fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o
obj-$(CONFIG_SIMPLE_GPIO) += simple_gpio.o obj-$(CONFIG_SIMPLE_GPIO) += simple_gpio.o
obj-$(CONFIG_FSL_RIO) += fsl_rio.o obj-$(CONFIG_FSL_RIO) += fsl_rio.o
......
...@@ -103,6 +103,14 @@ config GPIO_MPC5200 ...@@ -103,6 +103,14 @@ config GPIO_MPC5200
def_bool y def_bool y
depends on PPC_MPC52xx depends on PPC_MPC52xx
config GPIO_MPC8XXX
bool "MPC512x/MPC8xxx GPIO support"
depends on PPC_MPC512x || PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || \
FSL_SOC_BOOKE || PPC_86xx
help
Say Y here if you're going to use hardware that connects to the
MPC512x/831x/834x/837x/8572/8610 GPIOs.
config GPIO_MSM_V1 config GPIO_MSM_V1
tristate "Qualcomm MSM GPIO v1" tristate "Qualcomm MSM GPIO v1"
depends on GPIOLIB && ARCH_MSM depends on GPIOLIB && ARCH_MSM
......
...@@ -27,6 +27,7 @@ obj-$(CONFIG_GPIO_MC33880) += gpio-mc33880.o ...@@ -27,6 +27,7 @@ obj-$(CONFIG_GPIO_MC33880) += gpio-mc33880.o
obj-$(CONFIG_GPIO_MCP23S08) += gpio-mcp23s08.o obj-$(CONFIG_GPIO_MCP23S08) += gpio-mcp23s08.o
obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o obj-$(CONFIG_GPIO_ML_IOH) += gpio-ml-ioh.o
obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc5200.o
obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8xxx.o
obj-$(CONFIG_GPIO_MSM_V1) += gpio-msm-v1.o obj-$(CONFIG_GPIO_MSM_V1) += gpio-msm-v1.o
obj-$(CONFIG_GPIO_MSM_V2) += gpio-msm-v2.o obj-$(CONFIG_GPIO_MSM_V2) += gpio-msm-v2.o
obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册