diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2025-01-08 22:57:24 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2025-01-08 22:57:24 +0300 |
| commit | 214e7a51f7c12c45decbd8fa37e437b09af7b14e (patch) | |
| tree | d9f2f4f6f602f22b157bf7c047dced5d1c7769af /include | |
| parent | 40384c840ea1944d7c5a392e8975ed088ecf0b37 (diff) | |
| parent | 383ca7bee8a93be9ff5a072936981c2710d2856b (diff) | |
| download | linux-214e7a51f7c12c45decbd8fa37e437b09af7b14e.tar.xz | |
Merge tag 'sunxi-clk-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull Allwinner clk driver updates from Chen-Yu Tsai:
Instead of forcing a particular clock parent for TCON0 on the A64,
the decision is left to the device tree. Which clock parent gets
assigned depends on which display output is used. If the wrong
parent is assigned, the display doesn't work.
Patches include adding the clock parents to the DT binding (which
is shared with the DT tree), removing the now redundant macros from
the clock driver, and stop forcing a particular clock parent in the
driver.
* tag 'sunxi-clk-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
clk: sunxi-ng: a64: stop force-selecting PLL-MIPI as TCON0 parent
clk: sunxi-ng: a64: drop redundant CLK_PLL_VIDEO0_2X and CLK_PLL_MIPI
dt-bindings: clock: sunxi: Export PLL_VIDEO_2X and PLL_MIPI
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/sun50i-a64-ccu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/sun50i-a64-ccu.h b/include/dt-bindings/clock/sun50i-a64-ccu.h index 175892189e9d..4f220ea7a23c 100644 --- a/include/dt-bindings/clock/sun50i-a64-ccu.h +++ b/include/dt-bindings/clock/sun50i-a64-ccu.h @@ -44,7 +44,9 @@ #define _DT_BINDINGS_CLK_SUN50I_A64_H_ #define CLK_PLL_VIDEO0 7 +#define CLK_PLL_VIDEO0_2X 8 #define CLK_PLL_PERIPH0 11 +#define CLK_PLL_MIPI 17 #define CLK_CPUX 21 #define CLK_BUS_MIPI_DSI 28 |