| Message ID | 20241017200039.1235524-3-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | a823d7fd7970e1064fb580a081e5dd264ff7942d |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: Add support for FriendlyElec NanoPC-T6 LTS | expand |
On 2024/10/18 04:00, Jonas Karlman wrote: > From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > > MiniPCIe slot is present only in first version of NanoPC-T6 (2301). > > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-3-edff247e8c02@linaro.org > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > [ upstream commit: aea8d84070fe0846961deb23228d9dd3f8caefb3 ] > > (cherry picked from commit 697963b1c22336a44ac2e33536c652aae1671b3d) > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > .../src/arm64/rockchip/rk3588-nanopc-t6.dts | 23 +++++++++++++++++++ > .../src/arm64/rockchip/rk3588-nanopc-t6.dtsi | 17 -------------- > 2 files changed, 23 insertions(+), 17 deletions(-) > > diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts > index 3f8fbec65098..92321c1d3ff1 100644 > --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts > +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts > @@ -14,4 +14,27 @@ > model = "FriendlyElec NanoPC-T6"; > compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588"; > > + vdd_4g_3v3: vdd-4g-3v3-regulator { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pin_4g_lte_pwren>; > + regulator-name = "vdd_4g_3v3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + vin-supply = <&vcc5v0_sys>; > + }; > +}; > + > +&pinctrl { > + usb { > + pin_4g_lte_pwren: 4g-lte-pwren { > + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > +}; > + > +&u2phy2_host { > + phy-supply = <&vdd_4g_3v3>; > }; > diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi > index ad8e36a339dc..d199f51a220c 100644 > --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi > +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi > @@ -170,18 +170,6 @@ > regulator-name = "vcc3v3_sd_s0"; > vin-supply = <&vcc_3v3_s3>; > }; > - > - vdd_4g_3v3: vdd-4g-3v3-regulator { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pin_4g_lte_pwren>; > - regulator-name = "vdd_4g_3v3"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - vin-supply = <&vcc5v0_sys>; > - }; > }; > > &combphy0_ps { > @@ -527,10 +515,6 @@ > }; > > usb { > - pin_4g_lte_pwren: 4g-lte-pwren { > - rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; > - }; > - > typec5v_pwren: typec5v-pwren { > rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; > }; > @@ -912,7 +896,6 @@ > }; > > &u2phy2_host { > - phy-supply = <&vdd_4g_3v3>; > status = "okay"; > }; >
diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts index 3f8fbec65098..92321c1d3ff1 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dts @@ -14,4 +14,27 @@ model = "FriendlyElec NanoPC-T6"; compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588"; + vdd_4g_3v3: vdd-4g-3v3-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pin_4g_lte_pwren>; + regulator-name = "vdd_4g_3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&pinctrl { + usb { + pin_4g_lte_pwren: 4g-lte-pwren { + rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&u2phy2_host { + phy-supply = <&vdd_4g_3v3>; }; diff --git a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi index ad8e36a339dc..d199f51a220c 100644 --- a/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi @@ -170,18 +170,6 @@ regulator-name = "vcc3v3_sd_s0"; vin-supply = <&vcc_3v3_s3>; }; - - vdd_4g_3v3: vdd-4g-3v3-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pin_4g_lte_pwren>; - regulator-name = "vdd_4g_3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc5v0_sys>; - }; }; &combphy0_ps { @@ -527,10 +515,6 @@ }; usb { - pin_4g_lte_pwren: 4g-lte-pwren { - rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - typec5v_pwren: typec5v-pwren { rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; }; @@ -912,7 +896,6 @@ }; &u2phy2_host { - phy-supply = <&vdd_4g_3v3>; status = "okay"; };