Merge branch 'v4.8/dt64' into v4.8/dt64-2

8 files changed, 478 insertions, 4 deletions

diff --git a/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt
new file mode 100644
index 000000000000..c248cd44f727
--- /dev/null
+++ b/Documentation/devicetree/bindings/firmware/meson/meson_sm.txt
@@ -0,0 +1,15 @@
+* Amlogic Secure Monitor
+
+In the Amlogic SoCs the Secure Monitor code is used to provide access to the
+NVMEM, enable JTAG, set USB boot, etc...
+
+Required properties for the secure monitor node:
+- compatible: Should be "amlogic,meson-gxbb-sm"
+
+Example:
+
+        firmware {
+                sm: secure-monitor {
+                        compatible = "amlogic,meson-gxbb-sm";
+                };
+        };
diff --git a/Documentation/devicetree/bindings/media/meson-ir.txt b/Documentation/devicetree/bindings/media/meson-ir.txt
index 407848e85f31..e7e3f3c4fc8f 100644
--- a/Documentation/devicetree/bindings/media/meson-ir.txt
+++ b/Documentation/devicetree/bindings/media/meson-ir.txt
@@ -1,7 +1,10 @@
 * Amlogic Meson IR remote control receiver
 
 Required properties:
- - compatible   : should be "amlogic,meson6-ir"
+ - compatible   : depending on the platform this should be one of:
+                  - "amlogic,meson6-ir"
+                  - "amlogic,meson8b-ir"
+                  - "amlogic,meson-gxbb-ir"
  - reg          : physical base address and length of the device registers
  - interrupts   : a single specifier for the interrupt from the device
 
diff --git a/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt b/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt
new file mode 100644
index 000000000000..fafd85bd67a6
--- /dev/null
+++ b/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt
@@ -0,0 +1,39 @@
+= Amlogic eFuse device tree bindings =
+
+Required properties:
+- compatible: should be "amlogic,meson-gxbb-efuse"
+
+= Data cells =
+Are child nodes of eFuse, bindings of which as described in
+bindings/nvmem/nvmem.txt
+
+Example:
+
+        efuse: efuse {
+                compatible = "amlogic,meson-gxbb-efuse";
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                sn: sn@14 {
+                        reg = <0x14 0x10>;
+                };
+
+                eth_mac: eth_mac@34 {
+                        reg = <0x34 0x10>;
+                };
+
+                bid: bid@46 {
+                        reg = <0x46 0x30>;
+                };
+        };
+
+= Data consumers =
+Are device nodes which consume nvmem data cells.
+
+For example:
+
+        eth_mac {
+                ...
+                nvmem-cells = <&eth_mac>;
+                nvmem-cell-names = "eth_mac";
+        };
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index 90a84c514d3d..e6e3491d48a5 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -87,3 +87,14 @@
         pinctrl-names = "default";
 };
 
+&ir {
+        status = "okay";
+        pinctrl-0 = <&remote_input_ao_pins>;
+        pinctrl-names = "default";
+};
+
+&i2c_A {
+        status = "okay";
+        pinctrl-0 = <&i2c_a_pins>;
+        pinctrl-names = "default";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
index 62979076e250..03e3d76626dd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts
@@ -50,3 +50,9 @@
         compatible = "amlogic,p200", "amlogic,meson-gxbb";
         model = "Amlogic Meson GXBB P200 Development Board";
 };
+
+&i2c_B {
+        status = "okay";
+        pinctrl-0 = <&i2c_b_pins>;
+        pinctrl-names = "default";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index f4f30f674b4c..06a34dc6002f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -57,6 +57,19 @@
                 device_type = "memory";
                 reg = <0x0 0x0 0x0 0x40000000>;
         };
+
+        usb_pwr: regulator-usb-pwrs {
+                compatible = "regulator-fixed";
+
+                regulator-name = "USB_PWR";
+
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                /* signal name in schematic: USB_PWR_EN */
+                gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
 };
 
 /* This UART is brought out to the DB9 connector */
@@ -72,3 +85,25 @@
         pinctrl-names = "default";
 };
 
+&ir {
+        status = "okay";
+        pinctrl-0 = <&remote_input_ao_pins>;
+        pinctrl-names = "default";
+};
+
+&usb0_phy {
+        status = "okay";
+        phy-supply = <&usb_pwr>;
+};
+
+&usb1_phy {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+};
+
+&usb1 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 54bb7c739089..73f159370188 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -52,6 +52,19 @@
         chosen {
                 stdout-path = "serial0:115200n8";
         };
