From b49fda4c4ddfbe09987d0bc9d868667b015c1091 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 1 Dec 2009 12:37:30 +0100 Subject: [PATCH] board-qi_lb60: remove obsolete definitions. --- .../include/asm/mach-jz4740/board-qi_lb60.h | 32 ------------------- .../arch/mips/jz4740/board-qi_lb60.c | 1 - 2 files changed, 33 deletions(-) diff --git a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h index 98318f3d4..e5de9da7a 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h +++ b/target/linux/xburst/files-2.6.31/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h @@ -41,7 +41,6 @@ #define GPIO_SD_CD_N JZ_GPIO_PORTD(0) #define GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2) -#define GPIO_SD_WP JZ_GPIO_PORTD(16) #define GPIO_USB_DETE JZ_GPIO_PORTD(28) #define GPIO_BUZZ_PWM JZ_GPIO_PORTD(27) @@ -54,35 +53,4 @@ #define GPIO_KEYIN_BASE JZ_GPIO_PORTD(18) #define GPIO_KEYIN_8 JZ_GPIO_PORTD(26) -/* - * MMC/SD - */ -#define MSC_WP_PIN GPIO_SD_WP -#define MSC_HOTPLUG_PIN GPIO_SD_CD_N -#define MSC_HOTPLUG_IRQ (JZ_IRQ_GPIO(GPIO_SD_CD_N)) - -#define __msc_init_io() \ -do { \ - __gpio_as_output(GPIO_SD_VCC_EN_N); \ - __gpio_as_input(GPIO_SD_CD_N); \ -} while (0) - -#define __msc_enable_power() \ -do { \ - __gpio_clear_pin(GPIO_SD_VCC_EN_N); \ -} while (0) - -#define __msc_disable_power() \ -do { \ - __gpio_set_pin(GPIO_SD_VCC_EN_N); \ -} while (0) - -#define __msc_card_detected(s) \ -({ \ - int detected = 1; \ - if (!__gpio_get_pin(GPIO_SD_CD_N)) \ - detected = 0; \ - detected; \ -}) - #endif /* __ASM_JZ4740_QI_LB60_H__ */ diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c index 0e1f95564..9f463b818 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/board-qi_lb60.c @@ -356,7 +356,6 @@ static void __init board_gpio_setup(void) * drivers. Everything else is done by the drivers themselfs. */ jz_gpio_disable_pullup(GPIO_SD_VCC_EN_N); jz_gpio_disable_pullup(GPIO_SD_CD_N); - jz_gpio_disable_pullup(GPIO_SD_WP); } static int __init qi_lb60_init_platform_devices(void)