summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-11-21 14:44:09 -0700
committerOlof Johansson <olof@lixom.net>2011-12-07 20:48:04 -0800
commit88950f3b6d0f49b6b5a2f68bd1f67406c2c73922 (patch)
treea5b30c217c97769a620986f7e165b7abe42eaa84 /arch/arm/boot
parent492f204da87ccfef508d5fff63873bda37d4363b (diff)
downloadblackbird-op-linux-88950f3b6d0f49b6b5a2f68bd1f67406c2c73922.tar.gz
blackbird-op-linux-88950f3b6d0f49b6b5a2f68bd1f67406c2c73922.zip
arm/dt: tegra: Fix I2C nodes to match board files
With board files, all I2C busses run at 400KHz. Fix the device-tree to be consistent with this. It's possible this is incorrect, but at least it keeps the board files and device-tree consistent. Also, disable any I2C controllers that the board files don't register, also for consistency. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/tegra-seaboard.dts16
-rw-r--r--arch/arm/boot/dts/tegra-trimslice.dts4
-rw-r--r--arch/arm/boot/dts/tegra-ventana.dts16
3 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index d1ada26b7b90..92da1f1ed3a3 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -11,6 +11,22 @@
reg = < 0x00000000 0x40000000 >;
};
+ i2c@7000c000 {
+ clock-frequency = <400000>;
+ };
+
+ i2c@7000c400 {
+ clock-frequency = <400000>;
+ };
+
+ i2c@7000c500 {
+ clock-frequency = <400000>;
+ };
+
+ i2c@7000d000 {
+ clock-frequency = <400000>;
+ };
+
serial@70006300 {
clock-frequency = < 216000000 >;
};
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index cf8e5617f3bd..b1aaa45407d4 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -22,6 +22,10 @@
clock-frequency = <400000>;
};
+ i2c@7000d000 {
+ status = "disable";
+ };
+
serial@70006000 {
clock-frequency = < 216000000 >;
};
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 1c0948541806..0f14ee373e76 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -10,6 +10,22 @@
reg = < 0x00000000 0x40000000 >;
};
+ i2c@7000c000 {
+ clock-frequency = <400000>;
+ };
+
+ i2c@7000c400 {
+ clock-frequency = <400000>;
+ };
+
+ i2c@7000c500 {
+ clock-frequency = <400000>;
+ };
+
+ i2c@7000d000 {
+ clock-frequency = <400000>;
+ };
+
serial@70006300 {
clock-frequency = < 216000000 >;
};
OpenPOWER on IntegriCloud