+
+        usb_vbus: regulator-usb0-vbus {
+                compatible = "regulator-fixed";
+
+                regulator-name = "USB0_VBUS";
+
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+
+                gpio = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
 };
 
 &uart_AO {
@@ -60,3 +73,32 @@
         pinctrl-names = "default";
 
 };
+
+&ir {
+        status = "okay";
+        pinctrl-0 = <&remote_input_ao_pins>;
+        pinctrl-names = "default";
+};
+
+&ethmac {
+        status = "okay";
+        pinctrl-0 = <&eth_pins>;
+        pinctrl-names = "default";
+};
+
+&usb0_phy {
+        status = "okay";
+        phy-supply = <&usb_vbus>;
+};
+
+&usb1_phy {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+};
+
+&usb1 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index e502c24b0ac7..4e9cd01c60a7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -45,6 +45,9 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/gpio/meson-gxbb-gpio.h>
 #include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
+#include <dt-bindings/clock/gxbb-clkc.h>
+#include <dt-bindings/clock/gxbb-aoclkc.h>
+#include <dt-bindings/reset/gxbb-aoclkc.h>
 
 / {
         compatible = "amlogic,meson-gxbb";
@@ -99,6 +102,30 @@
                 method = "smc";
         };
 
+        firmware {
+                sm: secure-monitor {
+                        compatible = "amlogic,meson-gxbb-sm";
+                };
+        };
+
+        efuse: efuse {
+                compatible = "amlogic,meson-gxbb-efuse";
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                sn: sn@14 {
+                        reg = <0x14 0x10>;
+                };
+
+                eth_mac: eth_mac@34 {
+                        reg = <0x34 0x10>;
+                };
+
+                bid: bid@46 {
+                        reg = <0x46 0x30>;
+                };
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupts = <GIC_PPI 13
@@ -124,6 +151,25 @@
                 #size-cells = <2>;
                 ranges;
 
+                usb0_phy: phy@c0000000 {
+                        compatible = "amlogic,meson-gxbb-usb2-phy";
+                        #phy-cells = <0>;
+                        reg = <0x0 0xc0000000 0x0 0x20>;
+                        resets = <&reset RESET_USB_OTG>;
+                        clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;
+                        clock-names = "usb_general", "usb";
+                        status = "disabled";
+                };
+
+                usb1_phy: phy@c0000020 {
+                        compatible = "amlogic,meson-gxbb-usb2-phy";
+                        #phy-cells = <0>;
+                        reg = <0x0 0xc0000020 0x0 0x20>;
+                        clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1>;
+                        clock-names = "usb_general", "usb";
+                        status = "disabled";
+                };
+
                 cbus: cbus@c1100000 {
                         compatible = "simple-bus";
                         reg = <0x0 0xc1100000 0x0 0x100000>;
@@ -153,6 +199,27 @@
                                 status = "disabled";
                         };
 
+                        pwm_ab: pwm@8550 {
+                                compatible = "amlogic,meson-gxbb-pwm";
+                                reg = <0x0 0x08550 0x0 0x10>;
+                                #pwm-cells = <3>;
+                                status = "disabled";
+                        };
+
+                        pwm_cd: pwm@8650 {
+                                compatible = "amlogic,meson-gxbb-pwm";
+                                reg = <0x0 0x08650 0x0 0x10>;
+                                #pwm-cells = <3>;
+                                status = "disabled";
+                        };
+
+                        pwm_ef: pwm@86c0 {
+                                compatible = "amlogic,meson-gxbb-pwm";
+                                reg = <0x0 0x086c0 0x0 0x10>;
+                                #pwm-cells = <3>;
+                                status = "disabled";
+                        };
+
                         uart_C: serial@8700 {
                                 compatible = "amlogic,meson-uart";
                                 reg = <0x0 0x8700 0x0 0x14>;
@@ -160,6 +227,51 @@
                                 clocks = <&xtal>;
                                 status = "disabled";
                         };
+
+                        watchdog@98d0 {
+                                compatible = "amlogic,meson-gxbb-wdt";
+                                reg = <0x0 0x098d0 0x0 0x10>;
+                                clocks = <&xtal>;
+                        };
+
+                        spifc: spi@8c80 {
+                                compatible = "amlogic,meson-gxbb-spifc";
+                                reg = <0x0 0x08c80 0x0 0x80>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                clocks = <&clkc CLKID_SPI>;
+                                status = "disabled";
+                        };
+
+                        i2c_A: i2c@8500 {
+                                compatible = "amlogic,meson-gxbb-i2c";
+                                reg = <0x0 0x08500 0x0 0x20>;
+                                interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;
+                                clocks = <&clkc CLKID_I2C>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
+                        i2c_B: i2c@87c0 {
+                                compatible = "amlogic,meson-gxbb-i2c";
+                                reg = <0x0 0x087c0 0x0 0x20>;
+                                interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>;
+                                clocks = <&clkc CLKID_I2C>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
+
+                        i2c_C: i2c@87e0 {
+                                compatible = "amlogic,meson-gxbb-i2c";
+                                reg = <0x0 0x087e0 0x0 0x20>;
+                                interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>;
+                                clocks = <&clkc CLKID_I2C>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
                 };
 
                 gic: interrupt-controller@c4301000 {
@@ -203,6 +315,56 @@
                                                 function = "uart_ao";
                                         };
                                 };
+
+                                remote_input_ao_pins: remote_input_ao {
+                                        mux {
+                                                groups = "remote_input_ao";
+                                                function = "remote_input_ao";
+                                        };
+                                };
+
+                                i2c_ao_pins: i2c_ao {
+                                        mux {
+                                                groups = "i2c_sck_ao",
+                                                       "i2c_sda_ao";
+                                                function = "i2c_ao";
+                                        };
+                                };
+
+                                pwm_ao_a_3_pins: pwm_ao_a_3 {
+                                        mux {
+                                                groups = "pwm_ao_a_3";
+                                                function = "pwm_ao_a_3";
+                                        };
+                                };
+
+                                pwm_ao_a_6_pins: pwm_ao_a_6 {
+                                        mux {
+                                                groups = "pwm_ao_a_6";
+                                                function = "pwm_ao_a_6";
+                                        };
+                                };
+
+                                pwm_ao_a_12_pins: pwm_ao_a_12 {
+                                        mux {
+                                                groups = "pwm_ao_a_12";
+                                                function = "pwm_ao_a_12";
+                                        };
+                                };
+
+                                pwm_ao_b_pins: pwm_ao_b {
+                                        mux {
+                                                groups = "pwm_ao_b";
+                                                function = "pwm_ao_b";
+                                        };
+                                };
+                        };
+
+                        clkc_AO: clock-controller@040 {
+                                compatible = "amlogic,gxbb-aoclkc";
+                                reg = <0x0 0x00040 0x0 0x4>;
+                                #clock-cells = <1>;
+                                #reset-cells = <1>;
                         };
 
                         uart_AO: serial@4c0 {
@@ -212,6 +374,30 @@
                                 clocks = <&xtal>;
                                 status = "disabled";
                         };
+
+                        ir: ir@580 {
+                                compatible = "amlogic,meson-gxbb-ir";
+                                reg = <0x0 0x00580 0x0 0x40>;
+                                interrupts = <GIC_SPI 196 IRQ_TYPE_EDGE_RISING>;
+                                status = "disabled";
+                        };
+
+                        pwm_ab_AO: pwm@550 {
+                                compatible = "amlogic,meson-gxbb-pwm";
+                                reg = <0x0 0x0550 0x0 0x10>;
+                                #pwm-cells = <3>;
+                                status = "disabled";
+                        };
+
+                        i2c_AO: i2c@500 {
+                                compatible = "amlogic,meson-gxbb-i2c";
+                                reg = <0x0 0x500 0x0 0x20>;
+                                interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
+                                clocks = <&clkc CLKID_AO_I2C>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                status = "disabled";
+                        };
                 };
 
                 periphs: periphs@c8834000 {
@@ -251,6 +437,16 @@
                                         };
                                 };
 
