4 files changed, 185 insertions, 40 deletions

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
index 99d0d9912950..33c44e857247 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -104,6 +104,7 @@
         phy-mode = "rgmii";
         pinctrl-names = "default";
         pinctrl-0 = <&rgmiim1_pins>;
+        snps,force_thresh_dma_mode;
         snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
         snps,reset-active-low;
         snps,reset-delays-us = <0 10000 50000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index cf6cc4e7d315..d325e117287b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -218,7 +218,7 @@
         rk808: pmic@1b {
                 compatible = "rockchip,rk808";
                 reg = <0x1b>;
-                clock-output-names = "xin32k", "rk808-clkout2";
+                clock-output-names = "xin32k", "rtc_clko_wifi";
                 #clock-cells = <1>;
                 interrupt-parent = <&gpio1>;
                 interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
@@ -501,7 +501,20 @@
                 };
         };
 
-        sdio-pwrseq {
+        sdio {
+                bt_host_wake_l: bt-host-wake-l {
+                        rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+
+                bt_reg_on_h: bt-reg-on-h {
+                        /* external pullup to VCC1V8_PMUPLL */
+                        rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+
+                bt_wake_l: bt-wake-l {
+                        rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+
                 wifi_reg_on_h: wifi-reg_on-h {
                         rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
                 };
@@ -620,6 +633,20 @@
         pinctrl-names = "default";
         pinctrl-0 = <&uart0_xfer &uart0_rts &uart0_cts>;
         status = "okay";
+
+        bluetooth {
+                compatible = "brcm,bcm43438-bt";
+                clocks = <&rk808 1>;
+                clock-names = "lpo";
+                device-wakeup-gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
+                host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
+                shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
+                max-speed = <4000000>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&bt_reg_on_h &bt_host_wake_l &bt_wake_l>;
+                vbat-supply = <&vcc3v3_sys>;
+                vddio-supply = <&vcc_1v8>;
+        };
 };
 
 &uart2 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 56abbb08c133..2927db4dda9d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -9,6 +9,15 @@
 #include "rk3399-opp.dtsi"
 
 / {
+        sdio_pwrseq: sdio-pwrseq {
+                compatible = "mmc-pwrseq-simple";
+                clocks = <&rk808 1>;
+                clock-names = "ext_clock";
+                pinctrl-names = "default";
+                pinctrl-0 = <&wifi_enable_h>;
+                reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
+        };
+
         vcc1v8_s0: vcc1v8-s0 {
                 compatible = "regulator-fixed";
                 regulator-name = "vcc1v8_s0";
@@ -94,6 +103,10 @@
         status = "okay";
 };
 
+&hdmi_sound {
+        status = "okay";
+};
+
 &i2c0 {
         clock-frequency = <400000>;
         i2c-scl-rising-time-ns = <168>;
@@ -336,6 +349,10 @@
         status = "okay";
 };
 
+&i2s2 {
+        status = "okay";
+};
+
 &io_domains {
         bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */
         audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */
@@ -362,6 +379,20 @@
 };
 
 &pinctrl {
+        bt {
+                bt_enable_h: bt-enable-h {
+                        rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+
+                bt_host_wake_l: bt-host-wake-l {
+                        rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+
+                bt_wake_l: bt-wake-l {
+                        rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+
         sdmmc {
                 sdmmc_bus1: sdmmc-bus1 {
                         rockchip,pins =
@@ -387,6 +418,26 @@
                 };
         };
 
+        sdio0 {
+                sdio0_bus4: sdio0-bus4 {
+                        rockchip,pins =
+                                <2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
+                                <2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
+                                <2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
+                                <2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
+                };
+
+                sdio0_cmd: sdio0-cmd {
+                        rockchip,pins =
+                                <2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
+                };
+
+                sdio0_clk: sdio0-clk {
+                        rockchip,pins =
+                                <2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
+                };
+        };
+
         pmic {
                 pmic_int_l: pmic-int-l {
                         rockchip,pins =
@@ -403,6 +454,19 @@
                                 <1 14 RK_FUNC_GPIO &pcfg_pull_down>;
                 };
         };
+
+        sdio-pwrseq {
+                wifi_enable_h: wifi-enable-h {
+                        rockchip,pins =
+                                <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+
+        wifi {
+                wifi_host_wake_l: wifi-host-wake-l {
+                        rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
 };
 
 &pwm2 {
@@ -413,6 +477,32 @@
         status = "okay";
 };
 
+&sdio0 {
+        bus-width = <4>;
+        clock-frequency = <50000000>;
+        cap-sdio-irq;
+        cap-sd-highspeed;
+        keep-power-in-suspend;
+        mmc-pwrseq = <&sdio_pwrseq>;
+        non-removable;
+        pinctrl-names = "default";
+        pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
+        sd-uhs-sdr104;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        status = "okay";
+
+        brcmf: wifi@1 {
+                compatible = "brcm,bcm4329-fmac";
+                reg = <1>;
+                interrupt-parent = <&gpio0>;
+                interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+                interrupt-names = "host-wake";
+                pinctrl-names = "default";
+                pinctrl-0 = <&wifi_host_wake_l>;
+        };
+};
+
 &sdhci {
         bus-width = <8>;
         mmc-hs400-1_8v;
@@ -437,10 +527,28 @@
         status = "okay";
 };
 
+&tsadc {
+        rockchip,hw-tshut-mode = <1>;
+        rockchip,hw-tshut-polarity = <1>;
+        rockchip,hw-tshut-temp = <110000>;
+        status = "okay";
+};
+
 &uart0 {
         pinctrl-names = "default";
-        pinctrl-0 = <&uart0_xfer &uart0_cts>;
+        pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
         status = "okay";
+
+        bluetooth {
+                compatible = "brcm,bcm43438-bt";
+                clocks = <&rk808 1>;
+                clock-names = "ext_clock";
+                device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
+                host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
+                shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+        };
 };
 
 &uart2 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
index be78172abc09..1f2394e0587d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
@@ -25,15 +25,6 @@
                 #clock-cells = <0>;
         };
 
-        dc_12v: dc-12v {
-                compatible = "regulator-fixed";
-                regulator-name = "dc_12v";
-                regulator-always-on;
-                regulator-boot-on;
-                regulator-min-microvolt = <12000000>;
-                regulator-max-microvolt = <12000000>;
-        };
-
         gpio-keys {
                 compatible = "gpio-keys";
                 autorepeat;
@@ -83,6 +74,15 @@
                 reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
         };
 
+        vcc12v_dcin: vcc12v-dcin {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc12v_dcin";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+        };
+
         /* switched by pmic_sleep */
         vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
                 compatible = "regulator-fixed";
@@ -103,7 +103,7 @@
                 regulator-name = "vcc3v3_pcie";
                 regulator-always-on;
                 regulator-boot-on;
-                vin-supply = <&dc_12v>;
+                vin-supply = <&vcc12v_dcin>;
         };
 
         vcc3v3_sys: vcc3v3-sys {
@@ -113,7 +113,7 @@
                 regulator-boot-on;
                 regulator-min-microvolt = <3300000>;
                 regulator-max-microvolt = <3300000>;
-                vin-supply = <&vcc_sys>;
+                vin-supply = <&vcc5v0_sys>;
         };
 
         /* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
@@ -125,7 +125,7 @@
                 pinctrl-0 = <&vcc5v0_host_en>;
                 regulator-name = "vcc5v0_host";
                 regulator-always-on;
-                vin-supply = <&vcc_sys>;
+                vin-supply = <&vcc5v0_usb>;
         };
 
         vcc5v0_typec: vcc5v0-typec-regulator {
@@ -136,17 +136,27 @@
                 pinctrl-0 = <&vcc5v0_typec_en>;
                 regulator-name = "vcc5v0_typec";
                 regulator-always-on;
-                vin-supply = <&vcc_sys>;
+                vin-supply = <&vcc5v0_usb>;
         };
 
-        vcc_sys: vcc-sys {
+        vcc5v0_sys: vcc5v0-sys {
                 compatible = "regulator-fixed";
-                regulator-name = "vcc_sys";
+                regulator-name = "vcc5v0_sys";
                 regulator-always-on;
                 regulator-boot-on;
                 regulator-min-microvolt = <5000000>;
                 regulator-max-microvolt = <5000000>;
-                vin-supply = <&dc_12v>;
+                vin-supply = <&vcc12v_dcin>;
+        };
+
+        vcc5v0_usb: vcc5v0-usb {
+                compatible = "regulator-fixed";
+                regulator-name = "vcc5v0_usb";
+                regulator-always-on;
+                regulator-boot-on;
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                vin-supply = <&vcc12v_dcin>;
         };
 
         vdd_log: vdd-log {
@@ -157,7 +167,7 @@
                 regulator-boot-on;
                 regulator-min-microvolt = <800000>;
                 regulator-max-microvolt = <1400000>;
-                vin-supply = <&vcc_sys>;
+                vin-supply = <&vcc5v0_sys>;
         };
 };
 
@@ -212,6 +222,11 @@
         status = "okay";
 };
 
+&gpu {
+        mali-supply = <&vdd_gpu>;
+        status = "okay";
+};
+
 &i2c0 {
         clock-frequency = <400000>;
         i2c-scl-rising-time-ns = <168>;
@@ -230,18 +245,18 @@
                 rockchip,system-power-controller;
                 wakeup-source;
 
-                vcc1-supply = <&vcc_sys>;
-                vcc2-supply = <&vcc_sys>;
-                vcc3-supply = <&vcc_sys>;
-                vcc4-supply = <&vcc_sys>;
-                vcc6-supply = <&vcc_sys>;
-                vcc7-supply = <&vcc_sys>;
+                vcc1-supply = <&vcc5v0_sys>;
+                vcc2-supply = <&vcc5v0_sys>;
+                vcc3-supply = <&vcc5v0_sys>;
+                vcc4-supply = <&vcc5v0_sys>;
+                vcc6-supply = <&vcc5v0_sys>;
+                vcc7-supply = <&vcc5v0_sys>;
                 vcc8-supply = <&vcc3v3_sys>;
-                vcc9-supply = <&vcc_sys>;
-                vcc10-supply = <&vcc_sys>;
-                vcc11-supply = <&vcc_sys>;
+                vcc9-supply = <&vcc5v0_sys>;
+                vcc10-supply = <&vcc5v0_sys>;
+                vcc11-supply = <&vcc5v0_sys>;
                 vcc12-supply = <&vcc3v3_sys>;
-                vddio-supply = <&vcc1v8_pmu>;
+                vddio-supply = <&vcca_1v8>;
 
                 regulators {
                         vdd_center: DCDC_REG1 {
@@ -311,8 +326,8 @@
                                 };
                         };
 
-                        vcc1v8_pmu: LDO_REG3 {
-                                regulator-name = "vcc1v8_pmu";
+                        vcca_1v8: LDO_REG3 {
+                                regulator-name = "vcca_1v8";
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-min-microvolt = <1800000>;
@@ -413,7 +428,7 @@
                 regulator-ramp-delay = <1000>;
                 regulator-always-on;
                 regulator-boot-on;
-                vin-supply = <&vcc_sys>;
+                vin-supply = <&vcc5v0_sys>;
 
                 regulator-state-mem {
                         regulator-off-in-suspend;
@@ -432,7 +447,7 @@
                 regulator-ramp-delay = <1000>;
                 regulator-always-on;
                 regulator-boot-on;
-                vin-supply = <&vcc_sys>;
+                vin-supply = <&vcc5v0_sys>;
 
                 regulator-state-mem {
                         regulator-off-in-suspend;
@@ -522,12 +537,6 @@
                 };
         };
 
-        lcd-panel {
-                lcd_panel_reset: lcd-panel-reset {
-                        rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
-                };
-        };
-
         pcie {
                 pcie_pwr_en: pcie-pwr-en {
                         rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;