Unverified Commit 7665a85a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-keystone-dt-for-v5.19' of... 

Merge tag 'ti-keystone-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/dt

Keystone2 device tree updates for v5.19

* Cleanups for SPI NOR / flash

* tag 'ti-keystone-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  ARM: dts: keystone: Fix missing fallback and case in SPI NOR node compatible
  ARM: dts: keystone: Align SPI NOR node name with dtschema

Link: https://lore.kernel.org/r/20220507163435.tcg46cacwqhe7n64@busily


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 73ff4d18 6273a186

arch/arm/boot/dts/keystone-k2e-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -137,10 +137,10 @@ 
};



&spi0 {

	nor_flash: n25q128a11@0 {

	nor_flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "Micron,n25q128a11";

		compatible = "micron,n25q128a11", "jedec,spi-nor";

		spi-max-frequency = <54000000>;

		m25p,fast-read;

		reg = <0>;

arch/arm/boot/dts/keystone-k2g-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ 
	pinctrl-0 = <&qspi_pins>;

	cdns,rclk-en;



	flash0: m25p80@0 {

	flash0: flash@0 {

		compatible = "s25fl512s", "jedec,spi-nor";

		reg = <0>;

		spi-tx-bus-width = <1>;

arch/arm/boot/dts/keystone-k2g-ice.dts

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ 
	cdns,rclk-en;

	status = "okay";



	flash0: m25p80@0 {

	flash0: flash@0 {

		compatible = "s25fl256s1", "jedec,spi-nor";

		reg = <0>;

		spi-tx-bus-width = <1>;

arch/arm/boot/dts/keystone-k2hk-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -161,10 +161,10 @@ 
};



&spi0 {

	nor_flash: n25q128a11@0 {

	nor_flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "Micron,n25q128a11";

		compatible = "micron,n25q128a11", "jedec,spi-nor";

		spi-max-frequency = <54000000>;

		m25p,fast-read;

		reg = <0>;

arch/arm/boot/dts/keystone-k2l-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -110,10 +110,10 @@ 
};



&spi0 {

	nor_flash: n25q128a11@0 {

	nor_flash: flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "Micron,n25q128a11";

		compatible = "micron,n25q128a11", "jedec,spi-nor";

		spi-max-frequency = <54000000>;

		m25p,fast-read;

		reg = <0>;