summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2014-05-21 14:55:27 +0530
committerMatthew Pedro <mapedro@nvidia.com>2014-09-15 10:32:35 -0700
commitdebaa673365f6b8b9c959f67df2b216d5818cdb1 (patch)
treea5a6d0f138b0ce66919bcef3b2eafe006459fd91
parent22441900f485acb029e317e57f7ba2dcf3e69f52 (diff)
ARM: tegra: move pinmux dt node before gpio mode
Move the pimx DT node before gpio node to make sure that pinmux get registered before the gpio. Bug 200033491 Change-Id: I55d5a5c1a1570c16d8332ba224e0ed9a1f7c257c Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/412630 (cherry picked from commit 463019f3158b58906f5b4c81463e5b0b1067576f) Reviewed-on: http://git-master/r/498813 Reviewed-by: Matthew Pedro <mapedro@nvidia.com> Tested-by: Matthew Pedro <mapedro@nvidia.com>
-rw-r--r--arch/arm/boot/dts/tegra124-soc.dtsi12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/tegra124-soc.dtsi b/arch/arm/boot/dts/tegra124-soc.dtsi
index b3d2888c5f05..0249b093eacf 100644
--- a/arch/arm/boot/dts/tegra124-soc.dtsi
+++ b/arch/arm/boot/dts/tegra124-soc.dtsi
@@ -18,6 +18,12 @@
spi5 = &spi5;
};
+ pinmux: pinmux {
+ compatible = "nvidia,tegra124-pinmux";
+ reg = <0x0 0x70000868 0x0 0x164 /* Pad control registers */
+ 0x0 0x70003000 0x0 0x434>; /* Mux registers */
+ };
+
gpio: gpio@6000d000 {
compatible = "nvidia,tegra124-gpio", "nvidia,tegra30-gpio";
reg = <0x0 0x6000d000 0x0 0x1000>;
@@ -86,12 +92,6 @@
#dma-cells = <1>;
};
- pinmux: pinmux {
- compatible = "nvidia,tegra124-pinmux";
- reg = <0x0 0x70000868 0x0 0x164 /* Pad control registers */
- 0x0 0x70003000 0x0 0x434>; /* Mux registers */
- };
-
/*
* There are two serial driver i.e. 8250 based simple serial
* driver and APB DMA based serial driver for higher baudrate