Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / qcom-ipq8064-rb3011.dts

diff --git a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
index 282b89c..f7ea2e5 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
+++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
@@ -216,6 +216,10 @@
        };
 };
 
+&adm_dma {
+       status = "okay";
+};
+
 &gmac0 {
        status = "okay";
 
@@ -251,6 +255,39 @@
        status = "okay";
 };
 
+&hs_phy_1 {
+       status = "okay";
+};
+
+&nand {
+       status = "okay";
+
+       nandcs@0 {
+               compatible = "qcom,nandcs";
+               reg = <0>;
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       boot@0 {
+                               label = "RouterBoard NAND 1 Boot";
+                               reg = <0x0000000 0x0800000>;
+                       };
+
+                       main@800000 {
+                               label = "RouterBoard NAND 1 Main";
+                               reg = <0x0800000 0x7800000>;
+                       };
+               };
+       };
+};
+
 &qcom_pinmux {
        buttons_pins: buttons_pins {
                mux {
@@ -305,4 +342,25 @@
                        input-disable;
                };
        };
+
+       usb1_pwr_en_pins: usb1_pwr_en_pins {
+               mux {
+                       pins = "gpio4";
+                       function = "gpio";
+                       drive-strength = <16>;
+                       bias-disable;
+                       output-high;
+               };
+       };
+};
+
+&ss_phy_1 {
+       status = "okay";
+};
+
+&usb3_1 {
+       pinctrl-0 = <&usb1_pwr_en_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
 };