[PATCH] rockchip: puma-rk3399: sync DTS with Linux kernel next-20221114

[Kever Yang]

On 2022/11/15 22:46, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> This synchronizes the Device Trees related to Puma RK3399 SoM with Linux
> kernel next-20221114 to include two important changes pertaining to
> eMMC and SD card instability.
>
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> To: Simon Glass <sjg at chromium.org>
> To: Philipp Tomsich <philipp.tomsich at vrull.eu>
> To: Kever Yang <kever.yang at rock-chips.com>
> To: Klaus Goger <klaus.goger at theobroma-systems.com>
> Cc: u-boot at lists.denx.de
> ---
>   arch/arm/dts/rk3399-puma-haikou.dts |  5 +++--
>   arch/arm/dts/rk3399-puma.dtsi       | 32 +++++++++++++++++++++++++++++++-
>   2 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-puma-haikou.dts b/arch/arm/dts/rk3399-puma-haikou.dts
> index 292bb7e80c..115c14c0a3 100644
> --- a/arch/arm/dts/rk3399-puma-haikou.dts
> +++ b/arch/arm/dts/rk3399-puma-haikou.dts
> @@ -49,7 +49,7 @@
>   	sgtl5000_clk: sgtl5000-oscillator  {
>   			compatible = "fixed-clock";
>   			#clock-cells = <0>;
> -			clock-frequency  = <24576000>;
> +			clock-frequency = <24576000>;
>   	};
>   
>   	dc_12v: dc-12v {
> @@ -207,7 +207,7 @@
>   	cap-sd-highspeed;
>   	cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
>   	disable-wp;
> -	max-frequency = <150000000>;
> +	max-frequency = <40000000>;
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
>   	vmmc-supply = <&vcc3v3_baseboard>;
> @@ -232,6 +232,7 @@
>   
>   &usbdrd_dwc3_0 {
>   	dr_mode = "otg";
> +	extcon = <&extcon_usb3>;
>   	status = "okay";
>   };
>   
> diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
> index fb67db4619..aa3e21bd6c 100644
> --- a/arch/arm/dts/rk3399-puma.dtsi
> +++ b/arch/arm/dts/rk3399-puma.dtsi
> @@ -25,6 +25,13 @@
>   		};
>   	};
>   
> +	extcon_usb3: extcon-usb3 {
> +		compatible = "linux,extcon-usb-gpio";
> +		id-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&usb3_id>;
> +	};
> +
>   	clkin_gmac: external-gmac-clock {
>   		compatible = "fixed-clock";
>   		clock-frequency = <125000000>;
> @@ -55,7 +62,6 @@
>   	vcc5v0_host: vcc5v0-host-regulator {
>   		compatible = "regulator-fixed";
>   		gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
> -		enable-active-low;
>   		pinctrl-names = "default";
>   		pinctrl-0 = <&vcc5v0_host_en>;
>   		regulator-name = "vcc5v0_host";
> @@ -71,6 +77,17 @@
>   		regulator-min-microvolt = <5000000>;
>   		regulator-max-microvolt = <5000000>;
>   	};
> +
> +	vdd_log: vdd-log {
> +		compatible = "pwm-regulator";
> +		pwms = <&pwm2 0 25000 1>;
> +		pwm-supply = <&vcc5v0_sys>;
> +		regulator-name = "vdd_log";
> +		regulator-min-microvolt = <800000>;
> +		regulator-max-microvolt = <1400000>;
> +		regulator-always-on;
> +		regulator-boot-on;
> +	};
>   };
>   
>   &cpu_b0 {
> @@ -422,9 +439,22 @@
>   			  <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
>   		};
>   	};
> +
> +	usb3 {
> +		usb3_id: usb3-id {
> +			rockchip,pins =
> +			  <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
> +		};
> +	};
>   };
>   
>   &sdhci {
> +	/*
> +	 * Signal integrity isn't great at 200MHz but 100MHz has proven stable
> +	 * enough.
> +	 */
> +	max-frequency = <100000000>;
> +
>   	bus-width = <8>;
>   	mmc-hs400-1_8v;
>   	mmc-hs400-enhanced-strobe;
>
> ---
> base-commit: c4ee4fe92e9be120be6d12718273dec6b63cc7d9
> change-id: 20221115-puma-dts-sync-b73a5c739ad8
>
> Best regards,