From: Linus Torvalds Date: Tue, 7 May 2013 17:57:51 +0000 (-0700) Subject: Merge tag 'soc-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... X-Git-Tag: v3.10-rc1~65 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8c4b90e670be3b01e9395c7310639c8109fc77e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge tag 'soc-for-linus-2' of git://git./linux/kernel/git/arm/arm-soc Pull ARM SoC platform updates (part 2) from Arnd Bergmann: "These patches are all for Renesas shmobile, and depend on the earlier pinctrl updates. Remarkably, this adds support for three new SoCs: r8a73a4, r8a73a4 and r8a7778. The bulk of the code added for these is for pinctrl (using the new subsystem) and for clocks (not yet using the common clock subsystem). The latter will have to get converted in one of the upcoming releases, but shmobile is not ready for that yet. The series also contains Renesas shmobile board changes, adding one board file for each of the three new SoCs. These boards are using a mix of classic and device-tree based probing, as there is still a lot of infrastructure in shmobile that has not been converted to DT yet. Once those are resolved to the degree that no board specific setup code is needed, they can get folded into the respective SoC setup files." * tag 'soc-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits) ARM: shmobile: use r8a7790 timer setup code on Lager ARM: shmobile: force enable of r8a7790 arch timer ARM: shmobile: Add second I/O range for r8a7790 PFC ARM: shmobile: bockw: enable network settings on bootargs ARM: shmobile: bockw: add SMSC ethernet support ARM: shmobile: R8A7778: add Ether support ARM: shmobile: bockw: enable SMSC ethernet on defconfig ARM: shmobile: r8a7778: add r8a7778_init_irq_extpin() ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO() ARM: shmobile: mackerel: clean up MMCIF vs. SDHI1 selection ARM: shmobile: mackerel: add interrupt names for SDHI0 ARM: shmobile: mackerel: switch SDHI and MMCIF interfaces to slot-gpio ARM: shmobile: mackerel: remove OCR masks, where regulators are used ARM: shmobile: mackerel: SDHI resources do not have to be numbered ARM: shmobile: Initial r8a7790 Lager board support ARM: shmobile: APE6EVM LAN9220 support ARM: shmobile: APE6EVM PFC support ARM: shmobile: APE6EVM base support ARM: shmobile: kzm9g-reference: add ethernet support ARM: shmobile: add R-Car M1A Bock-W platform support ... --- a8c4b90e670be3b01e9395c7310639c8109fc77e diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c index 4dfe322,81db74a..b85b288 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@@ -1009,8 -1000,7 +1009,8 @@@ static struct st1232_pdata st1232_i2c0_ static struct i2c_board_info i2c0_devices[] = { { I2C_BOARD_INFO("st1232-ts", 0x55), - .irq = evt2irq(0x0340), + .irq = irq_pin(10), + .platform_data = &st1232_i2c0_pdata, }, { I2C_BOARD_INFO("wm8978", 0x1a), diff --cc arch/arm/mach-shmobile/include/mach/common.h index 1fef737,e002cfd..4634a5d --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@@ -14,62 -14,11 +14,8 @@@ extern int shmobile_clk_init(void) extern void shmobile_handle_irq_intc(struct pt_regs *); extern struct platform_suspend_ops shmobile_suspend_ops; struct cpuidle_driver; -struct cpuidle_device; -extern int shmobile_enter_wfi(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index); extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv); - extern void sh7372_init_irq(void); - extern void sh7372_map_io(void); - extern void sh7372_earlytimer_init(void); - extern void sh7372_add_early_devices(void); - extern void sh7372_add_standard_devices(void); - extern void sh7372_add_early_devices_dt(void); - extern void sh7372_add_standard_devices_dt(void); - extern void sh7372_clock_init(void); - extern void sh7372_pinmux_init(void); - extern void sh7372_pm_init(void); - extern void sh7372_resume_core_standby_sysc(void); - extern int sh7372_do_idle_sysc(unsigned long sleep_mode); - extern struct clk sh7372_extal1_clk; - extern struct clk sh7372_extal2_clk; - - extern void sh73a0_init_delay(void); - extern void sh73a0_init_irq(void); - extern void sh73a0_init_irq_dt(void); - extern void sh73a0_map_io(void); - extern void sh73a0_earlytimer_init(void); - extern void sh73a0_add_early_devices(void); - extern void sh73a0_add_standard_devices(void); - extern void sh73a0_add_standard_devices_dt(void); - extern void sh73a0_clock_init(void); - extern void sh73a0_pinmux_init(void); - extern void sh73a0_pm_init(void); - extern struct clk sh73a0_extal1_clk; - extern struct clk sh73a0_extal2_clk; - extern struct clk sh73a0_extcki_clk; - extern struct clk sh73a0_extalr_clk; - - extern void r8a7740_meram_workaround(void); - extern void r8a7740_init_irq(void); - extern void r8a7740_map_io(void); - extern void r8a7740_add_early_devices(void); - extern void r8a7740_add_standard_devices(void); - extern void r8a7740_clock_init(u8 md_ck); - extern void r8a7740_pinmux_init(void); - extern void r8a7740_pm_init(void); - - extern void r8a7779_init_delay(void); - extern void r8a7779_init_irq(void); - extern void r8a7779_init_irq_extpin(int irlm); - extern void r8a7779_init_irq_dt(void); - extern void r8a7779_map_io(void); - extern void r8a7779_earlytimer_init(void); - extern void r8a7779_add_early_devices(void); - extern void r8a7779_add_standard_devices(void); - extern void r8a7779_add_standard_devices_dt(void); - extern void r8a7779_clock_init(void); - extern void r8a7779_pinmux_init(void); - extern void r8a7779_pm_init(void); - extern void r8a7779_register_twd(void); - #ifdef CONFIG_SUSPEND int shmobile_suspend_init(void); #else