Skip to content

L
linux
Commit c4558562 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

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

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

Minor improvements in ARM DTS for v6.5

Minor improvements to fix dtbs_check warnings:
1. STE: Align UART nodes with bindings.
2. EN7523: add missing cache properties.

* tag 'dt-cleanup-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  ARM: dts: en7523: add missing cache properties
  ARM: dts: ste: align UART node name with bindings

Link: https://lore.kernel.org/r/20230517131255.471002-2-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6a023136 21f47594
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 36 deletions
arch/arm/boot/dts/en7523.dtsi
View file @ c4558562
......@@ -81,6 +81,8 @@ cpu1: cpu@1 {
L2_0: l2-cache0 {
compatible = "cache";
cache-level = <2>;
cache-unified;
};
};
......
arch/arm/boot/dts/ste-dbx5x0.dtsi
View file @ c4558562
......@@ -852,7 +852,7 @@ spi3: spi@80129000 {
status = "disabled";
};
serial0: uart@80120000 {
serial0: serial@80120000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x80120000 0x1000>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
......@@ -868,7 +868,7 @@ serial0: uart@80120000 {
status = "disabled";
};
serial1: uart@80121000 {
serial1: serial@80121000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x80121000 0x1000>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
......@@ -884,7 +884,7 @@ serial1: uart@80121000 {
status = "disabled";
};
serial2: uart@80007000 {
serial2: serial@80007000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x80007000 0x1000>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/ste-href.dtsi
View file @ c4558562
......@@ -45,7 +45,7 @@ bat_therm: thermistor {
};
soc {
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -53,13 +53,13 @@ uart@80120000 {
};
/* This UART is unused and thus left disabled */
uart@80121000 {
serial@80121000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default>;
pinctrl-1 = <&u1rxtx_a_1_sleep>;
};
uart@80007000 {
serial@80007000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
pinctrl-1 = <&u2rxtx_c_1_sleep>;
......
arch/arm/boot/dts/ste-hrefprev60.dtsi
View file @ c4558562
......@@ -17,7 +17,7 @@ button@1 {
soc {
/* Enable UART1 on this board */
uart@80121000 {
serial@80121000 {
status = "okay";
};
......
arch/arm/boot/dts/ste-nomadik-nhk15.dts
View file @ c4558562
......@@ -190,7 +190,7 @@ nomadik_clcd: endpoint {
};
/* Activate RX/TX and CTS/RTS on UART 0 */
uart0: uart@101fd000 {
uart0: serial@101fd000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_nhk_mode>;
status = "okay";
......
arch/arm/boot/dts/ste-nomadik-s8815.dts
View file @ c4558562
......@@ -133,7 +133,7 @@ stw4811@2d {
amba {
/* Activate RXTX on UART 0 */
uart0: uart@101fd000 {
uart0: serial@101fd000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_s8815_mode>;
status = "okay";
......
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
View file @ c4558562
......@@ -769,7 +769,7 @@ vicb: interrupt-controller@10140020 {
reg = <0x10140020 0x20>;
};
uart0: uart@101fd000 {
uart0: serial@101fd000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101fd000 0x1000>;
interrupt-parent = <&vica>;
......@@ -782,7 +782,7 @@ uart0: uart@101fd000 {
dma-names = "rx", "tx";
};
uart1: uart@101fb000 {
uart1: serial@101fb000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101fb000 0x1000>;
interrupt-parent = <&vica>;
......@@ -796,7 +796,7 @@ uart1: uart@101fb000 {
dma-names = "rx", "tx";
};
uart2: uart@101f2000 {
uart2: serial@101f2000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f2000 0x1000>;
interrupt-parent = <&vica>;
......
arch/arm/boot/dts/ste-snowball.dts
View file @ c4558562
......@@ -308,7 +308,7 @@ mmc@80114000 {
status = "okay";
};
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -316,13 +316,13 @@ uart@80120000 {
};
/* This UART is unused and thus left disabled */
uart@80121000 {
serial@80121000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default>;
pinctrl-1 = <&u1rxtx_a_1_sleep>;
};
uart@80007000 {
serial@80007000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
pinctrl-1 = <&u2rxtx_c_1_sleep>;
......
arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts
View file @ c4558562
......@@ -369,7 +369,7 @@ mmc@80005000 {
};
/* GBF (Bluetooth) UART */
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -393,7 +393,7 @@ bluetooth {
};
/* GPS UART */
uart@80121000 {
serial@80121000 {
status = "okay";
pinctrl-names = "default", "sleep";
/* CTS/RTS is not used, CTS is repurposed as GPIO */
......@@ -403,7 +403,7 @@ uart@80121000 {
};
/* Debugging console UART connected to AB8505 */
uart@80007000 {
serial@80007000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
......
arch/arm/boot/dts/ste-ux500-samsung-codina.dts
View file @ c4558562
......@@ -462,7 +462,7 @@ mmc@80005000 {
};
/* GBF (Bluetooth) UART */
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -485,7 +485,7 @@ bluetooth {
};
/* GPS UART */
uart@80121000 {
serial@80121000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default &u1ctsrts_a_1_default>;
......@@ -505,7 +505,7 @@ gnss {
};
/* Debugging console UART connected to TSU6111RSVR (FSA880) */
uart@80007000 {
serial@80007000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
......
arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
View file @ c4558562
......@@ -417,7 +417,7 @@ mmc@80005000 {
};
/* GBF (Bluetooth) UART */
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -439,7 +439,7 @@ bluetooth {
};
/* GPS UART */
uart@80121000 {
serial@80121000 {
status = "okay";
pinctrl-names = "default", "sleep";
/* CTS/RTS is not used, CTS is repurposed as GPIO */
......@@ -449,7 +449,7 @@ uart@80121000 {
};
/* Debugging console UART connected to TSU6111RSVR (FSA880) */
uart@80007000 {
serial@80007000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
......
arch/arm/boot/dts/ste-ux500-samsung-golden.dts
View file @ c4558562
......@@ -186,7 +186,7 @@ mmc@80005000 {
};
/* BT UART */
uart@80120000 {
serial@80120000 {
status = "okay";
pinctrl-names = "default", "sleep";
......@@ -209,7 +209,7 @@ bluetooth {
};
/* GPF UART */
uart@80121000 {
serial@80121000 {
status = "okay";
pinctrl-names = "default", "sleep";
......@@ -218,7 +218,7 @@ uart@80121000 {
};
/* Debugging console UART */
uart@80007000 {
serial@80007000 {
status = "okay";
pinctrl-names = "default", "sleep";
......
arch/arm/boot/dts/ste-ux500-samsung-janice.dts
View file @ c4558562
......@@ -467,7 +467,7 @@ mmc@80005000 {
};
/* GBF (Bluetooth) UART */
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -491,7 +491,7 @@ bluetooth {
};
/* GPS UART */
uart@80121000 {
serial@80121000 {
status = "okay";
pinctrl-names = "default", "sleep";
/* CTS/RTS is not used, CTS is repurposed as GPIO */
......@@ -520,7 +520,7 @@ gnss {
};
/* Debugging console UART connected to TSU6111RSVR (FSA880) */
uart@80007000 {
serial@80007000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
......
arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
View file @ c4558562
......@@ -292,7 +292,7 @@ mmc@80005000 {
};
/* GBF (Bluetooth) UART */
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -310,7 +310,7 @@ bluetooth {
};
/* GPF UART */
uart@80121000 {
serial@80121000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default &u1ctsrts_a_1_default>;
......@@ -333,7 +333,7 @@ gnss {
};
/* Debugging console UART connected to AB8505 USB */
uart@80007000 {
serial@80007000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
......
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
View file @ c4558562
......@@ -271,7 +271,7 @@ mmc@80005000 {
};
/* GBF (Bluetooth) UART */
uart@80120000 {
serial@80120000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
......@@ -290,7 +290,7 @@ bluetooth {
};
/* GPS UART */
uart@80121000 {
serial@80121000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default &u1ctsrts_a_1_default>;
......@@ -313,7 +313,7 @@ gnss {
};
/* Debugging console UART connected to AB8505 USB */
uart@80007000 {
serial@80007000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7