pull request for hisilicon hix5hd2 soc dt updates
Hi Olof, Hi Kevin, Hi Arnd,
Please help to merge pull request for hisilicon hix5hd2 soc dt updates for 3.18. Thanks!
Best Regards,
Wei
The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.git tags/hix5hd2-dt-for-3.18
for you to fetch changes up to 610bd8722ef40b649b51f01045c5d1903f41b583:
ARM: dts: hix5hd2: add wdg node (2014-09-16 11:00:43 +0800)
----------------------------------------------------------------
ARM: DT: Hisilicon terminal SoC HiX5HD2 DT updates for 3.18
- Add watchdog, gpio, sata, usb, mmc and gmac nodes in HiX5HD2 SoC DT
- Enable sata and gmac in HiX5HD2 dkb board DT
----------------------------------------------------------------
Zhangfei Gao (6):
ARM: dts: hix5hd2: add gmac node
ARM: dts: hix5hd2: add mmc node
ARM: dts: hix5hd2: add usb node
ARM: dts: hix5hd2: add sata node
ARM: dts: hix5hd2: add gpio node
ARM: dts: hix5hd2: add wdg node
arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 33 +++++++++++++++ arch/arm/boot/dts/hisi-x5hd2.dtsi | 310 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 343 insertions(+)
Quoted 4 lines · xuwei
Hi Olof, Hi Kevin, Hi Arnd,
Please help to merge pull request for hisilicon hix5hd2 soc dt updates for 3.18. Thanks!
Pulled into next/dt, sorry for the delay.
Arnd
Hi,
Quoted 27 lines · xuwei
Hi Olof, Hi Kevin, Hi Arnd,
Please help to merge pull request for hisilicon hix5hd2 soc dt updates for 3.18. Thanks!
Best Regards,
WeiThe following changes since commit
7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.gittags/hix5hd2-dt-for-3.18for you to fetch changes up to
610bd8722ef40b649b51f01045c5d1903f41b583:ARM: dts: hix5hd2: add wdg node (2014-09-16 11:00:43 +0800)
----------------------------------------------------------------
ARM: DT: Hisilicon terminal SoC HiX5HD2 DT updates for 3.18- Add watchdog, gpio, sata, usb, mmc and gmac nodes in HiX5HD2 SoC DT
- Enable sata and gmac in HiX5HD2 dkb board DT
Quoted 8 lines
----------------------------------------------------------------
Zhangfei Gao (6):
ARM: dts: hix5hd2: add gmac node
ARM: dts: hix5hd2: add mmc node
ARM: dts: hix5hd2: add usb node
ARM: dts: hix5hd2: add sata node
ARM: dts: hix5hd2: add gpio node
ARM: dts: hix5hd2: add wdg node
The watchdog commit causes build failures because:
Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
This is because HIX5HD2_WDG0_RST is not defined anywhere in the include files.
You _really_ need to build test branches before you send them to us.
I've reverted that particular patch now.
-Olof
Quoted 38 lines · Olof Johansson
Hi,
Quoted 35 lines · xuwei
Hi Olof, Hi Kevin, Hi Arnd,
Please help to merge pull request for hisilicon hix5hd2 soc dt updates for 3.18. Thanks!
Best Regards,
WeiThe following changes since commit
7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:
git://github.com/hisilicon/linux-hisi.gittags/hix5hd2-dt-for-3.18for you to fetch changes up to
610bd8722ef40b649b51f01045c5d1903f41b583:ARM: dts: hix5hd2: add wdg node (2014-09-16 11:00:43 +0800)
----------------------------------------------------------------
ARM: DT: Hisilicon terminal SoC HiX5HD2 DT updates for 3.18- Add watchdog, gpio, sata, usb, mmc and gmac nodes in HiX5HD2 SoC DT
- Enable sata and gmac in HiX5HD2 dkb board DT----------------------------------------------------------------
Zhangfei Gao (6):
ARM: dts: hix5hd2: add gmac node
ARM: dts: hix5hd2: add mmc node
ARM: dts: hix5hd2: add usb node
ARM: dts: hix5hd2: add sata node
ARM: dts: hix5hd2: add gpio node
ARM: dts: hix5hd2: add wdg node
Hi Olof,
Quoted 7 lines
The watchdog commit causes build failures because:
Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
This is because
HIX5HD2_WDG0_RSTis not defined anywhere in the include files.You _really_ need to build test branches before you send them to us.
Sorry, I will make sure it will not happen next time.
Quoted 1 line
I've reverted that particular patch now.
Thanks!
Best Regards,
Wei
Quoted 5 lines
-Olof
.
Quoted 4 lines · Olof Johansson
Quoted 1 line
ARM: dts: hix5hd2: add wdg node
The watchdog commit causes build failures because:
Quoted 8 lines
Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
This is because
HIX5HD2_WDG0_RSTis not defined anywhere in the include files.You _really_ need to build test branches before you send them to us.
I've reverted that particular patch now.
Sorry, it's my fault.
The watchdog patch is send out and go through Mike's tree. Will resend this patch after clock patch has been merged.
Thanks
Zhangfei
Quoted 10 lines · On Thursday 25 September 2014 17:46:36 Olof Johansson wrote:
Quoted 7 lines
Zhangfei Gao (6):
ARM: dts: hix5hd2: add gmac node
ARM: dts: hix5hd2: add mmc node
ARM: dts: hix5hd2: add usb node
ARM: dts: hix5hd2: add sata node
ARM: dts: hix5hd2: add gpio node
ARM: dts: hix5hd2: add wdg nodeThe watchdog commit causes build failures because:
Quoted 8 lines
Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
This is because
HIX5HD2_WDG0_RSTis not defined anywhere in the include files.You _really_ need to build test branches before you send them to us.
I've reverted that particular patch now.
The others were also broken, I've removed them all now.
I think the gpio patch was actually ok, but I didn't see a point in leaving that one in while all the other ones are reverted, and one patch is shorter, and it gets us back to a known working state.
Arnd
commit 3a75d1ad9a14dfbc8ea02824457729b79444e74f
Author: Arnd Bergmann <[email protected]> Date: Fri Sep 26 14:15:54 2014 +0200
Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
Apparently most of the newly added nodes had the same problem, so instead of reverting the individual patches, this undoes the effect of the merge and backs out all of them at once.
arch/arm/boot/dts/hisi-x5hd2-dkb.dts +0 -33
@@ -51,36 +51,3 @@ &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 at 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 at 1 { - reg = <1>; - }; -}; - -&ahci { - phys = <&sata_phy>; - phy-names = "sata-phy"; -};
arch/arm/boot/dts/hisi-x5hd2.dtsi +0 -301
312 lines not on this page · raw message