From 98cae5b67dc5c3ce4e188c82eabd7b30029b6273 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Tue, 10 Jan 2012 09:36:14 +0100 Subject: mach-ux500: Add support for 9540 ST-Ericsson ID: 398896 Signed-off-by: Yann Gautier --- arch/arm/mach-ux500/Kconfig | 7 +++++++ arch/arm/mach-ux500/board-mop500-pins.c | 12 ++++++------ arch/arm/mach-ux500/board-mop500.c | 11 +++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 989aca808da..400fa9b7090 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -59,6 +59,13 @@ config MACH_U5500 help Include support for the U5500 development platform. +config MACH_U9540 + bool "U9540 Development platform" + depends on UX500_SOC_DB8500 + select MACH_U8500 + help + Include support for the U9540 development platform. + config UX500_AUTO_PLATFORM def_bool y depends on !MACH_U5500 diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index ef2a2b540ea..df00ccf3f7f 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -922,7 +922,7 @@ static pin_cfg_t mop500_pins_common_power_save_bank8[] = { static void mop500_pins_suspend_force(void) { - if (machine_is_hrefv60()) + if (machine_is_hrefv60() || machine_is_u9540()) sleep_pins_config_pm(mop500_pins_common_power_save_bank0_href60, ARRAY_SIZE(mop500_pins_common_power_save_bank0_href60)); else @@ -932,7 +932,7 @@ static void mop500_pins_suspend_force(void) sleep_pins_config_pm(mop500_pins_common_power_save_bank1, ARRAY_SIZE(mop500_pins_common_power_save_bank1)); - if (machine_is_hrefv60()) + if (machine_is_hrefv60() || machine_is_u9540()) sleep_pins_config_pm(mop500_pins_common_power_save_bank2_href60, ARRAY_SIZE(mop500_pins_common_power_save_bank2_href60)); else @@ -950,7 +950,7 @@ static void mop500_pins_suspend_force(void) sleep_pins_config_pm(mop500_pins_common_power_save_bank4, ARRAY_SIZE(mop500_pins_common_power_save_bank4)); - if (machine_is_hrefv60()) + if (machine_is_hrefv60() || machine_is_u9540()) sleep_pins_config_pm(mop500_pins_common_power_save_bank5_href60, ARRAY_SIZE(mop500_pins_common_power_save_bank5_href60)); else @@ -960,7 +960,7 @@ static void mop500_pins_suspend_force(void) if (pins_for_u9500()) sleep_pins_config_pm(mop500_pins_common_power_save_bank6_u9500, ARRAY_SIZE(mop500_pins_common_power_save_bank6_u9500)); - else if (machine_is_hrefv60()) + else if (machine_is_hrefv60() || machine_is_u9540()) sleep_pins_config_pm(mop500_pins_common_power_save_bank6_href60, ARRAY_SIZE(mop500_pins_common_power_save_bank6_href60)); else @@ -970,7 +970,7 @@ static void mop500_pins_suspend_force(void) if (pins_for_u9500()) sleep_pins_config_pm(mop500_pins_common_power_save_bank7_u9500, ARRAY_SIZE(mop500_pins_common_power_save_bank7_u9500)); - else if (machine_is_hrefv60()) + else if (machine_is_hrefv60() || machine_is_u9540()) sleep_pins_config_pm(mop500_pins_common_power_save_bank7_href60, ARRAY_SIZE(mop500_pins_common_power_save_bank7_href60)); else @@ -1122,7 +1122,7 @@ void __init hrefv60_pins_init(void) static int __init mop500_offchip_gpio_init(void) { - if (machine_is_hrefv60()) + if (machine_is_hrefv60() || machine_is_u9540()) ux500_offchip_gpio_init(&mop500_offchip_gpio_cfg); return 0; diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 0bce0c81b6c..553b5ef568e 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -1351,6 +1351,17 @@ MACHINE_START(SNOWBALL, "ST-Ericsson Snowball platform") .restart = ux500_restart, MACHINE_END +/* Tempoary reuse hrefv60 machine */ +MACHINE_START(U9540, "ST-Ericsson 9540 platform") + .atag_offset = 0x100, + .map_io = u8500_map_io, + .init_irq = ux500_init_irq, + .timer = &ux500_timer, + .handle_irq = gic_handle_irq, + .init_machine = hrefv60_init_machine, + .restart = ux500_restart, +MACHINE_END + #ifdef CONFIG_MACH_UX500_DT struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { -- cgit v1.2.3