diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 16:58:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 16:58:49 -0700 |
| commit | d0312d7edc84a5b3b2e2106fde644b61dd10fbf9 (patch) | |
| tree | b6d334f6bb6f91b4493bfb36d033411b206fce25 /arch/arm/mach-imx/clk-imx51-imx53.c | |
| parent | 025c95a6826ad8acfe871f33c2fa9208beeb38df (diff) | |
| parent | 51f66191cf54ba3d62dd7e4a77dd376cc97de27f (diff) | |
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
ARM i.MX cleanup patches
* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX53 clk: Fix ldb parent clocks
serial/imx: fix IMX UART macro usage to reflect correct processor
ARM: i.MX remove last leftovers from legacy clock support
ARM: i.MX clk pllv1: move mxc_decode_pll code to its user
ARM: imx27-phytec-phycore: Fix I2C EEPROM address
ARM i.MX mx2_camera: Remove MX2_CAMERA_SWAP16 and MX2_CAMERA_PACK_DIR_MSB flags.
ARM i.MX: remove duplicated include from clk-imx21.c
ARM: plat-mxc: Remove unused imx_ioremap
Diffstat (limited to 'arch/arm/mach-imx/clk-imx51-imx53.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx51-imx53.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index 4bdcaa97bd98..f89c4403a922 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c @@ -39,10 +39,10 @@ static const char *ssi_ext2_com_sels[] = { "ssi_ext2_podf", "ssi2_root_gate", }; static const char *emi_slow_sel[] = { "main_bus", "ahb", }; static const char *usb_phy_sel_str[] = { "osc", "usb_phy_podf", }; static const char *mx51_ipu_di0_sel[] = { "di_pred", "osc", "ckih1", "tve_di", }; -static const char *mx53_ipu_di0_sel[] = { "di_pred", "osc", "ckih1", "di_pll4_podf", "dummy", "ldb_di0", }; +static const char *mx53_ipu_di0_sel[] = { "di_pred", "osc", "ckih1", "di_pll4_podf", "dummy", "ldb_di0_gate", }; static const char *mx53_ldb_di0_sel[] = { "pll3_sw", "pll4_sw", }; static const char *mx51_ipu_di1_sel[] = { "di_pred", "osc", "ckih1", "tve_di", "ipp_di1", }; -static const char *mx53_ipu_di1_sel[] = { "di_pred", "osc", "ckih1", "tve_di", "ipp_di1", "ldb_di1", }; +static const char *mx53_ipu_di1_sel[] = { "di_pred", "osc", "ckih1", "tve_di", "ipp_di1", "ldb_di1_gate", }; static const char *mx53_ldb_di1_sel[] = { "pll3_sw", "pll4_sw", }; static const char *mx51_tve_ext_sel[] = { "osc", "ckih1", }; static const char *mx53_tve_ext_sel[] = { "pll4_sw", "ckih1", }; |