Merge tag 'bcm-for-3.14-dt' of git://github.com/broadcom/bcm11351 into next/dt

From Christian Daudt:
Add i2c, usb and clock DT configuration to bcm mobile.

* tag 'bcm-for-3.14-dt' of git://github.com/broadcom/bcm11351: (697 commits)
  clk: bcm281xx: define kona clock binding
  ARM: dts: add usb udc support to bcm281xx
  ARM: dts: Specify clocks for timer on bcm11351
  Documentation: dt: kona-timer: Add clocks property
  ARM: dts: Specify clocks for SDHCIs on bcm11351
  Documentation: dt: kona-sdhci: Add clocks property
  ARM: dts: Specify clocks for UARTs on bcm11351
  ARM: dts: bcm281xx: Add i2c busses
  ARM: dts: Declare clocks as fixed on bcm11351
  ARM: dts: bcm28155-ap: Enable all the i2c busses
  +Linux 3.13-rc5
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>

diff --cc arch/arm/boot/dts/r8a7790.dtsi
index a1791250bf4b354148961f867568a5879ff0cd43,46e1d7ef163f52c611c488dd8390c305ff717978..a39d5b7773bf64acf3811e9d226874f86875c632
--- 1/arch/arm/boot/dts/r8a7790.dtsi
--- 2/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -88,14 -84,14 +88,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>;
@@@ -103,11 -99,11 +103,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>;
@@@ -115,11 -111,11 +115,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>;
@@@ -127,11 -123,11 +127,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>;
@@@ -139,11 -135,11 +139,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>;
@@@ -151,11 -147,11 +151,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/boot/dts/sun6i-a31.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge

diff --cc drivers/dma/dmaengine.c
Simple merge

diff --cc drivers/dma/mmp_pdma.c
Simple merge

diff --cc drivers/gpu/drm/tegra/drm.h
Simple merge

diff --cc drivers/pinctrl/sh-pfc/sh_pfc.h
Simple merge

diff --cc sound/soc/tegra/tegra20_i2s.c
Simple merge

diff --cc sound/soc/tegra/tegra30_i2s.c
Simple merge