From: Simon Horman Date: Tue, 10 Dec 2013 08:33:59 +0000 (+0900) Subject: Merge branches 'heads/fixes-for-v3.13', 'heads/defconfig', 'heads/usb-r8a66597-hcd... X-Git-Tag: next-20131212~94^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3b1263bf70011d27f78786d6d665736ed5d34a9e;p=karo-tx-linux.git Merge branches 'heads/fixes-for-v3.13', 'heads/defconfig', 'heads/usb-r8a66597-hcd', 'heads/boards' and 'heads/dt' into devel --- 3b1263bf70011d27f78786d6d665736ed5d34a9e diff --cc arch/arm/boot/dts/Makefile index d57c1a65b24f,d57c1a65b24f,d57c1a65b24f,5ef42fca1db0,909d910b5ddf..33c60542ae82 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@@@@ -216,8 -216,8 -216,8 -216,9 -216,8 +216,9 @@@@@@ dtb-$(CONFIG_ARCH_U8500) += ste-snowbal dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ s3c6410-smdk6410.dtb --- dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ +++ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ r7s72100-genmai.dtb \ +++ + r7s72100-genmai-reference.dtb \ r8a7740-armadillo800eva.dtb \ r8a7778-bockw.dtb \ r8a7778-bockw-reference.dtb \ diff --cc arch/arm/boot/dts/r8a7790.dtsi index 46e1d7ef163f,ee845fad939b,ee845fad939b,ee845fad939b,0e4d5b57c48b..68b7b87e535f --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@@@@@ -84,14 -84,14 -84,14 -84,14 -87,14 +87,14 @@@@@@ <0 0xf1002000 0 0x1000>, <0 0xf1004000 0 0x2000>, <0 0xf1006000 0 0x2000>; ---- interrupts = <1 9 0xf04>; ++++ interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; ---- gpio0: gpio@ffc40000 { ++++ gpio0: gpio@e6050000 { compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; ---- reg = <0 0xffc40000 0 0x2c>; ++++ reg = <0 0xe6050000 0 0x50>; interrupt-parent = <&gic>; ---- interrupts = <0 4 0x4>; ++++ interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; gpio-ranges = <&pfc 0 0 32>; @@@@@@ -99,11 -99,11 -99,11 -99,11 -102,11 +102,11 @@@@@@ interrupt-controller; }; ---- gpio1: gpio@ffc41000 { ++++ gpio1: gpio@e6051000 { compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; ---- reg = <0 0xffc41000 0 0x2c>; ++++ reg = <0 0xe6051000 0 0x50>; interrupt-parent = <&gic>; ---- interrupts = <0 5 0x4>; ++++ interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; gpio-ranges = <&pfc 0 32 32>; @@@@@@ -111,11 -111,11 -111,11 -111,11 -114,11 +114,11 @@@@@@ interrupt-controller; }; ---- gpio2: gpio@ffc42000 { ++++ gpio2: gpio@e6052000 { compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; ---- reg = <0 0xffc42000 0 0x2c>; ++++ reg = <0 0xe6052000 0 0x50>; interrupt-parent = <&gic>; ---- interrupts = <0 6 0x4>; ++++ interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; gpio-ranges = <&pfc 0 64 32>; @@@@@@ -123,11 -123,11 -123,11 -123,11 -126,11 +126,11 @@@@@@ interrupt-controller; }; ---- gpio3: gpio@ffc43000 { ++++ gpio3: gpio@e6053000 { compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; ---- reg = <0 0xffc43000 0 0x2c>; ++++ reg = <0 0xe6053000 0 0x50>; interrupt-parent = <&gic>; ---- interrupts = <0 7 0x4>; ++++ interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; gpio-ranges = <&pfc 0 96 32>; @@@@@@ -135,11 -135,11 -135,11 -135,11 -138,11 +138,11 @@@@@@ interrupt-controller; }; ---- gpio4: gpio@ffc44000 { ++++ gpio4: gpio@e6054000 { compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; ---- reg = <0 0xffc44000 0 0x2c>; ++++ reg = <0 0xe6054000 0 0x50>; interrupt-parent = <&gic>; ---- interrupts = <0 8 0x4>; ++++ interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; gpio-ranges = <&pfc 0 128 32>; @@@@@@ -147,11 -147,11 -147,11 -147,11 -150,11 +150,11 @@@@@@ interrupt-controller; }; ---- gpio5: gpio@ffc45000 { ++++ gpio5: gpio@e6055000 { compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; ---- reg = <0 0xffc45000 0 0x2c>; ++++ reg = <0 0xe6055000 0 0x50>; interrupt-parent = <&gic>; ---- interrupts = <0 9 0x4>; ++++ interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; #gpio-cells = <2>; gpio-controller; gpio-ranges = <&pfc 0 160 32>; diff --cc arch/arm/mach-shmobile/clock-r8a7790.c index a64f965c7da1,a64f965c7da1,a64f965c7da1,80cd8f31fa3c,092975abb2bb..312376d2cfd1 --- a/arch/arm/mach-shmobile/clock-r8a7790.c +++ b/arch/arm/mach-shmobile/clock-r8a7790.c @@@@@@ -282,20 -282,20 -282,20 -296,42 -296,42 +296,42 @@@@@@ static struct clk_lookup lookups[] = CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]), CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]), CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]), +++ CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]), CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]), ---- CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]), ++++ CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]), CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]), ---- CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]), ++++ CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]), CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), ---- CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]), ++++ CLKDEV_DEV_ID("ee120000.sd", &mstp_clks[MSTP313]), CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), ---- CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]), ++++ CLKDEV_DEV_ID("ee140000.sd", &mstp_clks[MSTP312]), CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]), ---- CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]), ++++ CLKDEV_DEV_ID("ee160000.sd", &mstp_clks[MSTP311]), CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]), ---- CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]), ++++ CLKDEV_DEV_ID("ee220000.mmc", &mstp_clks[MSTP305]), CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]), CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]), +++ CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]), +++ CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]), +++ +++ /* ICK */ +++ CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]), +++ CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7790", &mstp_clks[MSTP726]), +++ CLKDEV_ICK_ID("lvds.1", "rcar-du-r8a7790", &mstp_clks[MSTP725]), +++ CLKDEV_ICK_ID("du.0", "rcar-du-r8a7790", &mstp_clks[MSTP724]), +++ CLKDEV_ICK_ID("du.1", "rcar-du-r8a7790", &mstp_clks[MSTP723]), +++ CLKDEV_ICK_ID("du.2", "rcar-du-r8a7790", &mstp_clks[MSTP722]), +++ CLKDEV_ICK_ID("ssi.0", "rcar_sound", &mstp_clks[MSTP1015]), +++ CLKDEV_ICK_ID("ssi.1", "rcar_sound", &mstp_clks[MSTP1014]), +++ CLKDEV_ICK_ID("ssi.2", "rcar_sound", &mstp_clks[MSTP1013]), +++ CLKDEV_ICK_ID("ssi.3", "rcar_sound", &mstp_clks[MSTP1012]), +++ CLKDEV_ICK_ID("ssi.4", "rcar_sound", &mstp_clks[MSTP1011]), +++ CLKDEV_ICK_ID("ssi.5", "rcar_sound", &mstp_clks[MSTP1010]), +++ CLKDEV_ICK_ID("ssi.6", "rcar_sound", &mstp_clks[MSTP1009]), +++ CLKDEV_ICK_ID("ssi.7", "rcar_sound", &mstp_clks[MSTP1008]), +++ CLKDEV_ICK_ID("ssi.8", "rcar_sound", &mstp_clks[MSTP1007]), +++ CLKDEV_ICK_ID("ssi.9", "rcar_sound", &mstp_clks[MSTP1006]), +++ }; #define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31) \