Merge tag 'bcm2835-dt-next-2017-06-12' into devicetree/next

This pull request brings in installation of the RPi3 DT in 32-bit
mode, the new thermal nodes, switches to the faster sdhost controller
for MMC, and enables USB OTG mode on the Pi 0.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index 9644fddb5e3c3d6250f304dfee7c4ffa3bd90071..bf8c838157539e697e3b5e875ac05f59325c3b3e 100644 (file)
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -142,6 +142,55 @@
                        interrupts = <0>;
                };
 
+               mdio: mdio@18002000 {
+                       compatible = "brcm,iproc-mdio";
+                       reg = <0x18002000 0x8>;
+                       #size-cells = <1>;
+                       #address-cells = <0>;
+                       status = "disabled";
+
+                       gphy0: ethernet-phy@0 {
+                               reg = <0>;
+                       };
+
+                       gphy1: ethernet-phy@1 {
+                               reg = <1>;
+                       };
+               };
+
+               switch: switch@18007000 {
+                       compatible = "brcm,bcm11360-srab", "brcm,cygnus-srab";
+                       reg = <0x18007000 0x1000>;
+                       status = "disabled";
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       reg = <0>;
+                                       phy-handle = <&gphy0>;
+                                       phy-mode = "rgmii";
+                               };
+
+                               port@1 {
+                                       reg = <1>;
+                                       phy-handle = <&gphy1>;
+                                       phy-mode = "rgmii";
+                               };
+
+                               port@8 {
+                                       reg = <8>;
+                                       label = "cpu";
+                                       ethernet = <&eth0>;
+                                       fixed-link {
+                                               speed = <1000>;
+                                               full-duplex;
+                                       };
+                               };
+                       };
+               };
+
                i2c0: i2c@18008000 {
                        compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
                        reg = <0x18008000 0x100>;
@@ -295,6 +344,15 @@
                        status = "disabled";
                };
 
+               eth0: ethernet@18042000 {
+                       compatible = "brcm,amac";
+                       reg = <0x18042000 0x1000>,
+                             <0x18110000 0x1000>;
+                       reg-names = "amac_base", "idm_base";
+                       interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
                nand: nand@18046000 {
                        compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
                        reg = <0x18046000 0x600>, <0xf8105408 0x600>,
@@ -386,6 +444,19 @@
                        status = "disabled";
                };
 
+               v3d: v3d@180a2000 {
+                       compatible = "brcm,cygnus-v3d";
+                       reg = <0x180a2000 0x1000>;
+                       clocks = <&mipipll BCM_CYGNUS_MIPIPLL_CH2_V3D>;
+                       clock-names = "v3d_clk";
+                       interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
+               vc4: gpu {
+                       compatible = "brcm,cygnus-vc4";
+               };
+
                adc: adc@180a6000 {
                        compatible = "brcm,iproc-static-adc";
                        #io-channel-cells = <1>;

diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index fe6cba994a97df53b42cb7bef77e89cf18d280c9..7204d1def23df1c5712bc9a559a599392ffef4b7 100644 (file)
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -413,6 +413,12 @@
                              <0x3f408 0x04>;
                };
 
+               thermal: thermal@3f2c0 {
+                       compatible = "brcm,ns-thermal";
+                       reg = <0x3f2c0 0x10>;
+                       #thermal-sensor-cells = <0>;
+               };
+
                sata_phy: sata_phy@40100 {
                        compatible = "brcm,iproc-nsp-sata-phy";
                        reg = <0x40100 0x340>;
@@ -563,4 +569,24 @@
                        brcm,pcie-msi-inten;
                };
        };
+
+       thermal-zones {
+               cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <1000>;
+                       coefficients = <(-556) 418000>;
+                       thermal-sensors = <&thermal>;
+
+                       trips {
+                               cpu-crit {
+                                       temperature     = <125000>;
+                                       hysteresis      = <0>;
+                                       type            = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                       };
+               };
+       };
 };

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index acee36a610047f69383990ebc980508ea6e47fd8..98647d22b291f100399290adf1d2ed67b31fe0e7 100644 (file)
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -320,6 +320,14 @@
                };
        };
 
+       mdio: mdio@18003000 {
+               compatible = "brcm,iproc-mdio";
+               reg = <0x18003000 0x8>;
+               #size-cells = <1>;
+               #address-cells = <0>;
+               status = "disabled";
+       };
+
        i2c0: i2c@18009000 {
                compatible = "brcm,iproc-i2c";
                reg = <0x18009000 0x50>;
@@ -349,6 +357,12 @@
                                     "sata2";
        };
 
+       thermal: thermal@1800c2c0 {
+               compatible = "brcm,ns-thermal";
+               reg = <0x1800c2c0 0x10>;
+               #thermal-sensor-cells = <0>;
+       };
+
        srab: srab@18007000 {
                compatible = "brcm,bcm5301x-srab";
                reg = <0x18007000 0x1000>;
@@ -412,4 +426,24 @@
                        status = "disabled";
                };
        };
+
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <0>;
+                       polling-delay = <1000>;
+                       coefficients = <(-556) 418000>;
+                       thermal-sensors = <&thermal>;
+
+                       trips {
+                               cpu-crit {
+                                       temperature     = <125000>;
+                                       hysteresis      = <0>;
+                                       type            = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                       };
+               };
+       };
 };

diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts
index 8b3800f462882d3aaac6bd7e4aa4662e07c69533..000f5f19215e0cef9adea11ead762a3e027d5ed7 100644 (file)
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -57,6 +57,26 @@
        };
 };
 
+&eth0 {
+       status = "okay";
+};
+
+&mdio {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&v3d {
+       assigned-clocks =
+               <&mipipll BCM_CYGNUS_MIPIPLL>,
+               <&mipipll BCM_CYGNUS_MIPIPLL_CH2_V3D>;
+       assigned-clock-rates = <525000000>, <300000000>;
+       status = "okay";
+};
+
 &uart3 {
        status = "okay";
 };