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

[linux-2.6-microblaze.git] / arch / arm / boot / dts / bcm5301x.dtsi

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 7db72a2..f920892 100644 (file)
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -458,18 +458,18 @@
                                        function = "spi";
                                };
 
-                               pinmux_i2c: i2c {
+                               pinmux_i2c: i2c-pins {
                                        groups = "i2c_grp";
                                        function = "i2c";
                                };
 
-                               pinmux_pwm: pwm {
+                               pinmux_pwm: pwm-pins {
                                        groups = "pwm0_grp", "pwm1_grp",
                                                 "pwm2_grp", "pwm3_grp";
                                        function = "pwm";
                                };
 
-                               pinmux_uart1: uart1 {
+                               pinmux_uart1: uart1-pins {
                                        groups = "uart1_grp";
                                        function = "uart1";
                                };
@@ -501,7 +501,7 @@
                reg = <0x18004000 0x14>;
        };
 
-       nand: nand@18028000 {
+       nand_controller: nand-controller@18028000 {
                compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
                reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
                reg-names = "nand", "iproc-idm", "iproc-ext";
@@ -520,27 +520,27 @@
                      <0x1811b408 0x004>,
                      <0x180293a0 0x01c>;
                reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";
-               interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+               interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
-                            <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "spi_lr_fullness_reached",
+                            <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "mspi_done",
+                                 "mspi_halted",
+                                 "spi_lr_fullness_reached",
                                  "spi_lr_session_aborted",
                                  "spi_lr_impatient",
                                  "spi_lr_session_done",
-                                 "spi_lr_overhead",
-                                 "mspi_done",
-                                 "mspi_halted";
+                                 "spi_lr_overread";
                clocks = <&iprocmed>;
                clock-names = "iprocmed";
                num-cs = <2>;
                #address-cells = <1>;
                #size-cells = <0>;
 
-               spi_nor: spi-nor@0 {
+               spi_nor: flash@0 {
                        compatible = "jedec,spi-nor";
                        reg = <0>;
                        spi-max-frequency = <20000000>;