On 15/10/2018 17:12, Rob Herring wrote:
On Sat, Sep 22, 2018 at 06:02:34PM +0100, David Summers wrote:
Commit message needed.
Use subject prefixes that match the subsystem. 'dt-bindings: ...' for
binding docs. 'ARM: dts: ...' for ARM dts files.
Signed-off-by: David Summers <beagleboard@xxxxxxxxxxxxxxxxxxx>
---
.../devicetree/bindings/arm/rockchip.txt | 4 +
Bindings should be a separate patch.
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/rk3288-tinker-s.dts | 13 +
arch/arm/boot/dts/rk3288-tinker.dts | 498 +----------------
arch/arm/boot/dts/rk3288-tinker.dtsi | 504 ++++++++++++++++++
5 files changed, 524 insertions(+), 496 deletions(-)
create mode 100644 arch/arm/boot/dts/rk3288-tinker-s.dts
create mode 100644 arch/arm/boot/dts/rk3288-tinker.dtsi
Would be better to split the dts changes into 2 patches: restructuring
and add Tinker S board. Then we're not re-reviewing the existing stuff.
diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
index acfd3c773dd0..037ce94c3a73 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.txt
+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
@@ -13,6 +13,10 @@ Rockchip platforms device tree bindings
Required root node properties:
- compatible = "asus,rk3288-tinker", "rockchip,rk3288";
+- Asus Tinker board S
+ Required root node properties:
+ - compatible = "asus,rk3288-tinker-s", "rockchip,rk3288";
+
- Kylin RK3036 board:
Required root node properties:
- compatible = "rockchip,kylin-rk3036", "rockchip,rk3036";
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b5bd3de87c33..65c75265adfa 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -864,6 +864,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3288-r89.dtb \
rk3288-rock2-square.dtb \
rk3288-tinker.dtb \
+ rk3288-tinker-s.dtb \
rk3288-veyron-brain.dtb \
rk3288-veyron-jaq.dtb \
rk3288-veyron-jerry.dtb \
diff --git a/arch/arm/boot/dts/rk3288-tinker-s.dts b/arch/arm/boot/dts/rk3288-tinker-s.dts
new file mode 100644
index 000000000000..5e1078c6a784
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-tinker-s.dts
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
+ */
+
+/dts-v1/;
+
+#include "rk3288-tinker.dtsi"
+
+/ {
+ model = "Rockchip RK3288 Asus Tinker Board S";
+ compatible = "asus,rk3288-tinker-s", "rockchip,rk3288";
Perhaps you should have 'asus,rk3288-tinker' as a fallback?
+};
Hi Rob,
Heiko already had many of the same thoughts, he respan the patch here:
http://lists.infradead.org/pipermail/linux-rockchip/2018-September/021766.html
Which you already reviewed ;)
This was my first attempt at a kernel patch, so your thoughts are
appreciated.
David.
P.S. Heiko revised patch accepted into 4.20.
