ARM: UniPhier: add more device nodes to device tree

Add I2C controller and NAND controller devices.  Fix indentation too.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2014-12-06 00:03:23 +09:00
parent f5d0b9b2c3
commit f5fd7afcd5
6 changed files with 220 additions and 15 deletions

View file

@ -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";
};

View file

@ -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@58400000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58400000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
i2c1: i2c@58480000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58480000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
i2c2: i2c@58500000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58500000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
i2c3: i2c@58580000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58580000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
usb0: usb@5a800100 {
compatible = "panasonic,uniphier-ehci", "usb-ehci";
status = "disabled";
@ -74,5 +110,11 @@
status = "disabled";
reg = <0x5a820100 0x100>;
};
nand: nand@68000000 {
compatible = "denali,denali-nand-dt";
reg = <0x68000000 0x20>, <0x68100000 0x1000>;
reg-names = "nand_data", "denali_reg";
};
};
};

View file

@ -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";
status = "okay";
};
&i2c0 {
status = "okay";
eeprom {
compatible = "i2c-eeprom";
reg = <0x50>;
};
};
&usb0 {
status = "okay";
status = "okay";
};
&usb1 {
status = "okay";
status = "okay";
};

View file

@ -13,8 +13,8 @@
compatible = "panasonic,ph1-pro4";
cpus {
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
cpu@0 {
device_type = "cpu";
@ -63,6 +63,62 @@
clock-frequency = <73728000>;
};
i2c0: i2c@58780000 {
compatible = "panasonic,uniphier-fi2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58780000 0x80>;
clock-frequency = <100000>;
status = "disabled";
};
i2c1: i2c@58781000 {
compatible = "panasonic,uniphier-fi2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58781000 0x80>;
clock-frequency = <100000>;
status = "disabled";
};
i2c2: i2c@58782000 {
compatible = "panasonic,uniphier-fi2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58782000 0x80>;
clock-frequency = <100000>;
status = "disabled";
};
i2c3: i2c@58783000 {
compatible = "panasonic,uniphier-fi2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58783000 0x80>;
clock-frequency = <100000>;
status = "disabled";
};
/* i2c4 does not exist */
i2c5: i2c@58785000 {
compatible = "panasonic,uniphier-fi2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58785000 0x80>;
clock-frequency = <400000>;
status = "ok";
};
i2c6: i2c@58786000 {
compatible = "panasonic,uniphier-fi2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58786000 0x80>;
clock-frequency = <400000>;
status = "ok";
};
usb0: usb@5a800100 {
compatible = "panasonic,uniphier-ehci", "usb-ehci";
status = "disabled";
@ -74,5 +130,11 @@
status = "disabled";
reg = <0x5a810100 0x100>;
};
nand: nand@68000000 {
compatible = "denali,denali-nand-dt";
reg = <0x68000000 0x20>, <0x68100000 0x1000>;
reg-names = "nand_data", "denali_reg";
};
};
};

View file

@ -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";
};

View file

@ -13,8 +13,8 @@
compatible = "panasonic,ph1-sld8";
cpus {
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
cpu@0 {
device_type = "cpu";
@ -57,6 +57,42 @@
clock-frequency = <80000000>;
};
i2c0: i2c@58400000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58400000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
i2c1: i2c@58480000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58480000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
i2c2: i2c@58500000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58500000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
i2c3: i2c@58580000 {
compatible = "panasonic,uniphier-i2c";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x58580000 0x40>;
clock-frequency = <100000>;
status = "disabled";
};
usb0: usb@5a800100 {
compatible = "panasonic,uniphier-ehci", "usb-ehci";
status = "disabled";
@ -74,5 +110,11 @@
status = "disabled";
reg = <0x5a820100 0x100>;
};
nand: nand@68000000 {
compatible = "denali,denali-nand-dt";
reg = <0x68000000 0x20>, <0x68100000 0x1000>;
reg-names = "nand_data", "denali_reg";
};
};
};