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

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

Browse Source 
Minor improvements in ARM64 DTS for v6.3, part two

1. Drop deprecated "device_type" property from serial nodes (apm,
   amazon).
2. Align UART node names and OPP table names with bindings (hisilicon,
   realtek, synaptics).
3. Use "okay" for status, as expected by Devicetree specification and
   dtschema.

* tag 'dt64-cleanup-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  arm64: dts: amd: use "okay" for status
  arm64: dts: apm: use "okay" for status
  arm64: dts: microchip: use "okay" for status
  arm64: dts: synaptics: align UART node name with bindings
  arm64: dts: hisilicon: align UART node name with bindings
  arm64: dts: realtek: align UART node name with bindings
  arm64: dts: amazon: drop deprecated serial device_type
  arm64: dts: apm: drop deprecated serial device_type

Link: https://lore.kernel.org/r/20230129144525.5802-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-01-30 22:59:59 +01:00
parent 5868fc77e2 9f2c917093
commit 54a39a28ae
12 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/amazon/alpine-v2.dtsi
View File

@@ -159,7 +159,6 @@ io-fabric {
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 @@ uart0: serial@1883000 {
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 @@ uart1: serial@1884000 {
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 @@ uart2: serial@1885000 {
uart3: serial@1886000 {
compatible = "ns16550a";
device_type = "serial";
reg = <0x1886000 0x1000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <500000000>;

16
arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
View File

@@ -26,7 +26,7 @@ psci {
};
&ccp0 {
status = "ok";
status = "okay";
amd,zlib-support = <1>;
};
@@ -34,31 +34,31 @@ &ccp0 {
* 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>;

24
arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
View File

@@ -26,7 +26,7 @@ psci {
};
&ccp0 {
status = "ok";
status = "okay";
amd,zlib-support = <1>;
};
@@ -34,43 +34,43 @@ &ccp0 {
* 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 @@ sdcard0: sdcard@0 {
};
&ipmi_kcs {
status = "ok";
status = "okay";
};
&smb0 {

16
arch/arm64/boot/dts/apm/apm-merlin.dts
View File

@@ -45,38 +45,38 @@ poweroff: poweroff@10548010 {
};
&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";
};
};

16
arch/arm64/boot/dts/apm/apm-mustang.dts
View File

@@ -45,36 +45,36 @@ poweroff: poweroff@10548010 {
};
&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 {

1
arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
View File

@@ -588,7 +588,6 @@ hwmonslimpro {
};
serial0: serial@10600000 {
device_type = "serial";
compatible = "ns16550";
reg = <0 0x10600000 0x0 0x1000>;
reg-shift = <2>;

16
arch/arm64/boot/dts/apm/apm-storm.dtsi
View File

@@ -270,7 +270,7 @@ sataphy2clk: sataphy1clk@1f22c000 {
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 @@ sataphy3clk: sataphy1clk@1f23c000 {
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 @@ hwmonslimpro {
serial0: serial@1c020000 {
status = "disabled";
device_type = "serial";
compatible = "ns16550a";
reg = <0 0x1c020000 0x0 0x1000>;
reg-shift = <2>;
@@ -774,7 +773,6 @@ serial0: serial@1c020000 {
serial1: serial@1c021000 {
status = "disabled";
device_type = "serial";
compatible = "ns16550a";
reg = <0 0x1c021000 0x0 0x1000>;
reg-shift = <2>;
@@ -785,7 +783,6 @@ serial1: serial@1c021000 {
serial2: serial@1c022000 {
status = "disabled";
device_type = "serial";
compatible = "ns16550a";
reg = <0 0x1c022000 0x0 0x1000>;
reg-shift = <2>;
@@ -796,7 +793,6 @@ serial2: serial@1c022000 {
serial3: serial@1c023000 {
status = "disabled";
device_type = "serial";
compatible = "ns16550a";
reg = <0 0x1c023000 0x0 0x1000>;
reg-shift = <2>;
@@ -864,7 +860,7 @@ phy2: phy@1f22a000 {
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 @@ phy3: phy@1f23a000 {
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 @@ sata2: sata@1a400000 {
<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 @@ sata3: sata@1a800000 {
<0x0 0x1f23e000 0x0 0x1000>;
interrupts = <0x0 0x88 0x4>;
dma-coherent;
status = "ok";
status = "okay";
clocks = <&sata45clk 0>;
phys = <&phy3 0>;
phy-names = "sata-phy";

2
arch/arm64/boot/dts/hisilicon/hip07.dtsi
View File

@@ -1254,7 +1254,7 @@ ipmi0: bt@e4 {
};
};
uart0: uart@602b0000 {
uart0: serial@602b0000 {
compatible = "arm,sbsa-uart";
reg = <0x0 0x602b0000 0x0 0x1000>;
interrupt-parent = <&mbigen_uart>;

2
arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
View File

@@ -538,7 +538,7 @@ i2c_sfp20: i2c_sfp20 {
};
&mdio3 {
status = "ok";
status = "okay";
phy64: ethernet-phy@64 {
reg = <28>;
};

6
arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
View File

@@ -208,7 +208,7 @@ sfp_eth63: sfp-eth63 {
};
&mdio0 {
status = "ok";
status = "okay";
phy0: ethernet-phy@0 {
reg = <0>;
};
@@ -284,7 +284,7 @@ phy23: ethernet-phy@23 {
};
&mdio1 {
status = "ok";
status = "okay";
phy24: ethernet-phy@24 {
reg = <0>;
};
@@ -360,7 +360,7 @@ phy47: ethernet-phy@47 {
};
&mdio3 {
status = "ok";
status = "okay";
phy64: ethernet-phy@64 {
reg = <28>;
};

6
arch/arm64/boot/dts/realtek/rtd16xx.dtsi
View File

@@ -195,7 +195,7 @@ gic: interrupt-controller@ff100000 {
};
&iso {
uart0: serial0@800 {
uart0: serial@800 {
compatible = "snps,dw-apb-uart";
reg = <0x800 0x400>;
reg-shift = <2>;
@@ -207,7 +207,7 @@ uart0: serial0@800 {
};
&misc {
uart1: serial1@200 {
uart1: serial@200 {
compatible = "snps,dw-apb-uart";
reg = <0x200 0x400>;
reg-shift = <2>;
@@ -217,7 +217,7 @@ uart1: serial1@200 {
status = "disabled";
};
uart2: serial2@400 {
uart2: serial@400 {
compatible = "snps,dw-apb-uart";
reg = <0x400 0x400>;
reg-shift = <2>;

2
arch/arm64/boot/dts/synaptics/berlin4ct.dtsi
View File

@@ -289,7 +289,7 @@ portf: gpio-port@5 {
};
};
uart0: uart@d000 {
uart0: serial@d000 {
compatible = "snps,dw-apb-uart";
reg = <0xd000 0x100>;
interrupts = <8>;