Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: sunxi-ng: add missing hdmi-slow clock for H6 CCU

The Allwinner H6 CCU has a "HDMI Slow Clock", which is currently missing
in the ccu-sun50i-h6 driver.

Add this missing clock to the driver.

Fixes: 542353ea ("clk: sunxi-ng: add support for the Allwinner H6 CCU")
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

authored by

Icenowy Zheng and committed by
Maxime Ripard
f422fa55 524353ea

+19 -14
+4
drivers/clk/sunxi-ng/ccu-sun50i-h6.c
··· 643 643 BIT(31), /* gate */ 644 644 0); 645 645 646 + static SUNXI_CCU_GATE(hdmi_slow_clk, "hdmi-slow", "osc24M", 0xb04, BIT(31), 0); 647 + 646 648 static const char * const hdmi_cec_parents[] = { "osc32k", "pll-periph0-2x" }; 647 649 static const struct ccu_mux_fixed_prediv hdmi_cec_predivs[] = { 648 650 { .index = 1, .div = 36621 }, ··· 878 876 &pcie_aux_clk.common, 879 877 &bus_pcie_clk.common, 880 878 &hdmi_clk.common, 879 + &hdmi_slow_clk.common, 881 880 &hdmi_cec_clk.common, 882 881 &bus_hdmi_clk.common, 883 882 &bus_tcon_top_clk.common, ··· 1020 1017 [CLK_PCIE_AUX] = &pcie_aux_clk.common.hw, 1021 1018 [CLK_BUS_PCIE] = &bus_pcie_clk.common.hw, 1022 1019 [CLK_HDMI] = &hdmi_clk.common.hw, 1020 + [CLK_HDMI_SLOW] = &hdmi_slow_clk.common.hw, 1023 1021 [CLK_HDMI_CEC] = &hdmi_cec_clk.common.hw, 1024 1022 [CLK_BUS_HDMI] = &bus_hdmi_clk.common.hw, 1025 1023 [CLK_BUS_TCON_TOP] = &bus_tcon_top_clk.common.hw,
+1 -1
drivers/clk/sunxi-ng/ccu-sun50i-h6.h
··· 51 51 52 52 #define CLK_BUS_DRAM 60 53 53 54 - #define CLK_NUMBER 137 54 + #define CLK_NUMBER (CLK_BUS_HDCP + 1) 55 55 56 56 #endif /* _CCU_SUN50I_H6_H_ */
+14 -13
include/dt-bindings/clock/sun50i-h6-ccu.h
··· 107 107 #define CLK_PCIE_AUX 121 108 108 #define CLK_BUS_PCIE 122 109 109 #define CLK_HDMI 123 110 - #define CLK_HDMI_CEC 124 111 - #define CLK_BUS_HDMI 125 112 - #define CLK_BUS_TCON_TOP 126 113 - #define CLK_TCON_LCD0 127 114 - #define CLK_BUS_TCON_LCD0 128 115 - #define CLK_TCON_TV0 129 116 - #define CLK_BUS_TCON_TV0 130 117 - #define CLK_CSI_CCI 131 118 - #define CLK_CSI_TOP 132 119 - #define CLK_CSI_MCLK 133 120 - #define CLK_BUS_CSI 134 121 - #define CLK_HDCP 135 122 - #define CLK_BUS_HDCP 136 110 + #define CLK_HDMI_SLOW 124 111 + #define CLK_HDMI_CEC 125 112 + #define CLK_BUS_HDMI 126 113 + #define CLK_BUS_TCON_TOP 127 114 + #define CLK_TCON_LCD0 128 115 + #define CLK_BUS_TCON_LCD0 129 116 + #define CLK_TCON_TV0 130 117 + #define CLK_BUS_TCON_TV0 131 118 + #define CLK_CSI_CCI 132 119 + #define CLK_CSI_TOP 133 120 + #define CLK_CSI_MCLK 134 121 + #define CLK_BUS_CSI 135 122 + #define CLK_HDCP 136 123 + #define CLK_BUS_HDCP 137 123 124 124 125 #endif /* _DT_BINDINGS_CLK_SUN50I_H6_H_ */