| commit | c6af8e8135b50e302684fd2b7c375370499f42d2 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Tue Dec 24 12:07:22 2024 -0600 |
| committer | Tom Rini <trini@konsulko.com> | Tue Dec 24 13:33:03 2024 -0600 |
| tree | 5ffcd1663725f4e963ff53d8a6e16075e2cb5cf4 | |
| parent | ff9486ed2ff8b3b248dd2ebd16f0cc8db632af2a [diff] [blame] | |
| parent | 9c8af15f86b602d32dc0a1e638467c05b8792439 [diff] [blame] |
Subtree merge tag 'v6.12-dts' of dts repo [1] into dts/upstream [1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git Based on what "git diff" suggests, rename a device tree for imx8mm_venice_defconfig and imx8mp_venice_defconfig Signed-off-by: Tom Rini <trini@konsulko.com> --- Cc: Tim Harvey <tharvey@gateworks.com>
diff --git a/dts/upstream/include/dt-bindings/clock/at91.h b/dts/upstream/include/dt-bindings/clock/at91.h index 3e3972a..6ede88c 100644 --- a/dts/upstream/include/dt-bindings/clock/at91.h +++ b/dts/upstream/include/dt-bindings/clock/at91.h
@@ -38,6 +38,10 @@ #define PMC_CPU (PMC_MAIN + 9) #define PMC_MCK1 (PMC_MAIN + 10) +/* SAM9X7 */ +#define PMC_PLLADIV2 (PMC_MAIN + 11) +#define PMC_LVDSPLL (PMC_MAIN + 12) + #ifndef AT91_PMC_MOSCS #define AT91_PMC_MOSCS 0 /* MOSCS Flag */ #define AT91_PMC_LOCKA 1 /* PLLA Lock */