git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From aea8d84070fe0846961deb23228d9dd3f8caefb3 Mon Sep 17 00:00:00 2001
   2 From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
   3 Date: Thu, 29 Aug 2024 14:26:54 +0200
   4 Subject: [PATCH] arm64: dts: rockchip: move NanoPC-T6 parts to DTS
   5
   6 MiniPCIe slot is present only in first version of NanoPC-T6 (2301).
   7
   8 Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
   9 Link: https://lore.kernel.org/r/20240829-friendlyelec-nanopc-t6-lts-v6-3-edff247e8c02@linaro.org
  10 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
  11 ---
  12  .../boot/dts/rockchip/rk3588-nanopc-t6.dts    | 23 +++++++++++++++++++
  13  .../boot/dts/rockchip/rk3588-nanopc-t6.dtsi   | 17 --------------
  14  2 files changed, 23 insertions(+), 17 deletions(-)
  15
  16 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
  17 +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
  18 @@ -14,4 +14,27 @@
  19         model = "FriendlyElec NanoPC-T6";
  20         compatible = "friendlyarm,nanopc-t6", "rockchip,rk3588";
  21
  22 +       vdd_4g_3v3: vdd-4g-3v3-regulator {
  23 +               compatible = "regulator-fixed";
  24 +               enable-active-high;
  25 +               gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
  26 +               pinctrl-names = "default";
  27 +               pinctrl-0 = <&pin_4g_lte_pwren>;
  28 +               regulator-name = "vdd_4g_3v3";
  29 +               regulator-min-microvolt = <3300000>;
  30 +               regulator-max-microvolt = <3300000>;
  31 +               vin-supply = <&vcc5v0_sys>;
  32 +       };
  33 +};
  34 +
  35 +&pinctrl {
  36 +       usb {
  37 +               pin_4g_lte_pwren: 4g-lte-pwren {
  38 +                       rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
  39 +               };
  40 +       };
  41 +};
  42 +
  43 +&u2phy2_host {
  44 +       phy-supply = <&vdd_4g_3v3>;
  45  };
  46 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
  47 +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
  48 @@ -170,18 +170,6 @@
  49                 regulator-name = "vcc3v3_sd_s0";
  50                 vin-supply = <&vcc_3v3_s3>;
  51         };
  52 -
  53 -       vdd_4g_3v3: vdd-4g-3v3-regulator {
  54 -               compatible = "regulator-fixed";
  55 -               enable-active-high;
  56 -               gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
  57 -               pinctrl-names = "default";
  58 -               pinctrl-0 = <&pin_4g_lte_pwren>;
  59 -               regulator-name = "vdd_4g_3v3";
  60 -               regulator-min-microvolt = <3300000>;
  61 -               regulator-max-microvolt = <3300000>;
  62 -               vin-supply = <&vcc5v0_sys>;
  63 -       };
  64  };
  65
  66  &combphy0_ps {
  67 @@ -527,10 +515,6 @@
  68         };
  69
  70         usb {
  71 -               pin_4g_lte_pwren: 4g-lte-pwren {
  72 -                       rockchip,pins = <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
  73 -               };
  74 -
  75                 typec5v_pwren: typec5v-pwren {
  76                         rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
  77                 };
  78 @@ -912,7 +896,6 @@
  79  };
  80
  81  &u2phy2_host {
  82 -       phy-supply = <&vdd_4g_3v3>;
  83         status = "okay";
  84  };
  85