diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2013-09-24 11:21:29 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2013-09-24 17:33:22 +0200 |
| commit | d09356cc2ac45f0e0537460ed8a100a8a485174a (patch) | |
| tree | 4df19d85472b33e72fd9aacc02d423a7b062044c | |
| parent | 8ab970251a29a2ac40dd3f94e6b7a58e677fb0e8 (diff) | |
mvf: Added clock and register platform data for ADC1
Add clock information and platform data for ADC1. Those data are
used by the driver to create the second ADC instance.
| -rw-r--r-- | arch/arm/mach-mvf/board-colibri_vf50.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/clock.c | 11 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-mvf-adc.c | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-mvf/board-colibri_vf50.c b/arch/arm/mach-mvf/board-colibri_vf50.c index 6231b36143be..622aad8bf7aa 100644 --- a/arch/arm/mach-mvf/board-colibri_vf50.c +++ b/arch/arm/mach-mvf/board-colibri_vf50.c @@ -391,6 +391,7 @@ static void __init mvf_twr_init_usb(void) static void __init mvf_init_adc(void) { mvf_add_adc(0); + mvf_add_adc(1); } /*! diff --git a/arch/arm/mach-mvf/clock.c b/arch/arm/mach-mvf/clock.c index 432ed1facf11..2f6ccf31ac3f 100644 --- a/arch/arm/mach-mvf/clock.c +++ b/arch/arm/mach-mvf/clock.c @@ -1643,6 +1643,16 @@ static struct clk adc_clk[] = { .enable = _clk_enable, .disable = _clk_disable, }, + { + __INIT_CLK_DEBUG(adc_clk) + .id = 1, + .parent = &ipg_clk, + .enable_reg = MXC_CCM_CCGR7, + .enable_shift = MXC_CCM_CCGRx_CG11_OFFSET, + .enable = _clk_enable, + .disable = _clk_disable, + }, + }; static struct clk i2c_clk[] = { @@ -1906,6 +1916,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("fec.0", NULL, enet_clk[0]), _REGISTER_CLOCK("fec.1", NULL, enet_clk[1]), _REGISTER_CLOCK("mvf-adc.0", NULL, adc_clk[0]), + _REGISTER_CLOCK("mvf-adc.1", NULL, adc_clk[1]), _REGISTER_CLOCK("switch.0", NULL, enet_clk[0]), _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk), _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc1_clk), diff --git a/arch/arm/plat-mxc/devices/platform-mvf-adc.c b/arch/arm/plat-mxc/devices/platform-mvf-adc.c index 38add8b5fd4f..029e8e3a39ae 100644 --- a/arch/arm/plat-mxc/devices/platform-mvf-adc.c +++ b/arch/arm/plat-mxc/devices/platform-mvf-adc.c @@ -25,7 +25,8 @@ #ifdef CONFIG_SOC_MVFA5 const struct mvf_adc_data mvfa5_adc_data[] __initconst = { - mvf_adc_data_entry(MVF, 0, SZ_4K), + mvf_adc_data_entry(MVF, 0, SZ_4K), + mvf_adc_data_entry(MVF, 1, SZ_4K), }; #endif |