diff options
author | Chanwoo Choi <cw00.choi@samsung.com> | 2015-02-03 20:12:59 -0500 |
---|---|---|
committer | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2015-02-05 13:31:09 -0500 |
commit | b2f0e5f28e0686c0d5db238357a2e32555e97633 (patch) | |
tree | 679e096e114862b122788d383e090c9e4a1ddcbc | |
parent | 6166c01caf9394701a367b20422bcd558333795e (diff) |
clk: samsung: exynos5433: Move CLK_SCLK_HDMI_SPDIF_DISP clock to CMU_TOP domain
This patch fixes the bug of CLK_SCLK_HDMI_SPDIF_DISP clock because this clock
should be included in CMU_TOP domain. So, this patch moves the CLK_SCLK_HDMI_
SPDIF_DISP clock from CMU_MIF to CMU_TOP domain.
Reported-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
-rw-r--r-- | drivers/clk/samsung/clk-exynos5433.c | 10 | ||||
-rw-r--r-- | include/dt-bindings/clock/exynos5433.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/clk/samsung/clk-exynos5433.c b/drivers/clk/samsung/clk-exynos5433.c index 1a005c1f7c4b..387e3e39e635 100644 --- a/drivers/clk/samsung/clk-exynos5433.c +++ b/drivers/clk/samsung/clk-exynos5433.c | |||
@@ -661,6 +661,11 @@ static struct samsung_gate_clock top_gate_clks[] __initdata = { | |||
661 | GATE(CLK_SCLK_ISP_SPI0_CAM1, "sclk_isp_spi0_cam1", "div_sclk_isp_spi0_b", | 661 | GATE(CLK_SCLK_ISP_SPI0_CAM1, "sclk_isp_spi0_cam1", "div_sclk_isp_spi0_b", |
662 | ENABLE_SCLK_TOP_CAM1, 0, 0, 0), | 662 | ENABLE_SCLK_TOP_CAM1, 0, 0, 0), |
663 | 663 | ||
664 | /* ENABLE_SCLK_TOP_DISP */ | ||
665 | GATE(CLK_SCLK_HDMI_SPDIF_DISP, "sclk_hdmi_spdif_disp", | ||
666 | "mout_sclk_hdmi_spdif", ENABLE_SCLK_TOP_DISP, 0, | ||
667 | CLK_IGNORE_UNUSED, 0), | ||
668 | |||
664 | /* ENABLE_SCLK_TOP_FSYS */ | 669 | /* ENABLE_SCLK_TOP_FSYS */ |
665 | GATE(CLK_SCLK_PCIE_100_FSYS, "sclk_pcie_100_fsys", "div_sclk_pcie_100", | 670 | GATE(CLK_SCLK_PCIE_100_FSYS, "sclk_pcie_100_fsys", "div_sclk_pcie_100", |
666 | ENABLE_SCLK_TOP_FSYS, 7, 0, 0), | 671 | ENABLE_SCLK_TOP_FSYS, 7, 0, 0), |
@@ -1521,11 +1526,6 @@ static struct samsung_gate_clock mif_gate_clks[] __initdata = { | |||
1521 | ENABLE_SCLK_MIF, 1, CLK_IGNORE_UNUSED, 0), | 1526 | ENABLE_SCLK_MIF, 1, CLK_IGNORE_UNUSED, 0), |
1522 | GATE(CLK_SCLK_BUS_PLL_ATLAS, "sclk_bus_pll_atlas", "sclk_bus_pll", | 1527 | GATE(CLK_SCLK_BUS_PLL_ATLAS, "sclk_bus_pll_atlas", "sclk_bus_pll", |
1523 | ENABLE_SCLK_MIF, 0, CLK_IGNORE_UNUSED, 0), | 1528 | ENABLE_SCLK_MIF, 0, CLK_IGNORE_UNUSED, 0), |
1524 | |||
1525 | /* ENABLE_SCLK_TOP_DISP */ | ||
1526 | GATE(CLK_SCLK_HDMI_SPDIF_DISP, "sclk_hdmi_spdif_disp", | ||
1527 | "mout_sclk_hdmi_spdif", ENABLE_SCLK_TOP_DISP, 0, | ||
1528 | CLK_IGNORE_UNUSED, 0), | ||
1529 | }; | 1529 | }; |
1530 | 1530 | ||
1531 | static struct samsung_cmu_info mif_cmu_info __initdata = { | 1531 | static struct samsung_cmu_info mif_cmu_info __initdata = { |
diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindings/clock/exynos5433.h index 4853bc598b57..5bd80d5ecd0f 100644 --- a/include/dt-bindings/clock/exynos5433.h +++ b/include/dt-bindings/clock/exynos5433.h | |||
@@ -189,8 +189,9 @@ | |||
189 | #define CLK_SCLK_ISP_UART_CAM1 250 | 189 | #define CLK_SCLK_ISP_UART_CAM1 250 |
190 | #define CLK_SCLK_ISP_SPI1_CAM1 251 | 190 | #define CLK_SCLK_ISP_SPI1_CAM1 251 |
191 | #define CLK_SCLK_ISP_SPI0_CAM1 252 | 191 | #define CLK_SCLK_ISP_SPI0_CAM1 252 |
192 | #define CLK_SCLK_HDMI_SPDIF_DISP 253 | ||
192 | 193 | ||
193 | #define TOP_NR_CLK 253 | 194 | #define TOP_NR_CLK 254 |
194 | 195 | ||
195 | /* CMU_CPIF */ | 196 | /* CMU_CPIF */ |
196 | #define CLK_FOUT_MPHY_PLL 1 | 197 | #define CLK_FOUT_MPHY_PLL 1 |
@@ -397,9 +398,8 @@ | |||
397 | #define CLK_SCLK_BUS_PLL 198 | 398 | #define CLK_SCLK_BUS_PLL 198 |
398 | #define CLK_SCLK_BUS_PLL_APOLLO 199 | 399 | #define CLK_SCLK_BUS_PLL_APOLLO 199 |
399 | #define CLK_SCLK_BUS_PLL_ATLAS 200 | 400 | #define CLK_SCLK_BUS_PLL_ATLAS 200 |
400 | #define CLK_SCLK_HDMI_SPDIF_DISP 201 | ||
401 | 401 | ||
402 | #define MIF_NR_CLK 202 | 402 | #define MIF_NR_CLK 201 |
403 | 403 | ||
404 | /* CMU_PERIC */ | 404 | /* CMU_PERIC */ |
405 | #define CLK_PCLK_SPI2 1 | 405 | #define CLK_PCLK_SPI2 1 |