Merge branch 'x86/urgent' into x86/cpu, to pick up dependency

[karo-tx-linux.git] / arch / arm / boot / dts / bcm5301x.dtsi

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 65a1309bd6e26f52cd0229ae6cce3ca3801b70cb..7d4d29bf0ed35376b55a301a7fe93f7f04de8877 100644 (file)
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -18,6 +18,10 @@
 / {
        interrupt-parent = <&gic>;
 
+       chosen {
+               stdout-path = &uart0;
+       };
+
        chipcommonA {
                compatible = "simple-bus";
                ranges = <0x00000000 0x18000000 0x00001000>;
@@ -207,6 +211,34 @@
                        gpio-controller;
                        #gpio-cells = <2>;
                };
+
+               usb2: usb2@21000 {
+                       reg = <0x00021000 0x1000>;
+
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+               };
+
+               usb3: usb3@23000 {
+                       reg = <0x00023000 0x1000>;
+
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+               };
+
+               spi@29000 {
+                       reg = <0x00029000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       spi_nor: spi-nor@0 {
+                               compatible = "jedec,spi-nor";
+                               reg = <0>;
+                               spi-max-frequency = <20000000>;
+                               linux,part-probe = "ofpart", "bcm47xxpart";
+                               status = "disabled";
+                       };
+               };
        };
 
        lcpll0: lcpll0@1800c100 {