Re: [U-Boot] [PATCH v2 6/9] ARM: UniPhier: add more device nodes to device tree

2014-12-08 Thread Masahiro YAMADA
2014-12-09 0:16 GMT+09:00 Masahiro Yamada :
> Add I2C controller and NAND controller devices.  Fix indentation too.
>
> Signed-off-by: Masahiro Yamada 
> ---
>
> Changes v2:
>   - I2C Ch4 does not exist on PH1-Pro4
>   - Add "clock-frequency" property


Applied to u-boot-uniphier.


-- 
Best Regards
Masahiro Yamada
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH v2 6/9] ARM: UniPhier: add more device nodes to device tree

2014-12-08 Thread Masahiro Yamada
Add I2C controller and NAND controller devices.  Fix indentation too.

Signed-off-by: Masahiro Yamada 
---

Changes v2:
  - I2C Ch4 does not exist on PH1-Pro4
  - Add "clock-frequency" property

 arch/arm/dts/uniphier-ph1-ld4-ref.dts  | 27 +++---
 arch/arm/dts/uniphier-ph1-ld4.dtsi | 44 ++-
 arch/arm/dts/uniphier-ph1-pro4-ref.dts | 29 ---
 arch/arm/dts/uniphier-ph1-pro4.dtsi| 64 +-
 arch/arm/dts/uniphier-ph1-sld8-ref.dts | 27 +++---
 arch/arm/dts/uniphier-ph1-sld8.dtsi| 44 ++-
 6 files changed, 220 insertions(+), 15 deletions(-)

diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts 
b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
index f01189c..08bbd03 100644
--- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@ -23,20 +23,39 @@
bootargs = "console=ttyPS0,115200 earlyprintk";
stdout-path = &uart0;
};
+
+   aliases {
+   uart0 = &uart0;
+   uart1 = &uart1;
+   uart2 = &uart2;
+   uart3 = &uart3;
+   i2c0 = &i2c0;
+   i2c1 = &i2c1;
+   i2c2 = &i2c2;
+   i2c3 = &i2c3;
+   };
 };
 
 &uart0 {
-   status = "okay";
+   status = "okay";
 };
 
 &uart1 {
-   status = "okay";
+   status = "okay";
+};
+
+&i2c0 {
+   status = "okay";
+   eeprom {
+   compatible = "i2c-eeprom";
+   reg = <0x50>;
+   };
 };
 
 &usb0 {
-  status = "okay";
+   status = "okay";
 };
 
 &usb1 {
-  status = "okay";
+   status = "okay";
 };
diff --git a/arch/arm/dts/uniphier-ph1-ld4.dtsi 
b/arch/arm/dts/uniphier-ph1-ld4.dtsi
index 80074c5..2a3dd73 100644
--- a/arch/arm/dts/uniphier-ph1-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-ld4.dtsi
@@ -13,8 +13,8 @@
compatible = "panasonic,ph1-ld4";
 
cpus {
-   #size-cells = <0>;
#address-cells = <1>;
+   #size-cells = <0>;
 
cpu@0 {
device_type = "cpu";
@@ -57,6 +57,42 @@
clock-frequency = <36864000>;
};
 
+   i2c0: i2c@5840 {
+   compatible = "panasonic,uniphier-i2c";
+   #address-cells = <1>;
+   #size-cells = <0>;
+   reg = <0x5840 0x40>;
+   clock-frequency = <10>;
+   status = "disabled";
+   };
+
+   i2c1: i2c@5848 {
+   compatible = "panasonic,uniphier-i2c";
+   #address-cells = <1>;
+   #size-cells = <0>;
+   reg = <0x5848 0x40>;
+   clock-frequency = <10>;
+   status = "disabled";
+   };
+
+   i2c2: i2c@5850 {
+   compatible = "panasonic,uniphier-i2c";
+   #address-cells = <1>;
+   #size-cells = <0>;
+   reg = <0x5850 0x40>;
+   clock-frequency = <10>;
+   status = "disabled";
+   };
+
+   i2c3: i2c@5858 {
+   compatible = "panasonic,uniphier-i2c";
+   #address-cells = <1>;
+   #size-cells = <0>;
+   reg = <0x5858 0x40>;
+   clock-frequency = <10>;
+   status = "disabled";
+   };
+
usb0: usb@5a800100 {
compatible = "panasonic,uniphier-ehci", "usb-ehci";
status = "disabled";
@@ -74,5 +110,11 @@
status = "disabled";
reg = <0x5a820100 0x100>;
};
+
+   nand: nand@6800 {
+   compatible = "denali,denali-nand-dt";
+   reg = <0x6800 0x20>, <0x6810 0x1000>;
+   reg-names = "nand_data", "denali_reg";
+   };
};
 };
diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts 
b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
index 52fa81f..23add7c 100644
--- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
@@ -23,20 +23,41 @@
bootargs = "console=ttyPS0,115200 earlyprintk";
stdout-path = &uart0;
};
+
+   aliases {
+   uart0 = &uart0;
+   uart1 = &uart1;
+   uart2 = &uart2;
+   uart3 = &uart3;
+   i2c0 = &i2c0;
+   i2c1 = &i2c1;
+   i2c2 = &i2c2;
+   i2c3 = &i2c3;
+   i2c5 = &i2c5;
+   i2c6 = &i2c6;
+   };
 };
 
 &uart0 {
-   status = "okay";
+   status = "okay";
 };
 
 &uart1 {
-   status = "okay"