Re: [PATCH v2] rockchip: rv1126: Migrate to OF_UPSTREAM
Hi Kever, On Sat, 11 May 2024 at 12:09, Kever Yang wrote: > > > On 2024/5/10 12:43, Anand Moon wrote: > > Migrate RV1126 boards that exists in Linux v6.8 to use OF_UPSTREAM. > > > > Following targets is migrated to use OF_UPSTREAM: > > > > - rv1126-edgeble-neu2 : Board is an industrial form factor > > IO board. > > - sonoff-ihost-rv1126 : Gateway device designed to provide a > > Smart Home Hub. > > > > Cc: Tim Lunn > > Cc: Jagan Teki > > Signed-off-by: Anand Moon > Reviewed-by: Kever Yang > It looks like I have used the my personal Signed-off-by send v3 with correct Signed-off-by with edegeble.ai id. can you apply the modified patch? > Thanks, > - Kever Thanks -Anand
Re: [PATCH v2] rockchip: rv1126: Migrate to OF_UPSTREAM
On 2024/5/10 12:43, Anand Moon wrote:
Migrate RV1126 boards that exists in Linux v6.8 to use OF_UPSTREAM.
Following targets is migrated to use OF_UPSTREAM:
- rv1126-edgeble-neu2 : Board is an industrial form factor
IO board.
- sonoff-ihost-rv1126 : Gateway device designed to provide a
Smart Home Hub.
Cc: Tim Lunn
Cc: Jagan Teki
Signed-off-by: Anand Moon
Reviewed-by: Kever Yang
Thanks,
- Kever
---
v2: remove the dt-bindings for clock and power
fix the typo in commit message
Tested on neu2 board.
---
arch/arm/dts/Makefile | 3 -
arch/arm/dts/rv1126-edgeble-neu2-io.dts | 112
arch/arm/dts/rv1126-edgeble-neu2.dtsi | 345 --
arch/arm/dts/rv1126-pinctrl.dtsi | 341 --
arch/arm/dts/rv1126-sonoff-ihost.dts | 29 -
arch/arm/dts/rv1126-sonoff-ihost.dtsi | 404 ---
arch/arm/dts/rv1126.dtsi | 623 -
arch/arm/mach-rockchip/Kconfig| 1 +
configs/neu2-io-rv1126_defconfig | 2 +-
configs/sonoff-ihost-rv1126_defconfig | 2 +-
.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 --
.../dt-bindings/power/rockchip,rv1126-power.h | 35 -
12 files changed, 3 insertions(+), 2526 deletions(-)
delete mode 100644 arch/arm/dts/rv1126-edgeble-neu2-io.dts
delete mode 100644 arch/arm/dts/rv1126-edgeble-neu2.dtsi
delete mode 100644 arch/arm/dts/rv1126-pinctrl.dtsi
delete mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dts
delete mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dtsi
delete mode 100644 arch/arm/dts/rv1126.dtsi
delete mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h
delete mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 087645f354..79fc100dce 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -97,9 +97,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
rk3368-geekbox.dtb \
rk3368-px5-evb.dtb \
-dtb-$(CONFIG_ROCKCHIP_RV1126) += \
- rv1126-edgeble-neu2-io.dtb
-
dtb-$(CONFIG_ARCH_S5P4418) += \
s5p4418-nanopi2.dtb
diff --git a/arch/arm/dts/rv1126-edgeble-neu2-io.dts b/arch/arm/dts/rv1126-edgeble-neu2-io.dts
deleted file mode 100644
index 0c2396b8f8..00
--- a/arch/arm/dts/rv1126-edgeble-neu2-io.dts
+++ /dev/null
@@ -1,112 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
- * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
- */
-
-/dts-v1/;
-#include "rv1126.dtsi"
-#include "rv1126-edgeble-neu2.dtsi"
-
-/ {
- model = "Edgeble Neu2 IO Board";
- compatible = "edgeble,neural-compute-module-2-io",
-"edgeble,neural-compute-module-2", "rockchip,rv1126";
-
- aliases {
- serial2 =
- };
-
- chosen {
- stdout-path = "serial2:150n8";
- };
-
- vcc12v_dcin: vcc12v-dcin-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc12v_dcin";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1200>;
- regulator-max-microvolt = <1200>;
- };
-
- vcc5v0_sys: vcc5v0-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- vin-supply = <_dcin>;
- };
-
- v3v3_sys: v3v3-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "v3v3_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- vin-supply = <_sys>;
- };
-};
-
- {
- assigned-clocks = < CLK_GMAC_SRC>, < CLK_GMAC_TX_RX>,
- < CLK_GMAC_ETHERNET_OUT>;
- assigned-clock-parents = < CLK_GMAC_SRC_M1>, < RGMII_MODE_CLK>;
- assigned-clock-rates = <12500>, <0>, <2500>;
- clock_in_out = "input";
- phy-handle = <>;
- phy-mode = "rgmii";
- phy-supply = <_3v3>;
- pinctrl-names = "default";
- pinctrl-0 = <_miim _bus2 _bus4
_out_ethernetm1_pins>;
- tx_delay = <0x2a>;
- rx_delay = <0x1a>;
- status = "okay";
-};
-
- {
- phy: ethernet-phy@0 {
- compatible = "ethernet-phy-id001c.c916",
-"ethernet-phy-ieee802.3-c22";
- reg = <0x0>;
- pinctrl-names = "default";
- pinctrl-0 = <_phy_rst>;
- reset-assert-us = <2>;
- reset-deassert-us =
Re: [PATCH v2] rockchip: rv1126: Migrate to OF_UPSTREAM
Hi Anand,
On 5/10/24 14:43, Anand Moon wrote:
Migrate RV1126 boards that exists in Linux v6.8 to use OF_UPSTREAM.
Following targets is migrated to use OF_UPSTREAM:
- rv1126-edgeble-neu2 : Board is an industrial form factor
IO board.
- sonoff-ihost-rv1126 : Gateway device designed to provide a
Smart Home Hub.
This looks fine to me.
Tested on Sonoff iHost
Reviewed-By: Tim Lunn
Tested-By: Tim Lunn
Cc: Tim Lunn
Cc: Jagan Teki
Signed-off-by: Anand Moon
---
v2: remove the dt-bindings for clock and power
fix the typo in commit message
Tested on neu2 board.
---
arch/arm/dts/Makefile | 3 -
arch/arm/dts/rv1126-edgeble-neu2-io.dts | 112
arch/arm/dts/rv1126-edgeble-neu2.dtsi | 345 --
arch/arm/dts/rv1126-pinctrl.dtsi | 341 --
arch/arm/dts/rv1126-sonoff-ihost.dts | 29 -
arch/arm/dts/rv1126-sonoff-ihost.dtsi | 404 ---
arch/arm/dts/rv1126.dtsi | 623 -
arch/arm/mach-rockchip/Kconfig| 1 +
configs/neu2-io-rv1126_defconfig | 2 +-
configs/sonoff-ihost-rv1126_defconfig | 2 +-
.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 --
.../dt-bindings/power/rockchip,rv1126-power.h | 35 -
12 files changed, 3 insertions(+), 2526 deletions(-)
delete mode 100644 arch/arm/dts/rv1126-edgeble-neu2-io.dts
delete mode 100644 arch/arm/dts/rv1126-edgeble-neu2.dtsi
delete mode 100644 arch/arm/dts/rv1126-pinctrl.dtsi
delete mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dts
delete mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dtsi
delete mode 100644 arch/arm/dts/rv1126.dtsi
delete mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h
delete mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 087645f354..79fc100dce 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -97,9 +97,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
rk3368-geekbox.dtb \
rk3368-px5-evb.dtb \
-dtb-$(CONFIG_ROCKCHIP_RV1126) += \
- rv1126-edgeble-neu2-io.dtb
-
dtb-$(CONFIG_ARCH_S5P4418) += \
s5p4418-nanopi2.dtb
diff --git a/arch/arm/dts/rv1126-edgeble-neu2-io.dts b/arch/arm/dts/rv1126-edgeble-neu2-io.dts
deleted file mode 100644
index 0c2396b8f8..00
--- a/arch/arm/dts/rv1126-edgeble-neu2-io.dts
+++ /dev/null
@@ -1,112 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
- * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
- */
-
-/dts-v1/;
-#include "rv1126.dtsi"
-#include "rv1126-edgeble-neu2.dtsi"
-
-/ {
- model = "Edgeble Neu2 IO Board";
- compatible = "edgeble,neural-compute-module-2-io",
-"edgeble,neural-compute-module-2", "rockchip,rv1126";
-
- aliases {
- serial2 =
- };
-
- chosen {
- stdout-path = "serial2:150n8";
- };
-
- vcc12v_dcin: vcc12v-dcin-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc12v_dcin";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1200>;
- regulator-max-microvolt = <1200>;
- };
-
- vcc5v0_sys: vcc5v0-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- vin-supply = <_dcin>;
- };
-
- v3v3_sys: v3v3-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "v3v3_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- vin-supply = <_sys>;
- };
-};
-
- {
- assigned-clocks = < CLK_GMAC_SRC>, < CLK_GMAC_TX_RX>,
- < CLK_GMAC_ETHERNET_OUT>;
- assigned-clock-parents = < CLK_GMAC_SRC_M1>, < RGMII_MODE_CLK>;
- assigned-clock-rates = <12500>, <0>, <2500>;
- clock_in_out = "input";
- phy-handle = <>;
- phy-mode = "rgmii";
- phy-supply = <_3v3>;
- pinctrl-names = "default";
- pinctrl-0 = <_miim _bus2 _bus4
_out_ethernetm1_pins>;
- tx_delay = <0x2a>;
- rx_delay = <0x1a>;
- status = "okay";
-};
-
- {
- phy: ethernet-phy@0 {
- compatible = "ethernet-phy-id001c.c916",
-"ethernet-phy-ieee802.3-c22";
- reg = <0x0>;
- pinctrl-names = "default";
- pinctrl-0 = <_phy_rst>;
-
[PATCH v2] rockchip: rv1126: Migrate to OF_UPSTREAM
Migrate RV1126 boards that exists in Linux v6.8 to use OF_UPSTREAM.
Following targets is migrated to use OF_UPSTREAM:
- rv1126-edgeble-neu2 : Board is an industrial form factor
IO board.
- sonoff-ihost-rv1126 : Gateway device designed to provide a
Smart Home Hub.
Cc: Tim Lunn
Cc: Jagan Teki
Signed-off-by: Anand Moon
---
v2: remove the dt-bindings for clock and power
fix the typo in commit message
Tested on neu2 board.
---
arch/arm/dts/Makefile | 3 -
arch/arm/dts/rv1126-edgeble-neu2-io.dts | 112
arch/arm/dts/rv1126-edgeble-neu2.dtsi | 345 --
arch/arm/dts/rv1126-pinctrl.dtsi | 341 --
arch/arm/dts/rv1126-sonoff-ihost.dts | 29 -
arch/arm/dts/rv1126-sonoff-ihost.dtsi | 404 ---
arch/arm/dts/rv1126.dtsi | 623 -
arch/arm/mach-rockchip/Kconfig| 1 +
configs/neu2-io-rv1126_defconfig | 2 +-
configs/sonoff-ihost-rv1126_defconfig | 2 +-
.../dt-bindings/clock/rockchip,rv1126-cru.h | 632 --
.../dt-bindings/power/rockchip,rv1126-power.h | 35 -
12 files changed, 3 insertions(+), 2526 deletions(-)
delete mode 100644 arch/arm/dts/rv1126-edgeble-neu2-io.dts
delete mode 100644 arch/arm/dts/rv1126-edgeble-neu2.dtsi
delete mode 100644 arch/arm/dts/rv1126-pinctrl.dtsi
delete mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dts
delete mode 100644 arch/arm/dts/rv1126-sonoff-ihost.dtsi
delete mode 100644 arch/arm/dts/rv1126.dtsi
delete mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h
delete mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 087645f354..79fc100dce 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -97,9 +97,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
rk3368-geekbox.dtb \
rk3368-px5-evb.dtb \
-dtb-$(CONFIG_ROCKCHIP_RV1126) += \
- rv1126-edgeble-neu2-io.dtb
-
dtb-$(CONFIG_ARCH_S5P4418) += \
s5p4418-nanopi2.dtb
diff --git a/arch/arm/dts/rv1126-edgeble-neu2-io.dts
b/arch/arm/dts/rv1126-edgeble-neu2-io.dts
deleted file mode 100644
index 0c2396b8f8..00
--- a/arch/arm/dts/rv1126-edgeble-neu2-io.dts
+++ /dev/null
@@ -1,112 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
- * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
- */
-
-/dts-v1/;
-#include "rv1126.dtsi"
-#include "rv1126-edgeble-neu2.dtsi"
-
-/ {
- model = "Edgeble Neu2 IO Board";
- compatible = "edgeble,neural-compute-module-2-io",
-"edgeble,neural-compute-module-2", "rockchip,rv1126";
-
- aliases {
- serial2 =
- };
-
- chosen {
- stdout-path = "serial2:150n8";
- };
-
- vcc12v_dcin: vcc12v-dcin-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc12v_dcin";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <1200>;
- regulator-max-microvolt = <1200>;
- };
-
- vcc5v0_sys: vcc5v0-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <500>;
- regulator-max-microvolt = <500>;
- vin-supply = <_dcin>;
- };
-
- v3v3_sys: v3v3-sys-regulator {
- compatible = "regulator-fixed";
- regulator-name = "v3v3_sys";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <330>;
- regulator-max-microvolt = <330>;
- vin-supply = <_sys>;
- };
-};
-
- {
- assigned-clocks = < CLK_GMAC_SRC>, < CLK_GMAC_TX_RX>,
- < CLK_GMAC_ETHERNET_OUT>;
- assigned-clock-parents = < CLK_GMAC_SRC_M1>, < RGMII_MODE_CLK>;
- assigned-clock-rates = <12500>, <0>, <2500>;
- clock_in_out = "input";
- phy-handle = <>;
- phy-mode = "rgmii";
- phy-supply = <_3v3>;
- pinctrl-names = "default";
- pinctrl-0 = <_miim _bus2 _bus4
_out_ethernetm1_pins>;
- tx_delay = <0x2a>;
- rx_delay = <0x1a>;
- status = "okay";
-};
-
- {
- phy: ethernet-phy@0 {
- compatible = "ethernet-phy-id001c.c916",
-"ethernet-phy-ieee802.3-c22";
- reg = <0x0>;
- pinctrl-names = "default";
- pinctrl-0 = <_phy_rst>;
- reset-assert-us = <2>;
- reset-deassert-us = <10>;
- reset-gpios = < RK_PB6 GPIO_ACTIVE_LOW>;
- };
-};
-
- {
- ethernet {
-
