diff options
| author | Dinh Nguyen <Dinh.Nguyen@freescale.com> | 2010-08-30 17:27:14 -0500 |
|---|---|---|
| committer | Dinh Nguyen <Dinh.Nguyen@freescale.com> | 2010-09-02 08:27:59 -0500 |
| commit | 0922183a57a76cd818a69809d267d0649ee56ff2 (patch) | |
| tree | 35d7e04ab59cb553b9395b415d6c54a6b7a5bca2 | |
| parent | 6ffce08bb9c029a5d4ae4cd63c8033b33ba5e4e7 (diff) | |
ENGR00126861-1: mx51: pass csi clock in ipu platform data
ipu: pass csi clock in platform data
Acked-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx5/mx51_3stack.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx51_babbage.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/mx51_3stack.c b/arch/arm/mach-mx5/mx51_3stack.c index c8da53844227..cc5a205d594d 100644 --- a/arch/arm/mach-mx5/mx51_3stack.c +++ b/arch/arm/mach-mx5/mx51_3stack.c @@ -950,6 +950,8 @@ static void __init mxc_board_init(void) mxc_ipu_data.di_clk[0] = clk_get(NULL, "ipu_di0_clk"); mxc_ipu_data.di_clk[1] = clk_get(NULL, "ipu_di1_clk"); + mxc_ipu_data.csi_clk[0] = clk_get(NULL, "csi_mclk1"); + mxc_ipu_data.csi_clk[1] = clk_get(NULL, "csi_mclk2"); mxc_spdif_data.spdif_core_clk = clk_get(NULL, "spdif_xtal_clk"); clk_put(mxc_spdif_data.spdif_core_clk); diff --git a/arch/arm/mach-mx5/mx51_babbage.c b/arch/arm/mach-mx5/mx51_babbage.c index 55ed32344deb..d42b46217400 100644 --- a/arch/arm/mach-mx5/mx51_babbage.c +++ b/arch/arm/mach-mx5/mx51_babbage.c @@ -1167,6 +1167,8 @@ static void __init mxc_board_init(void) { mxc_ipu_data.di_clk[0] = clk_get(NULL, "ipu_di0_clk"); mxc_ipu_data.di_clk[1] = clk_get(NULL, "ipu_di1_clk"); + mxc_ipu_data.csi_clk[0] = clk_get(NULL, "csi_mclk1"); + mxc_ipu_data.csi_clk[1] = clk_get(NULL, "csi_mclk2"); mxc_spdif_data.spdif_core_clk = clk_get(NULL, "spdif_xtal_clk"); clk_put(mxc_spdif_data.spdif_core_clk); diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index e8e31f9e5348..c29070f2c052 100644 --- a/arch/arm/plat-mxc/include/mach/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h @@ -235,6 +235,7 @@ struct mxc_ipu_config { int rev; void (*reset) (void); struct clk *di_clk[2]; + struct clk *csi_clk[2]; }; struct mxc_ir_platform_data { |