[PATCH 1/3] ARM: dts: at91: sam9x60: Fix flexcom/i2c node addresses

[Alexander Dahl]

Tested on SAM9X60-Curiosity:

    U-Boot> i2c dev 0
    Setting bus to 0
    U-Boot> i2c md 0x53 0x00.1 0x100
    0000: fe ff ff ff ff ff ff ff ff ff ff 02 1e b3 12 eb    ................
    0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    0030: 02 06 06 14 ff ff ff ff ff ff ff ff ff ff ff ff    ................
    0040: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    0050: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    0060: 20 4d 43 48 49 50 20 52 44 43 15 31 44 44 34 00     MCHIP RDC.1DD4.
    0070: 00 00 53 41 4d 39 58 36 30 43 55 52 20 34 00 00    ..SAM9X60CUR 4..
    0080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    0090: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    00a0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    00b0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    00c0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    00d0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    00e0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff    ................
    00f0: ff ff ff ff ff ff ff ff ff ff 04 91 62 f2 9c 5a    ............b..Z
    U-Boot> printenv ethaddr
    ethaddr=04:91:62:f2:9c:5a

Signed-off-by: Alexander Dahl <ada at thorsis.com>
---
 arch/arm/dts/at91-sam9x60_curiosity.dts | 7 +++++--
 arch/arm/dts/sam9x60.dtsi               | 2 +-
 arch/arm/dts/sam9x60ek.dts              | 9 ++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts
index f165fdadb9e..f12d774b97d 100644
--- a/arch/arm/dts/at91-sam9x60_curiosity.dts
+++ b/arch/arm/dts/at91-sam9x60_curiosity.dts
@@ -15,9 +15,12 @@
 	model = "Microchip SAM9X60 Curiosity";
 	compatible = "microchip,sam9x60-curiosity", "microchip,sam9x60", "atmel,at91sam9";
 
+	aliases {
+		i2c0 = &i2c0;
+	};
+
 	chosen {
 		stdout-path = &dbgu;
-		i2c0 = &flx0;
 	};
 
 	memory {
@@ -156,7 +159,7 @@
 	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
 	status = "okay";
 
-	i2c at 600 {
+	i2c0: i2c at 600 {
 		compatible = "microchip,sam9x60-i2c";
 		reg = <0x600 0x200>;
 		pinctrl-names = "default";
diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi
index 79449042c24..a0db3dd132d 100644
--- a/arch/arm/dts/sam9x60.dtsi
+++ b/arch/arm/dts/sam9x60.dtsi
@@ -173,7 +173,7 @@
 				clock-names = "pclk", "gclk";
 			};
 
-			flx0: flexcom at f801c600 {
+			flx0: flexcom at f801c000 {
 				compatible = "atmel,sama5d2-flexcom";
 				reg = <0xf801c000 0x200>;
 				clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
diff --git a/arch/arm/dts/sam9x60ek.dts b/arch/arm/dts/sam9x60ek.dts
index 6521585ee9c..6e9dd4035de 100644
--- a/arch/arm/dts/sam9x60ek.dts
+++ b/arch/arm/dts/sam9x60ek.dts
@@ -14,9 +14,12 @@
 	model = "Microchip SAM9X60-Ek";
 	compatible = "microchip,sam9x60ek", "microchip,sam9x60", "atmel,at91sam9";
 
+	aliases {
+		i2c0 = &i2c0;
+	};
+
 	chosen {
 		stdout-path = &dbgu;
-		i2c0 = &flx0;
 	};
 
 	clocks {
@@ -57,11 +60,11 @@
 				};
 			};
 
-			flx0: flexcom at f801c600 {
+			flx0: flexcom at f801c000 {
 				atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
 				status = "okay";
 
-				i2c at 600 {
+				i2c0: i2c at 600 {
 					compatible = "microchip,sam9x60-i2c";
 					reg = <0x600 0x200>;
 					pinctrl-names = "default";
-- 
2.39.5