summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts/tegra20-colibri-iris.dts
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2014-04-05 13:52:11 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-04-07 08:36:03 +0200
commit8cffe6626325a87ad80c629b87884f68f5f4931e (patch)
treec8746415c1df11e027a73b7ff2febaa24a0e069a /arch/arm/dts/tegra20-colibri-iris.dts
parent50747b40ecc61093fca02bbc5c508b053f1dcc57 (diff)
downloadbarebox-8cffe6626325a87ad80c629b87884f68f5f4931e.tar.gz
barebox-8cffe6626325a87ad80c629b87884f68f5f4931e.tar.xz
ARM: dts: update colibri + iris DTs to Linux 3.14
Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/dts/tegra20-colibri-iris.dts')
-rw-r--r--arch/arm/dts/tegra20-colibri-iris.dts30
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/dts/tegra20-colibri-iris.dts b/arch/arm/dts/tegra20-colibri-iris.dts
index 31b0f59c7d..adfa917824 100644
--- a/arch/arm/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/dts/tegra20-colibri-iris.dts
@@ -6,61 +6,61 @@
model = "Toradex Colibri T20 on Iris";
compatible = "toradex,iris", "toradex,colibri_t20", "nvidia,tegra20";
- host1x {
- hdmi {
+ host1x@50000000 {
+ hdmi@54280000 {
status = "okay";
};
};
- pinmux {
+ pinmux@70000014 {
state_default: pinmux {
hdint {
- nvidia,tristate = <0>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
i2cddc {
- nvidia,tristate = <0>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
sdio4 {
- nvidia,tristate = <0>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
uarta {
- nvidia,tristate = <0>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
uartd {
- nvidia,tristate = <0>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
};
};
};
- usb@c5000000 {
+ serial@70006000 {
status = "okay";
};
- usb-phy@c5000000 {
+ serial@70006300 {
status = "okay";
};
- usb@c5008000 {
+ i2c_ddc: i2c@7000c400 {
status = "okay";
};
- usb-phy@c5008000 {
+ usb@c5000000 {
status = "okay";
};
- serial@70006000 {
+ usb-phy@c5000000 {
status = "okay";
};
- serial@70006300 {
+ usb@c5008000 {
status = "okay";
};
- i2c_ddc: i2c@7000c400 {
+ usb-phy@c5008000 {
status = "okay";
};