From ae9fbe0b1f9658d445d9e4049e2949b2ab141af1 Mon Sep 17 00:00:00 2001 From: Chukun Pan Date: Fri, 9 Dec 2022 18:25:23 +0800 Subject: dt-bindings: arm: rockchip: add Radxa CM3I E25 Radxa CM3 Industrial (CM3I) is an System on Module made by Radxa based on the Rockchip RK3568 SoC. The first carrier board supported is the Radxa E25. Add devicetree binding documentation for it. Signed-off-by: Chukun Pan Acked-by: Rob Herring Link: https://lore.kernel.org/r/20221209102524.129367-2-amadeus@jmu.edu.cn Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/arm/rockchip.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 88ff4422a8c1..3af95dbb95dc 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -599,6 +599,13 @@ properties: - const: pine64,soquartz - const: rockchip,rk3566 + - description: Radxa CM3 Industrial + items: + - enum: + - radxa,e25 + - const: radxa,cm3i + - const: rockchip,rk3568 + - description: Radxa Rock items: - const: radxa,rock -- cgit v1.2.3 From 43ba22818788f5a8fff5b1feaa329fa4991a3225 Mon Sep 17 00:00:00 2001 From: Wenhao Cui Date: Fri, 23 Dec 2022 11:18:12 +0800 Subject: dt-bindings: vendor-prefixes: Document EmbedFire EmbedFire is a manufacturer of embed computers and education platform for embed devices from Dongguan. Add vendor prefix for it. Signed-off-by: Wenhao Cui Signed-off-by: Yuteng Zhong Acked-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/Y6Ud9MhRjCVAYMCj@VM-66-53-centos Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 70ffb3780621..016f0ce31f9d 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -396,6 +396,8 @@ patternProperties: description: Elimo Engineering Ltd. "^elpida,.*": description: Elpida Memory, Inc. + "^embedfire,.*": + description: Dongguan EmbedFire Electronic Technology Co., Ltd. "^embest,.*": description: Shenzhen Embest Technology Co., Ltd. "^emlid,.*": -- cgit v1.2.3 From 1e83f6bfaf84d9e0bcb221304bb47e74c0e80924 Mon Sep 17 00:00:00 2001 From: Wenhao Cui Date: Fri, 23 Dec 2022 11:17:18 +0800 Subject: dt-bindings: arm: rockchip: Add EmbedFire LubanCat 1 Add devicetree binding documentation for the EmbedFire LubanCat 1. Signed-off-by: Wenhao Cui Signed-off-by: Yuteng Zhong Acked-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/Y6UdvrhLjS0/8Oic@VM-66-53-centos Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 3af95dbb95dc..cb2d1eacf012 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -95,6 +95,11 @@ properties: - const: elgin,rv1108-r1 - const: rockchip,rv1108 + - description: EmbedFire LubanCat 1 + items: + - const: embedfire,lubancat-1 + - const: rockchip,rk3566 + - description: Engicam PX30.Core C.TOUCH 2.0 items: - const: engicam,px30-core-ctouch2 -- cgit v1.2.3 From 7b1aa1613edc57dc505aaa91df4bf321e87d209c Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Sun, 8 Jan 2023 19:07:42 +0800 Subject: dt-bindings: arm: rockchip: Add EmbedFire LubanCat 2 Add EmbedFire LubanCat 2 Signed-off-by: Andy Yan Acked-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20230108110742.2214800-1-andyshrk@163.com Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index cb2d1eacf012..b91496fdc306 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -100,6 +100,11 @@ properties: - const: embedfire,lubancat-1 - const: rockchip,rk3566 + - description: EmbedFire LubanCat 2 + items: + - const: embedfire,lubancat-2 + - const: rockchip,rk3568 + - description: Engicam PX30.Core C.TOUCH 2.0 items: - const: engicam,px30-core-ctouch2 -- cgit v1.2.3 From 229e312019dd1fd82d4e1cbffef226288cde4357 Mon Sep 17 00:00:00 2001 From: Chukun Pan Date: Sat, 3 Dec 2022 15:41:48 +0800 Subject: dt-bindings: arm: rockchip: Add Orange Pi R1 Plus Add devicetree binding documentation for the Orange Pi R1 Plus. Signed-off-by: Chukun Pan Acked-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20221203074149.11543-2-amadeus@jmu.edu.cn Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index b91496fdc306..98d438358484 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -778,6 +778,11 @@ properties: - const: tronsmart,orion-r68-meta - const: rockchip,rk3368 + - description: Xunlong Orange Pi R1 Plus + items: + - const: xunlong,orangepi-r1-plus + - const: rockchip,rk3328 + - description: Zkmagic A95X Z2 items: - const: zkmagic,a95x-z2 -- cgit v1.2.3 From 306f74d278480e21ebbab01f88c68cd6c96eed41 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Mon, 9 Jan 2023 16:57:55 +0100 Subject: dt-bindings: soc: rockchip: add initial rk3588 syscon compatibles Add IOC and PHP GRF syscon compatibles for RK3588. Acked-by: Rob Herring Signed-off-by: Sebastian Reichel Reviewed-by: Jagan Teki Link: https://lore.kernel.org/r/20230109155801.51642-2-sebastian.reichel@collabora.com Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index 2ed8cca79b59..e682b407a383 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -20,6 +20,11 @@ properties: - rockchip,rk3568-pipe-grf - rockchip,rk3568-pipe-phy-grf - rockchip,rk3568-usb2phy-grf + - rockchip,rk3588-bigcore0-grf + - rockchip,rk3588-bigcore1-grf + - rockchip,rk3588-ioc + - rockchip,rk3588-php-grf + - rockchip,rk3588-sys-grf - rockchip,rk3588-pcie3-phy-grf - rockchip,rk3588-pcie3-pipe-grf - rockchip,rv1108-usbgrf -- cgit v1.2.3 From 999f0ec365f608c6c86e6af54de90574e360a876 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Mon, 9 Jan 2023 16:57:58 +0100 Subject: dt-bindings: arm: rockchip: add initial rk3588 boards Add DT binding documentation for the Rockchip RK3588 EVB1, Radxa Rock 5 Model A and B. Co-Developed-by: Christopher Obbard Signed-off-by: Christopher Obbard Acked-by: Krzysztof Kozlowski Signed-off-by: Sebastian Reichel Reviewed-by: Jagan Teki Link: https://lore.kernel.org/r/20230109155801.51642-5-sebastian.reichel@collabora.com Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/arm/rockchip.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 98d438358484..d921265cb8ba 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -669,6 +669,16 @@ properties: - const: radxa,rock3a - const: rockchip,rk3568 + - description: Radxa ROCK 5 Model A + items: + - const: radxa,rock-5a + - const: rockchip,rk3588s + + - description: Radxa ROCK 5 Model B + items: + - const: radxa,rock-5b + - const: rockchip,rk3588 + - description: Rikomagic MK808 v1 items: - const: rikomagic,mk808 @@ -753,6 +763,11 @@ properties: - const: rockchip,rk3399-sapphire-excavator - const: rockchip,rk3399 + - description: Rockchip RK3588 Evaluation board + items: + - const: rockchip,rk3588-evb1-v10 + - const: rockchip,rk3588 + - description: Rockchip RV1108 Evaluation board items: - const: rockchip,rv1108-evb -- cgit v1.2.3 From 24a28d3eb07d53cc9804978b3bb1ee6e870a682f Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Thu, 12 Jan 2023 16:29:00 +0530 Subject: dt-bindings: arm: rockchip: Add Radxa Compute Module 3 Radxa Compute Module 3(CM3) is one of the modules from a series System On Module based on the Radxa ROCK 3 series and is compatible with Raspberry Pi CM4 in pinout and form factor. Specification: - Rockchip RK3566 - up to 8GB LPDDR4 - up to 128GB high performance eMMC - Optional wireless LAN, 2.4GHz and 5.0GHz IEEE 802.11b/g/n/ac wireless, BT 5.0, BLE with onboard and external antenna. - Gigabit Ethernet PHY Add dt-bindings for Radxa CM3. Signed-off-by: Jagan Teki Acked-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20230112105902.192852-1-jagan@amarulasolutions.com Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/arm/rockchip.yaml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index d921265cb8ba..f0ea8d8d2130 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -609,6 +609,13 @@ properties: - const: pine64,soquartz - const: rockchip,rk3566 + - description: Radxa Compute Module 3(CM3) + items: + - enum: + - radxa,radxa-cm3-io + - const: radxa,radxa-cm3 + - const: rockchip,rk3566 + - description: Radxa CM3 Industrial items: - enum: -- cgit v1.2.3 From 8f19828844f20b22182719cf53be64f8c955aee8 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Mon, 23 Jan 2023 12:46:50 +0530 Subject: arm64: dts: rockchip: Fix compatible for Radxa CM3 The compatible string "radxa,radxa-cm3" referring the product name as "Radxa Radxa CM3" but the actual product name is "Radxa CM3". Fix the compatible strings. Fixes: 24a28d3eb07d ("dt-bindings: arm: rockchip: Add Radxa Compute Module 3") Fixes: 7469ab529bca ("arm64: dts: rockchip: Add rk3566 based Radxa Compute Module 3") Fixes: 096ebfb74b19 ("arm64: dts: rockchip: Add Radxa Compute Module 3 IO board") Suggested-by: Krzysztof Kozlowski Signed-off-by: Jagan Teki Acked-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20230123071654.73139-1-jagan@amarulasolutions.com Signed-off-by: Heiko Stuebner --- Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++-- arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation') diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index f0ea8d8d2130..d771a55a9eea 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -612,8 +612,8 @@ properties: - description: Radxa Compute Module 3(CM3) items: - enum: - - radxa,radxa-cm3-io - - const: radxa,radxa-cm3 + - radxa,cm3-io + - const: radxa,cm3 - const: rockchip,rk3566 - description: Radxa CM3 Industrial diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts index 170af01371ff..d89d5263cb5e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts @@ -11,7 +11,7 @@ / { model = "Radxa Compute Module 3(CM3) IO Board"; - compatible = "radxa,radxa-cm3-io", "radxa,radxa-cm3", "rockchip,rk3566"; + compatible = "radxa,cm3-io", "radxa,cm3", "rockchip,rk3566"; aliases { mmc1 = &sdmmc0; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi index 3de3a4f38756..45de2630bb50 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi @@ -8,7 +8,7 @@ #include / { - compatible = "radxa,radxa-cm3", "rockchip,rk3566"; + compatible = "radxa,cm3", "rockchip,rk3566"; aliases { mmc0 = &sdhci; -- cgit v1.2.3