pxa: remove reduntant gpio setting on mmc slot
Subsystems (3)
PATCH 1/1 pxa: remove reduntant gpio setting on mmc slot
PXA mmc host driver supports card detect, read only and power gpio pin setting already. Zylonite platform driver needn't implement this any more.
Signed-off-by Haojian Zhuang <[email protected]>
--- arch/arm/mach-pxa/include/mach/zylonite.h | 7 -- arch/arm/mach-pxa/zylonite.c | 87 +++++------------------------ arch/arm/mach-pxa/zylonite_pxa300.c | 12 +--- arch/arm/mach-pxa/zylonite_pxa320.c | 4 - 4 files changed, 16 insertions(+), 94 deletions(-)
(quoted diff) +0 -0
b/arch/arm/mach-pxa/include/mach/zylonite.h
index bf6785a..9edf645 100644
arch/arm/mach-pxa/include/mach/zylonite.h +0 -7
@@ -8,13 +8,6 @@/* the following variables are processor specific and initialized * by the corresponding zylonite_pxa3xx_init() */ -struct platform_mmc_slot { -int gpio_cd; -int gpio_wp; -}; - -extern struct platform_mmc_slot zylonite_mmc_slot[]; -extern int gpio_eth_irq;extern int gpio_debug_led1;extern int gpio_debug_led2;
arch/arm/mach-pxa/zylonite.c +14 -73
114 lines not on this page · raw message
(quoted diff) +0 -0
b/arch/arm/mach-pxa/zylonite_pxa300.c
index 8409544..3aa73b3 100644
arch/arm/mach-pxa/zylonite_pxa300.c +2 -10
@@ -129,8 +129,8 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = {GPIO22_I2C_SDA ,/* GPIO */ -GPIO18_GPIO ,/* GPIO Expander #0 INT_N */ - GPIO19_GPIO, /* GPIO Expander #1 INT_N */ +GPIO18_GPIO |MFP_PULL_HIGH ,/* GPIO Expander #0 INT_N */ + GPIO19_GPIO | MFP_PULL_HIGH, /* GPIO Expander #1 INT_N */ }; static mfp_cfg_t pxa300_mfp_cfg[] __initdata = {
@@ -258,10 +258,6 @@ void __init zylonite_pxa300_init(void)/* detect LCD panel */ zylonite_detect_lcd_panel (); -/* MMC card detect & write protect for controller 0 */ - zylonite_mmc_slot[0 ].gpio_cd =EXT_GPIO (0 ); - zylonite_mmc_slot[0 ].gpio_wp =EXT_GPIO (2 ); -/* WM9713 IRQ */ wm9713_irq =mfp_to_gpio (MFP_PIN_GPIO26 );
@@ -276,10 +272,6 @@ void __init zylonite_pxa300_init(void)if (cpu_is_pxa310 ()) {pxa3xx_mfp_config (ARRAY_AND_SIZE (pxa310_mfp_cfg)); gpio_eth_irq =mfp_to_gpio (MFP_PIN_GPIO102 ); - -/* MMC card detect & write protect for controller 2 */ - zylonite_mmc_slot[2 ].gpio_cd =EXT_GPIO (30 ); - zylonite_mmc_slot[2 ].gpio_wp =EXT_GPIO (31 ); }/* GPIOs for Debug LEDs */
(quoted diff) +0 -0
b/arch/arm/mach-pxa/zylonite_pxa320.c
index 60d08f2..9942bac 100644
arch/arm/mach-pxa/zylonite_pxa320.c +0 -4
@@ -209,10 +209,6 @@ void __init zylonite_pxa320_init(void) gpio_debug_led1 =mfp_to_gpio (MFP_PIN_GPIO1_2 ); gpio_debug_led2 =mfp_to_gpio (MFP_PIN_GPIO4_2 ); -/* MMC card detect & write protect for controller 0 */ - zylonite_mmc_slot[0 ].gpio_cd =mfp_to_gpio (MFP_PIN_GPIO1 ); - zylonite_mmc_slot[0 ].gpio_wp =mfp_to_gpio (MFP_PIN_GPIO5 ); -/* WM9713 IRQ */ wm9713_irq =mfp_to_gpio (MFP_PIN_GPIO15 ); }
Signature · 1 line
1.5.6.5