Merge tag 'v4.15-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Pull "Rockchip dts32 updates for 4.15 part2" from Heiko Stübner:

CEC support for the two rk3288-firefly variants and general hdmi support
for the firefly-reload. A lot of additions and corrections for the
rk3288-vyasa and thermal support for the rv1108.

* tag 'v4.15-rockchip-dts32-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: enable the hdmi output on the rk3288-firefly-reload
  ARM: dts: rockchip: define the two possible rk3288 CEC pins
  ARM: dts: rockchip: add the cec clk for dw-hdmi on rk3288
  ARM: dts: rockchip: Add io domains for rk3288-vyasa
  ARM: dts: rockchip: Add usb otg for rk3288-vyasa
  ARM: dts: rockchip: Add usb host for rk3288-vyasa
  ARM: dts: rockchip: Add gmac support for rk3288-vyasa board
  ARM: dts: rockchip: Add regulators for rk3288-vyasa
  ARM: dts: rockchip: Use vmmc-supply from PMIC on rk3288-vyasa
  ARM: dts: rockchip: Remove vdd_log from rk808, DCDC_REG1 on rk3288-vyasa
  ARM: dts: rockchip: enable tsadc module on RV1108 evaluation board
  ARM: dts: rockchip: add thermal nodes for RV1108 SoC
  ARM: dts: rockchip: add tsadc node for RV1108 SoC
  ARM: dts: rockchip: add RGA device node for RK3288

6 files changed, 270 insertions, 16 deletions

diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
index 5f05815f47e0..5f1e336dbaac 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi
@@ -184,6 +184,7 @@
                                 regulator-name = "vdd10_lcd";
                                 regulator-min-microvolt = <1000000>;
                                 regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
                         };
 
                         vcca_18: REG7  {
@@ -223,6 +224,7 @@
                                 regulator-name = "vcc18_lcd";
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts
index 7da0947ababb..eab176e3dfc3 100644
--- a/arch/arm/boot/dts/rk3288-firefly-reload.dts
+++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts
@@ -226,6 +226,13 @@
         };
 };
 
+&hdmi {
+        ddc-i2c-bus = <&i2c5>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&hdmi_cec_c0>;
+        status = "okay";
+};
+
 &i2c0 {
         hym8563: hym8563@51 {
                 compatible = "haoyu,hym8563";
@@ -255,6 +262,10 @@
         };
 };
 
+&i2c5 {
+        status = "okay";
+};
+
 &i2s {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk3288-vyasa.dts b/arch/arm/boot/dts/rk3288-vyasa.dts
index 3546eb8629c7..9842a006e823 100644
--- a/arch/arm/boot/dts/rk3288-vyasa.dts
+++ b/arch/arm/boot/dts/rk3288-vyasa.dts
@@ -56,25 +56,98 @@
                 device_type = "memory";
         };
 
-        vcc_sd: sdmmc-regulator {
+        dc12_vbat: dc12-vbat {
                 compatible = "regulator-fixed";
-                gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
-                pinctrl-names = "default";
-                pinctrl-0 = <&sdmmc_pwr>;
-                regulator-name = "vcc_sd";
+                regulator-name = "dc12_vbat";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        vboot_3v3: vboot-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "vboot_3v3";
                 regulator-min-microvolt = <3300000>;
                 regulator-max-microvolt = <3300000>;
-                startup-delay-us = <100000>;
-                vin-supply = <&vcc_io>;
+                regulator-always-on;
+                regulator-boot-on;
+                vin-supply = <&dc12_vbat>;
         };
 
         vcc_sys: vsys-regulator {
                 compatible = "regulator-fixed";
                 regulator-name = "vcc_sys";
+                regulator-min-microvolt = <3700000>;
+                regulator-max-microvolt = <3700000>;
+                regulator-always-on;
+                regulator-boot-on;
+                vin-supply = <&dc12_vbat>;
+        };
+
+        vboot_5v: vboot-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "vboot_sv";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                regulator-boot-on;
+                vin-supply = <&dc12_vbat>;
+        };
+
+        v3g_3v3: v3g-3v3 {
+                compatible = "regulator-fixed";
+                regulator-name = "v3g_3v3";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+                regulator-boot-on;
+                vin-supply = <&dc12_vbat>;
+        };
+
+        vsus_5v: vsus-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "vsus_5v";
                 regulator-min-microvolt = <5000000>;
                 regulator-max-microvolt = <5000000>;
                 regulator-always-on;
                 regulator-boot-on;
+                vin-supply = <&vcc_io>;
+        };
+
+        vusb1_5v: vusb1-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "vusb1_5v";
+                enable-active-high;
+                gpio = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; /* OTG_VBUS_DRV */
+                pinctrl-names = "default";
+                pinctrl-0 = <&otg_vbus_drv>;
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                regulator-boot-on;
+                vin-supply = <&vsus_5v>;
+        };
+
+        vusb2_5v: vusb2-5v {
+                compatible = "regulator-fixed";
+                regulator-name = "vusb2_5v";
+                enable-active-high;
+                gpio = <&gpio8 RK_PB1 GPIO_ACTIVE_HIGH>; /* USB2_PWR_EN */
+                pinctrl-names = "default";
+                pinctrl-0 = <&usb2_pwr_en>;
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                regulator-boot-on;
+                vin-supply = <&vsus_5v>;
+        };
+
+        ext_gmac: external-gmac-clock {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <125000000>;
+                clock-output-names = "ext_gmac";
         };
 };
 
@@ -82,6 +155,22 @@
         cpu0-supply = <&vdd_cpu>;
 };
 
+&gmac {
+        assigned-clocks = <&cru SCLK_MAC>;
+        assigned-clock-parents = <&ext_gmac>;
+        clock_in_out = "input";
+        pinctrl-names = "default";
+        pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>;
+        phy-supply = <&vcc_lan>;
+        phy-mode = "rgmii";
+        snps,reset-active-low;
+        snps,reset-delays-us = <0 10000 1000000>;
+        snps,reset-gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>;
+        tx_delay = <0x30>;