diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-05 14:29:14 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:16:53 +0200 |
| commit | b6965b27dafa8d39a2705d550008ab2dc43f5542 (patch) | |
| tree | 9fc0d1985fdc30584dedd9b053b1260eed1a278f | |
| parent | 2403f84984f445cabd5337ef5ec8e24a3e76929e (diff) | |
mach-ux500: Fix board merge & cleanup
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-sdi.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 12 |
3 files changed, 11 insertions, 18 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 0115e6f95c2..710ab28fd68 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -28,13 +28,6 @@ * SDI 0 (MicroSD slot) */ -/* MMCIPOWER bits */ -#define MCI_DATA2DIREN (1 << 2) -#define MCI_CMDDIREN (1 << 3) -#define MCI_DATA0DIREN (1 << 4) -#define MCI_DATA31DIREN (1 << 5) -#define MCI_FBCLKEN (1 << 7) - /* GPIO pins used by the sdi0 level shifter */ static int sdi0_en = -1; static int sdi0_vsel = -1; diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index a06fbafd08e..b360330c9e0 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -731,7 +731,8 @@ static struct pl022_ssp_controller ssp0_platform_data = { static void __init mop500_spi_init(void) { db8500_add_ssp0(&ssp0_platform_data); - db8500_add_msp2_spi(&mop500_msp2_spi_data); + if (!machine_is_snowball()) + db8500_add_msp2_spi(&mop500_msp2_spi_data); } #ifdef CONFIG_STE_DMA40_REMOVE @@ -907,10 +908,13 @@ static void __init mop500_init_machine(void) * instead. */ if (!machine_is_snowball()) { - if (machine_is_hrefv60()) + if (machine_is_hrefv60()) { mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO; - else + mop500_gpio_keys[1].gpio = HREFV60_HAL_SW_GPIO; + } else { mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR; + mop500_gpio_keys[1].gpio = GPIO_HAL_SENSOR; + } } accessory_detect_config(); diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 16ed8d3b9c1..679ec31ed32 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -397,9 +397,6 @@ static void __init db8500_add_gpios(void) if (cpu_is_u8500v2()) pdata.supports_sleepmode = true; - if (cpu_is_u8500v2()) - pdata.supports_sleepmode = true; - dbx500_add_gpios(ARRAY_AND_SIZE(db8500_gpio_base), IRQ_DB8500_GPIO0, &pdata); } @@ -499,14 +496,13 @@ static ssize_t ux500_get_process(char *buf, struct sysfs_soc_info *si) static ssize_t ux500_get_reset_code(char *buf, struct sysfs_soc_info *si) { - return 0; - // return sprintf(buf, "0x%04x\n", prcmu_get_reset_code()); + return sprintf(buf, "0x%04x\n", prcmu_get_reset_code()); } static ssize_t ux500_get_reset_reason(char *buf, struct sysfs_soc_info *si) { - return 0; - // return sprintf(buf, "%s\n", reboot_reason_string(prcmu_get_reset_code())); + return sprintf(buf, "%s\n", + reboot_reason_string(prcmu_get_reset_code())); } static struct sysfs_soc_info soc_info[] = { @@ -515,7 +511,7 @@ static struct sysfs_soc_info soc_info[] = { SYSFS_SOC_ATTR_CALLBACK("soc_id", ux500_get_soc_id), SYSFS_SOC_ATTR_CALLBACK("revision", ux500_get_revision), SYSFS_SOC_ATTR_CALLBACK("process", ux500_get_process), -// SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code), + SYSFS_SOC_ATTR_CALLBACK("reset_code", ux500_get_reset_code), SYSFS_SOC_ATTR_CALLBACK("reset_reason", ux500_get_reset_reason), }; |