Patches add labels into t30 and t114 dtsi for easier
node referencing. Quotes for mmc devices are replaced
with labels for better tree comprehension. Fixed
accelerometer mount matrix for TF101. Added 266.5MHz
peripheral opp node for devices which may need it.
Anton Bambura (1):
ARM: tegra: Add labels to tegra114.dtsi
Michał Mirosław (1):
ARM: tegra: Add labels to tegra30.dtsi
Svyatoslav Ryhel (3):
ARM: tegra: transformer: use labels for mmc in aliases
ARM: tegra: asus-tf101: fix accelerometer mount matrix
tegra30: peripherals: add 266.5MHz nodes
arch/arm/boot/dts/tegra114.dtsi | 48 +++++++++----------
arch/arm/boot/dts/tegra20-asus-tf101.dts | 6 +--
.../dts/tegra30-asus-transformer-common.dtsi | 6 +--
.../arm/boot/dts/tegra30-peripherals-opp.dtsi | 20 ++++++++
arch/arm/boot/dts/tegra30.dtsi | 36 +++++++-------
5 files changed, 68 insertions(+), 48 deletions(-)
--
2.37.2
From: Michał Mirosław <[email protected]>
Add phandle names for memory/I2C/SPI/USB/SDMMC controller nodes to allow
for cleaner device descriptions.
Signed-off-by: Michał Mirosław <[email protected]>
Signed-off-by: Dmitry Osipenko <[email protected]>
---
arch/arm/boot/dts/tegra30.dtsi | 36 +++++++++++++++++-----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 9dab8d2c158a..1cdc64fa1463 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -655,7 +655,7 @@ rtc@7000e000 {
clocks = <&tegra_car TEGRA30_CLK_RTC>;
};
- i2c@7000c000 {
+ i2c1: i2c@7000c000 {
compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
reg = <0x7000c000 0x100>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
@@ -671,7 +671,7 @@ i2c@7000c000 {
status = "disabled";
};
- i2c@7000c400 {
+ i2c2: i2c@7000c400 {
compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
reg = <0x7000c400 0x100>;
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -687,7 +687,7 @@ i2c@7000c400 {
status = "disabled";
};
- i2c@7000c500 {
+ i2c3: i2c@7000c500 {
compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
reg = <0x7000c500 0x100>;
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -703,7 +703,7 @@ i2c@7000c500 {
status = "disabled";
};
- i2c@7000c700 {
+ i2c4: i2c@7000c700 {
compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
reg = <0x7000c700 0x100>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
@@ -719,7 +719,7 @@ i2c@7000c700 {
status = "disabled";
};
- i2c@7000d000 {
+ i2c5: i2c@7000d000 {
compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
reg = <0x7000d000 0x100>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@@ -735,7 +735,7 @@ i2c@7000d000 {
status = "disabled";
};
- spi@7000d400 {
+ spi1: spi@7000d400 {
compatible = "nvidia,tegra30-slink";
reg = <0x7000d400 0x200>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -751,7 +751,7 @@ spi@7000d400 {
status = "disabled";
};
- spi@7000d600 {
+ spi2: spi@7000d600 {
compatible = "nvidia,tegra30-slink";
reg = <0x7000d600 0x200>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -767,7 +767,7 @@ spi@7000d600 {
status = "disabled";
};
- spi@7000d800 {
+ spi3: spi@7000d800 {
compatible = "nvidia,tegra30-slink";
reg = <0x7000d800 0x200>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -783,7 +783,7 @@ spi@7000d800 {
status = "disabled";
};
- spi@7000da00 {
+ spi4: spi@7000da00 {
compatible = "nvidia,tegra30-slink";
reg = <0x7000da00 0x200>;
interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@@ -799,7 +799,7 @@ spi@7000da00 {
status = "disabled";
};
- spi@7000dc00 {
+ spi5: spi@7000dc00 {
compatible = "nvidia,tegra30-slink";
reg = <0x7000dc00 0x200>;
interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
@@ -815,7 +815,7 @@ spi@7000dc00 {
status = "disabled";
};
- spi@7000de00 {
+ spi6: spi@7000de00 {
compatible = "nvidia,tegra30-slink";
reg = <0x7000de00 0x200>;
interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
@@ -1064,7 +1064,7 @@ tegra_i2s4: i2s@70080700 {
};
};
- mmc@78000000 {
+ sdmmc1: mmc@78000000 {
compatible = "nvidia,tegra30-sdhci";
reg = <0x78000000 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -1077,7 +1077,7 @@ mmc@78000000 {
status = "disabled";
};
- mmc@78000200 {
+ sdmmc2: mmc@78000200 {
compatible = "nvidia,tegra30-sdhci";
reg = <0x78000200 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -1088,7 +1088,7 @@ mmc@78000200 {
status = "disabled";
};
- mmc@78000400 {
+ sdmmc3: mmc@78000400 {
compatible = "nvidia,tegra30-sdhci";
reg = <0x78000400 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1101,7 +1101,7 @@ mmc@78000400 {
status = "disabled";
};
- mmc@78000600 {
+ sdmmc4: mmc@78000600 {
compatible = "nvidia,tegra30-sdhci";
reg = <0x78000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
@@ -1112,7 +1112,7 @@ mmc@78000600 {
status = "disabled";
};
- usb@7d000000 {
+ usb1: usb@7d000000 {
compatible = "nvidia,tegra30-ehci";
reg = <0x7d000000 0x4000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
@@ -1156,7 +1156,7 @@ phy1: usb-phy@7d000000 {
status = "disabled";
};
- usb@7d004000 {
+ usb2: usb@7d004000 {
compatible = "nvidia,tegra30-ehci";
reg = <0x7d004000 0x4000>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
@@ -1198,7 +1198,7 @@ phy2: usb-phy@7d004000 {
status = "disabled";
};
- usb@7d008000 {
+ usb3: usb@7d008000 {
compatible = "nvidia,tegra30-ehci";
reg = <0x7d008000 0x4000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
--
2.37.2
Since mmc devices in common dtsi are labeled let's use labels
for simpler comprehension of tree.
Signed-off-by: Svyatoslav Ryhel <[email protected]>
---
arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
index 08ea9cb32d0e..70f7f279fd35 100644
--- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
+++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi
@@ -12,9 +12,9 @@ / {
chassis-type = "convertible";
aliases {
- mmc0 = "/mmc@78000600"; /* eMMC */
- mmc1 = "/mmc@78000000"; /* uSD slot */
- mmc2 = "/mmc@78000400"; /* WiFi */
+ mmc0 = &sdmmc4; /* eMMC */
+ mmc1 = &sdmmc1; /* uSD slot */
+ mmc2 = &sdmmc3; /* WiFi */
rtc0 = &pmic;
rtc1 = "/rtc@7000e000";
--
2.37.2
Accelerometer mount matrix used in tf101 downstream is inverted.
This new matrix was generated on actual device using calibration
script, like on other transformers.
Tested-by: Robert Eckelmann <[email protected]>
Signed-off-by: Svyatoslav Ryhel <[email protected]>
---
arch/arm/boot/dts/tegra20-asus-tf101.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/tegra20-asus-tf101.dts b/arch/arm/boot/dts/tegra20-asus-tf101.dts
index c39ddb462ad0..588845965f99 100644
--- a/arch/arm/boot/dts/tegra20-asus-tf101.dts
+++ b/arch/arm/boot/dts/tegra20-asus-tf101.dts
@@ -577,9 +577,9 @@ accelerometer@f {
vdd-supply = <&vdd_1v8_sys>;
vddio-supply = <&vdd_1v8_sys>;
- mount-matrix = "1", "0", "0",
- "0", "1", "0",
- "0", "0", "1";
+ mount-matrix = "-1", "0", "0",
+ "0", "-1", "0",
+ "0", "0", "-1";
};
};
};
--
2.37.2
From: Anton Bambura <[email protected]>
Add more labels in order to use label reference in device-specific
dts files. Labels make device-trees more readable and prevent typos
that are difficult to notice.
Signed-off-by: Anton Bambura <[email protected]>
Signed-off-by: Dmitry Osipenko <[email protected]>
---
arch/arm/boot/dts/tegra114.dtsi | 48 ++++++++++++++++-----------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index 09996acad639..76c52d0b518a 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -106,7 +106,7 @@ rgb {
};
};
- hdmi@54280000 {
+ hdmi: hdmi@54280000 {
compatible = "nvidia,tegra114-hdmi";
reg = <0x54280000 0x00040000>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
@@ -370,7 +370,7 @@ pwm: pwm@7000a000 {
status = "disabled";
};
- i2c@7000c000 {
+ i2c1: i2c@7000c000 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c000 0x100>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
@@ -385,7 +385,7 @@ i2c@7000c000 {
status = "disabled";
};
- i2c@7000c400 {
+ i2c2: i2c@7000c400 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c400 0x100>;
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
@@ -400,7 +400,7 @@ i2c@7000c400 {
status = "disabled";
};
- i2c@7000c500 {
+ i2c3: i2c@7000c500 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c500 0x100>;
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -415,7 +415,7 @@ i2c@7000c500 {
status = "disabled";
};
- i2c@7000c700 {
+ i2c4: i2c@7000c700 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000c700 0x100>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
@@ -430,7 +430,7 @@ i2c@7000c700 {
status = "disabled";
};
- i2c@7000d000 {
+ i2c5: i2c@7000d000 {
compatible = "nvidia,tegra114-i2c";
reg = <0x7000d000 0x100>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@@ -445,7 +445,7 @@ i2c@7000d000 {
status = "disabled";
};
- spi@7000d400 {
+ spi1: spi@7000d400 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000d400 0x200>;
interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
@@ -460,7 +460,7 @@ spi@7000d400 {
status = "disabled";
};
- spi@7000d600 {
+ spi2: spi@7000d600 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000d600 0x200>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -475,7 +475,7 @@ spi@7000d600 {
status = "disabled";
};
- spi@7000d800 {
+ spi3: spi@7000d800 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000d800 0x200>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -490,7 +490,7 @@ spi@7000d800 {
status = "disabled";
};
- spi@7000da00 {
+ spi4: spi@7000da00 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000da00 0x200>;
interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
@@ -505,7 +505,7 @@ spi@7000da00 {
status = "disabled";
};
- spi@7000dc00 {
+ spi5: spi@7000dc00 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000dc00 0x200>;
interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
@@ -520,7 +520,7 @@ spi@7000dc00 {
status = "disabled";
};
- spi@7000de00 {
+ spi6: spi@7000de00 {
compatible = "nvidia,tegra114-spi";
reg = <0x7000de00 0x200>;
interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
@@ -535,14 +535,14 @@ spi@7000de00 {
status = "disabled";
};
- rtc@7000e000 {
+ tegra_rtc: rtc@7000e000 {
compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc";
reg = <0x7000e000 0x100>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&tegra_car TEGRA114_CLK_RTC>;
};
- kbc@7000e200 {
+ tegra_kbc: kbc@7000e200 {
compatible = "nvidia,tegra114-kbc";
reg = <0x7000e200 0x100>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
@@ -682,7 +682,7 @@ mipi: mipi@700e3000 {
#nvidia,mipi-calibrate-cells = <1>;
};
- mmc@78000000 {
+ sdmmc1: mmc@78000000 {
compatible = "nvidia,tegra114-sdhci";
reg = <0x78000000 0x200>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -693,7 +693,7 @@ mmc@78000000 {
status = "disabled";
};
- mmc@78000200 {
+ sdmmc2: mmc@78000200 {
compatible = "nvidia,tegra114-sdhci";
reg = <0x78000200 0x200>;
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -704,7 +704,7 @@ mmc@78000200 {
status = "disabled";
};
- mmc@78000400 {
+ sdmmc3: mmc@78000400 {
compatible = "nvidia,tegra114-sdhci";
reg = <0x78000400 0x200>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -715,7 +715,7 @@ mmc@78000400 {
status = "disabled";
};
- mmc@78000600 {
+ sdmmc4: mmc@78000600 {
compatible = "nvidia,tegra114-sdhci";
reg = <0x78000600 0x200>;
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
@@ -726,7 +726,7 @@ mmc@78000600 {
status = "disabled";
};
- usb@7d000000 {
+ usb1: usb@7d000000 {
compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci";
reg = <0x7d000000 0x4000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
@@ -734,11 +734,11 @@ usb@7d000000 {
clocks = <&tegra_car TEGRA114_CLK_USBD>;
resets = <&tegra_car 22>;
reset-names = "usb";
- nvidia,phy = <&phy1>;
+ nvidia,phy = <&usb1_phy>;
status = "disabled";
};
- phy1: usb-phy@7d000000 {
+ usb1_phy: usb-phy@7d000000 {
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d000000 0x4000>,
<0x7d000000 0x4000>;
@@ -766,7 +766,7 @@ phy1: usb-phy@7d000000 {
status = "disabled";
};
- usb@7d008000 {
+ usb3: usb@7d008000 {
compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci";
reg = <0x7d008000 0x4000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
@@ -774,11 +774,11 @@ usb@7d008000 {
clocks = <&tegra_car TEGRA114_CLK_USB3>;
resets = <&tegra_car 59>;
reset-names = "usb";
- nvidia,phy = <&phy3>;
+ nvidia,phy = <&usb3_phy>;
status = "disabled";
};
- phy3: usb-phy@7d008000 {
+ usb3_phy: usb-phy@7d008000 {
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d008000 0x4000>,
<0x7d000000 0x4000>;
--
2.37.2
Some devices may require this entry for proper work.
Signed-off-by: Svyatoslav Ryhel <[email protected]>
---
.../arm/boot/dts/tegra30-peripherals-opp.dtsi | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm/boot/dts/tegra30-peripherals-opp.dtsi b/arch/arm/boot/dts/tegra30-peripherals-opp.dtsi
index d100a1a8b705..a2d557155114 100644
--- a/arch/arm/boot/dts/tegra30-peripherals-opp.dtsi
+++ b/arch/arm/boot/dts/tegra30-peripherals-opp.dtsi
@@ -210,6 +210,20 @@ opp-204000000-1250 {
opp-suspend;
};
+ opp-266500000-1000 {
+ opp-microvolt = <1000000 1000000 1350000>;
+ opp-hz = /bits/ 64 <266500000>;
+ opp-supported-hw = <0x0007>;
+ required-opps = <&core_opp_1000>;
+ };
+
+ opp-266500000-1250 {
+ opp-microvolt = <1250000 1250000 1350000>;
+ opp-hz = /bits/ 64 <266500000>;
+ opp-supported-hw = <0x0008>;
+ required-opps = <&core_opp_1250>;
+ };
+
opp-333500000-1000 {
opp-microvolt = <1000000 1000000 1350000>;
opp-hz = /bits/ 64 <333500000>;
@@ -424,6 +438,12 @@ opp-204000000 {
opp-suspend;
};
+ opp-266500000 {
+ opp-hz = /bits/ 64 <266500000>;
+ opp-supported-hw = <0x000F>;
+ opp-peak-kBps = <2132000>;
+ };
+
opp-333500000 {
opp-hz = /bits/ 64 <333500000>;
opp-supported-hw = <0x000F>;
--
2.37.2
On 2/21/23 19:53, Svyatoslav Ryhel wrote:
> From: Michał Mirosław <[email protected]>
>
> Add phandle names for memory/I2C/SPI/USB/SDMMC controller nodes to allow
> for cleaner device descriptions.
>
> Signed-off-by: Michał Mirosław <[email protected]>
> Signed-off-by: Dmitry Osipenko <[email protected]>
> ---
Hi!
Patches 1 and 2 are missing your Signed-off-by. But also, I'd only add
labels as they are needed instead of adding them all in one go.
Mikko
22 лютого 2023 р. 10:56:23 GMT+02:00, Mikko Perttunen <[email protected]> написав(-ла):
>On 2/21/23 19:53, Svyatoslav Ryhel wrote:
>> From: Michał Mirosław <[email protected]>
>>
>> Add phandle names for memory/I2C/SPI/USB/SDMMC controller nodes to allow
>> for cleaner device descriptions.
>>
>> Signed-off-by: Michał Mirosław <[email protected]>
>> Signed-off-by: Dmitry Osipenko <[email protected]>
>> ---
>
>Hi!
>
>Patches 1 and 2 are missing your Signed-off-by. But also, I'd only add labels as they are needed instead of adding them all in one go.
>
>Mikko
>
Thanks for suggestions. I may agree about labels, but it eventually will get to stage when all labels from patches will be added. So why not add them in one commit instead of making a dozen more with adding one label a time.
Best regards,
Svyatoslav R.