Skip to content

Commit d4c74f6

Browse files
committed
Merge tag 'tegra-for-6.10-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt
arm64: tegra: Changes for v6.10-rc1 Adds the Security Engine devices found on Tegra234 and fixes RTC aliases by referencing them by label rather than path so that errors can be detected more easily. * tag 'tegra-for-6.10-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: tegra: Add Tegra Security Engine DT nodes arm64: tegra: Correct Tegra132 I2C alias Link: https://lore.kernel.org/r/20240426180519.3972626-4-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 44923d8 + 0d23cac commit d4c74f6

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

arch/arm64/boot/dts/nvidia/tegra132-norrin.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
compatible = "nvidia,norrin", "nvidia,tegra132", "nvidia,tegra124";
1010

1111
aliases {
12-
rtc0 = "/i2c@7000d000/as3722@40";
13-
rtc1 = "/rtc@7000e000";
12+
rtc0 = &as3722;
13+
rtc1 = &tegra_rtc;
1414
serial0 = &uarta;
1515
};
1616

arch/arm64/boot/dts/nvidia/tegra132.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@
572572
status = "disabled";
573573
};
574574

575-
rtc@7000e000 {
575+
tegra_rtc: rtc@7000e000 {
576576
compatible = "nvidia,tegra124-rtc", "nvidia,tegra20-rtc";
577577
reg = <0x0 0x7000e000 0x0 0x100>;
578578
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/nvidia/tegra234.dtsi

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4406,6 +4406,22 @@
44064406
*/
44074407
status = "disabled";
44084408
};
4409+
4410+
crypto@15820000 {
4411+
compatible = "nvidia,tegra234-se-aes";
4412+
reg = <0x00 0x15820000 0x00 0x10000>;
4413+
clocks = <&bpmp TEGRA234_CLK_SE>;
4414+
iommus = <&smmu_niso1 TEGRA234_SID_SES_SE1>;
4415+
dma-coherent;
4416+
};
4417+
4418+
crypto@15840000 {
4419+
compatible = "nvidia,tegra234-se-hash";
4420+
reg = <0x00 0x15840000 0x00 0x10000>;
4421+
clocks = <&bpmp TEGRA234_CLK_SE>;
4422+
iommus = <&smmu_niso1 TEGRA234_SID_SES_SE2>;
4423+
dma-coherent;
4424+
};
44094425
};
44104426

44114427
pcie@140a0000 {

0 commit comments

Comments
 (0)