Skip to content

Commit 7182f5f

Browse files
committed
Merge tag 'tegra-for-6.15-arm-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt
ARM: tegra: Device tree changes for v6.15-rc1 This contains a few patches that add some missing, display-related nodes on Tegra114 and Tegra124, as well as a small fix in the display clock used for DSI on Tegra114 and the addition of a light sensor found on the ASUS TF101. * tag 'tegra-for-6.15-arm-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: tf101: Add al3000a illuminance sensor node ARM: tegra: Add DSI-A and DSI-B nodes on Tegra124 ARM: tegra: Add HDA node on Tegra114 ARM: tegra: Add ARM PMU node on Tegra114 ARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114 Link: https://lore.kernel.org/r/20250307162332.3451523-4-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 2c5ef4e + 237a868 commit 7182f5f

3 files changed

Lines changed: 80 additions & 5 deletions

File tree

arch/arm/boot/dts/nvidia/tegra114.dtsi

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
reg = <0x54400000 0x00040000>;
140140
clocks = <&tegra_car TEGRA114_CLK_DSIB>,
141141
<&tegra_car TEGRA114_CLK_DSIBLP>,
142-
<&tegra_car TEGRA114_CLK_PLL_D2_OUT0>;
142+
<&tegra_car TEGRA114_CLK_PLL_D_OUT0>;
143143
clock-names = "dsi", "lp", "parent";
144144
resets = <&tegra_car 82>;
145145
reset-names = "dsi";
@@ -577,6 +577,21 @@
577577
#iommu-cells = <1>;
578578
};
579579

580+
hda@70030000 {
581+
compatible = "nvidia,tegra114-hda", "nvidia,tegra30-hda";
582+
reg = <0x70030000 0x10000>;
583+
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
584+
clocks = <&tegra_car TEGRA114_CLK_HDA>,
585+
<&tegra_car TEGRA114_CLK_HDA2HDMI>,
586+
<&tegra_car TEGRA114_CLK_HDA2CODEC_2X>;
587+
clock-names = "hda", "hda2hdmi", "hda2codec_2x";
588+
resets = <&tegra_car 125>, /* hda */
589+
<&tegra_car 128>, /* hda2hdmi */
590+
<&tegra_car 111>; /* hda2codec_2x */
591+
reset-names = "hda", "hda2hdmi", "hda2codec_2x";
592+
status = "disabled";
593+
};
594+
580595
ahub@70080000 {
581596
compatible = "nvidia,tegra114-ahub";
582597
reg = <0x70080000 0x200>,
@@ -805,31 +820,40 @@
805820
#address-cells = <1>;
806821
#size-cells = <0>;
807822

808-
cpu@0 {
823+
cpu0: cpu@0 {
809824
device_type = "cpu";
810825
compatible = "arm,cortex-a15";
811826
reg = <0>;
812827
};
813828

814-
cpu@1 {
829+
cpu1: cpu@1 {
815830
device_type = "cpu";
816831
compatible = "arm,cortex-a15";
817832
reg = <1>;
818833
};
819834

820-
cpu@2 {
835+
cpu2: cpu@2 {
821836
device_type = "cpu";
822837
compatible = "arm,cortex-a15";
823838
reg = <2>;
824839
};
825840

826-
cpu@3 {
841+
cpu3: cpu@3 {
827842
device_type = "cpu";
828843
compatible = "arm,cortex-a15";
829844
reg = <3>;
830845
};
831846
};
832847

848+
pmu {
849+
compatible = "arm,cortex-a15-pmu";
850+
interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
851+
<GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
852+
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
853+
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
854+
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
855+
};
856+
833857
timer {
834858
compatible = "arm,armv7-timer";
835859
interrupts =

arch/arm/boot/dts/nvidia/tegra124.dtsi

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,22 @@
165165
status = "disabled";
166166
};
167167

168+
dsia: dsi@54300000 {
169+
compatible = "nvidia,tegra124-dsi";
170+
reg = <0x0 0x54300000 0x0 0x00040000>;
171+
clocks = <&tegra_car TEGRA124_CLK_DSIA>,
172+
<&tegra_car TEGRA124_CLK_DSIALP>,
173+
<&tegra_car TEGRA124_CLK_PLL_D_OUT0>;
174+
clock-names = "dsi", "lp", "parent";
175+
resets = <&tegra_car 48>;
176+
reset-names = "dsi";
177+
nvidia,mipi-calibrate = <&mipi 0x060>; /* DSIA & DSIB pads */
178+
status = "disabled";
179+
180+
#address-cells = <1>;
181+
#size-cells = <0>;
182+
};
183+
168184
vic@54340000 {
169185
compatible = "nvidia,tegra124-vic";
170186
reg = <0x0 0x54340000 0x0 0x00040000>;
@@ -177,6 +193,22 @@
177193
iommus = <&mc TEGRA_SWGROUP_VIC>;
178194
};
179195

196+
dsib: dsi@54400000 {
197+
compatible = "nvidia,tegra124-dsi";
198+
reg = <0x0 0x54400000 0x0 0x00040000>;
199+
clocks = <&tegra_car TEGRA124_CLK_DSIB>,
200+
<&tegra_car TEGRA124_CLK_DSIBLP>,
201+
<&tegra_car TEGRA124_CLK_PLL_D_OUT0>;
202+
clock-names = "dsi", "lp", "parent";
203+
resets = <&tegra_car 82>;
204+
reset-names = "dsi";
205+
nvidia,mipi-calibrate = <&mipi 0x180>; /* DSIC & DSID pads */
206+
status = "disabled";
207+
208+
#address-cells = <1>;
209+
#size-cells = <0>;
210+
};
211+
180212
sor@54540000 {
181213
compatible = "nvidia,tegra124-sor";
182214
reg = <0x0 0x54540000 0x0 0x00040000>;
@@ -938,6 +970,14 @@
938970
};
939971
};
940972

973+
mipi: mipi@700e3000 {
974+
compatible = "nvidia,tegra124-mipi";
975+
reg = <0x0 0x700e3000 0x0 0x100>;
976+
clocks = <&tegra_car TEGRA124_CLK_MIPI_CAL>;
977+
clock-names = "mipi-cal";
978+
#nvidia,mipi-calibrate-cells = <1>;
979+
};
980+
941981
dfll: clock@70110000 {
942982
compatible = "nvidia,tegra124-dfll";
943983
reg = <0 0x70110000 0 0x100>, /* DFLL control */

arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,17 @@
10851085
sbs,poll-retry-count = <10>;
10861086
power-supplies = <&mains>;
10871087
};
1088+
1089+
/* Dynaimage ambient light sensor */
1090+
light-sensor@1c {
1091+
compatible = "dynaimage,al3000a";
1092+
reg = <0x1c>;
1093+
1094+
interrupt-parent = <&gpio>;
1095+
interrupts = <TEGRA_GPIO(Z, 2) IRQ_TYPE_LEVEL_HIGH>;
1096+
1097+
vdd-supply = <&vdd_1v8_sys>;
1098+
};
10881099
};
10891100
};
10901101

0 commit comments

Comments
 (0)