diff options
-rw-r--r-- | Documentation/devicetree/bindings/clock/imx5-clock.txt | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk-imx51-imx53.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx5-clock.txt b/Documentation/devicetree/bindings/clock/imx5-clock.txt index 84cae1f187ca..d71b4b2c077d 100644 --- a/Documentation/devicetree/bindings/clock/imx5-clock.txt +++ b/Documentation/devicetree/bindings/clock/imx5-clock.txt | |||
@@ -38,7 +38,6 @@ clocks and IDs. | |||
38 | usb_phy_podf 23 | 38 | usb_phy_podf 23 |
39 | cpu_podf 24 | 39 | cpu_podf 24 |
40 | di_pred 25 | 40 | di_pred 25 |
41 | tve_di 26 | ||
42 | tve_s 27 | 41 | tve_s 27 |
43 | uart1_ipg_gate 28 | 42 | uart1_ipg_gate 28 |
44 | uart1_per_gate 29 | 43 | uart1_per_gate 29 |
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index a107e811004a..cac6a5fce9de 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c | |||
@@ -78,7 +78,7 @@ enum imx5_clks { | |||
78 | dummy, ckil, osc, ckih1, ckih2, ahb, ipg, axi_a, axi_b, uart_pred, | 78 | dummy, ckil, osc, ckih1, ckih2, ahb, ipg, axi_a, axi_b, uart_pred, |
79 | uart_root, esdhc_a_pred, esdhc_b_pred, esdhc_c_s, esdhc_d_s, | 79 | uart_root, esdhc_a_pred, esdhc_b_pred, esdhc_c_s, esdhc_d_s, |
80 | emi_sel, emi_slow_podf, nfc_podf, ecspi_pred, ecspi_podf, usboh3_pred, | 80 | emi_sel, emi_slow_podf, nfc_podf, ecspi_pred, ecspi_podf, usboh3_pred, |
81 | usboh3_podf, usb_phy_pred, usb_phy_podf, cpu_podf, di_pred, tve_di, | 81 | usboh3_podf, usb_phy_pred, usb_phy_podf, cpu_podf, di_pred, tve_di_unused, |
82 | tve_s, uart1_ipg_gate, uart1_per_gate, uart2_ipg_gate, | 82 | tve_s, uart1_ipg_gate, uart1_per_gate, uart2_ipg_gate, |
83 | uart2_per_gate, uart3_ipg_gate, uart3_per_gate, i2c1_gate, i2c2_gate, | 83 | uart2_per_gate, uart3_ipg_gate, uart3_per_gate, i2c1_gate, i2c2_gate, |
84 | gpt_ipg_gate, pwm1_ipg_gate, pwm1_hf_gate, pwm2_ipg_gate, pwm2_hf_gate, | 84 | gpt_ipg_gate, pwm1_ipg_gate, pwm1_hf_gate, pwm2_ipg_gate, pwm2_hf_gate, |
@@ -187,7 +187,6 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, | |||
187 | usb_phy_sel_str, ARRAY_SIZE(usb_phy_sel_str)); | 187 | usb_phy_sel_str, ARRAY_SIZE(usb_phy_sel_str)); |
188 | clk[cpu_podf] = imx_clk_divider("cpu_podf", "pll1_sw", MXC_CCM_CACRR, 0, 3); | 188 | clk[cpu_podf] = imx_clk_divider("cpu_podf", "pll1_sw", MXC_CCM_CACRR, 0, 3); |
189 | clk[di_pred] = imx_clk_divider("di_pred", "pll3_sw", MXC_CCM_CDCDR, 6, 3); | 189 | clk[di_pred] = imx_clk_divider("di_pred", "pll3_sw", MXC_CCM_CDCDR, 6, 3); |
190 | clk[tve_di] = imx_clk_fixed("tve_di", 65000000); /* FIXME */ | ||
191 | clk[iim_gate] = imx_clk_gate2("iim_gate", "ipg", MXC_CCM_CCGR0, 30); | 190 | clk[iim_gate] = imx_clk_gate2("iim_gate", "ipg", MXC_CCM_CCGR0, 30); |
192 | clk[uart1_ipg_gate] = imx_clk_gate2("uart1_ipg_gate", "ipg", MXC_CCM_CCGR1, 6); | 191 | clk[uart1_ipg_gate] = imx_clk_gate2("uart1_ipg_gate", "ipg", MXC_CCM_CCGR1, 6); |
193 | clk[uart1_per_gate] = imx_clk_gate2("uart1_per_gate", "uart_root", MXC_CCM_CCGR1, 8); | 192 | clk[uart1_per_gate] = imx_clk_gate2("uart1_per_gate", "uart_root", MXC_CCM_CCGR1, 8); |