ARM: DT: Hisilicon hip04 soc and D01 board updates for 4.2

- Add hip04 GPIO nodes
 - Add NANDC nodes for hip04 and D01 board
 - Add hip04 ethernet related nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVTBseAAoJEAvIV27ZiWZcqjcP/iboUW/3RpbKafraJdUNBKV5
 SIQvSdV1oNiWYjq+75ZZdp0Jk9lE1GAhefNmhGUET6oubu6jW3w8//uIO0/9ZhjN
 3SyPuQIkYDGzonegvAUw+ffnpwEXP0yrdcBjsQRMmSf1tAHuxLK9e7pEH/G1jUou
 g8e3bmfkXXG2mMUQSGg+oEhzUpEuiPjTDD3BcWK1Cb3aJBoUBH6wtE/fy2clPwEP
 WXa6KjsBBUuONLH1za/usq+4jBzgOa7gfzRWRMCk5/uhcuJ3ojOGp6TgruLmg6q3
 XiZVRaAp9Wjz8nA4nkP2SWRVkDUYbhvTNu3lPkfcCDiR2mbinWDdzdw1gk3Zadnr
 UYbpXWgkR9m0E+0WG8/LuE1eg+XmoSB5GiCkwPAYo513eUy73NUwTtcry4V7RkSJ
 V7tgRhhqN3M31PrRuYxImu092f/zR3xAxSfX2JchD2c/GQeEJ5XNuvTmRH7JgpCP
 2Jo7BHXFMTFbodYPmaUlze7U1RaKw+Knt1MJCrJznpMX6m0S0DcWI6qtBWfATxJY
 lPL1jq9XDAlvz7+S5GwefS/ydR6nRJgQwb4UaWdKQodS6t3ahPodUte6dWFZ9gGN
 ANi4e+0YQl4xuqTHT2/154dlkpK4DSu8ZH9UaCf1c1GM9J3lLPTozFieqfq2XXhj
 f4o/Qbez4ZImuhfdJGoz
 =n1gB
 -----END PGP SIGNATURE-----

Merge tag 'hip04-dt-for-4.2' of git://github.com/hisilicon/linux-hisi into next/dt

Merge "ARM: DT: Hisilicon hip04 soc and D01 board updates for 4.2" from Wei Xu:

- Add hip04 GPIO nodes
- Add NANDC nodes for hip04 and D01 board
- Add hip04 ethernet related nodes

* tag 'hip04-dt-for-4.2' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: add HiSilicon hip04 ethernet controller resource
  mtd: hisilicon: add device tree node for NAND controller
  ARM: dts: hip04: add GPIO pieces
This commit is contained in:
Arnd Bergmann 2015-05-12 17:05:39 +02:00
commit 0b1480103f
2 changed files with 160 additions and 0 deletions

View file

@ -28,5 +28,32 @@
uart0: uart@4007000 {
status = "ok";
};
nand: nand@4020000 {
nand-bus-width = <8>;
nand-ecc-mode = "hw";
nand-ecc-strength = <16>;
nand-ecc-step-size = <1024>;
partition@0 {
label = "nand_text";
reg = <0x00000000 0x00400000>;
};
partition@00400000 {
label = "nand_monitor";
reg = <0x00400000 0x00400000>;
};
partition@00800000 {
label = "nand_kernel";
reg = <0x00800000 0x00800000>;
};
partition@01000000 {
label = "nand_fs";
reg = <0x01000000 0x1f000000>;
};
};
};
};

View file

@ -269,6 +269,139 @@
interrupts = <0 372 4>;
};
gpio@4003000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dw-apb-gpio";
reg = <0x4003000 0x1000>;
gpio3: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
interrupt-parent = <&gic>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <0 392 4>;
};
};
gpio@4002000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dw-apb-gpio";
reg = <0x4002000 0x1000>;
gpio2: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
interrupt-parent = <&gic>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <0 391 4>;
};
};
gpio@4001000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dw-apb-gpio";
reg = <0x4001000 0x1000>;
gpio1: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
interrupt-parent = <&gic>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <0 390 4>;
};
};
gpio@4000000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dw-apb-gpio";
reg = <0x4000000 0x1000>;
gpio0: gpio-controller@0 {
compatible = "snps,dw-apb-gpio-port";
gpio-controller;
#gpio-cells = <2>;
snps,nr-gpios = <32>;
reg = <0>;
interrupt-parent = <&gic>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <0 389 4>;
};
};
nand: nand@4020000 {
compatible = "hisilicon,504-nfc";
reg = <0x4020000 0x10000>, <0x5000000 0x1000>;
interrupts = <0 379 4>;
#address-cells = <1>;
#size-cells = <1>;
};
mdio {
compatible = "hisilicon,hip04-mdio";
reg = <0x28f1000 0x1000>;
#address-cells = <1>;
#size-cells = <0>;
phy0: ethernet-phy@0 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <0>;
marvell,reg-init = <18 0x14 0 0x8001>;
};
phy1: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22";
reg = <1>;
marvell,reg-init = <18 0x14 0 0x8001>;
};
};
ppe: ppe@28c0000 {
compatible = "hisilicon,hip04-ppe", "syscon";
reg = <0x28c0000 0x10000>;
};
fe: ethernet@28b0000 {
compatible = "hisilicon,hip04-mac";
reg = <0x28b0000 0x10000>;
interrupts = <0 413 4>;
phy-mode = "mii";
port-handle = <&ppe 31 0>;
};
ge0: ethernet@2800000 {
compatible = "hisilicon,hip04-mac";
reg = <0x2800000 0x10000>;
interrupts = <0 402 4>;
phy-mode = "sgmii";
port-handle = <&ppe 0 1>;
phy-handle = <&phy0>;
};
ge8: ethernet@2880000 {
compatible = "hisilicon,hip04-mac";
reg = <0x2880000 0x10000>;
interrupts = <0 410 4>;
phy-mode = "sgmii";
port-handle = <&ppe 8 2>;
phy-handle = <&phy1>;
};
};
etb@0,e3c42000 {