From d95ab8443f278f6c917c508a8745c09a298c9fff Mon Sep 17 00:00:00 2001 From: Bengt Jonsson Date: Thu, 2 Feb 2012 11:36:49 +0100 Subject: ux500: Add U8520 machine ST-Ericsson ID: 371953 Signed-off-by: Bengt Jonsson --- arch/arm/mach-ux500/Kconfig | 7 +++++++ arch/arm/mach-ux500/board-mop500-cyttsp.c | 2 +- arch/arm/mach-ux500/board-mop500-pins.c | 17 +++++++++++------ arch/arm/mach-ux500/board-mop500-stuib.c | 2 +- arch/arm/mach-ux500/board-mop500-u8500uib.c | 2 +- arch/arm/mach-ux500/board-mop500.c | 16 +++++++++++++++- 6 files changed, 36 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 400fa9b7090..35171c7d970 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -47,6 +47,13 @@ config MACH_HREFV60 Include support for the HREFv60 new development platform. Includes HREFv70, v71 etc. +config MACH_U8520 + bool "U8520 Development platform" + depends on UX500_SOC_DB8500 + select MACH_U8500 + help + Include support for the 8520 development platform. + config MACH_SNOWBALL bool "U8500 Snowball platform" select MACH_MOP500 diff --git a/arch/arm/mach-ux500/board-mop500-cyttsp.c b/arch/arm/mach-ux500/board-mop500-cyttsp.c index 8aca8bef5ad..48f4187d887 100755 --- a/arch/arm/mach-ux500/board-mop500-cyttsp.c +++ b/arch/arm/mach-ux500/board-mop500-cyttsp.c @@ -232,7 +232,7 @@ void __init mop500_u8500uib_r3_init(void) mop500_cyttsp_init(); db8500_add_spi2(&mop500_spi2_data); nmk_config_pin((GPIO64_GPIO | PIN_INPUT_PULLUP), false); - if (machine_is_hrefv60()) { + if (machine_is_hrefv60() || machine_is_u8520()) { adp1653_pdata_u8500_uib.enable_gpio = HREFV60_CAMERA_FLASH_ENABLE; } else { diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index df00ccf3f7f..636dadf0efb 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -922,7 +922,8 @@ static pin_cfg_t mop500_pins_common_power_save_bank8[] = { static void mop500_pins_suspend_force(void) { - if (machine_is_hrefv60() || machine_is_u9540()) + if (machine_is_hrefv60() || machine_is_u8520() || + 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 +933,8 @@ 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() || machine_is_u9540()) + if (machine_is_hrefv60() || machine_is_u8520() || + 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 +952,8 @@ 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() || machine_is_u9540()) + if (machine_is_hrefv60() || machine_is_u8520() || + 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 +963,8 @@ 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() || machine_is_u9540()) + else if (machine_is_hrefv60() || machine_is_u8520() || + 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 +974,8 @@ 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() || machine_is_u9540()) + else if (machine_is_hrefv60() || machine_is_u8520() || + 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 +1127,7 @@ void __init hrefv60_pins_init(void) static int __init mop500_offchip_gpio_init(void) { - if (machine_is_hrefv60() || machine_is_u9540()) + if (machine_is_hrefv60() || machine_is_u8520() || machine_is_u9540()) ux500_offchip_gpio_init(&mop500_offchip_gpio_cfg); return 0; diff --git a/arch/arm/mach-ux500/board-mop500-stuib.c b/arch/arm/mach-ux500/board-mop500-stuib.c index 273869bf3ca..1e5c2f6e3e3 100644 --- a/arch/arm/mach-ux500/board-mop500-stuib.c +++ b/arch/arm/mach-ux500/board-mop500-stuib.c @@ -245,7 +245,7 @@ static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = { void __init mop500_stuib_init(void) { - if (machine_is_hrefv60()) { + if (machine_is_hrefv60() || machine_is_u8520()) { tsc_plat_device.cs_pin = HREFV60_TOUCH_RST_GPIO; tsc_plat2_device.cs_pin = HREFV60_TOUCH_RST_GPIO; #ifdef CONFIG_U8500_FLASH diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c index 8e49fad2793..0b77ee29982 100644 --- a/arch/arm/mach-ux500/board-mop500-u8500uib.c +++ b/arch/arm/mach-ux500/board-mop500-u8500uib.c @@ -114,7 +114,7 @@ void __init mop500_u8500uib_init(void) ARRAY_SIZE(mop500_i2c0_devices_u8500)); #ifdef CONFIG_U8500_FLASH - if (machine_is_hrefv60()) + if (machine_is_hrefv60() || machine_is_u8520()) adp1653_pdata_u8500_uib.enable_gpio = HREFV60_CAMERA_FLASH_ENABLE; else diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 553b5ef568e..2f375d64e77 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -1330,6 +1330,20 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") .restart = ux500_restart, MACHINE_END +/* + * NOTE! 8520 machine reports as a HREFV60 until user space updates has been + * done for 8520. + */ +MACHINE_START(U8520, "ST-Ericsson U8500 Platform HREFv60+") + .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 + MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") .atag_offset = 0x100, .map_io = u8500_map_io, @@ -1351,7 +1365,7 @@ MACHINE_START(SNOWBALL, "ST-Ericsson Snowball platform") .restart = ux500_restart, MACHINE_END -/* Tempoary reuse hrefv60 machine */ +/* Temporary reuse hrefv60 machine */ MACHINE_START(U9540, "ST-Ericsson 9540 platform") .atag_offset = 0x100, .map_io = u8500_map_io, -- cgit v1.2.3