| Message ID | 5417D73E.8080309@hisilicon.com |
|---|---|
| State | New |
| Headers | show |
On Tuesday 16 September 2014, xuwei wrote: > 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, On Mon, Sep 15, 2014 at 11:22 PM, xuwei <xuwei5@hisilicon.com> wrote: > 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 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
On 2014/9/26 8:46, Olof Johansson wrote: > Hi, > > On Mon, Sep 15, 2014 at 11:22 PM, xuwei <xuwei5@hisilicon.com> wrote: >> 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 Hi Olof, > 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. Sorry, I will make sure it will not happen next time. > I've reverted that particular patch now. Thanks! Best Regards, Wei > > -Olof > > . >
On 09/26/2014 08:46 AM, Olof Johansson wrote: >> 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. > 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
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(+)