[U-Boot] [PATCH 1/2] arm: dts: rk3399-rockpro64: sync dts from linux kernel

Vasily Khoruzhick anarsoul at gmail.com
Thu Nov 7 20:04:02 UTC 2019


On Thu, Nov 7, 2019 at 3:11 AM Soeren Moch <smoch at web.de> wrote:
>
> 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.

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.

> Signed-off-by: Soeren Moch <smoch at web.de>
> ---
> Cc: Kever Yang <kever.yang at rock-chips.com>
> Cc: u-boot at lists.denx.de
> ---
>  arch/arm/dts/rk3399-rockpro64.dts | 57 ++++++++++++++++++++++++++-----
>  1 file changed, 49 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-rockpro64.dts b/arch/arm/dts/rk3399-rockpro64.dts
> index 1f2394e058..e544deb61d 100644
> --- a/arch/arm/dts/rk3399-rockpro64.dts
> +++ b/arch/arm/dts/rk3399-rockpro64.dts
> @@ -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


More information about the U-Boot mailing list