Re: [PATCH v2 10/14] rockchip: rk3308: Sync device tree from linux v6.8
On 2024/4/9 02:14, Jonas Karlman wrote:
Sync device tree from linux v6.8 and rename the rockchip,rk3308-mac
compatible in gmac_rockchip driver to match upstream linux.
Also move rk3308-roc-cc gmac node to u-boot.dtsi to not break features
not enabled in upstream device tree.
Signed-off-by: Jonas Karlman
Reviewed-by: Kever Yang
Thanks,
- Kever
---
v2: Sort bootph-all prop after compatible and reg props
---
arch/arm/dts/rk3308-evb.dts | 104 +-
arch/arm/dts/rk3308-roc-cc-u-boot.dtsi| 19 +
arch/arm/dts/rk3308-roc-cc.dts| 83 +-
arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi |4 +
arch/arm/dts/rk3308-rock-pi-s.dts | 100 +-
arch/arm/dts/rk3308-u-boot.dtsi | 14 +-
arch/arm/dts/rk3308.dtsi | 1205 +++--
drivers/net/gmac_rockchip.c |2 +-
8 files changed, 837 insertions(+), 694 deletions(-)
diff --git a/arch/arm/dts/rk3308-evb.dts b/arch/arm/dts/rk3308-evb.dts
index 124a24086684..184b84fdde07 100644
--- a/arch/arm/dts/rk3308-evb.dts
+++ b/arch/arm/dts/rk3308-evb.dts
@@ -23,7 +23,7 @@
poll-interval = <100>;
keyup-threshold-microvolt = <180>;
- func-key {
+ button-func {
linux,code = ;
label = "function";
press-threshold-microvolt = <18000>;
@@ -37,31 +37,31 @@
poll-interval = <100>;
keyup-threshold-microvolt = <180>;
- esc-key {
+ button-esc {
linux,code = ;
label = "micmute";
press-threshold-microvolt = <113>;
};
- home-key {
+ button-home {
linux,code = ;
label = "mode";
press-threshold-microvolt = <901000>;
};
- menu-key {
+ button-menu {
linux,code = ;
label = "play";
press-threshold-microvolt = <624000>;
};
- vol-down-key {
+ button-down {
linux,code = ;
label = "volume down";
press-threshold-microvolt = <30>;
};
- vol-up-key {
+ button-up {
linux,code = ;
label = "volume up";
press-threshold-microvolt = <18000>;
@@ -75,115 +75,115 @@
pinctrl-names = "default";
pinctrl-0 = <_key>;
- power {
+ key-power {
gpios = < RK_PA6 GPIO_ACTIVE_LOW>;
linux,code = ;
label = "GPIO Key Power";
- wakeup-source;
debounce-interval = <100>;
+ wakeup-source;
};
};
vcc12v_dcin: vcc12v-dcin {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
- regulator-always-on;
- regulator-boot-on;
regulator-min-microvolt = <1200>;
regulator-max-microvolt = <1200>;
+ regulator-always-on;
+ regulator-boot-on;
};
vcc5v0_sys: vcc5v0-sys {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
regulator-min-microvolt = <500>;
regulator-max-microvolt = <500>;
- vin-supply = <_dcin>;
- };
-
- vdd_core: vdd-core {
- compatible = "pwm-regulator";
- pwms = < 0 5000 1>;
- regulator-name = "vdd_core";
- regulator-min-microvolt = <827000>;
- regulator-max-microvolt = <134>;
regulator-always-on;
regulator-boot-on;
- regulator-settling-time-up-us = <250>;
- pwm-supply = <_sys>;
- };
-
- vdd_log: vdd-log {
- compatible = "regulator-fixed";
- regulator-name = "vdd_log";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <105>;
- regulator-max-microvolt = <105>;
- vin-supply = <_sys>;
- };
-
- vdd_1v0: vdd-1v0 {
- compatible = "regulator-fixed";
- regulator-name = "vdd_1v0";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <100>;
- regulator-max-microvolt = <100>;
- vin-supply = <_sys>;
+ vin-supply = <_dcin>;
};
vccio_sdio: vcc_1v8: vcc-1v8 {
compatible =
[PATCH v2 10/14] rockchip: rk3308: Sync device tree from linux v6.8
Sync device tree from linux v6.8 and rename the rockchip,rk3308-mac
compatible in gmac_rockchip driver to match upstream linux.
Also move rk3308-roc-cc gmac node to u-boot.dtsi to not break features
not enabled in upstream device tree.
Signed-off-by: Jonas Karlman
---
v2: Sort bootph-all prop after compatible and reg props
---
arch/arm/dts/rk3308-evb.dts | 104 +-
arch/arm/dts/rk3308-roc-cc-u-boot.dtsi| 19 +
arch/arm/dts/rk3308-roc-cc.dts| 83 +-
arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi |4 +
arch/arm/dts/rk3308-rock-pi-s.dts | 100 +-
arch/arm/dts/rk3308-u-boot.dtsi | 14 +-
arch/arm/dts/rk3308.dtsi | 1205 +++--
drivers/net/gmac_rockchip.c |2 +-
8 files changed, 837 insertions(+), 694 deletions(-)
diff --git a/arch/arm/dts/rk3308-evb.dts b/arch/arm/dts/rk3308-evb.dts
index 124a24086684..184b84fdde07 100644
--- a/arch/arm/dts/rk3308-evb.dts
+++ b/arch/arm/dts/rk3308-evb.dts
@@ -23,7 +23,7 @@
poll-interval = <100>;
keyup-threshold-microvolt = <180>;
- func-key {
+ button-func {
linux,code = ;
label = "function";
press-threshold-microvolt = <18000>;
@@ -37,31 +37,31 @@
poll-interval = <100>;
keyup-threshold-microvolt = <180>;
- esc-key {
+ button-esc {
linux,code = ;
label = "micmute";
press-threshold-microvolt = <113>;
};
- home-key {
+ button-home {
linux,code = ;
label = "mode";
press-threshold-microvolt = <901000>;
};
- menu-key {
+ button-menu {
linux,code = ;
label = "play";
press-threshold-microvolt = <624000>;
};
- vol-down-key {
+ button-down {
linux,code = ;
label = "volume down";
press-threshold-microvolt = <30>;
};
- vol-up-key {
+ button-up {
linux,code = ;
label = "volume up";
press-threshold-microvolt = <18000>;
@@ -75,115 +75,115 @@
pinctrl-names = "default";
pinctrl-0 = <_key>;
- power {
+ key-power {
gpios = < RK_PA6 GPIO_ACTIVE_LOW>;
linux,code = ;
label = "GPIO Key Power";
- wakeup-source;
debounce-interval = <100>;
+ wakeup-source;
};
};
vcc12v_dcin: vcc12v-dcin {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
- regulator-always-on;
- regulator-boot-on;
regulator-min-microvolt = <1200>;
regulator-max-microvolt = <1200>;
+ regulator-always-on;
+ regulator-boot-on;
};
vcc5v0_sys: vcc5v0-sys {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys";
- regulator-always-on;
- regulator-boot-on;
regulator-min-microvolt = <500>;
regulator-max-microvolt = <500>;
- vin-supply = <_dcin>;
- };
-
- vdd_core: vdd-core {
- compatible = "pwm-regulator";
- pwms = < 0 5000 1>;
- regulator-name = "vdd_core";
- regulator-min-microvolt = <827000>;
- regulator-max-microvolt = <134>;
regulator-always-on;
regulator-boot-on;
- regulator-settling-time-up-us = <250>;
- pwm-supply = <_sys>;
- };
-
- vdd_log: vdd-log {
- compatible = "regulator-fixed";
- regulator-name = "vdd_log";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <105>;
- regulator-max-microvolt = <105>;
- vin-supply = <_sys>;
- };
-
- vdd_1v0: vdd-1v0 {
- compatible = "regulator-fixed";
- regulator-name = "vdd_1v0";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <100>;
- regulator-max-microvolt = <100>;
- vin-supply = <_sys>;
+ vin-supply = <_dcin>;
};
vccio_sdio: vcc_1v8: vcc-1v8 {
compatible =
