diff for duplicates of <20180913181245.25484-5-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 179774b..e3f6624 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,9 +3,9 @@ unit-addresses. There's over 100 warnings for FSL boards, a few examples: -arch/arm/boot/dts/imx28-duckbill-2-spi.dtb: Warning (spi_bus_bridge): /apb at 80000000/apbh at 80000000/ssp at 80014000: node name for SPI buses should be 'spi' -arch/arm/boot/dts/imx53-ppd.dtb: Warning (spi_bus_bridge): /soc/aips at 50000000/spba at 50000000/ecspi at 50010000: node name for SPI buses should be 'spi' -arch/arm/boot/dts/imx6dl-colibri-eval-v3.dtb: Warning (spi_bus_reg): /soc/aips-bus at 2000000/spba-bus at 2000000/spi at 2014000/mcp251x at 1: SPI bus unit address format error, expected "0" +arch/arm/boot/dts/imx28-duckbill-2-spi.dtb: Warning (spi_bus_bridge): /apb@80000000/apbh@80000000/ssp@80014000: node name for SPI buses should be 'spi' +arch/arm/boot/dts/imx53-ppd.dtb: Warning (spi_bus_bridge): /soc/aips@50000000/spba@50000000/ecspi@50010000: node name for SPI buses should be 'spi' +arch/arm/boot/dts/imx6dl-colibri-eval-v3.dtb: Warning (spi_bus_reg): /soc/aips-bus@2000000/spba-bus@2000000/spi@2014000/mcp251x@1: SPI bus unit address format error, expected "0" Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> @@ -66,8 +66,8 @@ index 3edc7b5550d8..b00ece16b853 100644 reg = <0x00210000 0x10000>; ranges; -- cspi1: cspi at 213000 { -+ cspi1: spi at 213000 { +- cspi1: cspi@213000 { ++ cspi1: spi@213000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx1-cspi"; @@ -75,8 +75,8 @@ index 3edc7b5550d8..b00ece16b853 100644 status = "disabled"; }; -- cspi2: cspi at 219000 { -+ cspi2: spi at 219000 { +- cspi2: cspi@219000 { ++ cspi2: spi@219000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx1-cspi"; @@ -88,8 +88,8 @@ index ad2ae25b7b4d..98efe1aeb26a 100644 status = "okay"; }; -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; @@ -99,10 +99,10 @@ index e9351774c619..31b1e3581ac0 100644 +++ b/arch/arm/boot/dts/imx23-olinuxino.dts @@ -25,7 +25,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; @@ -110,8 +110,8 @@ index e9351774c619..31b1e3581ac0 100644 }; }; -- ssp1: ssp at 80034000 { -+ ssp1: spi at 80034000 { +- ssp1: ssp@80034000 { ++ ssp1: spi@80034000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx23-spi"; @@ -121,10 +121,10 @@ index 67de7863ad79..faf701b2adb2 100644 +++ b/arch/arm/boot/dts/imx23-sansa.dts @@ -55,7 +55,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; @@ -132,8 +132,8 @@ index 67de7863ad79..faf701b2adb2 100644 status = "okay"; }; -- ssp1: ssp at 80034000 { -+ ssp1: spi at 80034000 { +- ssp1: ssp@80034000 { ++ ssp1: spi@80034000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc1_8bit_pins_a>; @@ -143,10 +143,10 @@ index 95c7b918f6d6..2ff6cdf71a55 100644 +++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts @@ -22,7 +22,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; @@ -156,10 +156,10 @@ index 9616e500b996..db53089fb7fb 100644 +++ b/arch/arm/boot/dts/imx23-xfi3.dts @@ -54,7 +54,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; @@ -167,8 +167,8 @@ index 9616e500b996..db53089fb7fb 100644 status = "okay"; }; -- ssp1: ssp at 80034000 { -+ ssp1: spi at 80034000 { +- ssp1: ssp@80034000 { ++ ssp1: spi@80034000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc1_4bit_pins_a>; @@ -180,8 +180,8 @@ index 71bfd2b15609..ea259927eef6 100644 status = "disabled"; }; -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { reg = <0x80010000 0x2000>; interrupts = <15>; clocks = <&clks 33>; @@ -189,8 +189,8 @@ index 71bfd2b15609..ea259927eef6 100644 status = "disabled"; }; -- ssp1: ssp at 80034000 { -+ ssp1: spi at 80034000 { +- ssp1: ssp@80034000 { ++ ssp1: spi@80034000 { reg = <0x80034000 0x2000>; interrupts = <2>; clocks = <&clks 33>; @@ -202,8 +202,8 @@ index 85c15ee63272..b25309d26ea5 100644 status = "disabled"; }; -- spi1: cspi at 43fa4000 { -+ spi1: spi at 43fa4000 { +- spi1: cspi@43fa4000 { ++ spi1: spi@43fa4000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; @@ -211,8 +211,8 @@ index 85c15ee63272..b25309d26ea5 100644 reg = <0x50000000 0x40000>; ranges; -- spi3: cspi at 50004000 { -+ spi3: spi at 50004000 { +- spi3: cspi@50004000 { ++ spi3: spi@50004000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; @@ -220,8 +220,8 @@ index 85c15ee63272..b25309d26ea5 100644 status = "disabled"; }; -- spi2: cspi at 50010000 { -+ spi2: spi at 50010000 { +- spi2: cspi@50010000 { ++ spi2: spi@50010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; @@ -233,8 +233,8 @@ index 753d88df1627..151b0eb17dda 100644 status = "disabled"; }; -- cspi1: cspi at 1000e000 { -+ cspi1: spi at 1000e000 { +- cspi1: cspi@1000e000 { ++ cspi1: spi@1000e000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx27-cspi"; @@ -242,8 +242,8 @@ index 753d88df1627..151b0eb17dda 100644 status = "disabled"; }; -- cspi2: cspi at 1000f000 { -+ cspi2: spi at 1000f000 { +- cspi2: cspi@1000f000 { ++ cspi2: spi@1000f000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx27-cspi"; @@ -251,8 +251,8 @@ index 753d88df1627..151b0eb17dda 100644 status = "disabled"; }; -- cspi3: cspi at 10017000 { -+ cspi3: spi at 10017000 { +- cspi3: cspi@10017000 { ++ cspi3: spi@10017000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx27-cspi"; @@ -262,10 +262,10 @@ index c4fadbc1b400..8df5ec470376 100644 +++ b/arch/arm/boot/dts/imx28-apf28dev.dts @@ -18,7 +18,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a @@ -273,7 +273,7 @@ index c4fadbc1b400..8df5ec470376 100644 status = "okay"; }; -- ssp2: ssp at 80014000 { +- ssp2: ssp@80014000 { + ssp2: spi@80014000 { compatible = "fsl,imx28-spi"; pinctrl-names = "default"; @@ -286,8 +286,8 @@ index 96faa53ba44c..6c9b498305c0 100644 status = "okay"; }; -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>; @@ -295,8 +295,8 @@ index 96faa53ba44c..6c9b498305c0 100644 status = "okay"; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc2_4bit_pins_apx4 &mmc2_sck_cfg_apx4>; @@ -308,8 +308,8 @@ index e54f5aba7091..8337ca21e281 100644 }; -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a @@ -319,10 +319,10 @@ index 97084e463d7c..f4f2b3d16c8e 100644 +++ b/arch/arm/boot/dts/imx28-duckbill-2-485.dts @@ -25,7 +25,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_8bit_pins_a @@ -330,8 +330,8 @@ index 97084e463d7c..f4f2b3d16c8e 100644 non-removable; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc2_4bit_pins_b @@ -341,10 +341,10 @@ index 22215337f72a..71d0fcbc2d8c 100644 +++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts @@ -26,7 +26,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_8bit_pins_a @@ -352,8 +352,8 @@ index 22215337f72a..71d0fcbc2d8c 100644 non-removable; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc2_4bit_pins_b @@ -363,10 +363,10 @@ index 13e7b134da9e..6580ec6e26ba 100644 +++ b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts @@ -29,7 +29,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_8bit_pins_a @@ -374,7 +374,7 @@ index 13e7b134da9e..6580ec6e26ba 100644 non-removable; }; -- ssp2: ssp at 80014000 { +- ssp2: ssp@80014000 { + ssp2: spi@80014000 { compatible = "fsl,imx28-spi"; pinctrl-names = "default"; @@ -385,10 +385,10 @@ index 88556c93b00f..693634edae99 100644 +++ b/arch/arm/boot/dts/imx28-duckbill-2.dts @@ -25,7 +25,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_8bit_pins_a @@ -396,8 +396,8 @@ index 88556c93b00f..693634edae99 100644 non-removable; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc2_4bit_pins_b @@ -407,10 +407,10 @@ index f286bfe699be..16f524428ed7 100644 +++ b/arch/arm/boot/dts/imx28-duckbill.dts @@ -24,7 +24,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a @@ -418,7 +418,7 @@ index f286bfe699be..16f524428ed7 100644 status = "okay"; }; -- ssp2: ssp at 80014000 { +- ssp2: ssp@80014000 { + ssp2: spi@80014000 { compatible = "fsl,imx28-spi"; pinctrl-names = "default"; @@ -431,8 +431,8 @@ index 93ab5bdfe068..5778300f44e8 100644 status = "okay"; }; -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_8bit_pins_a @@ -440,15 +440,15 @@ index 93ab5bdfe068..5778300f44e8 100644 status = "okay"; }; -- ssp1: ssp at 80012000 { +- ssp1: ssp@80012000 { + ssp1: spi@80012000 { compatible = "fsl,imx28-mmc"; bus-width = <8>; wp-gpios = <&gpio0 28 0>; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx28-spi"; @@ -460,8 +460,8 @@ index 3bb5ffc644d6..8883d36a51b5 100644 }; }; -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a @@ -469,8 +469,8 @@ index 3bb5ffc644d6..8883d36a51b5 100644 status = "okay"; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc2_4bit_pins_a @@ -480,10 +480,10 @@ index 7d97a0ce74a3..893886d17b2d 100644 +++ b/arch/arm/boot/dts/imx28-m28evk.dts @@ -18,7 +18,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_8bit_pins_a @@ -491,7 +491,7 @@ index 7d97a0ce74a3..893886d17b2d 100644 status = "okay"; }; -- ssp2: ssp at 80014000 { +- ssp2: ssp@80014000 { + ssp2: spi@80014000 { #address-cells = <1>; #size-cells = <0>; @@ -504,8 +504,8 @@ index 2393e83979e0..ea9212f6ecda 100644 }; -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a>; @@ -513,8 +513,8 @@ index 2393e83979e0..ea9212f6ecda 100644 status = "okay"; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx28-spi"; @@ -524,10 +524,10 @@ index f8a09a8c2c36..dccdd6bcd0b2 100644 +++ b/arch/arm/boot/dts/imx28-ts4600.dts @@ -25,7 +25,7 @@ - apb at 80000000 { - apbh at 80000000 { -- ssp0: ssp at 80010000 { -+ ssp0: spi at 80010000 { + apb@80000000 { + apbh@80000000 { +- ssp0: ssp@80010000 { ++ ssp0: spi@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; pinctrl-0 = <&mmc0_4bit_pins_a @@ -539,7 +539,7 @@ index 5107fdc482ea..2b7efb659fc0 100644 status = "disabled"; }; -- ssp0: ssp at 80010000 { +- ssp0: ssp@80010000 { + ssp0: spi@80010000 { #address-cells = <1>; #size-cells = <0>; @@ -548,8 +548,8 @@ index 5107fdc482ea..2b7efb659fc0 100644 status = "disabled"; }; -- ssp1: ssp at 80012000 { -+ ssp1: spi at 80012000 { +- ssp1: ssp@80012000 { ++ ssp1: spi@80012000 { #address-cells = <1>; #size-cells = <0>; reg = <0x80012000 0x2000>; @@ -557,8 +557,8 @@ index 5107fdc482ea..2b7efb659fc0 100644 status = "disabled"; }; -- ssp2: ssp at 80014000 { -+ ssp2: spi at 80014000 { +- ssp2: ssp@80014000 { ++ ssp2: spi@80014000 { #address-cells = <1>; #size-cells = <0>; reg = <0x80014000 0x2000>; @@ -566,8 +566,8 @@ index 5107fdc482ea..2b7efb659fc0 100644 status = "disabled"; }; -- ssp3: ssp at 80016000 { -+ ssp3: spi at 80016000 { +- ssp3: ssp@80016000 { ++ ssp3: spi@80016000 { #address-cells = <1>; #size-cells = <0>; reg = <0x80016000 0x2000>; @@ -579,8 +579,8 @@ index ca1419ca303c..af7afccf5f2f 100644 status = "disabled"; }; -- spi2: cspi at 50010000 { -+ spi2: spi at 50010000 { +- spi2: cspi@50010000 { ++ spi2: spi@50010000 { compatible = "fsl,imx31-cspi"; reg = <0x50010000 0x4000>; interrupts = <13>; @@ -588,8 +588,8 @@ index ca1419ca303c..af7afccf5f2f 100644 #clock-cells = <1>; }; -- spi3: cspi at 53f84000 { -+ spi3: spi at 53f84000 { +- spi3: cspi@53f84000 { ++ spi3: spi@53f84000 { compatible = "fsl,imx31-cspi"; reg = <0x53f84000 0x4000>; interrupts = <17>; @@ -601,8 +601,8 @@ index 1c50b785cad4..a1c3d28e8771 100644 status = "disabled"; }; -- spi1: cspi at 43fa4000 { -+ spi1: spi at 43fa4000 { +- spi1: cspi@43fa4000 { ++ spi1: spi@43fa4000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx35-cspi"; @@ -610,8 +610,8 @@ index 1c50b785cad4..a1c3d28e8771 100644 status = "disabled"; }; -- spi2: cspi at 50010000 { -+ spi2: spi at 50010000 { +- spi2: cspi@50010000 { ++ spi2: spi@50010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx35-cspi"; @@ -623,8 +623,8 @@ index 7fae2ffb76fe..95b7fba58300 100644 status = "disabled"; }; -- ecspi1: ecspi at 50010000 { -+ ecspi1: spi at 50010000 { +- ecspi1: ecspi@50010000 { ++ ecspi1: spi@50010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx50-ecspi", "fsl,imx51-ecspi"; @@ -632,8 +632,8 @@ index 7fae2ffb76fe..95b7fba58300 100644 status = "disabled"; }; -- ecspi2: ecspi at 63fac000 { -+ ecspi2: spi at 63fac000 { +- ecspi2: ecspi@63fac000 { ++ ecspi2: spi@63fac000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx50-ecspi", "fsl,imx51-ecspi"; @@ -641,8 +641,8 @@ index 7fae2ffb76fe..95b7fba58300 100644 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx50.bin"; }; -- cspi: cspi at 63fc0000 { -+ cspi: spi at 63fc0000 { +- cspi: cspi@63fc0000 { ++ cspi: spi@63fc0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx50-cspi", "fsl,imx35-cspi"; @@ -654,8 +654,8 @@ index 5c4ba91e43ba..48f9c27c9ca2 100644 status = "disabled"; }; -- ecspi1: ecspi at 70010000 { -+ ecspi1: spi at 70010000 { +- ecspi1: ecspi@70010000 { ++ ecspi1: spi@70010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-ecspi"; @@ -663,8 +663,8 @@ index 5c4ba91e43ba..48f9c27c9ca2 100644 status = "disabled"; }; -- ecspi2: ecspi at 83fac000 { -+ ecspi2: spi at 83fac000 { +- ecspi2: ecspi@83fac000 { ++ ecspi2: spi@83fac000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-ecspi"; @@ -672,8 +672,8 @@ index 5c4ba91e43ba..48f9c27c9ca2 100644 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin"; }; -- cspi: cspi at 83fc0000 { -+ cspi: spi at 83fc0000 { +- cspi: cspi@83fc0000 { ++ cspi: spi@83fc0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-cspi", "fsl,imx35-cspi"; @@ -685,8 +685,8 @@ index 6386185ae234..207eb557c90e 100644 status = "disabled"; }; -- ecspi1: ecspi at 50010000 { -+ ecspi1: spi at 50010000 { +- ecspi1: ecspi@50010000 { ++ ecspi1: spi@50010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi"; @@ -694,8 +694,8 @@ index 6386185ae234..207eb557c90e 100644 status = "disabled"; }; -- ecspi2: ecspi at 63fac000 { -+ ecspi2: spi at 63fac000 { +- ecspi2: ecspi@63fac000 { ++ ecspi2: spi@63fac000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi"; @@ -703,8 +703,8 @@ index 6386185ae234..207eb557c90e 100644 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin"; }; -- cspi: cspi at 63fc0000 { -+ cspi: spi at 63fc0000 { +- cspi: cspi@63fc0000 { ++ cspi: spi@63fc0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-cspi", "fsl,imx35-cspi"; @@ -716,8 +716,8 @@ index 9de45a717356..d08e0402793b 100644 &ecspi4 { status = "okay"; -- mcp251x0: mcp251x at 1 { -+ mcp251x0: mcp251x at 0 { +- mcp251x0: mcp251x@1 { ++ mcp251x0: mcp251x@0 { compatible = "microchip,mcp2515"; reg = <0>; clocks = <&clk16m>; @@ -727,10 +727,10 @@ index 0193ee6fe964..8381d24eff7d 100644 +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -163,7 +163,7 @@ - aips-bus at 2000000 { /* AIPS1 */ - spba-bus at 2000000 { -- ecspi5: ecspi at 2018000 { -+ ecspi5: spi at 2018000 { + aips-bus@2000000 { /* AIPS1 */ + spba-bus@2000000 { +- ecspi5: ecspi@2018000 { ++ ecspi5: spi@2018000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -742,8 +742,8 @@ index 61d2d26afbf4..e4daf150881a 100644 status = "disabled"; }; -- ecspi1: ecspi at 2008000 { -+ ecspi1: spi at 2008000 { +- ecspi1: ecspi@2008000 { ++ ecspi1: spi@2008000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -751,8 +751,8 @@ index 61d2d26afbf4..e4daf150881a 100644 status = "disabled"; }; -- ecspi2: ecspi at 200c000 { -+ ecspi2: spi at 200c000 { +- ecspi2: ecspi@200c000 { ++ ecspi2: spi@200c000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -760,8 +760,8 @@ index 61d2d26afbf4..e4daf150881a 100644 status = "disabled"; }; -- ecspi3: ecspi at 2010000 { -+ ecspi3: spi at 2010000 { +- ecspi3: ecspi@2010000 { ++ ecspi3: spi@2010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -769,8 +769,8 @@ index 61d2d26afbf4..e4daf150881a 100644 status = "disabled"; }; -- ecspi4: ecspi at 2014000 { -+ ecspi4: spi at 2014000 { +- ecspi4: ecspi@2014000 { ++ ecspi4: spi@2014000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -782,8 +782,8 @@ index 7a4f5dace902..7a3ae7160c12 100644 status = "disabled"; }; -- ecspi1: ecspi at 2008000 { -+ ecspi1: spi at 2008000 { +- ecspi1: ecspi@2008000 { ++ ecspi1: spi@2008000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi"; @@ -791,8 +791,8 @@ index 7a4f5dace902..7a3ae7160c12 100644 status = "disabled"; }; -- ecspi2: ecspi at 200c000 { -+ ecspi2: spi at 200c000 { +- ecspi2: ecspi@200c000 { ++ ecspi2: spi@200c000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi"; @@ -800,8 +800,8 @@ index 7a4f5dace902..7a3ae7160c12 100644 status = "disabled"; }; -- ecspi3: ecspi at 2010000 { -+ ecspi3: spi at 2010000 { +- ecspi3: ecspi@2010000 { ++ ecspi3: spi@2010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi"; @@ -809,8 +809,8 @@ index 7a4f5dace902..7a3ae7160c12 100644 status = "disabled"; }; -- ecspi4: ecspi at 2014000 { -+ ecspi4: spi at 2014000 { +- ecspi4: ecspi@2014000 { ++ ecspi4: spi@2014000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sl-ecspi", "fsl,imx51-ecspi"; @@ -822,8 +822,8 @@ index 844caa39364f..95a3c1cb877d 100644 status = "disabled"; }; -- ecspi1: ecspi at 2008000 { -+ ecspi1: spi at 2008000 { +- ecspi1: ecspi@2008000 { ++ ecspi1: spi@2008000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi"; @@ -831,8 +831,8 @@ index 844caa39364f..95a3c1cb877d 100644 status = "disabled"; }; -- ecspi2: ecspi at 200c000 { -+ ecspi2: spi at 200c000 { +- ecspi2: ecspi@200c000 { ++ ecspi2: spi@200c000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi"; @@ -840,8 +840,8 @@ index 844caa39364f..95a3c1cb877d 100644 status = "disabled"; }; -- ecspi3: ecspi at 2010000 { -+ ecspi3: spi at 2010000 { +- ecspi3: ecspi@2010000 { ++ ecspi3: spi@2010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi"; @@ -849,8 +849,8 @@ index 844caa39364f..95a3c1cb877d 100644 status = "disabled"; }; -- ecspi4: ecspi at 2014000 { -+ ecspi4: spi at 2014000 { +- ecspi4: ecspi@2014000 { ++ ecspi4: spi@2014000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi"; @@ -858,8 +858,8 @@ index 844caa39364f..95a3c1cb877d 100644 status = "disabled"; }; -- qspi1: qspi at 21e0000 { -+ qspi1: spi at 21e0000 { +- qspi1: qspi@21e0000 { ++ qspi1: spi@21e0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sx-qspi"; @@ -867,8 +867,8 @@ index 844caa39364f..95a3c1cb877d 100644 status = "disabled"; }; -- qspi2: qspi at 21e4000 { -+ qspi2: spi at 21e4000 { +- qspi2: qspi@21e4000 { ++ qspi2: spi@21e4000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sx-qspi"; @@ -876,8 +876,8 @@ index 844caa39364f..95a3c1cb877d 100644 status = "disabled"; }; -- ecspi5: ecspi at 228c000 { -+ ecspi5: spi at 228c000 { +- ecspi5: ecspi@228c000 { ++ ecspi5: spi@228c000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi"; @@ -889,8 +889,8 @@ index 6dc0b569acdf..ed8d917b4664 100644 reg = <0x02000000 0x40000>; ranges; -- ecspi1: ecspi at 2008000 { -+ ecspi1: spi at 2008000 { +- ecspi1: ecspi@2008000 { ++ ecspi1: spi@2008000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6ul-ecspi", "fsl,imx51-ecspi"; @@ -898,8 +898,8 @@ index 6dc0b569acdf..ed8d917b4664 100644 status = "disabled"; }; -- ecspi2: ecspi at 200c000 { -+ ecspi2: spi at 200c000 { +- ecspi2: ecspi@200c000 { ++ ecspi2: spi@200c000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6ul-ecspi", "fsl,imx51-ecspi"; @@ -907,8 +907,8 @@ index 6dc0b569acdf..ed8d917b4664 100644 status = "disabled"; }; -- ecspi3: ecspi at 2010000 { -+ ecspi3: spi at 2010000 { +- ecspi3: ecspi@2010000 { ++ ecspi3: spi@2010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6ul-ecspi", "fsl,imx51-ecspi"; @@ -916,8 +916,8 @@ index 6dc0b569acdf..ed8d917b4664 100644 status = "disabled"; }; -- ecspi4: ecspi at 2014000 { -+ ecspi4: spi at 2014000 { +- ecspi4: ecspi@2014000 { ++ ecspi4: spi@2014000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6ul-ecspi", "fsl,imx51-ecspi"; @@ -925,8 +925,8 @@ index 6dc0b569acdf..ed8d917b4664 100644 status = "disabled"; }; -- qspi: qspi at 21e0000 { -+ qspi: spi at 21e0000 { +- qspi: qspi@21e0000 { ++ qspi: spi@21e0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6ul-qspi", "fsl,imx6sx-qspi"; @@ -938,8 +938,8 @@ index a052198f6e96..eee90b369c12 100644 status = "disabled"; }; -- ecspi4: ecspi at 30630000 { -+ ecspi4: spi at 30630000 { +- ecspi4: ecspi@30630000 { ++ ecspi4: spi@30630000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi"; @@ -947,8 +947,8 @@ index a052198f6e96..eee90b369c12 100644 reg = <0x30800000 0x100000>; ranges; -- ecspi1: ecspi at 30820000 { -+ ecspi1: spi at 30820000 { +- ecspi1: ecspi@30820000 { ++ ecspi1: spi@30820000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi"; @@ -956,8 +956,8 @@ index a052198f6e96..eee90b369c12 100644 status = "disabled"; }; -- ecspi2: ecspi at 30830000 { -+ ecspi2: spi at 30830000 { +- ecspi2: ecspi@30830000 { ++ ecspi2: spi@30830000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi"; @@ -965,8 +965,8 @@ index a052198f6e96..eee90b369c12 100644 status = "disabled"; }; -- ecspi3: ecspi at 30840000 { -+ ecspi3: spi at 30840000 { +- ecspi3: ecspi@30840000 { ++ ecspi3: spi@30840000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi"; @@ -978,8 +978,8 @@ index f18490548c78..74ae649ffa59 100644 big-endian; }; -- qspi: quadspi at 1550000 { -+ qspi: spi at 1550000 { +- qspi: quadspi@1550000 { ++ qspi: spi@1550000 { compatible = "fsl,ls1021a-qspi"; #address-cells = <1>; #size-cells = <0>; @@ -987,8 +987,8 @@ index f18490548c78..74ae649ffa59 100644 }; }; -- dspi0: dspi at 2100000 { -+ dspi0: spi at 2100000 { +- dspi0: dspi@2100000 { ++ dspi0: spi@2100000 { compatible = "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; @@ -996,8 +996,8 @@ index f18490548c78..74ae649ffa59 100644 status = "disabled"; }; -- dspi1: dspi at 2110000 { -+ dspi1: spi at 2110000 { +- dspi1: dspi@2110000 { ++ dspi1: spi@2110000 { compatible = "fsl,ls1021a-v1.0-dspi"; #address-cells = <1>; #size-cells = <0>; @@ -1009,8 +1009,8 @@ index d392794d9c13..5e3399939006 100644 status = "disabled"; }; -- dspi0: dspi0 at 4002c000 { -+ dspi0: spi at 4002c000 { +- dspi0: dspi0@4002c000 { ++ dspi0: spi@4002c000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,vf610-dspi"; @@ -1018,8 +1018,8 @@ index d392794d9c13..5e3399939006 100644 status = "disabled"; }; -- dspi1: dspi1 at 4002d000 { -+ dspi1: spi at 4002d000 { +- dspi1: dspi1@4002d000 { ++ dspi1: spi@4002d000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,vf610-dspi"; @@ -1027,8 +1027,8 @@ index d392794d9c13..5e3399939006 100644 status = "disabled"; }; -- qspi0: quadspi at 40044000 { -+ qspi0: spi at 40044000 { +- qspi0: quadspi@40044000 { ++ qspi0: spi@40044000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,vf610-qspi"; @@ -1036,8 +1036,8 @@ index d392794d9c13..5e3399939006 100644 status = "disabled"; }; -- dspi2: dspi2 at 400ac000 { -+ dspi2: spi at 400ac000 { +- dspi2: dspi2@400ac000 { ++ dspi2: spi@400ac000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,vf610-dspi"; @@ -1045,8 +1045,8 @@ index d392794d9c13..5e3399939006 100644 status = "disabled"; }; -- dspi3: dspi3 at 400ad000 { -+ dspi3: spi at 400ad000 { +- dspi3: dspi3@400ad000 { ++ dspi3: spi@400ad000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,vf610-dspi"; @@ -1054,8 +1054,8 @@ index d392794d9c13..5e3399939006 100644 status = "disabled"; }; -- qspi1: quadspi at 400c4000 { -+ qspi1: spi at 400c4000 { +- qspi1: quadspi@400c4000 { ++ qspi1: spi@400c4000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,vf610-qspi"; diff --git a/a/content_digest b/N1/content_digest index 97bb3e3..02e1bdc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,15 @@ - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh@kernel.org>\0" "Subject\0[PATCH] ARM: dts: fsl: Fix SPI bus warnings\0" "Date\0Thu, 13 Sep 2018 13:12:29 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Sascha Hauer <s.hauer@pengutronix.de>" + Stefan Agner <stefan@agner.ch> + Li Yang <leoyang.li@nxp.com> + NXP Linux Team <linux-imx@nxp.com> + Pengutronix Kernel Team <kernel@pengutronix.de> + Fabio Estevam <fabio.estevam@nxp.com> + " Shawn Guo <shawnguo@kernel.org>\0" "\00:1\0" "b\0" "dtc has new checks for SPI buses. Fix the warnings in node names and\n" @@ -9,9 +17,9 @@ "\n" "There's over 100 warnings for FSL boards, a few examples:\n" "\n" - "arch/arm/boot/dts/imx28-duckbill-2-spi.dtb: Warning (spi_bus_bridge): /apb at 80000000/apbh at 80000000/ssp at 80014000: node name for SPI buses should be 'spi'\n" - "arch/arm/boot/dts/imx53-ppd.dtb: Warning (spi_bus_bridge): /soc/aips at 50000000/spba at 50000000/ecspi at 50010000: node name for SPI buses should be 'spi'\n" - "arch/arm/boot/dts/imx6dl-colibri-eval-v3.dtb: Warning (spi_bus_reg): /soc/aips-bus at 2000000/spba-bus at 2000000/spi at 2014000/mcp251x at 1: SPI bus unit address format error, expected \"0\"\n" + "arch/arm/boot/dts/imx28-duckbill-2-spi.dtb: Warning (spi_bus_bridge): /apb@80000000/apbh@80000000/ssp@80014000: node name for SPI buses should be 'spi'\n" + "arch/arm/boot/dts/imx53-ppd.dtb: Warning (spi_bus_bridge): /soc/aips@50000000/spba@50000000/ecspi@50010000: node name for SPI buses should be 'spi'\n" + "arch/arm/boot/dts/imx6dl-colibri-eval-v3.dtb: Warning (spi_bus_reg): /soc/aips-bus@2000000/spba-bus@2000000/spi@2014000/mcp251x@1: SPI bus unit address format error, expected \"0\"\n" "\n" "Cc: Shawn Guo <shawnguo@kernel.org>\n" "Cc: Sascha Hauer <s.hauer@pengutronix.de>\n" @@ -72,8 +80,8 @@ " \t\t\treg = <0x00210000 0x10000>;\n" " \t\t\tranges;\n" " \n" - "-\t\t\tcspi1: cspi at 213000 {\n" - "+\t\t\tcspi1: spi at 213000 {\n" + "-\t\t\tcspi1: cspi@213000 {\n" + "+\t\t\tcspi1: spi@213000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx1-cspi\";\n" @@ -81,8 +89,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tcspi2: cspi at 219000 {\n" - "+\t\t\tcspi2: spi at 219000 {\n" + "-\t\t\tcspi2: cspi@219000 {\n" + "+\t\t\tcspi2: spi@219000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx1-cspi\";\n" @@ -94,8 +102,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx23-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;\n" @@ -105,10 +113,10 @@ "+++ b/arch/arm/boot/dts/imx23-olinuxino.dts\n" "@@ -25,7 +25,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx23-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;\n" @@ -116,8 +124,8 @@ " \t\t\t\t};\n" " \t\t\t};\n" " \n" - "-\t\t\tssp1: ssp at 80034000 {\n" - "+\t\t\tssp1: spi at 80034000 {\n" + "-\t\t\tssp1: ssp@80034000 {\n" + "+\t\t\tssp1: spi@80034000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx23-spi\";\n" @@ -127,10 +135,10 @@ "+++ b/arch/arm/boot/dts/imx23-sansa.dts\n" "@@ -55,7 +55,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx23-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;\n" @@ -138,8 +146,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp1: ssp at 80034000 {\n" - "+\t\t\tssp1: spi at 80034000 {\n" + "-\t\t\tssp1: ssp@80034000 {\n" + "+\t\t\tssp1: spi@80034000 {\n" " \t\t\t\tcompatible = \"fsl,imx23-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc1_8bit_pins_a>;\n" @@ -149,10 +157,10 @@ "+++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts\n" "@@ -22,7 +22,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx23-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;\n" @@ -162,10 +170,10 @@ "+++ b/arch/arm/boot/dts/imx23-xfi3.dts\n" "@@ -54,7 +54,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx23-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;\n" @@ -173,8 +181,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp1: ssp at 80034000 {\n" - "+\t\t\tssp1: spi at 80034000 {\n" + "-\t\t\tssp1: ssp@80034000 {\n" + "+\t\t\tssp1: spi@80034000 {\n" " \t\t\t\tcompatible = \"fsl,imx23-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc1_4bit_pins_a>;\n" @@ -186,8 +194,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\treg = <0x80010000 0x2000>;\n" " \t\t\t\tinterrupts = <15>;\n" " \t\t\t\tclocks = <&clks 33>;\n" @@ -195,8 +203,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp1: ssp at 80034000 {\n" - "+\t\t\tssp1: spi at 80034000 {\n" + "-\t\t\tssp1: ssp@80034000 {\n" + "+\t\t\tssp1: spi@80034000 {\n" " \t\t\t\treg = <0x80034000 0x2000>;\n" " \t\t\t\tinterrupts = <2>;\n" " \t\t\t\tclocks = <&clks 33>;\n" @@ -208,8 +216,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tspi1: cspi at 43fa4000 {\n" - "+\t\t\tspi1: spi at 43fa4000 {\n" + "-\t\t\tspi1: cspi@43fa4000 {\n" + "+\t\t\tspi1: spi@43fa4000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx25-cspi\", \"fsl,imx35-cspi\";\n" @@ -217,8 +225,8 @@ " \t\t\treg = <0x50000000 0x40000>;\n" " \t\t\tranges;\n" " \n" - "-\t\t\tspi3: cspi at 50004000 {\n" - "+\t\t\tspi3: spi at 50004000 {\n" + "-\t\t\tspi3: cspi@50004000 {\n" + "+\t\t\tspi3: spi@50004000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx25-cspi\", \"fsl,imx35-cspi\";\n" @@ -226,8 +234,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tspi2: cspi at 50010000 {\n" - "+\t\t\tspi2: spi at 50010000 {\n" + "-\t\t\tspi2: cspi@50010000 {\n" + "+\t\t\tspi2: spi@50010000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx25-cspi\", \"fsl,imx35-cspi\";\n" @@ -239,8 +247,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tcspi1: cspi at 1000e000 {\n" - "+\t\t\tcspi1: spi at 1000e000 {\n" + "-\t\t\tcspi1: cspi@1000e000 {\n" + "+\t\t\tcspi1: spi@1000e000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx27-cspi\";\n" @@ -248,8 +256,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tcspi2: cspi at 1000f000 {\n" - "+\t\t\tcspi2: spi at 1000f000 {\n" + "-\t\t\tcspi2: cspi@1000f000 {\n" + "+\t\t\tcspi2: spi@1000f000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx27-cspi\";\n" @@ -257,8 +265,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tcspi3: cspi at 10017000 {\n" - "+\t\t\tcspi3: spi at 10017000 {\n" + "-\t\t\tcspi3: cspi@10017000 {\n" + "+\t\t\tcspi3: spi@10017000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx27-cspi\";\n" @@ -268,10 +276,10 @@ "+++ b/arch/arm/boot/dts/imx28-apf28dev.dts\n" "@@ -18,7 +18,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a\n" @@ -279,7 +287,7 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-spi\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" @@ -292,8 +300,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a &mmc0_sck_cfg>;\n" @@ -301,8 +309,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc2_4bit_pins_apx4 &mmc2_sck_cfg_apx4>;\n" @@ -314,8 +322,8 @@ " \n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a\n" @@ -325,10 +333,10 @@ "+++ b/arch/arm/boot/dts/imx28-duckbill-2-485.dts\n" "@@ -25,7 +25,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_8bit_pins_a\n" @@ -336,8 +344,8 @@ " \t\t\t\tnon-removable;\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc2_4bit_pins_b\n" @@ -347,10 +355,10 @@ "+++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts\n" "@@ -26,7 +26,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_8bit_pins_a\n" @@ -358,8 +366,8 @@ " \t\t\t\tnon-removable;\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc2_4bit_pins_b\n" @@ -369,10 +377,10 @@ "+++ b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts\n" "@@ -29,7 +29,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_8bit_pins_a\n" @@ -380,7 +388,7 @@ " \t\t\t\tnon-removable;\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-spi\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" @@ -391,10 +399,10 @@ "+++ b/arch/arm/boot/dts/imx28-duckbill-2.dts\n" "@@ -25,7 +25,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_8bit_pins_a\n" @@ -402,8 +410,8 @@ " \t\t\t\tnon-removable;\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc2_4bit_pins_b\n" @@ -413,10 +421,10 @@ "+++ b/arch/arm/boot/dts/imx28-duckbill.dts\n" "@@ -24,7 +24,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a\n" @@ -424,7 +432,7 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-spi\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" @@ -437,8 +445,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_8bit_pins_a\n" @@ -446,15 +454,15 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp1: ssp at 80012000 {\n" + "-\t\t\tssp1: ssp@80012000 {\n" "+\t\t\tssp1: spi@80012000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tbus-width = <8>;\n" " \t\t\t\twp-gpios = <&gpio0 28 0>;\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx28-spi\";\n" @@ -466,8 +474,8 @@ " \t\t\t\t};\n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a\n" @@ -475,8 +483,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc2_4bit_pins_a\n" @@ -486,10 +494,10 @@ "+++ b/arch/arm/boot/dts/imx28-m28evk.dts\n" "@@ -18,7 +18,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_8bit_pins_a\n" @@ -497,7 +505,7 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" @@ -510,8 +518,8 @@ " \n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a>;\n" @@ -519,8 +527,8 @@ " \t\t\t\tstatus = \"okay\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx28-spi\";\n" @@ -530,10 +538,10 @@ "+++ b/arch/arm/boot/dts/imx28-ts4600.dts\n" "@@ -25,7 +25,7 @@\n" " \n" - " \tapb at 80000000 {\n" - " \t\tapbh at 80000000 {\n" - "-\t\t\tssp0: ssp at 80010000 {\n" - "+\t\t\tssp0: spi at 80010000 {\n" + " \tapb@80000000 {\n" + " \t\tapbh@80000000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" + "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\tcompatible = \"fsl,imx28-mmc\";\n" " \t\t\t\tpinctrl-names = \"default\";\n" " \t\t\t\tpinctrl-0 = <&mmc0_4bit_pins_a\n" @@ -545,7 +553,7 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp0: ssp at 80010000 {\n" + "-\t\t\tssp0: ssp@80010000 {\n" "+\t\t\tssp0: spi@80010000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" @@ -554,8 +562,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp1: ssp at 80012000 {\n" - "+\t\t\tssp1: spi at 80012000 {\n" + "-\t\t\tssp1: ssp@80012000 {\n" + "+\t\t\tssp1: spi@80012000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\treg = <0x80012000 0x2000>;\n" @@ -563,8 +571,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp2: ssp at 80014000 {\n" - "+\t\t\tssp2: spi at 80014000 {\n" + "-\t\t\tssp2: ssp@80014000 {\n" + "+\t\t\tssp2: spi@80014000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\treg = <0x80014000 0x2000>;\n" @@ -572,8 +580,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tssp3: ssp at 80016000 {\n" - "+\t\t\tssp3: spi at 80016000 {\n" + "-\t\t\tssp3: ssp@80016000 {\n" + "+\t\t\tssp3: spi@80016000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\treg = <0x80016000 0x2000>;\n" @@ -585,8 +593,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tspi2: cspi at 50010000 {\n" - "+\t\t\tspi2: spi at 50010000 {\n" + "-\t\t\tspi2: cspi@50010000 {\n" + "+\t\t\tspi2: spi@50010000 {\n" " \t\t\t\tcompatible = \"fsl,imx31-cspi\";\n" " \t\t\t\treg = <0x50010000 0x4000>;\n" " \t\t\t\tinterrupts = <13>;\n" @@ -594,8 +602,8 @@ " \t\t\t\t#clock-cells = <1>;\n" " \t\t\t};\n" " \n" - "-\t\t\tspi3: cspi at 53f84000 {\n" - "+\t\t\tspi3: spi at 53f84000 {\n" + "-\t\t\tspi3: cspi@53f84000 {\n" + "+\t\t\tspi3: spi@53f84000 {\n" " \t\t\t\tcompatible = \"fsl,imx31-cspi\";\n" " \t\t\t\treg = <0x53f84000 0x4000>;\n" " \t\t\t\tinterrupts = <17>;\n" @@ -607,8 +615,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tspi1: cspi at 43fa4000 {\n" - "+\t\t\tspi1: spi at 43fa4000 {\n" + "-\t\t\tspi1: cspi@43fa4000 {\n" + "+\t\t\tspi1: spi@43fa4000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx35-cspi\";\n" @@ -616,8 +624,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tspi2: cspi at 50010000 {\n" - "+\t\t\tspi2: spi at 50010000 {\n" + "-\t\t\tspi2: cspi@50010000 {\n" + "+\t\t\tspi2: spi@50010000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx35-cspi\";\n" @@ -629,8 +637,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi1: ecspi at 50010000 {\n" - "+\t\t\t\tecspi1: spi at 50010000 {\n" + "-\t\t\t\tecspi1: ecspi@50010000 {\n" + "+\t\t\t\tecspi1: spi@50010000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx50-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -638,8 +646,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tecspi2: ecspi at 63fac000 {\n" - "+\t\t\tecspi2: spi at 63fac000 {\n" + "-\t\t\tecspi2: ecspi@63fac000 {\n" + "+\t\t\tecspi2: spi@63fac000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx50-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -647,8 +655,8 @@ " \t\t\t\tfsl,sdma-ram-script-name = \"imx/sdma/sdma-imx50.bin\";\n" " \t\t\t};\n" " \n" - "-\t\t\tcspi: cspi at 63fc0000 {\n" - "+\t\t\tcspi: spi at 63fc0000 {\n" + "-\t\t\tcspi: cspi@63fc0000 {\n" + "+\t\t\tcspi: spi@63fc0000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx50-cspi\", \"fsl,imx35-cspi\";\n" @@ -660,8 +668,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi1: ecspi at 70010000 {\n" - "+\t\t\t\tecspi1: spi at 70010000 {\n" + "-\t\t\t\tecspi1: ecspi@70010000 {\n" + "+\t\t\t\tecspi1: spi@70010000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx51-ecspi\";\n" @@ -669,8 +677,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tecspi2: ecspi at 83fac000 {\n" - "+\t\t\tecspi2: spi at 83fac000 {\n" + "-\t\t\tecspi2: ecspi@83fac000 {\n" + "+\t\t\tecspi2: spi@83fac000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx51-ecspi\";\n" @@ -678,8 +686,8 @@ " \t\t\t\tfsl,sdma-ram-script-name = \"imx/sdma/sdma-imx51.bin\";\n" " \t\t\t};\n" " \n" - "-\t\t\tcspi: cspi at 83fc0000 {\n" - "+\t\t\tcspi: spi at 83fc0000 {\n" + "-\t\t\tcspi: cspi@83fc0000 {\n" + "+\t\t\tcspi: spi@83fc0000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx51-cspi\", \"fsl,imx35-cspi\";\n" @@ -691,8 +699,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi1: ecspi at 50010000 {\n" - "+\t\t\t\tecspi1: spi at 50010000 {\n" + "-\t\t\t\tecspi1: ecspi@50010000 {\n" + "+\t\t\t\tecspi1: spi@50010000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx53-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -700,8 +708,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tecspi2: ecspi at 63fac000 {\n" - "+\t\t\tecspi2: spi at 63fac000 {\n" + "-\t\t\tecspi2: ecspi@63fac000 {\n" + "+\t\t\tecspi2: spi@63fac000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx53-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -709,8 +717,8 @@ " \t\t\t\tfsl,sdma-ram-script-name = \"imx/sdma/sdma-imx53.bin\";\n" " \t\t\t};\n" " \n" - "-\t\t\tcspi: cspi at 63fc0000 {\n" - "+\t\t\tcspi: spi at 63fc0000 {\n" + "-\t\t\tcspi: cspi@63fc0000 {\n" + "+\t\t\tcspi: spi@63fc0000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx53-cspi\", \"fsl,imx35-cspi\";\n" @@ -722,8 +730,8 @@ " &ecspi4 {\n" " \tstatus = \"okay\";\n" " \n" - "-\tmcp251x0: mcp251x at 1 {\n" - "+\tmcp251x0: mcp251x at 0 {\n" + "-\tmcp251x0: mcp251x@1 {\n" + "+\tmcp251x0: mcp251x@0 {\n" " \t\tcompatible = \"microchip,mcp2515\";\n" " \t\treg = <0>;\n" " \t\tclocks = <&clk16m>;\n" @@ -733,10 +741,10 @@ "+++ b/arch/arm/boot/dts/imx6q.dtsi\n" "@@ -163,7 +163,7 @@\n" " \n" - " \t\taips-bus at 2000000 { /* AIPS1 */\n" - " \t\t\tspba-bus at 2000000 {\n" - "-\t\t\t\tecspi5: ecspi at 2018000 {\n" - "+\t\t\t\tecspi5: spi at 2018000 {\n" + " \t\taips-bus@2000000 { /* AIPS1 */\n" + " \t\t\tspba-bus@2000000 {\n" + "-\t\t\t\tecspi5: ecspi@2018000 {\n" + "+\t\t\t\tecspi5: spi@2018000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6q-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -748,8 +756,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi1: ecspi at 2008000 {\n" - "+\t\t\t\tecspi1: spi at 2008000 {\n" + "-\t\t\t\tecspi1: ecspi@2008000 {\n" + "+\t\t\t\tecspi1: spi@2008000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6q-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -757,8 +765,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi2: ecspi at 200c000 {\n" - "+\t\t\t\tecspi2: spi at 200c000 {\n" + "-\t\t\t\tecspi2: ecspi@200c000 {\n" + "+\t\t\t\tecspi2: spi@200c000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6q-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -766,8 +774,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi3: ecspi at 2010000 {\n" - "+\t\t\t\tecspi3: spi at 2010000 {\n" + "-\t\t\t\tecspi3: ecspi@2010000 {\n" + "+\t\t\t\tecspi3: spi@2010000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6q-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -775,8 +783,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi4: ecspi at 2014000 {\n" - "+\t\t\t\tecspi4: spi at 2014000 {\n" + "-\t\t\t\tecspi4: ecspi@2014000 {\n" + "+\t\t\t\tecspi4: spi@2014000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6q-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -788,8 +796,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi1: ecspi at 2008000 {\n" - "+\t\t\t\tecspi1: spi at 2008000 {\n" + "-\t\t\t\tecspi1: ecspi@2008000 {\n" + "+\t\t\t\tecspi1: spi@2008000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sl-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -797,8 +805,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi2: ecspi at 200c000 {\n" - "+\t\t\t\tecspi2: spi at 200c000 {\n" + "-\t\t\t\tecspi2: ecspi@200c000 {\n" + "+\t\t\t\tecspi2: spi@200c000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sl-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -806,8 +814,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi3: ecspi at 2010000 {\n" - "+\t\t\t\tecspi3: spi at 2010000 {\n" + "-\t\t\t\tecspi3: ecspi@2010000 {\n" + "+\t\t\t\tecspi3: spi@2010000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sl-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -815,8 +823,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi4: ecspi at 2014000 {\n" - "+\t\t\t\tecspi4: spi at 2014000 {\n" + "-\t\t\t\tecspi4: ecspi@2014000 {\n" + "+\t\t\t\tecspi4: spi@2014000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sl-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -828,8 +836,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi1: ecspi at 2008000 {\n" - "+\t\t\t\tecspi1: spi at 2008000 {\n" + "-\t\t\t\tecspi1: ecspi@2008000 {\n" + "+\t\t\t\tecspi1: spi@2008000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sx-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -837,8 +845,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi2: ecspi at 200c000 {\n" - "+\t\t\t\tecspi2: spi at 200c000 {\n" + "-\t\t\t\tecspi2: ecspi@200c000 {\n" + "+\t\t\t\tecspi2: spi@200c000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sx-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -846,8 +854,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi3: ecspi at 2010000 {\n" - "+\t\t\t\tecspi3: spi at 2010000 {\n" + "-\t\t\t\tecspi3: ecspi@2010000 {\n" + "+\t\t\t\tecspi3: spi@2010000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sx-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -855,8 +863,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi4: ecspi at 2014000 {\n" - "+\t\t\t\tecspi4: spi at 2014000 {\n" + "-\t\t\t\tecspi4: ecspi@2014000 {\n" + "+\t\t\t\tecspi4: spi@2014000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6sx-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -864,8 +872,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tqspi1: qspi at 21e0000 {\n" - "+\t\t\tqspi1: spi at 21e0000 {\n" + "-\t\t\tqspi1: qspi@21e0000 {\n" + "+\t\t\tqspi1: spi@21e0000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx6sx-qspi\";\n" @@ -873,8 +881,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tqspi2: qspi at 21e4000 {\n" - "+\t\t\tqspi2: spi at 21e4000 {\n" + "-\t\t\tqspi2: qspi@21e4000 {\n" + "+\t\t\tqspi2: spi@21e4000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx6sx-qspi\";\n" @@ -882,8 +890,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tecspi5: ecspi at 228c000 {\n" - "+\t\t\tecspi5: spi at 228c000 {\n" + "-\t\t\tecspi5: ecspi@228c000 {\n" + "+\t\t\tecspi5: spi@228c000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx6sx-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -895,8 +903,8 @@ " \t\t\t\treg = <0x02000000 0x40000>;\n" " \t\t\t\tranges;\n" " \n" - "-\t\t\t\tecspi1: ecspi at 2008000 {\n" - "+\t\t\t\tecspi1: spi at 2008000 {\n" + "-\t\t\t\tecspi1: ecspi@2008000 {\n" + "+\t\t\t\tecspi1: spi@2008000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6ul-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -904,8 +912,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi2: ecspi at 200c000 {\n" - "+\t\t\t\tecspi2: spi at 200c000 {\n" + "-\t\t\t\tecspi2: ecspi@200c000 {\n" + "+\t\t\t\tecspi2: spi@200c000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6ul-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -913,8 +921,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi3: ecspi at 2010000 {\n" - "+\t\t\t\tecspi3: spi at 2010000 {\n" + "-\t\t\t\tecspi3: ecspi@2010000 {\n" + "+\t\t\t\tecspi3: spi@2010000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6ul-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -922,8 +930,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi4: ecspi at 2014000 {\n" - "+\t\t\t\tecspi4: spi at 2014000 {\n" + "-\t\t\t\tecspi4: ecspi@2014000 {\n" + "+\t\t\t\tecspi4: spi@2014000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx6ul-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -931,8 +939,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tqspi: qspi at 21e0000 {\n" - "+\t\t\tqspi: spi at 21e0000 {\n" + "-\t\t\tqspi: qspi@21e0000 {\n" + "+\t\t\tqspi: spi@21e0000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx6ul-qspi\", \"fsl,imx6sx-qspi\";\n" @@ -944,8 +952,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tecspi4: ecspi at 30630000 {\n" - "+\t\t\tecspi4: spi at 30630000 {\n" + "-\t\t\tecspi4: ecspi@30630000 {\n" + "+\t\t\tecspi4: spi@30630000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,imx7d-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -953,8 +961,8 @@ " \t\t\t\treg = <0x30800000 0x100000>;\n" " \t\t\t\tranges;\n" " \n" - "-\t\t\t\tecspi1: ecspi at 30820000 {\n" - "+\t\t\t\tecspi1: spi at 30820000 {\n" + "-\t\t\t\tecspi1: ecspi@30820000 {\n" + "+\t\t\t\tecspi1: spi@30820000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx7d-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -962,8 +970,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi2: ecspi at 30830000 {\n" - "+\t\t\t\tecspi2: spi at 30830000 {\n" + "-\t\t\t\tecspi2: ecspi@30830000 {\n" + "+\t\t\t\tecspi2: spi@30830000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx7d-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -971,8 +979,8 @@ " \t\t\t\t\tstatus = \"disabled\";\n" " \t\t\t\t};\n" " \n" - "-\t\t\t\tecspi3: ecspi at 30840000 {\n" - "+\t\t\t\tecspi3: spi at 30840000 {\n" + "-\t\t\t\tecspi3: ecspi@30840000 {\n" + "+\t\t\t\tecspi3: spi@30840000 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\tcompatible = \"fsl,imx7d-ecspi\", \"fsl,imx51-ecspi\";\n" @@ -984,8 +992,8 @@ " \t\t\tbig-endian;\n" " \t\t};\n" " \n" - "-\t\tqspi: quadspi at 1550000 {\n" - "+\t\tqspi: spi at 1550000 {\n" + "-\t\tqspi: quadspi@1550000 {\n" + "+\t\tqspi: spi@1550000 {\n" " \t\t\tcompatible = \"fsl,ls1021a-qspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -993,8 +1001,8 @@ " \t\t\t};\n" " \t\t};\n" " \n" - "-\t\tdspi0: dspi at 2100000 {\n" - "+\t\tdspi0: spi at 2100000 {\n" + "-\t\tdspi0: dspi@2100000 {\n" + "+\t\tdspi0: spi@2100000 {\n" " \t\t\tcompatible = \"fsl,ls1021a-v1.0-dspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -1002,8 +1010,8 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - "-\t\tdspi1: dspi at 2110000 {\n" - "+\t\tdspi1: spi at 2110000 {\n" + "-\t\tdspi1: dspi@2110000 {\n" + "+\t\tdspi1: spi@2110000 {\n" " \t\t\tcompatible = \"fsl,ls1021a-v1.0-dspi\";\n" " \t\t\t#address-cells = <1>;\n" " \t\t\t#size-cells = <0>;\n" @@ -1015,8 +1023,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tdspi0: dspi0 at 4002c000 {\n" - "+\t\t\tdspi0: spi at 4002c000 {\n" + "-\t\t\tdspi0: dspi0@4002c000 {\n" + "+\t\t\tdspi0: spi@4002c000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,vf610-dspi\";\n" @@ -1024,8 +1032,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tdspi1: dspi1 at 4002d000 {\n" - "+\t\t\tdspi1: spi at 4002d000 {\n" + "-\t\t\tdspi1: dspi1@4002d000 {\n" + "+\t\t\tdspi1: spi@4002d000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,vf610-dspi\";\n" @@ -1033,8 +1041,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tqspi0: quadspi at 40044000 {\n" - "+\t\t\tqspi0: spi at 40044000 {\n" + "-\t\t\tqspi0: quadspi@40044000 {\n" + "+\t\t\tqspi0: spi@40044000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,vf610-qspi\";\n" @@ -1042,8 +1050,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tdspi2: dspi2 at 400ac000 {\n" - "+\t\t\tdspi2: spi at 400ac000 {\n" + "-\t\t\tdspi2: dspi2@400ac000 {\n" + "+\t\t\tdspi2: spi@400ac000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,vf610-dspi\";\n" @@ -1051,8 +1059,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tdspi3: dspi3 at 400ad000 {\n" - "+\t\t\tdspi3: spi at 400ad000 {\n" + "-\t\t\tdspi3: dspi3@400ad000 {\n" + "+\t\t\tdspi3: spi@400ad000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,vf610-dspi\";\n" @@ -1060,12 +1068,12 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\tqspi1: quadspi at 400c4000 {\n" - "+\t\t\tqspi1: spi at 400c4000 {\n" + "-\t\t\tqspi1: quadspi@400c4000 {\n" + "+\t\t\tqspi1: spi@400c4000 {\n" " \t\t\t\t#address-cells = <1>;\n" " \t\t\t\t#size-cells = <0>;\n" " \t\t\t\tcompatible = \"fsl,vf610-qspi\";\n" "-- \n" 2.17.1 -4cd8563adee4d0984288e81bd58edd27d91f1184592a8a426c89491c9f4847eb +67cf179a70b6c21e2969ce2f863f2f559c247cc8b44cd9a17e3dd7b0973abd2a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.