+                                nor_pins: nor {
+                                        mux {
+                                                groups = "nor_d",
+                                                       "nor_q",
+                                                       "nor_c",
+                                                       "nor_cs";
+                                                function = "nor";
+                                        };
+                                };
+
                                 sdcard_pins: sdcard {
                                         mux {
                                                 groups = "sdcard_d0",
@@ -263,6 +459,25 @@
                                         };
                                 };
 
+                                sdio_pins: sdio {
+                                        mux {
+                                                groups = "sdio_d0",
+                                                       "sdio_d1",
+                                                       "sdio_d2",
+                                                       "sdio_d3",
+                                                       "sdio_cmd",
+                                                       "sdio_clk";
+                                                function = "sdio";
+                                        };
+                                };
+
+                                sdio_irq_pins: sdio_irq {
+                                        mux {
+                                                groups = "sdio_irq";
+                                                function = "sdio";
+                                        };
+                                };
+
                                 uart_a_pins: uart_a {
                                         mux {
                                                 groups = "uart_tx_a",
@@ -287,6 +502,30 @@
                                         };
                                 };
 
+                                i2c_a_pins: i2c_a {
+                                        mux {
+                                                groups = "i2c_sck_a",
+                                                       "i2c_sda_a";
+                                                function = "i2c_a";
+                                        };
+                                };
+
+                                i2c_b_pins: i2c_b {
+                                        mux {
+                                                groups = "i2c_sck_b",
+                                                       "i2c_sda_b";
+                                                function = "i2c_b";
+                                        };
+                                };
+
+                                i2c_c_pins: i2c_c {
+                                        mux {
+                                                groups = "i2c_sck_c",
+                                                       "i2c_sda_c";
+                                                function = "i2c_c";
+                                        };
+                                };
+
                                 eth_pins: eth_c {
                                         mux {
                                                 groups = "eth_mdio",
@@ -306,6 +545,55 @@
                                                 function = "eth";
                                         };
                                 };
