Merge tag 'tag-chrome-platform-for-v4.20' of git://git.kernel.org/pub/scm/linux/kerne...
[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx25.dtsi
index 85c15ee63272775f2b0025ef2175f64e2b4c36d3..b25309d26ea569561284100c77a721398a7bf0c2 100644 (file)
                                status = "disabled";
                        };
 
-                       spi1: cspi@43fa4000 {
+                       spi1: spi@43fa4000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "fsl,imx25-cspi", "fsl,imx35-cspi";
                        reg = <0x50000000 0x40000>;
                        ranges;
 
-                       spi3: cspi@50004000 {
+                       spi3: spi@50004000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "fsl,imx25-cspi", "fsl,imx35-cspi";
                                status = "disabled";
                        };
 
-                       spi2: cspi@50010000 {
+                       spi2: spi@50010000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "fsl,imx25-cspi", "fsl,imx35-cspi";