mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-15 17:51:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'tegra-for-6.10-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2024-04-29 16:31:47 +02:00
parent 44923d845d 0d23cacb2a
commit d4c74f6b02
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
View File

@@ -9,8 +9,8 @@ / {
compatible = "nvidia,norrin", "nvidia,tegra132", "nvidia,tegra124";
aliases {
rtc0 = "/i2c@7000d000/as3722@40";
rtc1 = "/rtc@7000e000";
rtc0 = &as3722;
rtc1 = &tegra_rtc;
serial0 = &uarta;
};

2
arch/arm64/boot/dts/nvidia/tegra132.dtsi
View File

@@ -572,7 +572,7 @@ spi@7000de00 {
status = "disabled";
};
rtc@7000e000 {
tegra_rtc: rtc@7000e000 {
compatible = "nvidia,tegra124-rtc", "nvidia,tegra20-rtc";
reg = <0x0 0x7000e000 0x0 0x100>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

16
arch/arm64/boot/dts/nvidia/tegra234.dtsi
View File

@@ -4406,6 +4406,22 @@ nvdec@15480000 {
*/
status = "disabled";
};
crypto@15820000 {
compatible = "nvidia,tegra234-se-aes";
reg = <0x00 0x15820000 0x00 0x10000>;
clocks = <&bpmp TEGRA234_CLK_SE>;
iommus = <&smmu_niso1 TEGRA234_SID_SES_SE1>;
dma-coherent;
};
crypto@15840000 {
compatible = "nvidia,tegra234-se-hash";
reg = <0x00 0x15840000 0x00 0x10000>;
clocks = <&bpmp TEGRA234_CLK_SE>;
iommus = <&smmu_niso1 TEGRA234_SID_SES_SE2>;
dma-coherent;
};
};
pcie@140a0000 {