On Thu, 2018-09-13 at 23:35 +0530, Manivannan Sadhasivam wrote:
> This patchset adds 96Boards Rock960 CE board support. Rock960 CE
> (Consumer Edition) board is one of the member of 96Boards Consumer
> Edition and AI platform and is manufactured by Vamrs Limited. Most of
> the board configuration is shared with the Ficus board manufactured by
> vamrs, which is an Enterprise 96Board.
>
> For the sake of avoiding code duplication, a common rock960.dtsi file
> with common DT nodes for both boards and separate board specific DTS
> files has been added.
>
> To be specific, below are some of the key differences between both
> boards:
>
> 1. Different host enable GPIO for USB
> 2. Different power and reset GPIO for PCI-E
> 3. No Ethernet port on Rock960
>
> While adding the board support, SD card Chip detection support is also
> added to the common dtsi file, shared by both boards.
>
> This series has been tested on Rock960 CE v1.2 board.
>
> Thanks,
> Mani
>
> Changes in v3:
>
> * Moved usb and pcie nodes to common dtsi and kept only the properties
> which differ in board specific dts.
> * Updated the common dtsi commit description.
>
> Changes in v2:
>
> * Changed the board compatible to "vamrs,rock960"
>
> Manivannan Sadhasivam (4):
> arm64: dts: rockchip: Split out common nodes for Rock960 based boards
> dt-bindings: arm: rockchip: Add binding for Rock960 board
> arm64: boot: dts: rockchip: Add support for Rock960 board
> arm64: dts: rockchip: Enable SD card detection for Rock960 boards
>
> .../devicetree/bindings/arm/rockchip.txt | 4 +
> arch/arm64/boot/dts/rockchip/Makefile | 1 +
> arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 524 +----------------
> .../boot/dts/rockchip/rk3399-rock960.dts | 52 ++
> .../boot/dts/rockchip/rk3399-rock960.dtsi | 542 ++++++++++++++++++
> 5 files changed, 604 insertions(+), 519 deletions(-)
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock960.dts
> create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
>
Looks pretty good!
When applying this series, I noticed that it conflicts with
commit 8bb878cf20ae10809c36db96993bfce7026d062b
Author: Levin Du <djw@xxxxxxxxxxxxx>
Date: Mon Jul 30 10:12:01 2018 +0800
arm64: dts: rockchip: add support for ROC-RK3399-PC board
resolution is trivial, but you might want to rebase and resend,
to make Heiko's life easier.
Thanks,
Eze
