Thread (16 messages) 16 messages, 5 authors, 2011-08-03

Re: [PATCH 2/4] dt: OMAP3: Beagle board: set clock freq for i2c devices

From: Grant Likely <hidden>
Date: 2011-07-13 23:04:29
Also in: linux-arm-kernel, linux-omap

On Thu, Jul 14, 2011 at 7:06 AM, G, Manjunath Kondaiah [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Update omap3 beagle dts file with required clock frequencies for the i2c
client devices existing on beagle board.

Beagle custom board dts file is cleaned up so that it can coexist with omap3
soc dts file.

Signed-off-by: G, Manjunath Kondaiah <redacted>
---
 arch/arm/boot/dts/omap3-beagle-nunchuck.dts |   11 +---------
 arch/arm/boot/dts/omap3-beagle.dts          |   29 +++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-beagle-nunchuck.dts b/arch/arm/boot/dts/omap3-beagle-nunchuck.dts
index 2607be5..324ff86 100644
--- a/arch/arm/boot/dts/omap3-beagle-nunchuck.dts
+++ b/arch/arm/boot/dts/omap3-beagle-nunchuck.dts
@@ -1,16 +1,7 @@
 /include/ "omap3-beagle.dts"

 / {
-       i2c@48072000 {
-               compatible = "ti,omap3-i2c";
-               reg = <0x48072000 0x80>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               eeprom@50 {
-                       compatible = "at,at24c01";
-                       reg = < 0x50 >;
-               };
+       i2c@2 {
               joystick@52 {
                       compatible = "sparkfun,wiichuck";
                       reg = < 0x52 >;
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 4439466..b45fbc9 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -1,7 +1,32 @@
-/dts-v1/;
-/include/ "skeleton.dtsi"
+/include/ "omap3-soc.dtsi"
 / {
       model = "TI OMAP3 BeagleBoard";
       compatible = "ti,omap3-beagle";
compatible = "ti,omap3-beagle", "ti,omap3";
+
+       i2c@1 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               clock-frequency = <2600000>;
+               status = "disabled";
+       };
Since this file include the omap3-soc dtsi, you don't need to
duplicate the #address-cells and #size-cells properties.  You only
need to specify the ones that have changed.  Also, since the include
file has the i2c nodes as children of the l4 bus, you should you need
to either duplicate the same bus hierarchy here, or use an independent
label reference by adding a label to the node in omap3-soc.dtsi, and
using the following syntax /outside/ of the /{ ... } root node:

&i2c-1 {
       clock-frequency = <2600000>;
};

g.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help