On 08/21/2012 04:32 PM, [email protected] : > From: Ludovic Desroches <[email protected]> > > Use the atmel twi instead of gpio for i2c stuff. > > Signed-off-by: Ludovic Desroches <[email protected]>
Seems good. Maybe we will have to test wm8731 a little bit more. Acked-by: Nicolas Ferre <[email protected]> > --- > arch/arm/boot/dts/at91sam9263ek.dts | 20 ++++++++++---------- > arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 28 ++++++++++++++-------------- > arch/arm/boot/dts/at91sam9g25ek.dts | 12 ++++++++++++ > arch/arm/boot/dts/at91sam9m10g45ek.dts | 14 ++++++++++++++ > arch/arm/boot/dts/at91sam9n12ek.dts | 8 ++++++++ > 5 files changed, 58 insertions(+), 24 deletions(-) > > diff --git a/arch/arm/boot/dts/at91sam9263ek.dts > b/arch/arm/boot/dts/at91sam9263ek.dts > index f86ac4b..772ab75 100644 > --- a/arch/arm/boot/dts/at91sam9263ek.dts > +++ b/arch/arm/boot/dts/at91sam9263ek.dts > @@ -50,6 +50,16 @@ > atmel,vbus-gpio = <&pioA 25 0>; > status = "okay"; > }; > + > + i2c0: i2c@fff88000 { > + status = "okay"; > + > + 24c512@50 { > + compatible = "24c512"; > + reg = <0x50>; > + pagesize = <128>; > + }; > + }; > }; > > nand0: nand@40000000 { > @@ -143,14 +153,4 @@ > gpio-key,wakeup; > }; > }; > - > - i2c@0 { > - status = "okay"; > - > - 24c512@50 { > - compatible = "24c512"; > - reg = <0x50>; > - pagesize = <128>; > - }; > - }; > }; > diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > index b06c0db..712106b 100644 > --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > @@ -51,6 +51,20 @@ > atmel,vbus-gpio = <&pioC 5 0>; > status = "okay"; > }; > + > + i2c0: i2c@fffac000 { > + status = "okay"; > + > + 24c512@50 { > + compatible = "24c512"; > + reg = <0x50>; > + }; > + > + wm8731@1b { > + compatible = "wm8731"; > + reg = <0x1b>; > + }; > + }; > }; > > nand0: nand@40000000 { > @@ -106,20 +120,6 @@ > }; > }; > > - i2c@0 { > - status = "okay"; > - > - 24c512@50 { > - compatible = "24c512"; > - reg = <0x50>; > - }; > - > - wm8731@1b { > - compatible = "wm8731"; > - reg = <0x1b>; > - }; > - }; > - > gpio_keys { > compatible = "gpio-keys"; > #address-cells = <1>; > diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts > b/arch/arm/boot/dts/at91sam9g25ek.dts > index 7829a4d..3b0adbc 100644 > --- a/arch/arm/boot/dts/at91sam9g25ek.dts > +++ b/arch/arm/boot/dts/at91sam9g25ek.dts > @@ -32,6 +32,18 @@ > phy-mode = "rmii"; > status = "okay"; > }; > + > + i2c0: i2c@f8010000 { > + status = "okay"; > + }; > + > + i2c1: i2c@f8014000 { > + status = "okay"; > + }; > + > + i2c2: i2c@f8018000 { > + status = "okay"; > + }; > }; > > usb0: ohci@00600000 { > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts > b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index a3633bd..4f94f23 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -46,6 +46,20 @@ > phy-mode = "rmii"; > status = "okay"; > }; > + > + i2c0: i2c@fff84000 { > + status = "okay"; > + > + 24c512@50 { > + compatible = "24c512"; > + reg = <0x50>; > + pagesize = <128>; > + }; > + }; > + > + i2c1: i2c@fff88000 { > + status = "okay"; > + }; > }; > > nand0: nand@40000000 { > diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts > b/arch/arm/boot/dts/at91sam9n12ek.dts > index f4e43e3..912b2c2 100644 > --- a/arch/arm/boot/dts/at91sam9n12ek.dts > +++ b/arch/arm/boot/dts/at91sam9n12ek.dts > @@ -37,6 +37,14 @@ > dbgu: serial@fffff200 { > status = "okay"; > }; > + > + i2c0: i2c@f8010000 { > + status = "okay"; > + }; > + > + i2c1: i2c@f8014000 { > + status = "okay"; > + }; > }; > > nand0: nand@40000000 { > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
