Skip to content

Commit 44923d8

Browse files
committed
Merge tag 'tegra-for-6.10-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt
ARM: tegra: Changes for v6.10-rc1 Adds support for EMC frequency scaling on PAZ100 devices with RAM code 1 and cleans up deprecated device tree properties. * tag 'tegra-for-6.10-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: tegra20-ac97: Replace deprecated "gpio" suffix ARM: tegra: paz00: Add emc-tables for ram-code 1 Link: https://lore.kernel.org/r/20240426180519.3972626-3-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 83c9697 + ff4d7e1 commit 44923d8

2 files changed

Lines changed: 45 additions & 2 deletions

File tree

arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,9 @@
445445

446446
tegra_ac97: ac97@70002000 {
447447
status = "okay";
448-
nvidia,codec-reset-gpio =
448+
nvidia,codec-reset-gpios =
449449
<&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>;
450-
nvidia,codec-sync-gpio =
450+
nvidia,codec-sync-gpios =
451451
<&gpio TEGRA_GPIO(P, 0) GPIO_ACTIVE_HIGH>;
452452
};
453453

arch/arm/boot/dts/nvidia/tegra20-paz00.dts

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,49 @@
533533
0x00000000 0x00000000 0x00000000 0x00000000>;
534534
};
535535
};
536+
537+
emc-tables@1 {
538+
nvidia,ram-code = <0x1>;
539+
#address-cells = <1>;
540+
#size-cells = <0>;
541+
reg = <1>;
542+
543+
emc-table@166500 {
544+
reg = <166500>;
545+
compatible = "nvidia,tegra20-emc-table";
546+
clock-frequency = <166500>;
547+
nvidia,emc-registers = <0x0000000a 0x00000016
548+
0x00000008 0x00000003 0x00000004 0x00000004
549+
0x00000002 0x0000000c 0x00000003 0x00000003
550+
0x00000002 0x00000001 0x00000004 0x00000005
551+
0x00000004 0x00000009 0x0000000d 0x000004df
552+
0x00000000 0x00000003 0x00000003 0x00000003
553+
0x00000003 0x00000001 0x0000000a 0x000000c8
554+
0x00000003 0x00000006 0x00000004 0x00000008
555+
0x00000002 0x00000000 0x00000000 0x00000002
556+
0x00000000 0x00000000 0x00000083 0xe03b0323
557+
0x007fe010 0x00001414 0x00000000 0x00000000
558+
0x00000000 0x00000000 0x00000000 0x00000000>;
559+
};
560+
561+
emc-table@333000 {
562+
reg = <333000>;
563+
compatible = "nvidia,tegra20-emc-table";
564+
clock-frequency = <333000>;
565+
nvidia,emc-registers = <0x00000018 0x00000033
566+
0x00000012 0x00000004 0x00000004 0x00000005
567+
0x00000003 0x0000000c 0x00000006 0x00000006
568+
0x00000003 0x00000001 0x00000004 0x00000005
569+
0x00000004 0x00000009 0x0000000d 0x00000bff
570+
0x00000000 0x00000003 0x00000003 0x00000006
571+
0x00000006 0x00000001 0x00000011 0x000000c8
572+
0x00000003 0x0000000e 0x00000007 0x00000008
573+
0x00000002 0x00000000 0x00000000 0x00000002
574+
0x00000000 0x00000000 0x00000083 0xf0440303
575+
0x007fe010 0x00001414 0x00000000 0x00000000
576+
0x00000000 0x00000000 0x00000000 0x00000000>;
577+
};
578+
};
536579
};
537580

538581
usb@c5000000 {

0 commit comments

Comments
 (0)