arm64: tegra: Various minor device tree fixes
Subsystems (2)
cover arm64: tegra: Various minor device tree fixes
From: Thierry Reding <[email protected]>
This contains a number of minor fixes to various 64-bit Tegra device tree files that are required for proper DT validation.
Thierry
Thierry Reding (5):
arm64: tegra: Add missing current-speed for SBSA UART
arm64: tegra: Remove duplicate nodes on Jetson Orin NX
arm64: tegra: Use correct format for clocks property
arm64: tegra: Add dmas and dma-names for Tegra234 UARTE
arm64: tegra: Mark Tegra234 SPI as compatible with Tegra114
.../nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 + .../nvidia/tegra234-p3768-0000+p3767-0000.dts | 11 ----- .../boot/dts/nvidia/tegra234-p3768-0000.dtsi | 1 + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 40 ++++++++++--------- 4 files changed, 23 insertions(+), 30 deletions(-)
Signature · 7 lines
2.41.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/5 arm64: tegra: Add missing current-speed for SBSA UART
From: Thierry Reding <[email protected]>
The SBSA UART device tree bindings require a current-speed property that specifies the baud rate configured by the firmware. Add it on Jetson AGX Orin and Jetson Orin Nano/NX.
--- arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 + arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi | 1 + 2 files changed, 2 insertions(+)
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +1 -0
@@ -121,6 +121,7 @@ serial@3100000 { }; serial@31d0000 { + current-speed = <115200>; status = "okay"; };
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi +1 -0
@@ -31,6 +31,7 @@ eeprom@57 { }; serial@31d0000 { + current-speed = <115200>; status = "okay"; };
Signature · 7 lines
2.41.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 2/5 arm64: tegra: Remove duplicate nodes on Jetson Orin NX
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The SBSA UART and TCU as well as the TCU alias and the stdout-path are configured via the P3768 carrier board DTS include, so the can be removed from the system DTS file.
--- .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 11 ----------- 1 file changed, 11 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts +0 -11
@@ -24,14 +24,11 @@ fb: framebuffer@0 { }; aliases { - serial0 = &tcu; serial1 = &uarta; serial2 = &uarte; }; chosen { - stdout-path = "serial0:115200n8"; - framebuffer { compatible = "simple-framebuffer"; status = "disabled";
@@ -126,10 +123,6 @@ serial@3140000 { status = "okay"; }; - serial@31d0000 { - status = "okay"; - }; - pwm@32a0000 { assigned-clocks = <&bpmp TEGRA234_CLK_PWM3>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
@@ -186,10 +179,6 @@ vdd_3v3_pcie: regulator-vdd-3v3-pcie { enable-active-high; }; - serial { - status = "okay"; - }; - thermal-zones { tj-thermal { cooling-maps {
Signature · 1 line
2.41.0
PATCH 3/5 arm64: tegra: Use correct format for clocks property
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
phandle and clock specifier pairs should be enclosed in angular brackets.
--- arch/arm64/boot/dts/nvidia/tegra234.dtsi | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234.dtsi +16 -16
@@ -743,8 +743,8 @@ gen1_i2c: i2c@3160000 { #address-cells = <1>; #size-cells = <0>; clock-frequency = <400000>; - clocks = <&bpmp TEGRA234_CLK_I2C1 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C1>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; assigned-clocks = <&bpmp TEGRA234_CLK_I2C1>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent";
@@ -762,8 +762,8 @@ cam_i2c: i2c@3180000 { #size-cells = <0>; status = "disabled"; clock-frequency = <400000>; - clocks = <&bpmp TEGRA234_CLK_I2C3 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C3>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; assigned-clocks = <&bpmp TEGRA234_CLK_I2C3>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent";
@@ -781,8 +781,8 @@ dp_aux_ch1_i2c: i2c@3190000 { #size-cells = <0>; status = "disabled"; clock-frequency = <100000>; - clocks = <&bpmp TEGRA234_CLK_I2C4 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C4>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; assigned-clocks = <&bpmp TEGRA234_CLK_I2C4>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent";
@@ -800,8 +800,8 @@ dp_aux_ch0_i2c: i2c@31b0000 { #size-cells = <0>; status = "disabled"; clock-frequency = <100000>; - clocks = <&bpmp TEGRA234_CLK_I2C6 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C6>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; assigned-clocks = <&bpmp TEGRA234_CLK_I2C6>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent";
@@ -819,8 +819,8 @@ dp_aux_ch2_i2c: i2c@31c0000 { #size-cells = <0>; status = "disabled"; clock-frequency = <100000>; - clocks = <&bpmp TEGRA234_CLK_I2C7 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C7>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; assigned-clocks = <&bpmp TEGRA234_CLK_I2C7>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent";
@@ -845,8 +845,8 @@ dp_aux_ch3_i2c: i2c@31e0000 { #size-cells = <0>; status = "disabled"; clock-frequency = <100000>; - clocks = <&bpmp TEGRA234_CLK_I2C9 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C9>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; assigned-clocks = <&bpmp TEGRA234_CLK_I2C9>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent";
@@ -1810,8 +1810,8 @@ gen2_i2c: i2c@c240000 { #size-cells = <0>; status = "disabled"; clock-frequency = <100000>; - clocks = <&bpmp TEGRA234_CLK_I2C2 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C2>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent"; assigned-clocks = <&bpmp TEGRA234_CLK_I2C2>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
@@ -1829,8 +1829,8 @@ gen8_i2c: i2c@c250000 { #size-cells = <0>; status = "disabled"; clock-frequency = <400000>; - clocks = <&bpmp TEGRA234_CLK_I2C8 - &bpmp TEGRA234_CLK_PLLP_OUT0>; + clocks = <&bpmp TEGRA234_CLK_I2C8>, + <&bpmp TEGRA234_CLK_PLLP_OUT0>; clock-names = "div-clk", "parent"; assigned-clocks = <&bpmp TEGRA234_CLK_I2C8>; assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
Signature · 1 line
2.41.0
PATCH 4/5 arm64: tegra: Add dmas and dma-names for Tegra234 UARTE
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Commit 940acdac99b2 ("arm64: tegra: Add UARTE device tree node on Tegra234") added the device tree node for the UARTE on Tegra234 but didn't include the "dmas" and "dma-names" properties required for this device when it's used in high-speed mode.
--- arch/arm64/boot/dts/nvidia/tegra234.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/nvidia/tegra234.dtsi +2 -0
@@ -732,6 +732,8 @@ uarte: serial@3140000 { interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; clocks = <&bpmp TEGRA234_CLK_UARTE>; resets = <&bpmp TEGRA234_RESET_UARTE>; + dmas = <&gpcdma 20>, <&gpcdma 20>; + dma-names = "rx", "tx"; status = "disabled"; };
Signature · 1 line
2.41.0
PATCH 5/5 arm64: tegra: Mark Tegra234 SPI as compatible with Tegra114
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
According to the bindings, both Tegra210 and Tegra114 compatible strings need to be specified since the version of this hardware block found in Tegra210 is backwards-compatible.
--- arch/arm64/boot/dts/nvidia/tegra234.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234.dtsi +3 -3
@@ -859,7 +859,7 @@ dp_aux_ch3_i2c: i2c@31e0000 { }; spi@3210000 { - compatible = "nvidia,tegra210-spi"; + compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi"; reg = <0x0 0x03210000 0x0 0x1000>; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>;
@@ -878,7 +878,7 @@ spi@3210000 { }; spi@3230000 { - compatible = "nvidia,tegra210-spi"; + compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi"; reg = <0x0 0x03230000 0x0 0x1000>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>;
@@ -1843,7 +1843,7 @@ gen8_i2c: i2c@c250000 { }; spi@c260000 { - compatible = "nvidia,tegra210-spi"; + compatible = "nvidia,tegra210-spi", "nvidia,tegra114-spi"; reg = <0x0 0x0c260000 0x0 0x1000>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>;
Signature · 1 line
2.41.0