]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'heads/fixes-for-v3.13', 'heads/defconfig' and 'heads/boards2', tag...
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 10:08:36 +0000 (19:08 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 10:08:36 +0000 (19:08 +0900)
Linux 3.13-rc4

1  2  3  4  5 
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/r8a7790.dtsi
arch/arm/configs/armadillo800eva_defconfig
arch/arm/configs/koelsch_defconfig
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/clock-r8a7790.c
arch/arm/mach-shmobile/clock-sh73a0.c

index 33c60542ae8232f876b5299c47e174798e31e1b2,d57c1a65b24f981fb25c62aa58c73c1fedd84ab8,d57c1a65b24f981fb25c62aa58c73c1fedd84ab8,ee0f2bd6a310ed6cf43890bdfbd7368b42b21da3,d57c1a65b24f981fb25c62aa58c73c1fedd84ab8..00aa1442735a782d950542660fdcf31e70b669c4
@@@@@@ -226,17 -225,14 -225,14 -226,16 -225,14 +226,17 @@@@@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += e
        r8a7779-marzen.dtb \
        r8a7779-marzen-reference.dtb \
        r8a7791-koelsch.dtb \
 ++++   r8a7791-koelsch-reference.dtb \
        r8a7790-lager.dtb \
--- -   r8a7790-lager-reference.dtb \
        sh73a0-kzm9g.dtb \
        sh73a0-kzm9g-reference.dtb \
        r8a73a4-ape6evm.dtb \
        r8a73a4-ape6evm-reference.dtb \
        sh7372-mackerel.dtb
 -- -dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb
 ++ +dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
 ++ +   r7s72100-genmai-reference.dtb \
-       r8a7791-koelsch-reference.dtb
+++ +   r8a7791-koelsch.dtb \
+++ +   r8a7790-lager.dtb
     dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
index 68b7b87e535f6343bd20ff6d1156ed60877f9cf5,9987dd0e9c599929042b1ce70d4b1d6c3ec1ebfb,ee845fad939b895a1bfb907c6597f9f916d926f8,ee845fad939b895a1bfb907c6597f9f916d926f8,ee845fad939b895a1bfb907c6597f9f916d926f8..c6001032d9a7cb28eb28ffa403a64222edd16b66
                        <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>;
                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>;
                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>;
                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>;
                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>;
                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>;
                reg = <0 0xe6060000 0 0x250>;
        };
     
 ----   sdhi0: sdhi@ee100000 {
 ++++   sdhi0: sd@ee100000 {
                compatible = "renesas,sdhi-r8a7790";
- ---           reg = <0 0xee100000 0 0x100>;
+ +++           reg = <0 0xee100000 0 0x200>;
                interrupt-parent = <&gic>;
 ----           interrupts = <0 165 4>;
 ++++           interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
                cap-sd-highspeed;
                status = "disabled";
        };
     
 ----   sdhi1: sdhi@ee120000 {
 ++++   sdhi1: sd@ee120000 {
                compatible = "renesas,sdhi-r8a7790";
- ---           reg = <0 0xee120000 0 0x100>;
+ +++           reg = <0 0xee120000 0 0x200>;
                interrupt-parent = <&gic>;
 ----           interrupts = <0 166 4>;
 ++++           interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
                cap-sd-highspeed;
                status = "disabled";
        };
index 284846e921c0facd68979ea15a95052ccb4579c5,825c16dee8a002689b6498ad94c0421ea19aef13,acec6b8e4186be2d098f7e25bda8e894c55a203d,7fd65a01ec7ee2636a179d955cebd5ab90bd30c4,825c16dee8a002689b6498ad94c0421ea19aef13..e248f49d55498491d00434467826a512d2fe9c2a
@@@@@@ -29,27 -29,7 -29,29 -29,7 -29,7 +29,29 @@@@@@ CONFIG_VFP=
     CONFIG_NEON=y
     # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
     CONFIG_PM_RUNTIME=y
 + ++CONFIG_NET=y
++ ++CONFIG_PACKET=y
++ ++CONFIG_UNIX=y
 + ++CONFIG_INET=y
 + ++CONFIG_IP_PNP=y
 + ++CONFIG_IP_PNP_DHCP=y
     CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 + ++CONFIG_NETDEVICES=y
 + ++# CONFIG_NET_VENDOR_ARC is not set
 + ++# CONFIG_NET_CADENCE is not set
 + ++# CONFIG_NET_VENDOR_BROADCOM is not set
 + ++# CONFIG_NET_VENDOR_CIRRUS is not set
 + ++# CONFIG_NET_VENDOR_FARADAY is not set
 + ++# CONFIG_NET_VENDOR_INTEL is not set
 + ++# CONFIG_NET_VENDOR_MARVELL is not set
 + ++# CONFIG_NET_VENDOR_MICREL is not set
 + ++# CONFIG_NET_VENDOR_NATSEMI is not set
 + ++CONFIG_SH_ETH=y
 + ++# CONFIG_NET_VENDOR_SEEQ is not set
 + ++# CONFIG_NET_VENDOR_SMSC is not set
 + ++# CONFIG_NET_VENDOR_STMICRO is not set
 + ++# CONFIG_NET_VENDOR_VIA is not set
 + ++# CONFIG_NET_VENDOR_WIZNET is not set
     # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
     # CONFIG_INPUT_MOUSE is not set
     # CONFIG_LEGACY_PTYS is not set
Simple merge
index 312376d2cfd14572d60753118d3c375797423ed0,a64f965c7da142b118ab42a52afadeb5038dff81,a64f965c7da142b118ab42a52afadeb5038dff81,09c5c7d664315fe2104b62dbd6f1a27dbb5af02c,a64f965c7da142b118ab42a52afadeb5038dff81..c5c60ecdec8f78138e2c0aaf9667ff513c627d7d
@@@@@@ -292,46 -278,24 -278,24 -292,50 -278,24 +292,50 @@@@@@ static struct clk_lookup lookups[] = 
        CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
        CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
        CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
+++ +   CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
        CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
+++ +   CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
        CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
+++ +   CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
        CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
+++ +   CLKDEV_DEV_ID("i2c-rcar.3", &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)         \
Simple merge