Merge tag 'amlogic-dt64' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Pull "Amlogic 64-bit DT updates for v4.16" from Kevin Hilman
- meson-gx: add VPU power domain support
- odroid-c2: add HDMI and CEC nodes
- misc cleanups

* tag 'amlogic-dt64' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: dts: meson-gxm: fix q200 interrupt number
  ARM64: dts: meson-gxm: add the PHY interrupt line on Khadas VIM2
  ARM64: dts: meson: add comments with the GPIO for the PHY interrupts
  ARM64: dts: amlogic: use generic bus node names
  ARM64: dts: meson: drop "sana" clock from SAR ADC
  ARM64: dts: odroid-c2: Add HDMI and CEC Nodes
  ARM64: dts: meson-gx: grow reset controller memory zone
  ARM64: dts: meson-gx: Add HDMI_5V regulator on selected boards
  ARM64: dts: meson-gx: add VPU power domain

12 files changed, 192 insertions, 11 deletions

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index b932a784b02a..e7213eb53958 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -113,7 +113,7 @@
                 #size-cells = <2>;
                 ranges;
 
-                cbus: cbus@ffd00000 {
+                cbus: bus@ffd00000 {
                         compatible = "simple-bus";
                         reg = <0x0 0xffd00000 0x0 0x25000>;
                         #address-cells = <2>;
@@ -175,7 +175,7 @@
                         };
                 };
 
-                aobus: aobus@ff800000 {
+                aobus: bus@ff800000 {
                         compatible = "simple-bus";
                         reg = <0x0 0xff800000 0x0 0x100000>;
                         #address-cells = <2>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index 7d4b95e49993..aeb6d21a3bec 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -59,6 +59,18 @@
                 reg = <0x0 0x0 0x0 0x80000000>;
         };
 
+        hdmi_5v: regulator-hdmi-5v {
+                compatible = "regulator-fixed";
+
+                regulator-name = "HDMI_5V";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                regulator-always-on;
+        };
+
         vddio_boot: regulator-vddio_boot {
                 compatible = "regulator-fixed";
                 regulator-name = "VDDIO_BOOT";
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index ab7ce1644cdc..6cb3c2a52baf 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -211,7 +211,7 @@
                 #size-cells = <2>;
                 ranges;
 
-                cbus: cbus@c1100000 {
+                cbus: bus@c1100000 {
                         compatible = "simple-bus";
                         reg = <0x0 0xc1100000 0x0 0x100000>;
                         #address-cells = <2>;
@@ -229,7 +229,7 @@
 
                         reset: reset-controller@4404 {
                                 compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset";
-                                reg = <0x0 0x04404 0x0 0x20>;
+                                reg = <0x0 0x04404 0x0 0x9c>;
                                 #reset-cells = <1>;
                         };
 
@@ -366,7 +366,7 @@
                         };
                 };
 
-                aobus: aobus@c8100000 {
+                aobus: bus@c8100000 {
                         compatible = "simple-bus";
                         reg = <0x0 0xc8100000 0x0 0x100000>;
                         #address-cells = <2>;
@@ -377,6 +377,12 @@
                                 compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd";
                                 reg =  <0x0 0x0 0x0 0x100>;
 
+                                pwrc_vpu: power-controller-vpu {
+                                        compatible = "amlogic,meson-gx-pwrc-vpu";
+                                        #power-domain-cells = <0>;
+                                        amlogic,hhi-sysctrl = <&sysctrl>;
+                                };
+
                                 clkc_AO: clock-controller {
                                         compatible = "amlogic,meson-gx-aoclkc";
                                         #clock-cells = <1>;
@@ -447,13 +453,18 @@
                         };
                 };
 
-                hiubus: hiubus@c883c000 {
+                hiubus: bus@c883c000 {
                         compatible = "simple-bus";
                         reg = <0x0 0xc883c000 0x0 0x2000>;
                         #address-cells = <2>;
                         #size-cells = <2>;
                         ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;
 
+                        sysctrl: system-controller@0 {
+                                compatible = "amlogic,meson-gx-hhi-sysctrl", "syscon", "simple-mfd";
+                                reg = <0 0 0 0x400>;
+                        };
+
                         mailbox: mailbox@404 {
                                 compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";
                                 reg = <0 0x404 0 0x4c>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
index 4a4251001bfd..011e8e08e429 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
@@ -169,6 +169,7 @@
                         /* Realtek RTL8211F (0x001cc916) */
                         reg = <0>;
                         interrupt-parent = <&gpio_intc>;
+                        /* MAC_INTR on GPIOZ_15 */
                         interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
                 };
         };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index f8d221463c60..ee4ada61c59c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -135,6 +135,24 @@
                 compatible = "mmc-pwrseq-emmc";
                 reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&hdmi_tx_tmds_out>;
+                        };
+                };
+        };
+};
+
+&cec_AO {
+        status = "okay";
+        pinctrl-0 = <&ao_cec_pins>;
+        pinctrl-names = "default";
+        hdmi-phandle = <&hdmi_tx>;
 };
 
 &ethmac {
@@ -156,8 +174,10 @@
                 #size-cells = <0>;
 
                 eth_phy0: ethernet-phy@0 {
+                        /* Realtek RTL8211F (0x001cc916) */
                         reg = <0>;
                         interrupt-parent = <&gpio_intc>;
+                        /* MAC_INTR on GPIOZ_15 */
                         interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
                         eee-broken-1000t;
                 };
@@ -179,6 +199,18 @@
         };
 };
 
