arm: dts: rk3399-rockpro64: sync dts from linux kernel
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the VD_LOGIC power domain.
---
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
--- arch/arm/dts/rk3399-rockpro64.dts | 57 ++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 8 deletions(-)
arch/arm/dts/rk3399-rockpro64.dts +49 -8
@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible = "pwm-fan"; + #cooling-cells = <2>; + fan-supply = <&vcc12v_dcin>; + pwms = <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>;
@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; + regulator-max-microvolt = <1700000>; vin-supply = <&vcc5v0_sys>; }; };
@@ -222,6 +229,10 @@ status = "okay"; }; +&hdmi_sound { + status = "okay"; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay";
@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible = "rockchip,rk808"; reg = <0x1b>; - interrupt-parent = <&gpio1>; - interrupts = <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent = <&gpio3>; + interrupts = <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <1>; clock-output-names = "xin32k", "rk808-clkout2"; pinctrl-names = "default";
@@ -504,11 +515,25 @@ status = "okay"; bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; + audio-supply = <&vcc_3v0>; sdmmc-supply = <&vcc_sdio>; gpio1830-supply = <&vcc_3v0>; }; +&pcie0 { + ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_perst>; + vpcie12v-supply = <&vcc12v_dcin>; + vpcie3v3-supply = <&vcc3v3_pcie>; + status = "okay"; +}; + +&pcie_phy { + status = "okay"; +}; + &pmu_io_domains { pmu1830-supply = <&vcc_3v0>; status = "okay";
@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };
@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {
@@ -580,6 +609,10 @@ status = "okay"; }; +&pwm1 { + status = "okay"; +}; + &pwm2 { status = "okay"; };
@@ -591,7 +624,6 @@ &sdmmc { bus-width = <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;
@@ -603,12 +635,21 @@ &sdhci { bus-width = <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status = "okay"; }; +&spi1 { + status = "okay"; + + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + &tcphy0 { status = "okay"; };
--
2.17.1
PATCH 2/2 arm: dts: rk3399-rockpro64: slightly increase center voltage
The rk3399 VD_CENTER voltage domain is not subject to dynamic voltage scaling. So the regulator reset voltage of 0.9V is used on this board. Let u-boot initialize the center voltage to 0.95V as it is done for the VD_LOGIC domain. This avoids instability and occasional linux kernel Opses on this board.
---
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
--- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +5 -0
@@ -11,6 +11,11 @@ }; }; +&vdd_center { + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <950000>; +}; + &vdd_log { regulator-init-microvolt = <950000>; };
--
2.17.1
PATCH 2/2 arm: dts: rk3399-rockpro64: slightly increase center voltage
Quoted 6 lines · Soeren Moch
The rk3399
VD_CENTERvoltage domain is not subject to dynamic voltage scaling. So the regulator reset voltage of 0.9V is used on this board. Let u-boot initialize the center voltage to 0.95V as it is done for theVD_LOGICdomain. This avoids instability and occasional linux kernel Opses on this board.
Quoted 6 lines
Signed-off-by Soeren Moch <[email protected]>=2D--
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
=2D--arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 5 +++++
Thanks,
- Kever
Quoted 23 lines
1 file changed, 5 insertions(+)arch/arm/dts/rk33= renamed from arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +0
-0
99-rockpro64-u-boot.dtsi
indexa073ea25f5..4648513ea9100644
=2D--a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
+++b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsiarch/arm/dts/rk33= renamed from arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +5
-0@@ -11,6 +11,11 @@ }; }; +&vdd_center { + regulator-min-microvolt =3D <950000>; + regulator-max-microvolt =3D <950000>; +}; + &vdd_log { regulator-init-microvolt =3D <950000>; };=2D-
2.17.1
PATCH 2/2 arm: dts: rk3399-rockpro64: slightly increase center voltage【请注意,邮件由[email protected]代发】
Quoted 8 lines · Kever Yang
Quoted 6 lines · Soeren Moch
The rk3399
VD_CENTERvoltage domain is not subject to dynamic voltage scaling. So the regulator reset voltage of 0.9V is used on this board. Let u-boot initialize the center voltage to 0.95V as it is done for theVD_LOGICdomain. This avoids instability and occasional linux kernel Opses on this board.
Quoted 9 lines
Quoted 6 lines
Signed-off-by Soeren Moch <[email protected]>=2D--
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
=2D--arch/arm/dts/rk3399-rockpro64-u-boot.dtsi| 5 +++++Reviewed-by Kever Yang<[email protected]>
Applied to u-boot-rockchip master .
Thanks,
- Kever
Quoted 32 lines
Thanks,
- KeverQuoted 20 lines
1 file changed, 5 insertions(+)arch/arm/dts/rk33= renamed from arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +0
-0
99-rockpro64-u-boot.dtsi
indexa073ea25f5..4648513ea9100644
=2D--a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
+++b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsiarch/arm/dts/rk33= renamed from arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +5
-0@@ -11,6 +11,11 @@ }; }; +&vdd_center { + regulator-min-microvolt =3D <950000>; + regulator-max-microvolt =3D <950000>; +}; + &vdd_log { regulator-init-microvolt =3D <950000>; };Quoted 4 lines
=2D-
2.17.1_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel
In reply to Soeren MochQuoted 3 lines · Soeren Moch
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the
VD_LOGICpower domain.
I don't see any changes to vdd-log regulator in this patch that can help avoiding overvoltage. It just bumps regulator-max-microvolt to 1700000.
Quoted 154 lines
Signed-off-by Soeren Moch <[email protected]>---
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de--- arch/arm/dts/rk3399-rockpro64.dts | 57 ++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 8 deletions(-)arch/arm/dts/rk3399-rockpro64.dts +49
-9@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible = "pwm-fan"; + #cooling-cells = <2>; + fan-supply = <&vcc12v_dcin>; + pwms = <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>;@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; + regulator-max-microvolt = <1700000>; vin-supply = <&vcc5v0_sys>; }; };@@ -222,6 +229,10 @@ status = "okay"; }; +&hdmi_sound { + status = "okay"; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay";@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible = "rockchip,rk808"; reg = <0x1b>; - interrupt-parent = <&gpio1>; - interrupts = <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent = <&gpio3>; + interrupts = <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <1>; clock-output-names = "xin32k", "rk808-clkout2"; pinctrl-names = "default";@@ -504,11 +515,25 @@ status = "okay"; bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; + audio-supply = <&vcc_3v0>; sdmmc-supply = <&vcc_sdio>; gpio1830-supply = <&vcc_3v0>; }; +&pcie0 { + ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_perst>; + vpcie12v-supply = <&vcc12v_dcin>; + vpcie3v3-supply = <&vcc3v3_pcie>; + status = "okay"; +}; + +&pcie_phy { + status = "okay"; +}; + &pmu_io_domains { pmu1830-supply = <&vcc_3v0>; status = "okay";@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {@@ -580,6 +609,10 @@ status = "okay"; }; +&pwm1 { + status = "okay"; +}; + &pwm2 { status = "okay"; };@@ -591,7 +624,6 @@ &sdmmc { bus-width = <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;@@ -603,12 +635,21 @@ &sdhci { bus-width = <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status = "okay"; }; +&spi1 { + status = "okay"; + + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + &tcphy0 { status = "okay"; }; --2.17.1
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel
Quoted 6 lines · Vasily Khoruzhick
Quoted 2 lines · Soeren Moch
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the
VD_LOGICpower domain.I don't see any changes to vdd-log regulator in this patch that can help avoiding overvoltage. It just bumps regulator-max-microvolt to 1700000.
The duty-cycle of this pwm regulator is calculated from the min and max values. And with a max value that is set too low for the actual circuitry, a wrong duty-cycle is calculated that results in a higher voltage that what is set in regulator-init-microvolt.
I measured the voltage on the board, with the original setting it was far above the allowed 1.0V, this patch fixes this, also see [1].
Regards,
Soeren
[1] https://patchwork.kernel.org/patch/11173465/
Quoted 155 lines
Quoted 155 lines
Signed-off-by Soeren Moch <[email protected]>---
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de--- arch/arm/dts/rk3399-rockpro64.dts | 57 ++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 8 deletions(-)arch/arm/dts/rk3399-rockpro64.dts +49
-9@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible = "pwm-fan"; + #cooling-cells = <2>; + fan-supply = <&vcc12v_dcin>; + pwms = <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>;@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; + regulator-max-microvolt = <1700000>; vin-supply = <&vcc5v0_sys>; }; };@@ -222,6 +229,10 @@ status = "okay"; }; +&hdmi_sound { + status = "okay"; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay";@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible = "rockchip,rk808"; reg = <0x1b>; - interrupt-parent = <&gpio1>; - interrupts = <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent = <&gpio3>; + interrupts = <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <1>; clock-output-names = "xin32k", "rk808-clkout2"; pinctrl-names = "default";@@ -504,11 +515,25 @@ status = "okay"; bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; + audio-supply = <&vcc_3v0>; sdmmc-supply = <&vcc_sdio>; gpio1830-supply = <&vcc_3v0>; }; +&pcie0 { + ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_perst>; + vpcie12v-supply = <&vcc12v_dcin>; + vpcie3v3-supply = <&vcc3v3_pcie>; + status = "okay"; +}; + +&pcie_phy { + status = "okay"; +}; + &pmu_io_domains { pmu1830-supply = <&vcc_3v0>; status = "okay";@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {@@ -580,6 +609,10 @@ status = "okay"; }; +&pwm1 { + status = "okay"; +}; + &pwm2 { status = "okay"; };@@ -591,7 +624,6 @@ &sdmmc { bus-width = <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;@@ -603,12 +635,21 @@ &sdhci { bus-width = <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status = "okay"; }; +&spi1 { + status = "okay"; + + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + &tcphy0 { status = "okay"; }; --2.17.1
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel
Quoted 8 lines · Soeren Moch
Quoted 6 lines · Vasily Khoruzhick
Quoted 2 lines · Soeren Moch
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the
VD_LOGICpower domain.I don't see any changes to vdd-log regulator in this patch that can help avoiding overvoltage. It just bumps regulator-max-microvolt to 1700000.
Quoted 6 lines
The duty-cycle of this pwm regulator is calculated from the min and max values. And with a max value that is set too low for the actual circuitry, a wrong duty-cycle is calculated that results in a higher voltage that what is set in regulator-init-microvolt.
I measured the voltage on the board, with the original setting it was far above the allowed 1.0V, this patch fixes this, also see [1].
Thanks for explanation!
Quoted 161 lines
Regards,
Soeren[1] https://patchwork.kernel.org/patch/11173465/
Quoted 155 lines
Quoted 155 lines
Signed-off-by Soeren Moch <[email protected]>---
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de--- arch/arm/dts/rk3399-rockpro64.dts | 57 ++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 8 deletions(-)arch/arm/dts/rk3399-rockpro64.dts +49
-9@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible = "pwm-fan"; + #cooling-cells = <2>; + fan-supply = <&vcc12v_dcin>; + pwms = <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk808 1>;@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; + regulator-max-microvolt = <1700000>; vin-supply = <&vcc5v0_sys>; }; };@@ -222,6 +229,10 @@ status = "okay"; }; +&hdmi_sound { + status = "okay"; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay";@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible = "rockchip,rk808"; reg = <0x1b>; - interrupt-parent = <&gpio1>; - interrupts = <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent = <&gpio3>; + interrupts = <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <1>; clock-output-names = "xin32k", "rk808-clkout2"; pinctrl-names = "default";@@ -504,11 +515,25 @@ status = "okay"; bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; + audio-supply = <&vcc_3v0>; sdmmc-supply = <&vcc_sdio>; gpio1830-supply = <&vcc_3v0>; }; +&pcie0 { + ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&pcie_perst>; + vpcie12v-supply = <&vcc12v_dcin>; + vpcie3v3-supply = <&vcc3v3_pcie>; + status = "okay"; +}; + +&pcie_phy { + status = "okay"; +}; + &pmu_io_domains { pmu1830-supply = <&vcc_3v0>; status = "okay";@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins = <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {@@ -580,6 +609,10 @@ status = "okay"; }; +&pwm1 { + status = "okay"; +}; + &pwm2 { status = "okay"; };@@ -591,7 +624,6 @@ &sdmmc { bus-width = <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;@@ -603,12 +635,21 @@ &sdhci { bus-width = <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status = "okay"; }; +&spi1 { + status = "okay"; + + flash at 0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + &tcphy0 { status = "okay"; }; --2.17.1
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel
In reply to Soeren MochQuoted 8 lines · Soeren Moch
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the
VD_LOGICpower domain.Signed-off-by Soeren Moch <[email protected]>=2D--
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
=2D--
Why is the "=2D- -" here?
Otherwise looks good to me.
Thanks,
- Kever
Quoted 147 lines
arch/arm/dts/rk3399-rockpro64.dts | 57 ++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 8 deletions(-)arch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +0
-0
ro64.dts
index1f2394e058..e544deb61d100644
=2D--a/arch/arm/dts/rk3399-rockpro64.dts
+++b/arch/arm/dts/rk3399-rockpro64.dtsarch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +49
-8@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible =3D "pwm-fan"; + #cooling-cells =3D <2>; + fan-supply =3D <&vcc12v_dcin>; + pwms =3D <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible =3D "mmc-pwrseq-simple"; clocks =3D <&rk808 1>;@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt =3D <800000>; - regulator-max-microvolt =3D <1400000>; + regulator-max-microvolt =3D <1700000>; vin-supply =3D <&vcc5v0_sys>; }; };@@ -222,6 +229,10 @@ status =3D "okay"; }; +&hdmi_sound { + status =3D "okay"; +}; + &gpu { mali-supply =3D <&vdd_gpu>; status =3D "okay";@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible =3D "rockchip,rk808"; reg =3D <0x1b>; - interrupt-parent =3D <&gpio1>; - interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent =3D <&gpio3>; + interrupts =3D <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells =3D <1>; clock-output-names =3D "xin32k", "rk808-clkout2"; pinctrl-names =3D "default";@@ -504,11 +515,25 @@ status =3D "okay"; bt656-supply =3D <&vcc1v8_dvp>; - audio-supply =3D <&vcca1v8_codec>; + audio-supply =3D <&vcc_3v0>; sdmmc-supply =3D <&vcc_sdio>; gpio1830-supply =3D <&vcc_3v0>; }; +&pcie0 { + ep-gpios =3D <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes =3D <4>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie_perst>; + vpcie12v-supply =3D <&vcc12v_dcin>; + vpcie3v3-supply =3D <&vcc3v3_pcie>; + status =3D "okay"; +}; + +&pcie_phy { + status =3D "okay"; +}; + &pmu_io_domains { pmu1830-supply =3D <&vcc_3v0>; status =3D "okay";@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins =3D <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins =3D <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins =3D <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins =3D <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {@@ -580,6 +609,10 @@ status =3D "okay"; }; +&pwm1 { + status =3D "okay"; +}; + &pwm2 { status =3D "okay"; };@@ -591,7 +624,6 @@ &sdmmc { bus-width =3D <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios =3D <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;@@ -603,12 +635,21 @@ &sdhci { bus-width =3D <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status =3D "okay"; }; +&spi1 { + status =3D "okay"; + + flash at 0 { + compatible =3D "jedec,spi-nor"; + reg =3D <0>; + spi-max-frequency =3D <10000000>; + }; +}; + &tcphy0 { status =3D "okay"; };=2D-
2.17.1
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel
Quoted 5 lines · Kever Yang
Quoted 3 lines · Soeren Moch
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the
VD_LOGICpower domain.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Soeren Moch <[email protected]>=2D--
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
=2D--Why is the "=2D- -" here?
'git send-email' encodes the patch this way. I use git version 2.17.1 . Apparently this this done to avoid problems with MTAs, I also saw 'From' in a patch description encoded in this special way.
Seems to be no problem for other tools, e.g. u-boot patchwork converts this back to the more traditional readable form.
I'm not sure what I should do about this, seems to be more a feature than a bug.
Quoted 5 lines
Otherwise looks good to me.
Reviewed-by Kever Yang<[email protected]>
Thanks,
Soeren
Quoted 154 lines
Thanks,
- KeverQuoted 148 lines
arch/arm/dts/rk3399-rockpro64.dts| 57 ++++++++++++++++++++++++++-----1 file changed, 49 insertions(+), 8 deletions(-)arch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +0
-0
ro64.dts
index1f2394e058..e544deb61d100644
=2D--a/arch/arm/dts/rk3399-rockpro64.dts
+++b/arch/arm/dts/rk3399-rockpro64.dtsarch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +49
-8@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible =3D "pwm-fan"; + #cooling-cells =3D <2>; + fan-supply =3D <&vcc12v_dcin>; + pwms =3D <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible =3D "mmc-pwrseq-simple"; clocks =3D <&rk808 1>;@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt =3D <800000>; - regulator-max-microvolt =3D <1400000>; + regulator-max-microvolt =3D <1700000>; vin-supply =3D <&vcc5v0_sys>; }; };@@ -222,6 +229,10 @@ status =3D "okay"; }; +&hdmi_sound { + status =3D "okay"; +}; + &gpu { mali-supply =3D <&vdd_gpu>; status =3D "okay";@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible =3D "rockchip,rk808"; reg =3D <0x1b>; - interrupt-parent =3D <&gpio1>; - interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent =3D <&gpio3>; + interrupts =3D <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells =3D <1>; clock-output-names =3D "xin32k", "rk808-clkout2"; pinctrl-names =3D "default";@@ -504,11 +515,25 @@ status =3D "okay"; bt656-supply =3D <&vcc1v8_dvp>; - audio-supply =3D <&vcca1v8_codec>; + audio-supply =3D <&vcc_3v0>; sdmmc-supply =3D <&vcc_sdio>; gpio1830-supply =3D <&vcc_3v0>; }; +&pcie0 { + ep-gpios =3D <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes =3D <4>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie_perst>; + vpcie12v-supply =3D <&vcc12v_dcin>; + vpcie3v3-supply =3D <&vcc3v3_pcie>; + status =3D "okay"; +}; + +&pcie_phy { + status =3D "okay"; +}; + &pmu_io_domains { pmu1830-supply =3D <&vcc_3v0>; status =3D "okay";@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins =3D <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins =3D <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins =3D <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins =3D <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {@@ -580,6 +609,10 @@ status =3D "okay"; }; +&pwm1 { + status =3D "okay"; +}; + &pwm2 { status =3D "okay"; };@@ -591,7 +624,6 @@ &sdmmc { bus-width =3D <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios =3D <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;@@ -603,12 +635,21 @@ &sdhci { bus-width =3D <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status =3D "okay"; }; +&spi1 { + status =3D "okay"; + + flash at 0 { + compatible =3D "jedec,spi-nor"; + reg =3D <0>; + spi-max-frequency =3D <10000000>; + }; +}; + &tcphy0 { status =3D "okay"; };=2D-
2.17.1
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel
Quoted 11 lines · Soeren Moch
Quoted 10 lines · Kever Yang
Quoted 8 lines · Soeren Moch
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the
VD_LOGICpower domain.Signed-off-by Soeren Moch <[email protected]>=2D--
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
=2D--Why is the "=2D- -" here?
Quoted 8 lines
'git send-email' encodes the patch this way. I use git version 2.17.1 . Apparently this this done to avoid problems with MTAs, I also saw 'From' in a patch description encoded in this special way.
Seems to be no problem for other tools, e.g. u-boot patchwork converts this back to the more traditional readable form.I'm not sure what I should do about this, seems to be more a feature than a bug.
Apparently 'git send-email' changed the default transfer encoding from unspecified 8bit to quoted-printable.
Do you want me to resend these patches with simpler transfer encoding, e.g. 7bit?
Thanks,
Soeren
Quoted 158 lines
Quoted 4 lines
Otherwise looks good to me.
Reviewed-by Kever Yang<[email protected]>Thanks,
SoerenQuoted 152 lines
Thanks,
- KeverQuoted 148 lines
arch/arm/dts/rk3399-rockpro64.dts| 57 ++++++++++++++++++++++++++-----1 file changed, 49 insertions(+), 8 deletions(-)arch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +0
-0
ro64.dts
index1f2394e058..e544deb61d100644
=2D--a/arch/arm/dts/rk3399-rockpro64.dts
+++b/arch/arm/dts/rk3399-rockpro64.dtsarch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +49
-8@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible =3D "pwm-fan"; + #cooling-cells =3D <2>; + fan-supply =3D <&vcc12v_dcin>; + pwms =3D <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible =3D "mmc-pwrseq-simple"; clocks =3D <&rk808 1>;@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt =3D <800000>; - regulator-max-microvolt =3D <1400000>; + regulator-max-microvolt =3D <1700000>; vin-supply =3D <&vcc5v0_sys>; }; };@@ -222,6 +229,10 @@ status =3D "okay"; }; +&hdmi_sound { + status =3D "okay"; +}; + &gpu { mali-supply =3D <&vdd_gpu>; status =3D "okay";@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible =3D "rockchip,rk808"; reg =3D <0x1b>; - interrupt-parent =3D <&gpio1>; - interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent =3D <&gpio3>; + interrupts =3D <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells =3D <1>; clock-output-names =3D "xin32k", "rk808-clkout2"; pinctrl-names =3D "default";@@ -504,11 +515,25 @@ status =3D "okay"; bt656-supply =3D <&vcc1v8_dvp>; - audio-supply =3D <&vcca1v8_codec>; + audio-supply =3D <&vcc_3v0>; sdmmc-supply =3D <&vcc_sdio>; gpio1830-supply =3D <&vcc_3v0>; }; +&pcie0 { + ep-gpios =3D <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes =3D <4>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie_perst>; + vpcie12v-supply =3D <&vcc12v_dcin>; + vpcie3v3-supply =3D <&vcc3v3_pcie>; + status =3D "okay"; +}; + +&pcie_phy { + status =3D "okay"; +}; + &pmu_io_domains { pmu1830-supply =3D <&vcc_3v0>; status =3D "okay";@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins =3D <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins =3D <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins =3D <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins =3D <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {@@ -580,6 +609,10 @@ status =3D "okay"; }; +&pwm1 { + status =3D "okay"; +}; + &pwm2 { status =3D "okay"; };@@ -591,7 +624,6 @@ &sdmmc { bus-width =3D <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios =3D <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;@@ -603,12 +635,21 @@ &sdhci { bus-width =3D <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status =3D "okay"; }; +&spi1 { + status =3D "okay"; + + flash at 0 { + compatible =3D "jedec,spi-nor"; + reg =3D <0>; + spi-max-frequency =3D <10000000>; + }; +}; + &tcphy0 { status =3D "okay"; };=2D-
2.17.1
PATCH 1/2 arm: dts: rk3399-rockpro64: sync dts from linux kernel【请注意,邮件由[email protected]代发】
In reply to Kever YangQuoted 11 lines · Kever Yang
Quoted 8 lines · Soeren Moch
The most important change for u-boot is the fix for the vdd-log pwm voltage regulator to avoid overvoltage for the
VD_LOGICpower domain.Signed-off-by Soeren Moch <[email protected]>=2D--
Cc: Kever Yang <[email protected]>
Cc: u-boot at lists.denx.de
=2D--
Quoted 6 lines
Why is the "=2D- -" here?
Otherwise looks good to me.
Reviewed-by Kever Yang<[email protected]>
Applied to u-boot-rockchip master.
Thanks,
- Kever
Quoted 158 lines
Thanks,
- KeverQuoted 144 lines
arch/arm/dts/rk3399-rockpro64.dts| 57 ++++++++++++++++++++++++++-----1 file changed, 49 insertions(+), 8 deletions(-)arch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +0
-0
ro64.dts
index1f2394e058..e544deb61d100644
=2D--a/arch/arm/dts/rk3399-rockpro64.dts
+++b/arch/arm/dts/rk3399-rockpro64.dtsarch/arm/dts/rk3399-rockp= renamed from arch/arm/dts/rk3399-rockpro64.dts +49
-8@@ -58,6 +58,13 @@ }; }; + fan: pwm-fan { + compatible =3D "pwm-fan"; + #cooling-cells =3D <2>; + fan-supply =3D <&vcc12v_dcin>; + pwms =3D <&pwm1 0 50000 0>; + }; + sdio_pwrseq: sdio-pwrseq { compatible =3D "mmc-pwrseq-simple"; clocks =3D <&rk808 1>;@@ -166,7 +173,7 @@ regulator-always-on; regulator-boot-on; regulator-min-microvolt =3D <800000>; - regulator-max-microvolt =3D <1400000>; + regulator-max-microvolt =3D <1700000>; vin-supply =3D <&vcc5v0_sys>; }; };@@ -222,6 +229,10 @@ status =3D "okay"; }; +&hdmi_sound { + status =3D "okay"; +}; + &gpu { mali-supply =3D <&vdd_gpu>; status =3D "okay";@@ -236,8 +247,8 @@ rk808: pmic at 1b { compatible =3D "rockchip,rk808"; reg =3D <0x1b>; - interrupt-parent =3D <&gpio1>; - interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + interrupt-parent =3D <&gpio3>; + interrupts =3D <10 IRQ_TYPE_LEVEL_LOW>; #clock-cells =3D <1>; clock-output-names =3D "xin32k", "rk808-clkout2"; pinctrl-names =3D "default";@@ -504,11 +515,25 @@ status =3D "okay"; bt656-supply =3D <&vcc1v8_dvp>; - audio-supply =3D <&vcca1v8_codec>; + audio-supply =3D <&vcc_3v0>; sdmmc-supply =3D <&vcc_sdio>; gpio1830-supply =3D <&vcc_3v0>; }; +&pcie0 { + ep-gpios =3D <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + num-lanes =3D <4>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pcie_perst>; + vpcie12v-supply =3D <&vcc12v_dcin>; + vpcie3v3-supply =3D <&vcc3v3_pcie>; + status =3D "okay"; +}; + +&pcie_phy { + status =3D "okay"; +}; + &pmu_io_domains { pmu1830-supply =3D <&vcc_3v0>; status =3D "okay";@@ -538,6 +563,10 @@ }; pcie { + pcie_perst: pcie-perst { + rockchip,pins =3D <2 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + pcie_pwr_en: pcie-pwr-en { rockchip,pins =3D <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; };@@ -545,7 +574,7 @@ pmic { pmic_int_l: pmic-int-l { - rockchip,pins =3D <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins =3D <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; }; vsel1_gpio: vsel1-gpio {@@ -580,6 +609,10 @@ status =3D "okay"; }; +&pwm1 { + status =3D "okay"; +}; + &pwm2 { status =3D "okay"; };@@ -591,7 +624,6 @@ &sdmmc { bus-width =3D <4>; - cap-mmc-highspeed; cap-sd-highspeed; cd-gpios =3D <&gpio0 7 GPIO_ACTIVE_LOW>; disable-wp;@@ -603,12 +635,21 @@ &sdhci { bus-width =3D <8>; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; + mmc-hs200-1_8v; non-removable; status =3D "okay"; }; +&spi1 { + status =3D "okay"; + + flash at 0 { + compatible =3D "jedec,spi-nor"; + reg =3D <0>; + spi-max-frequency =3D <10000000>; + }; +}; + &tcphy0 { status =3D "okay"; };Quoted 4 lines
=2D-
2.17.1_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot