github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 23:52:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Freescale QSPI device tree cleanup for 4.21:

Browse Source 
- It contains a series from Schrempf Frieder that cleans up FSL QSPI
    device tree nodes.  The current device trees are broken because they
    use an inconsistent scheme for assigning the reg properties.  It
    becomes a problem with ongoing QSPI driver under SPI framework.  So
    the cleanup is a preparation for new driver landing in the next
    cycle.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJcFg+pAAoJEFBXWFqHsHzOC3UH/RsA0ysBXsaUF9aNpfmwFpKP
 bApnoyo+MhLZSvFqD8eU1K0BhXFOkOmMXMbTle0b3uF7qaknnXEoWTCNz+hJGDsz
 fFeOqz7xjyG8Q4U8PT4ImG0OPuFNNGBs1byJKZygxJp/xBlAGMKDp/rRKbM4c8+8
 WzoKcWcLqFe+Vau0vuesjcT7J/B3nWvzOWsWX5MHOp10rEWyv9Y4Ct3cAzSMVhAM
 1eLQpYegOvUckX0if7BZpj7vSIhDNp/urx6U7D5KGAf9iHK50euMX55LhveiSM8w
 CdnnZn2MUXEt2A81Aqb97IOhMsEra47Ffomr1nIV2OGbmDY27HrlUrNSEKNER28=
 =I3dR
 -----END PGP SIGNATURE-----

Merge tag 'imx-qspi-dt-clean' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Freescale QSPI device tree cleanup for 4.21:
 - It contains a series from Schrempf Frieder that cleans up FSL QSPI
   device tree nodes.  The current device trees are broken because they
   use an inconsistent scheme for assigning the reg properties.  It
   becomes a problem with ongoing QSPI driver under SPI framework.  So
   the cleanup is a preparation for new driver landing in the next
   cycle.

* tag 'imx-qspi-dt-clean' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: Add spi-[tx/rx]-bus-width for the FSL QSPI controller
  arm64: dts: Remove unused properties from FSL QSPI driver nodes
  ARM: dts: Add spi-[tx/rx]-bus-width for the FSL QSPI controller
  ARM: dts: imx6sx-sdb: Fix the reg properties for the FSL QSPI nodes
  ARM: dts: Remove unused properties from FSL QSPI driver nodes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2018-12-20 16:47:25 +01:00
commit f1a6caf73c
8 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/imx6sx-sdb-reva.dts
View File

@ -128,14 +128,18 @@ flash0: s25fl128s@0 {
#size-cells = <1>;
compatible = "spansion,s25fl128s", "jedec,spi-nor";
spi-max-frequency = <66000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
};
flash1: s25fl128s@1 {
reg = <1>;
flash1: s25fl128s@2 {
reg = <2>;
#address-cells = <1>;
#size-cells = <1>;
compatible = "spansion,s25fl128s", "jedec,spi-nor";
spi-max-frequency = <66000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
};
};

8
arch/arm/boot/dts/imx6sx-sdb.dts
View File

@ -113,15 +113,19 @@ flash0: n25q256a@0 {
#size-cells = <1>;
compatible = "micron,n25q256a", "jedec,spi-nor";
spi-max-frequency = <29000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>;
};
flash1: n25q256a@1 {
flash1: n25q256a@2 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "micron,n25q256a", "jedec,spi-nor";
spi-max-frequency = <29000000>;
reg = <1>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <2>;
};
};

2
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
View File

@ -217,6 +217,8 @@ flash0: n25q256a@0 {
#size-cells = <1>;
compatible = "micron,n25q256a";
spi-max-frequency = <29000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>;
};
};

5
arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts
View File

@ -203,9 +203,6 @@ rgmii_phy2: ethernet-phy@2 {
};
&qspi {
bus-num = <0>;
fsl,spi-num-chipselects = <2>;
fsl,spi-flash-chipselects = <0>;
fsl,qspi-has-second-chip;
status = "okay";
@ -214,6 +211,8 @@ flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>;
partitions@0 {

3
arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
View File

@ -135,7 +135,6 @@ &lpuart0 {
};
&qspi {
bus-num = <0>;
status = "okay";
qflash0: s25fl128s@0 {
@ -143,6 +142,8 @@ qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>;
};
};

4
arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
View File

@ -163,8 +163,6 @@ &lpuart0 {
};
&qspi {
num-cs = <2>;
bus-num = <0>;
status = "okay";
qflash0: s25fl128s@0 {
@ -172,6 +170,8 @@ qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>;
};
};

6
arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
View File

@ -99,8 +99,6 @@ cpld: board-control@2,0 {
};
&qspi {
num-cs = <2>;
bus-num = <0>;
status = "okay";
qflash0: s25fs512s@0 {
@ -108,6 +106,8 @@ qflash0: s25fs512s@0 {
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>;
};
@ -116,6 +116,8 @@ qflash1: s25fs512s@1 {
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <1>;
};
};

4
arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi
View File

@ -134,6 +134,8 @@ flash0: s25fl256s1@0 {
#size-cells = <1>;
compatible = "st,m25p80";
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <0>;
};
flash2: s25fl256s1@2 {
@ -141,6 +143,8 @@ flash2: s25fl256s1@2 {
#size-cells = <1>;
compatible = "st,m25p80";
spi-max-frequency = <20000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
reg = <2>;
};
};