Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[karo-tx-linux.git] / arch / arm / boot / dts / tegra30.dtsi

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 782b11b2af6aa53470afed4f2432ce9f00a22c03..fe04fb5e155f4c7dd39509b8877d95eb7a6f8021 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -329,9 +329,9 @@
                #dma-cells = <1>;
        };
 
-       ahb: ahb@6000c004 {
+       ahb: ahb@6000c000 {
                compatible = "nvidia,tegra30-ahb";
-               reg = <0x6000c004 0x14c>; /* AHB Arbitration + Gizmo Controller */
+               reg = <0x6000c000 0x150>; /* AHB Arbitration + Gizmo Controller */
        };
 
        gpio: gpio@6000d000 {
@@ -349,6 +349,7 @@
                gpio-controller;
                #interrupt-cells = <2>;
                interrupt-controller;
+               gpio-ranges = <&pinmux 0 0 248>;
        };
 
        apbmisc@70000800 {