diff options
-rw-r--r-- | arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 4 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 16 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 24 | ||||
-rw-r--r-- | arch/arm64/boot/dts/apm/apm-merlin.dts | 16 | ||||
-rw-r--r-- | arch/arm64/boot/dts/apm/apm-mustang.dts | 16 | ||||
-rw-r--r-- | arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 1 | ||||
-rw-r--r-- | arch/arm64/boot/dts/apm/apm-storm.dtsi | 16 | ||||
-rw-r--r-- | arch/arm64/boot/dts/hisilicon/hip07.dtsi | 2 | ||||
-rw-r--r-- | arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi | 2 | ||||
-rw-r--r-- | arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi | 6 | ||||
-rw-r--r-- | arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 6 | ||||
-rw-r--r-- | arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 2 |
12 files changed, 51 insertions, 60 deletions
diff --git a/arch/arm64/boot/dts/amazon/alpine-v2.dtsi b/arch/arm64/boot/dts/amazon/alpine-v2.dtsi index 4eb2cd14e00b..dccbba6e7f98 100644 --- a/arch/arm64/boot/dts/amazon/alpine-v2.dtsi +++ b/arch/arm64/boot/dts/amazon/alpine-v2.dtsi @@ -159,7 +159,6 @@ uart0: serial@1883000 { compatible = "ns16550a"; - device_type = "serial"; reg = <0x1883000 0x1000>; interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <500000000>; @@ -170,7 +169,6 @@ uart1: serial@1884000 { compatible = "ns16550a"; - device_type = "serial"; reg = <0x1884000 0x1000>; interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <500000000>; @@ -181,7 +179,6 @@ uart2: serial@1885000 { compatible = "ns16550a"; - device_type = "serial"; reg = <0x1885000 0x1000>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <500000000>; @@ -192,7 +189,6 @@ uart3: serial@1886000 { compatible = "ns16550a"; - device_type = "serial"; reg = <0x1886000 0x1000>; interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <500000000>; diff --git a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts index 02bff65e5fd6..21149acb6b31 100644 --- a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts +++ b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts @@ -26,7 +26,7 @@ }; &ccp0 { - status = "ok"; + status = "okay"; amd,zlib-support = <1>; }; @@ -34,31 +34,31 @@ * NOTE: In Rev.B, gpio0 is reserved. */ &gpio1 { - status = "ok"; + status = "okay"; }; &gpio4 { - status = "ok"; + status = "okay"; }; &i2c0 { - status = "ok"; + status = "okay"; }; &i2c1 { - status = "ok"; + status = "okay"; }; &pcie0 { - status = "ok"; + status = "okay"; }; &spi0 { - status = "ok"; + status = "okay"; }; &spi1 { - status = "ok"; + status = "okay"; sdcard0: sdcard@0 { compatible = "mmc-spi-slot"; reg = <0>; diff --git a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts index 07dab1f1e3c8..99205ae1b46b 100644 --- a/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts +++ b/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts @@ -26,7 +26,7 @@ }; &ccp0 { - status = "ok"; + status = "okay"; amd,zlib-support = <1>; }; @@ -34,43 +34,43 @@ * NOTE: In Rev.B, gpio0 is reserved. */ &gpio1 { - status = "ok"; + status = "okay"; }; &gpio2 { - status = "ok"; + status = "okay"; }; &gpio3 { - status = "ok"; + status = "okay"; }; &gpio4 { - status = "ok"; + status = "okay"; }; &i2c0 { - status = "ok"; + status = "okay"; }; &i2c1 { - status = "ok"; + status = "okay"; }; &pcie0 { - status = "ok"; + status = "okay"; }; &sata1 { - status = "ok"; + status = "okay"; }; &spi0 { - status = "ok"; + status = "okay"; }; &spi1 { - status = "ok"; + status = "okay"; sdcard0: sdcard@0 { compatible = "mmc-spi-slot"; reg = <0>; @@ -85,7 +85,7 @@ }; &ipmi_kcs { - status = "ok"; + status = "okay"; }; &smb0 { diff --git a/arch/arm64/boot/dts/apm/apm-merlin.dts b/arch/arm64/boot/dts/apm/apm-merlin.dts index 049e7a5edca7..2e8069002ec1 100644 --- a/arch/arm64/boot/dts/apm/apm-merlin.dts +++ b/arch/arm64/boot/dts/apm/apm-merlin.dts @@ -45,38 +45,38 @@ }; &serial0 { - status = "ok"; + status = "okay"; }; &sata1 { - status = "ok"; + status = "okay"; }; &sata2 { - status = "ok"; + status = "okay"; }; &sata3 { - status = "ok"; + status = "okay"; }; &sgenet0 { - status = "ok"; + status = "okay"; }; &xgenet1 { - status = "ok"; + status = "okay"; }; &mmc0 { - status = "ok"; + status = "okay"; }; &i2c4 { rtc68: rtc@68 { compatible = "dallas,ds1337"; reg = <0x68>; - status = "ok"; + status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts index efac50aeca64..033e10e12b18 100644 --- a/arch/arm64/boot/dts/apm/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm/apm-mustang.dts @@ -45,36 +45,36 @@ }; &pcie0clk { - status = "ok"; + status = "okay"; }; &pcie0 { - status = "ok"; + status = "okay"; }; &serial0 { - status = "ok"; + status = "okay"; }; &menet { - status = "ok"; + status = "okay"; }; &sgenet0 { - status = "ok"; + status = "okay"; }; &sgenet1 { - status = "ok"; + status = "okay"; }; &xgenet { - status = "ok"; + status = "okay"; rxlos-gpios = <&sbgpio 12 1>; }; &mmc0 { - status = "ok"; + status = "okay"; }; &mdio { diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi index a8526f8157ec..70a10bcafcff 100644 --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi @@ -588,7 +588,6 @@ }; serial0: serial@10600000 { - device_type = "serial"; compatible = "ns16550"; reg = <0 0x10600000 0x0 0x1000>; reg-shift = <2>; diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index f56d687f772d..d73e809fe41a 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -270,7 +270,7 @@ reg = <0x0 0x1f22c000 0x0 0x1000>; reg-names = "csr-reg"; clock-output-names = "sataphy2clk"; - status = "ok"; + status = "okay"; csr-offset = <0x4>; csr-mask = <0x3a>; enable-offset = <0x0>; @@ -284,7 +284,7 @@ reg = <0x0 0x1f23c000 0x0 0x1000>; reg-names = "csr-reg"; clock-output-names = "sataphy3clk"; - status = "ok"; + status = "okay"; csr-offset = <0x4>; csr-mask = <0x3a>; enable-offset = <0x0>; @@ -763,7 +763,6 @@ serial0: serial@1c020000 { status = "disabled"; - device_type = "serial"; compatible = "ns16550a"; reg = <0 0x1c020000 0x0 0x1000>; reg-shift = <2>; @@ -774,7 +773,6 @@ serial1: serial@1c021000 { status = "disabled"; - device_type = "serial"; compatible = "ns16550a"; reg = <0 0x1c021000 0x0 0x1000>; reg-shift = <2>; @@ -785,7 +783,6 @@ serial2: serial@1c022000 { status = "disabled"; - device_type = "serial"; compatible = "ns16550a"; reg = <0 0x1c022000 0x0 0x1000>; reg-shift = <2>; @@ -796,7 +793,6 @@ serial3: serial@1c023000 { status = "disabled"; - device_type = "serial"; compatible = "ns16550a"; reg = <0 0x1c023000 0x0 0x1000>; reg-shift = <2>; @@ -864,7 +860,7 @@ reg = <0x0 0x1f22a000 0x0 0x100>; #phy-cells = <1>; clocks = <&sataphy2clk 0>; - status = "ok"; + status = "okay"; apm,tx-boost-gain = <30 30 30 30 30 30>; apm,tx-eye-tuning = <1 10 10 2 10 10>; }; @@ -874,7 +870,7 @@ reg = <0x0 0x1f23a000 0x0 0x100>; #phy-cells = <1>; clocks = <&sataphy3clk 0>; - status = "ok"; + status = "okay"; apm,tx-boost-gain = <31 31 31 31 31 31>; apm,tx-eye-tuning = <2 10 10 2 10 10>; }; @@ -903,7 +899,7 @@ <0x0 0x1f227000 0x0 0x1000>; interrupts = <0x0 0x87 0x4>; dma-coherent; - status = "ok"; + status = "okay"; clocks = <&sata23clk 0>; phys = <&phy2 0>; phy-names = "sata-phy"; @@ -917,7 +913,7 @@ <0x0 0x1f23e000 0x0 0x1000>; interrupts = <0x0 0x88 0x4>; dma-coherent; - status = "ok"; + status = "okay"; clocks = <&sata45clk 0>; phys = <&phy3 0>; phy-names = "sata-phy"; diff --git a/arch/arm64/boot/dts/hisilicon/hip07.dtsi b/arch/arm64/boot/dts/hisilicon/hip07.dtsi index b8746fb959b5..8a9436ca2531 100644 --- a/arch/arm64/boot/dts/hisilicon/hip07.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hip07.dtsi @@ -1254,7 +1254,7 @@ }; }; - uart0: uart@602b0000 { + uart0: serial@602b0000 { compatible = "arm,sbsa-uart"; reg = <0x0 0x602b0000 0x0 0x1000>; interrupt-parent = <&mbigen_uart>; diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi index bf12be5e8d84..ed94a80bf05f 100644 --- a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi +++ b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi @@ -538,7 +538,7 @@ }; &mdio3 { - status = "ok"; + status = "okay"; phy64: ethernet-phy@64 { reg = <28>; }; diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi index ec90bda7ed6a..0760cf2e48bc 100644 --- a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi +++ b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi @@ -208,7 +208,7 @@ }; &mdio0 { - status = "ok"; + status = "okay"; phy0: ethernet-phy@0 { reg = <0>; }; @@ -284,7 +284,7 @@ }; &mdio1 { - status = "ok"; + status = "okay"; phy24: ethernet-phy@24 { reg = <0>; }; @@ -360,7 +360,7 @@ }; &mdio3 { - status = "ok"; + status = "okay"; phy64: ethernet-phy@64 { reg = <28>; }; diff --git a/arch/arm64/boot/dts/realtek/rtd16xx.dtsi b/arch/arm64/boot/dts/realtek/rtd16xx.dtsi index afba5f04c8ec..bf4d9e917925 100644 --- a/arch/arm64/boot/dts/realtek/rtd16xx.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd16xx.dtsi @@ -195,7 +195,7 @@ }; &iso { - uart0: serial0@800 { + uart0: serial@800 { compatible = "snps,dw-apb-uart"; reg = <0x800 0x400>; reg-shift = <2>; @@ -207,7 +207,7 @@ }; &misc { - uart1: serial1@200 { + uart1: serial@200 { compatible = "snps,dw-apb-uart"; reg = <0x200 0x400>; reg-shift = <2>; @@ -217,7 +217,7 @@ status = "disabled"; }; - uart2: serial2@400 { + uart2: serial@400 { compatible = "snps,dw-apb-uart"; reg = <0x400 0x400>; reg-shift = <2>; diff --git a/arch/arm64/boot/dts/synaptics/berlin4ct.dtsi b/arch/arm64/boot/dts/synaptics/berlin4ct.dtsi index 0949acee4728..dc12350b9fc8 100644 --- a/arch/arm64/boot/dts/synaptics/berlin4ct.dtsi +++ b/arch/arm64/boot/dts/synaptics/berlin4ct.dtsi @@ -289,7 +289,7 @@ }; }; - uart0: uart@d000 { + uart0: serial@d000 { compatible = "snps,dw-apb-uart"; reg = <0xd000 0x100>; interrupts = <8>; |