+&hdmi_tx {
+        status = "okay";
+        pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
+        pinctrl-names = "default";
+};
+
+&hdmi_tx_tmds_port {
+        hdmi_tx_tmds_out: endpoint {
+                remote-endpoint = <&hdmi_connector_in>;
+        };
+};
+
 &i2c_A {
         status = "okay";
         pinctrl-0 = <&i2c_a_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 9bf16bb7c491..09f34f7ef084 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -118,6 +118,7 @@
                         /* Micrel KSZ9031 (0x00221620) */
                         reg = <3>;
                         interrupt-parent = <&gpio_intc>;
+                        /* MAC_INTR on GPIOZ_15 */
                         interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
                 };
         };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 1fb8b9d6cb4e..3290a4dc3522 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -694,14 +694,55 @@
         };
 };
 
+&pwrc_vpu {
+        resets = <&reset RESET_VIU>,
+                 <&reset RESET_VENC>,
+                 <&reset RESET_VCBUS>,
+                 <&reset RESET_BT656>,
+                 <&reset RESET_DVIN_RESET>,
+                 <&reset RESET_RDMA>,
+                 <&reset RESET_VENCI>,
+                 <&reset RESET_VENCP>,
+                 <&reset RESET_VDAC>,
+                 <&reset RESET_VDI6>,
+                 <&reset RESET_VENCL>,
+                 <&reset RESET_VID_LOCK>;
+        clocks = <&clkc CLKID_VPU>,
+                 <&clkc CLKID_VAPB>;
+        clock-names = "vpu", "vapb";
+        /*
+         * VPU clocking is provided by two identical clock paths
+         * VPU_0 and VPU_1 muxed to a single clock by a glitch
+         * free mux to safely change frequency while running.
+         * Same for VAPB but with a final gate after the glitch free mux.
+         */
+        assigned-clocks = <&clkc CLKID_VPU_0_SEL>,
+                          <&clkc CLKID_VPU_0>,
+                          <&clkc CLKID_VPU>, /* Glitch free mux */
+                          <&clkc CLKID_VAPB_0_SEL>,
+                          <&clkc CLKID_VAPB_0>,
+                          <&clkc CLKID_VAPB_SEL>; /* Glitch free mux */
+        assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
+                                 <0>, /* Do Nothing */
+                                 <&clkc CLKID_VPU_0>,
+                                 <&clkc CLKID_FCLK_DIV4>,
+                                 <0>, /* Do Nothing */
+                                 <&clkc CLKID_VAPB_0>;
+        assigned-clock-rates = <0>, /* Do Nothing */
+                               <666666666>,
+                               <0>, /* Do Nothing */
+                               <0>, /* Do Nothing */
+                               <250000000>,
+                               <0>; /* Do Nothing */
+};
+
 &saradc {
         compatible = "amlogic,meson-gxbb-saradc", "amlogic,meson-saradc";
         clocks = <&xtal>,
                  <&clkc CLKID_SAR_ADC>,
-                 <&clkc CLKID_SANA>,
                  <&clkc CLKID_SAR_ADC_CLK>,
                  <&clkc CLKID_SAR_ADC_SEL>;
-        clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel";
+        clock-names = "clkin", "core", "adc_clk", "adc_sel";
 };
 
 &sd_emmc_a {
@@ -763,4 +804,5 @@
 
 &vpu {
         compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
+        power-domains = <&pwrc_vpu>;
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index dc9c3b8216c2..9671f1e3c74a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@ -72,6 +72,18 @@
                 reg = <0x0 0x0 0x0 0x80000000>;
         };
 
+        hdmi_5v: regulator-hdmi-5v {
+                compatible = "regulator-fixed";
+
+                regulator-name = "HDMI_5V";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                regulator-always-on;
+        };
+
         vcc_3v3: regulator-vcc_3v3 {
                 compatible = "regulator-fixed";
                 regulator-name = "VCC_3V3";
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index ff09df1fd5a3..7005068346a0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@ -28,6 +28,18 @@
                 reg = <0x0 0x0 0x0 0x80000000>;
         };
 
+        hdmi_5v: regulator-hdmi-5v {
+                compatible = "regulator-fixed";
+
+                regulator-name = "HDMI_5V";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                regulator-always-on;
+        };
+
         vddio_boot: regulator-vddio_boot {
                 compatible = "regulator-fixed";
                 regulator-name = "VDDIO_BOOT";
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index 6524b89e7115..4f355f17eed6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -644,14 +644,55 @@
         };
 };
 
