Skip to content

Commit

Permalink
Merge tag 'hix5hd2-dt-for-3.19' of git://github.com/hisilicon/linux-h…
Browse files Browse the repository at this point in the history
…isi into next/dt

Pull "ARM: DT:  Hisilicon terminal SoC HiX5HD2 DT updates for 3.19" from Wei Xu:

- Add reboot node, reusing syscon-reboot
- Add I2C nodes Hisilicon IP
- Add IR node based on Hisilicon IP
- Add Watchdog node based on ARM IP
- Add GPIO nodes based on ARM GPIO IP
- Add SATA node based on Hisilicon IP
- Add USB nodes
- Add MMC nodes based on Synopsys IP
- Add GMAC nodes based on Hisilicon IP

* tag 'hix5hd2-dt-for-3.19' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: hix5hd2: add reboot node
  ARM: dts: hix5hd2: add i2c node
  ARM: dts: hix5hd2: add ir node
  ARM: dts: hix5hd2: add wdg node
  ARM: dts: hix5hd2: add gpio node
  ARM: dts: hix5hd2: add sata node
  ARM: dts: hix5hd2: add usb node
  ARM: dts: hix5hd2: add mmc node
  ARM: dts: hix5hd2: add gmac node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Nov 19, 2014
2 parents a096c88 + 92cfcb2 commit 2184d56
Show file tree
Hide file tree
Showing 2 changed files with 421 additions and 2 deletions.
33 changes: 33 additions & 0 deletions arch/arm/boot/dts/hisi-x5hd2-dkb.dts
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,36 @@
&uart0 {
status = "okay";
};

&gmac0 {
#address-cells = <1>;
#size-cells = <0>;
phy-handle = <&phy2>;
phy-mode = "mii";
/* Placeholder, overwritten by bootloader */
mac-address = [00 00 00 00 00 00];
status = "okay";

phy2: ethernet-phy@2 {
reg = <2>;
};
};

&gmac1 {
#address-cells = <1>;
#size-cells = <0>;
phy-handle = <&phy1>;
phy-mode = "rgmii";
/* Placeholder, overwritten by bootloader */
mac-address = [00 00 00 00 00 00];
status = "okay";

phy1: ethernet-phy@1 {
reg = <1>;
};
};

&ahci {
phys = <&sata_phy>;
phy-names = "sata-phy";
};
Loading

0 comments on commit 2184d56

Please sign in to comment.