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