Unverified Commit 6e4c9b1f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'dt-cleanup-5.19-2' of... 

Merge tag 'dt-cleanup-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Minor cleanup of ARM DTS for v5.19, part two

Align SPI NOR node names to DT schema and drop unused/undocumented
dma-channels/dma-requests.

* tag 'dt-cleanup-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: socfpga: drop useless 'dma-channels/requests' properties
  ARM: dts: zynq-7000: drop useless 'dma-channels/requests' properties
  ARM: dts: marvell: align SPI NOR node name with dtschema
  ARM: dts: omap: align SPI NOR node name with dtschema
  ARM: dts: nuvoton: align SPI NOR node name with dtschema

Link: https://lore.kernel.org/r/20220506081438.149192-2-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 620b2c35 361736cf

arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;



	m25p80@0 {

	flash@0 {

		compatible = "mx25l6405d";

		spi-max-frequency = <40000000>;

arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;



	m25p80@0 {

	flash@0 {

		compatible = "mx25l6405d";

		spi-max-frequency = <40000000>;

arch/arm/boot/dts/am335x-phycore-som.dtsi

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

	status = "okay";



	serial_flash: m25p80@0 {

	serial_flash: flash@0 {

		compatible = "jedec,spi-nor";

		spi-max-frequency = <48000000>;

		reg = <0x0>;

arch/arm/boot/dts/am335x-sl50.dts

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;



	flash: n25q032@1 {

	flash: flash@1 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "micron,n25q032";

arch/arm/boot/dts/am3874-iceboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ 
};



&mcspi1 {

	s25fl256@0 {

	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";