[PATCH v2 0/2] rockchip: rk3308: Update otp node in u-boot dtsi to match v6.11-rc1
The merged upstream DT node for OTP differs in nodename and a future update of dts/upstream to devicetree-rebasing v6.11-rc1-dts tag or newer will cause build issues.
This series replace the node in soc u-boot dtsi with the upstream node.
Changes in v2: - Drop patch that changed the nodename to match v6.11-rc1 - Add patch to remove the OTP device node from rk3308-u-boot.dtsi - Cherry-pick upstream commit from devicetree-rebasing v6.11-rc1-dts
Jonas Karlman (2): rockchip: rk3308: Remove OTP device node from soc u-boot dtsi arm64: dts: rockchip: Add OTP device node for RK3308
arch/arm/dts/rk3308-u-boot.dtsi | 16 -------------- dts/upstream/src/arm64/rockchip/rk3308.dtsi | 24 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-)
The merged upstream DT node for OTP differs in nodename and will cause following build errors once rk3308.dtsi in dts/upstream is updated:
ERROR (duplicate_label): /nvmem@ff210000: Duplicate label 'otp' on /nvmem@ff210000 and /efuse@ff210000 ERROR (duplicate_label): /nvmem@ff210000/id@7: Duplicate label 'cpu_id' on /nvmem@ff210000/id@7 and /efuse@ff210000/id@7
Remove the OTP device node from soc u-boot dtsi in preparation for replacing it with the merged upstream DT node in dts/upstream.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- v2: New patch --- arch/arm/dts/rk3308-u-boot.dtsi | 16 ---------------- 1 file changed, 16 deletions(-)
diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi index 684fa7abddb1..b7964e2756f3 100644 --- a/arch/arm/dts/rk3308-u-boot.dtsi +++ b/arch/arm/dts/rk3308-u-boot.dtsi @@ -21,22 +21,6 @@ bootph-all; };
- otp: nvmem@ff210000 { - compatible = "rockchip,rk3308-otp"; - reg = <0x0 0xff210000 0x0 0x4000>; - clocks = <&cru SCLK_OTP_USR>, <&cru PCLK_OTP_NS>, - <&cru PCLK_OTP_PHY>; - clock-names = "otp", "apb_pclk", "phy"; - resets = <&cru SRST_OTP_PHY>; - reset-names = "phy"; - #address-cells = <1>; - #size-cells = <1>; - - cpu_id: id@7 { - reg = <0x07 0x10>; - }; - }; - rng: rng@ff2f0000 { compatible = "rockchip,cryptov2-rng"; reg = <0x0 0xff2f0000 0x0 0x4000>;
On 2024/7/30 22:27, Jonas Karlman wrote:
The merged upstream DT node for OTP differs in nodename and will cause following build errors once rk3308.dtsi in dts/upstream is updated:
ERROR (duplicate_label): /nvmem@ff210000: Duplicate label 'otp' on /nvmem@ff210000 and /efuse@ff210000 ERROR (duplicate_label): /nvmem@ff210000/id@7: Duplicate label 'cpu_id' on /nvmem@ff210000/id@7 and /efuse@ff210000/id@7
Remove the OTP device node from soc u-boot dtsi in preparation for replacing it with the merged upstream DT node in dts/upstream.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
v2: New patch
arch/arm/dts/rk3308-u-boot.dtsi | 16 ---------------- 1 file changed, 16 deletions(-)
diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi index 684fa7abddb1..b7964e2756f3 100644 --- a/arch/arm/dts/rk3308-u-boot.dtsi +++ b/arch/arm/dts/rk3308-u-boot.dtsi @@ -21,22 +21,6 @@ bootph-all; };
- otp: nvmem@ff210000 {
compatible = "rockchip,rk3308-otp";reg = <0x0 0xff210000 0x0 0x4000>;clocks = <&cru SCLK_OTP_USR>, <&cru PCLK_OTP_NS>,<&cru PCLK_OTP_PHY>;clock-names = "otp", "apb_pclk", "phy";resets = <&cru SRST_OTP_PHY>;reset-names = "phy";#address-cells = <1>;#size-cells = <1>;cpu_id: id@7 {reg = <0x07 0x10>;};- };
- rng: rng@ff2f0000 { compatible = "rockchip,cryptov2-rng"; reg = <0x0 0xff2f0000 0x0 0x4000>;
The RK3308 SoC contains a controller for one-time-programmable memory, add a device node for it.
Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-9-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 36d3bbc8cdbef2f83391f7708888265ac4c37a99 ]
(cherry picked from commit db11d284200d0f811a8f8238dbc9c63daf4e6131) --- v2: New patch --- dts/upstream/src/arm64/rockchip/rk3308.dtsi | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308.dtsi b/dts/upstream/src/arm64/rockchip/rk3308.dtsi index c00da150a22f..6531ede13af9 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3308.dtsi @@ -556,6 +556,30 @@ status = "disabled"; };
+ otp: efuse@ff210000 { + compatible = "rockchip,rk3308-otp"; + reg = <0x0 0xff210000 0x0 0x4000>; + #address-cells = <1>; + #size-cells = <1>; + clocks = <&cru SCLK_OTP_USR>, <&cru PCLK_OTP_NS>, + <&cru PCLK_OTP_PHY>; + clock-names = "otp", "apb_pclk", "phy"; + resets = <&cru SRST_OTP_PHY>; + reset-names = "phy"; + + cpu_id: id@7 { + reg = <0x07 0x10>; + }; + + cpu_leakage: cpu-leakage@17 { + reg = <0x17 0x1>; + }; + + logic_leakage: logic-leakage@18 { + reg = <0x18 0x1>; + }; + }; + dmac0: dma-controller@ff2c0000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x0 0xff2c0000 0x0 0x4000>;
On 2024/7/30 22:27, Jonas Karlman wrote:
The RK3308 SoC contains a controller for one-time-programmable memory, add a device node for it.
Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-9-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 36d3bbc8cdbef2f83391f7708888265ac4c37a99 ]
(cherry picked from commit db11d284200d0f811a8f8238dbc9c63daf4e6131)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
v2: New patch
dts/upstream/src/arm64/rockchip/rk3308.dtsi | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308.dtsi b/dts/upstream/src/arm64/rockchip/rk3308.dtsi index c00da150a22f..6531ede13af9 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3308.dtsi @@ -556,6 +556,30 @@ status = "disabled"; };
- otp: efuse@ff210000 {
compatible = "rockchip,rk3308-otp";reg = <0x0 0xff210000 0x0 0x4000>;#address-cells = <1>;#size-cells = <1>;clocks = <&cru SCLK_OTP_USR>, <&cru PCLK_OTP_NS>,<&cru PCLK_OTP_PHY>;clock-names = "otp", "apb_pclk", "phy";resets = <&cru SRST_OTP_PHY>;reset-names = "phy";cpu_id: id@7 {reg = <0x07 0x10>;};cpu_leakage: cpu-leakage@17 {reg = <0x17 0x1>;};logic_leakage: logic-leakage@18 {reg = <0x18 0x1>;};- };
- dmac0: dma-controller@ff2c0000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x0 0xff2c0000 0x0 0x4000>;
participants (3)
-
Jonas Karlman -
Kever Yang -
Quentin Schulz