Commit 6583d1fd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.1-arm-dt' of... 

Merge tag 'tegra-for-5.1-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

ARM: tegra: Device tree changes for v5.1-rc1

Contains a single patch that adds the "jedec,spi-nor" compatible string
where appropriate.

* tag 'tegra-for-5.1-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: tegra: add "jedec,spi-nor" flash compatible binding

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 14ab4f43 de45b787

arch/arm/boot/dts/tegra114-dalmore.dts

+1 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ 
		status = "okay";

		spi-max-frequency = <25000000>;

		spi-flash@0 {

			compatible = "winbond,w25q32dw";

			compatible = "winbond,w25q32dw", "jedec,spi-nor";

			reg = <0>;

			spi-max-frequency = <20000000>;

		};

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+1 −1
Original line number Diff line number Diff line
@@ -1656,7 +1656,7 @@ 
		status = "okay";

		spi-max-frequency = <25000000>;

		spi-flash@0 {

			compatible = "winbond,w25q32dw";

			compatible = "winbond,w25q32dw", "jedec,spi-nor";

			reg = <0>;

			spi-max-frequency = <20000000>;

		};

arch/arm/boot/dts/tegra124-nyan.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ 
		spi-max-frequency = <25000000>;



		flash@0 {

			compatible = "winbond,w25q32dw";

			compatible = "winbond,w25q32dw", "jedec,spi-nor";

			spi-max-frequency = <25000000>;

			reg = <0>;

		};

arch/arm/boot/dts/tegra124-venice2.dts

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ 
		status = "okay";

		spi-max-frequency = <25000000>;

		spi-flash@0 {

			compatible = "winbond,w25q32dw";

			compatible = "winbond,w25q32dw", "jedec,spi-nor";

			reg = <0>;

			spi-max-frequency = <20000000>;

		};

arch/arm/boot/dts/tegra20-trimslice.dts

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ 
		status = "okay";

		spi-max-frequency = <48000000>;

		spi-flash@0 {

			compatible = "winbond,w25q80bl";

			compatible = "winbond,w25q80bl", "jedec,spi-nor";

			reg = <0>;

			spi-max-frequency = <48000000>;

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE