mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 06:17:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-03-24 18:55:11 +01:00
parent 7e11bc0759 aff750faa5
commit 07fcd6bfce
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/armada-388-db.dts
View File

@@ -62,7 +62,7 @@ ethernet@30000 {
};
usb@58000 {
status = "ok";
status = "okay";
};
ethernet@70000 {

2
arch/arm/boot/dts/da850-evm.dts
View File

@@ -415,7 +415,7 @@ &edma1 {
&aemif {
pinctrl-names = "default";
pinctrl-0 = <&nand_pins>;
status = "ok";
status = "okay";
cs3 {
#address-cells = <2>;
#size-cells = <1>;

2
arch/arm/boot/dts/dove.dtsi
View File

@@ -422,7 +422,7 @@ sata_phy0: sata-phy@a2000 {
clocks = <&gate_clk 3>;
clock-names = "sata";
#phy-cells = <0>;
status = "ok";
status = "okay";
};
audio0: audio-controller@b0000 {

12
arch/arm/boot/dts/hi3620-hi4511.dts
View File

@@ -24,42 +24,42 @@ memory@40000000 {
amba-bus {
dual_timer0: dual_timer@800000 {
status = "ok";
status = "okay";
};
uart0: serial@b00000 { /* console */
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart0_pmx_func &uart0_cfg_func>;
pinctrl-1 = <&uart0_pmx_idle &uart0_cfg_idle>;
status = "ok";
status = "okay";
};
uart1: serial@b01000 { /* modem */
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func>;
pinctrl-1 = <&uart1_pmx_idle &uart1_cfg_idle>;
status = "ok";
status = "okay";
};
uart2: serial@b02000 { /* audience */
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart2_pmx_func &uart2_cfg_func>;
pinctrl-1 = <&uart2_pmx_idle &uart2_cfg_idle>;
status = "ok";
status = "okay";
};
uart3: serial@b03000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart3_pmx_func &uart3_cfg_func>;
pinctrl-1 = <&uart3_pmx_idle &uart3_cfg_idle>;
status = "ok";
status = "okay";
};
uart4: serial@b04000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart4_pmx_func &uart4_cfg_func>;
pinctrl-1 = <&uart4_pmx_idle &uart4_cfg_func>;
status = "ok";
status = "okay";
};
pmx0: pinmux@803000 {

2
arch/arm/boot/dts/hip04-d01.dts
View File

@@ -23,7 +23,7 @@ memory@0,10000000 {
soc {
uart0: serial@4007000 {
status = "ok";
status = "okay";
};
};
};

2
arch/arm/boot/dts/keystone-k2e-evm.dts
View File

@@ -159,7 +159,7 @@ partition@1 {
};
&mdio {
status = "ok";
status = "okay";
ethphy0: ethernet-phy@0 {
compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
reg = <0>;

2
arch/arm/boot/dts/keystone-k2g-evm.dts
View File

@@ -534,7 +534,7 @@ tlv320aic3106: tlv320aic3106@1b {
&dss {
pinctrl-names = "default";
pinctrl-0 = <&vout_pins>;
status = "ok";
status = "okay";
port {
dpi_out: endpoint {

2
arch/arm/boot/dts/keystone-k2hk-evm.dts
View File

@@ -183,7 +183,7 @@ partition@1 {
};
&mdio {
status = "ok";
status = "okay";
ethphy0: ethernet-phy@0 {
compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
reg = <0>;

2
arch/arm/boot/dts/keystone-k2l-evm.dts
View File

@@ -132,7 +132,7 @@ partition@1 {
};
&mdio {
status = "ok";
status = "okay";
ethphy0: ethernet-phy@0 {
compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";
reg = <0>;

8
arch/arm/boot/dts/omap-zoom-common.dtsi
View File

@@ -14,7 +14,7 @@ &gpmc {
* they probably share the same GPIO IRQ
* REVISIT: Add timing support from slls644g.pdf
*/
uart@3,0 {
serial@3,0 {
compatible = "ns16550a";
reg = <3 0 8>; /* CS3, offset 0, IO size 8 */
bank-width = <2>;
@@ -50,7 +50,7 @@ uart@3,0 {
gpmc,wr-data-mux-bus-ns = <45>;
gpmc,wr-access-ns = <145>;
};
uart@3,1 {
serial@3,1 {
compatible = "ns16550a";
reg = <3 0x100 8>; /* CS3, offset 0x100, IO size 8 */
bank-width = <2>;
@@ -61,7 +61,7 @@ uart@3,1 {
clock-frequency = <1843200>;
current-speed = <115200>;
};
uart@3,2 {
serial@3,2 {
compatible = "ns16550a";
reg = <3 0x200 8>; /* CS3, offset 0x200, IO size 8 */
bank-width = <2>;
@@ -72,7 +72,7 @@ uart@3,2 {
clock-frequency = <1843200>;
current-speed = <115200>;
};
uart@3,3 {
serial@3,3 {
compatible = "ns16550a";
reg = <3 0x300 8>; /* CS3, offset 0x300, IO size 8 */
bank-width = <2>;