Unverified Commit 07fcd6bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'dt-cleanup-6.4' of... 

Merge tag 'dt-cleanup-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt

Minor improvements in ARM DTS for v6.4

1. TI, Marvell, HiSilicon: "okay" over "ok" is preferred for status
   property.
2. OMAP: align UART node name with bindings.

* tag 'dt-cleanup-6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  ARM: dts: hisilicon: use "okay" for status
  ARM: dts: ti: use "okay" for status
  ARM: dts: marvell: use "okay" for status
  ARM: dts: omap: align UART node name with bindings

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7e11bc07 aff750fa

arch/arm/boot/dts/armada-388-db.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ ethernet@30000 { 
			};

			};





			usb@58000 {

			usb@58000 {

				status = "ok";

				status = "okay";

			};

			};





			ethernet@70000 {

			ethernet@70000 {

arch/arm/boot/dts/da850-evm.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -415,7 +415,7 @@ &edma1 { 
&aemif {

&aemif {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&nand_pins>;

	pinctrl-0 = <&nand_pins>;

	status = "ok";

	status = "okay";

	cs3 {

	cs3 {

		#address-cells = <2>;

		#address-cells = <2>;

		#size-cells = <1>;

		#size-cells = <1>;

arch/arm/boot/dts/dove.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -422,7 +422,7 @@ sata_phy0: sata-phy@a2000 { 
				clocks = <&gate_clk 3>;

				clocks = <&gate_clk 3>;

				clock-names = "sata";

				clock-names = "sata";

				#phy-cells = <0>;

				#phy-cells = <0>;

				status = "ok";

				status = "okay";

			};

			};





			audio0: audio-controller@b0000 {

			audio0: audio-controller@b0000 {

arch/arm/boot/dts/hi3620-hi4511.dts

+6 −6
Original line number Original line Diff line number Diff line
@@ -24,42 +24,42 @@ memory@40000000 { 




	amba-bus {

	amba-bus {

		dual_timer0: dual_timer@800000 {

		dual_timer0: dual_timer@800000 {

			status = "ok";

			status = "okay";

		};

		};





		uart0: serial@b00000 {	/* console */

		uart0: serial@b00000 {	/* console */

			pinctrl-names = "default", "sleep";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&uart0_pmx_func &uart0_cfg_func>;

			pinctrl-0 = <&uart0_pmx_func &uart0_cfg_func>;

			pinctrl-1 = <&uart0_pmx_idle &uart0_cfg_idle>;

			pinctrl-1 = <&uart0_pmx_idle &uart0_cfg_idle>;

			status = "ok";

			status = "okay";

		};

		};





		uart1: serial@b01000 { /* modem */

		uart1: serial@b01000 { /* modem */

			pinctrl-names = "default", "sleep";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func>;

			pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func>;

			pinctrl-1 = <&uart1_pmx_idle &uart1_cfg_idle>;

			pinctrl-1 = <&uart1_pmx_idle &uart1_cfg_idle>;

			status = "ok";

			status = "okay";

		};

		};





		uart2: serial@b02000 { /* audience */

		uart2: serial@b02000 { /* audience */

			pinctrl-names = "default", "sleep";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&uart2_pmx_func &uart2_cfg_func>;

			pinctrl-0 = <&uart2_pmx_func &uart2_cfg_func>;

			pinctrl-1 = <&uart2_pmx_idle &uart2_cfg_idle>;

			pinctrl-1 = <&uart2_pmx_idle &uart2_cfg_idle>;

			status = "ok";

			status = "okay";

		};

		};





		uart3: serial@b03000 {

		uart3: serial@b03000 {

			pinctrl-names = "default", "sleep";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&uart3_pmx_func &uart3_cfg_func>;

			pinctrl-0 = <&uart3_pmx_func &uart3_cfg_func>;

			pinctrl-1 = <&uart3_pmx_idle &uart3_cfg_idle>;

			pinctrl-1 = <&uart3_pmx_idle &uart3_cfg_idle>;

			status = "ok";

			status = "okay";

		};

		};





		uart4: serial@b04000 {

		uart4: serial@b04000 {

			pinctrl-names = "default", "sleep";

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&uart4_pmx_func &uart4_cfg_func>;

			pinctrl-0 = <&uart4_pmx_func &uart4_cfg_func>;

			pinctrl-1 = <&uart4_pmx_idle &uart4_cfg_func>;

			pinctrl-1 = <&uart4_pmx_idle &uart4_cfg_func>;

			status = "ok";

			status = "okay";

		};

		};





		pmx0: pinmux@803000 {

		pmx0: pinmux@803000 {

arch/arm/boot/dts/hip04-d01.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ memory@0,10000000 { 




	soc {

	soc {

		uart0: serial@4007000 {

		uart0: serial@4007000 {

			status = "ok";

			status = "okay";

		};

		};

	};

	};

};
 
};