[PATCH] rockchip: rk3308: Update otp node in u-boot dtsi to match v6.11-rc1
The merged upstream DT node for OTP differs slightly, update node in rk3308-u-boot.dtsi to match Linux kernel v6.11-rc1 in order to reduce possible issue in future when devicetree-rebasing v6.11-dts is merged.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- arch/arm/dts/rk3308-u-boot.dtsi | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi index 684fa7abddb1..82b522eef8ec 100644 --- a/arch/arm/dts/rk3308-u-boot.dtsi +++ b/arch/arm/dts/rk3308-u-boot.dtsi @@ -21,20 +21,28 @@ bootph-all; };
- otp: nvmem@ff210000 { + 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"; - #address-cells = <1>; - #size-cells = <1>;
cpu_id: id@7 { reg = <0x07 0x10>; }; + + cpu_leakage: cpu-leakage@17 { + reg = <0x17 0x1>; + }; + + logic_leakage: logic-leakage@18 { + reg = <0x18 0x1>; + }; };
rng: rng@ff2f0000 {
On 2024/7/24 15:44, Jonas Karlman wrote:
The merged upstream DT node for OTP differs slightly, update node in rk3308-u-boot.dtsi to match Linux kernel v6.11-rc1 in order to reduce possible issue in future when devicetree-rebasing v6.11-dts is merged.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3308-u-boot.dtsi | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi index 684fa7abddb1..82b522eef8ec 100644 --- a/arch/arm/dts/rk3308-u-boot.dtsi +++ b/arch/arm/dts/rk3308-u-boot.dtsi @@ -21,20 +21,28 @@ bootph-all; };
- otp: nvmem@ff210000 {
- otp: efuse@ff210000 { compatible = "rockchip,rk3308-otp"; reg = <0x0 0xff210000 0x0 0x4000>;
#address-cells = <1>;#size-cells = <1>;
#address-cells = <1>;#size-cells = <1>;cpu_id: id@7 { reg = <0x07 0x10>; };
cpu_leakage: cpu-leakage@17 {reg = <0x17 0x1>;};logic_leakage: logic-leakage@18 {reg = <0x18 0x1>;};};
rng: rng@ff2f0000 {
Hi Jonas,
On 7/24/24 9:44 AM, Jonas Karlman wrote:
The merged upstream DT node for OTP differs slightly, update node in rk3308-u-boot.dtsi to match Linux kernel v6.11-rc1 in order to reduce possible issue in future when devicetree-rebasing v6.11-dts is merged.
Why not simply cherry-picking the commit from devicetree-rebasing.git instead?
If you spend the time doing this, better do it once than twice?
(but I realize the v6.11-rc1 tag was only pushed half a day ago so maybe the timing was unfortunate :) ).
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Quentin Schulz quentin.schulz@cherry.de
Thanks! Quentin
Hi Quentin,
On 2024-07-29 10:48, Quentin Schulz wrote:
Hi Jonas,
On 7/24/24 9:44 AM, Jonas Karlman wrote:
The merged upstream DT node for OTP differs slightly, update node in rk3308-u-boot.dtsi to match Linux kernel v6.11-rc1 in order to reduce possible issue in future when devicetree-rebasing v6.11-dts is merged.
Why not simply cherry-picking the commit from devicetree-rebasing.git instead?
If you spend the time doing this, better do it once than twice?
Agree, this patch will be superseded by a different patch in a new series that cherry-picks rk3308 dtsi and rock-pi-s dts updates from the devicetree-rebasing v6.11-rc1-dts tag.
Regards, Jonas
(but I realize the v6.11-rc1 tag was only pushed half a day ago so maybe the timing was unfortunate :) ).
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Quentin Schulz quentin.schulz@cherry.de
Thanks! Quentin
participants (3)
-
Jonas Karlman -
Kever Yang -
Quentin Schulz