+
+                                pwm_a_x_pins: pwm_a_x {
+                                        mux {
+                                                groups = "pwm_a_x";
+                                                function = "pwm_a_x";
+                                        };
+                                };
+
+                                pwm_a_y_pins: pwm_a_y {
+                                        mux {
+                                                groups = "pwm_a_y";
+                                                function = "pwm_a_y";
+                                        };
+                                };
+
+                                pwm_b_pins: pwm_b {
+                                        mux {
+                                                groups = "pwm_b";
+                                                function = "pwm_b";
+                                        };
+                                };
+
+                                pwm_d_pins: pwm_d {
+                                        mux {
+                                                groups = "pwm_d";
+                                                function = "pwm_d";
+                                        };
+                                };
+
+                                pwm_e_pins: pwm_e {
+                                        mux {
+                                                groups = "pwm_e";
+                                                function = "pwm_e";
+                                        };
+                                };
+
+                                pwm_f_x_pins: pwm_f_x {
+                                        mux {
+                                                groups = "pwm_f_x";
+                                                function = "pwm_f_x";
+                                        };
+                                };
+
+                                pwm_f_y_pins: pwm_f_y {
+                                        mux {
+                                                groups = "pwm_f_y";
+                                                function = "pwm_f_y";
+                                        };
+                                };
                         };
                 };
 
@@ -321,6 +609,15 @@
                                 #clock-cells = <1>;
                                 reg = <0x0 0x0 0x0 0x3db>;
                         };
+
+                        mailbox: mailbox@404 {
+                                compatible = "amlogic,meson-gxbb-mhu";
+                                reg = <0 0x404 0 0x4c>;
+                                interrupts = <0 208 IRQ_TYPE_EDGE_RISING>,
+                                             <0 209 IRQ_TYPE_EDGE_RISING>,
+                                             <0 210 IRQ_TYPE_EDGE_RISING>;
+                                #mbox-cells = <1>;
+                        };
                 };
 
                 apb: apb@d0000000 {
@@ -331,14 +628,40 @@
                         ranges = <0x0 0x0 0x0 0xd0000000 0x0 0x200000>;
                 };
 
+                usb0: usb@c9000000 {
+                        compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";
+                        reg = <0x0 0xc9000000 0x0 0x40000>;
+                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clkc CLKID_USB0_DDR_BRIDGE>;
+                        clock-names = "otg";
+                        phys = <&usb0_phy>;
+                        phy-names = "usb2-phy";
+                        dr_mode = "host";
+                        status = "disabled";
+                };
+
+                usb1: usb@c9100000 {
+                        compatible = "amlogic,meson-gxbb-usb", "snps,dwc2";
+                        reg = <0x0 0xc9100000 0x0 0x40000>;
+                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;
+                        clock-names = "otg";
+                        phys = <&usb1_phy>;
+                        phy-names = "usb2-phy";
+                        dr_mode = "host";
+                        status = "disabled";
+                };
+
                 ethmac: ethernet@c9410000 {
-                        compatible = "amlogic,meson6-dwmac", "snps,dwmac";
+                        compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac";
                         reg = <0x0 0xc9410000 0x0 0x10000
                                0x0 0xc8834540 0x0 0x4>;
                         interrupts = <0 8 1>;
                         interrupt-names = "macirq";
-                        clocks = <&xtal>;
-                        clock-names = "stmmaceth";
+                        clocks = <&clkc CLKID_ETH>,
+                                 <&clkc CLKID_FCLK_DIV2>,
+                                 <&clkc CLKID_MPLL2>;
+                        clock-names = "stmmaceth", "clkin0", "clkin1";
                         phy-mode = "rgmii";
                         status = "disabled";
                 };