+&pwrc_vpu {
+        resets = <&reset RESET_VIU>,
+                 <&reset RESET_VENC>,
+                 <&reset RESET_VCBUS>,
+                 <&reset RESET_BT656>,
+                 <&reset RESET_DVIN_RESET>,
+                 <&reset RESET_RDMA>,
+                 <&reset RESET_VENCI>,
+                 <&reset RESET_VENCP>,
+                 <&reset RESET_VDAC>,
+                 <&reset RESET_VDI6>,
+                 <&reset RESET_VENCL>,
+                 <&reset RESET_VID_LOCK>;
+        clocks = <&clkc CLKID_VPU>,
+                 <&clkc CLKID_VAPB>;
+        clock-names = "vpu", "vapb";
+        /*
+         * VPU clocking is provided by two identical clock paths
+         * VPU_0 and VPU_1 muxed to a single clock by a glitch
+         * free mux to safely change frequency while running.
+         * Same for VAPB but with a final gate after the glitch free mux.
+         */
+        assigned-clocks = <&clkc CLKID_VPU_0_SEL>,
+                          <&clkc CLKID_VPU_0>,
+                          <&clkc CLKID_VPU>, /* Glitch free mux */
+                          <&clkc CLKID_VAPB_0_SEL>,
+                          <&clkc CLKID_VAPB_0>,
+                          <&clkc CLKID_VAPB_SEL>; /* Glitch free mux */
+        assigned-clock-parents = <&clkc CLKID_FCLK_DIV3>,
+                                 <0>, /* Do Nothing */
+                                 <&clkc CLKID_VPU_0>,
+                                 <&clkc CLKID_FCLK_DIV4>,
+                                 <0>, /* Do Nothing */
+                                 <&clkc CLKID_VAPB_0>;
+        assigned-clock-rates = <0>, /* Do Nothing */
+                               <666666666>,
+                               <0>, /* Do Nothing */
+                               <0>, /* Do Nothing */
+                               <250000000>,
+                               <0>; /* Do Nothing */
+};
+
 &saradc {
         compatible = "amlogic,meson-gxl-saradc", "amlogic,meson-saradc";
         clocks = <&xtal>,
                  <&clkc CLKID_SAR_ADC>,
-                 <&clkc CLKID_SANA>,
                  <&clkc CLKID_SAR_ADC_CLK>,
                  <&clkc CLKID_SAR_ADC_SEL>;
-        clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel";
+        clock-names = "clkin", "core", "adc_clk", "adc_sel";
 };
 
 &sd_emmc_a {
@@ -713,4 +754,5 @@
 
 &vpu {
         compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
+        power-domains = <&pwrc_vpu>;
 };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
index 34a41b26a4ed..1448c3dba08e 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
@@ -153,6 +153,18 @@
                 };
         };
 
+        hdmi_5v: regulator-hdmi-5v {
+                compatible = "regulator-fixed";
+
+                regulator-name = "HDMI_5V";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+                regulator-always-on;
+        };
+
         vcc_3v3: regulator-vcc_3v3 {
                 compatible = "regulator-fixed";
                 regulator-name = "VCC_3V3";
@@ -232,6 +244,9 @@
         external_phy: ethernet-phy@0 {
                 /* Realtek RTL8211F (0x001cc916) */
                 reg = <0>;
+                interrupt-parent = <&gpio_intc>;
+                /* MAC_INTR on GPIOZ_15 */
+                interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
         };
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
index 66c6da7e112c..388fac4f2d97 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
@@ -111,7 +111,8 @@
                 reg = <0>;
                 max-speed = <1000>;
                 interrupt-parent = <&gpio_intc>;
-                interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+                /* MAC_INTR on GPIOZ_15 */
+                interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
         };
 };