* [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect @ 2011-02-25 12:49 Eric Bénard 2011-02-25 12:49 ` [PATCH 2/2] i.MX25: add sdma clock definitions Eric Bénard 2011-02-25 12:53 ` [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect Wolfram Sang 0 siblings, 2 replies; 5+ messages in thread From: Eric Bénard @ 2011-02-25 12:49 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Eric B?nard <eric@eukrea.com> --- arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c index cb705c2..6269053 100644 --- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c @@ -34,6 +34,7 @@ #include <mach/mx25.h> #include <mach/imx-uart.h> #include <mach/audmux.h> +#include <mach/esdhc.h> #include "devices-imx25.h" @@ -242,6 +243,11 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = { .flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE, }; +static struct esdhc_platform_data sd1_pdata = { + .cd_gpio = GPIO_SD1CD, + .wp_gpio = -EINVAL, +}; + /* * system init for baseboard usage. Will be called by cpuimx25 init. * @@ -275,7 +281,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void) imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); imx25_add_flexcan1(NULL); - imx25_add_sdhci_esdhc_imx(0, NULL); + imx25_add_sdhci_esdhc_imx(0, &sd1_pdata); gpio_request(GPIO_LED1, "LED1"); gpio_direction_output(GPIO_LED1, 1); -- 1.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] i.MX25: add sdma clock definitions 2011-02-25 12:49 [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect Eric Bénard @ 2011-02-25 12:49 ` Eric Bénard 2011-03-15 18:46 ` Michael Trimarchi 2011-02-25 12:53 ` [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect Wolfram Sang 1 sibling, 1 reply; 5+ messages in thread From: Eric Bénard @ 2011-02-25 12:49 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Eric B?nard <eric@eukrea.com> --- arch/arm/mach-imx/clock-imx25.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c index daa0165..a65838f 100644 --- a/arch/arm/mach-imx/clock-imx25.c +++ b/arch/arm/mach-imx/clock-imx25.c @@ -228,6 +228,7 @@ DEFINE_CLOCK(esdhc1_per_clk, 0, CCM_CGCR0, 3, get_rate_esdhc1, NULL, DEFINE_CLOCK(esdhc2_ahb_clk, 0, CCM_CGCR0, 22, get_rate_esdhc2, NULL, NULL); DEFINE_CLOCK(esdhc2_per_clk, 0, CCM_CGCR0, 4, get_rate_esdhc2, NULL, &esdhc2_ahb_clk); +DEFINE_CLOCK(sdma_ahb_clk, 0, CCM_CGCR0, 26, NULL, NULL, NULL); DEFINE_CLOCK(fec_ahb_clk, 0, CCM_CGCR0, 23, NULL, NULL, NULL); DEFINE_CLOCK(lcdc_ahb_clk, 0, CCM_CGCR0, 24, NULL, NULL, NULL); DEFINE_CLOCK(lcdc_per_clk, 0, CCM_CGCR0, 7, NULL, NULL, &lcdc_ahb_clk); @@ -253,6 +254,7 @@ DEFINE_CLOCK(lcdc_clk, 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk); DEFINE_CLOCK(wdt_clk, 0, CCM_CGCR2, 19, get_rate_ipg, NULL, NULL); DEFINE_CLOCK(ssi1_clk, 0, CCM_CGCR2, 11, get_rate_ssi1, NULL, &ssi1_per_clk); DEFINE_CLOCK(ssi2_clk, 1, CCM_CGCR2, 12, get_rate_ssi2, NULL, &ssi2_per_clk); +DEFINE_CLOCK(sdma_clk, 0, CCM_CGCR2, 6, get_rate_ipg, NULL, &sdma_ahb_clk); DEFINE_CLOCK(esdhc1_clk, 0, CCM_CGCR1, 13, get_rate_esdhc1, NULL, &esdhc1_per_clk); DEFINE_CLOCK(esdhc2_clk, 1, CCM_CGCR1, 14, get_rate_esdhc2, NULL, @@ -304,6 +306,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "audmux", audmux_clk) _REGISTER_CLOCK("flexcan.0", NULL, can1_clk) _REGISTER_CLOCK("flexcan.1", NULL, can2_clk) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) }; int __init mx25_clocks_init(void) -- 1.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] i.MX25: add sdma clock definitions 2011-02-25 12:49 ` [PATCH 2/2] i.MX25: add sdma clock definitions Eric Bénard @ 2011-03-15 18:46 ` Michael Trimarchi 0 siblings, 0 replies; 5+ messages in thread From: Michael Trimarchi @ 2011-03-15 18:46 UTC (permalink / raw) To: linux-arm-kernel Hi I have done the same yesterday On 02/25/2011 01:49 PM, Eric B?nard wrote: > Signed-off-by: Eric B?nard <eric@eukrea.com> > --- > arch/arm/mach-imx/clock-imx25.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c > index daa0165..a65838f 100644 > --- a/arch/arm/mach-imx/clock-imx25.c > +++ b/arch/arm/mach-imx/clock-imx25.c > @@ -228,6 +228,7 @@ DEFINE_CLOCK(esdhc1_per_clk, 0, CCM_CGCR0, 3, get_rate_esdhc1, NULL, > DEFINE_CLOCK(esdhc2_ahb_clk, 0, CCM_CGCR0, 22, get_rate_esdhc2, NULL, NULL); > DEFINE_CLOCK(esdhc2_per_clk, 0, CCM_CGCR0, 4, get_rate_esdhc2, NULL, > &esdhc2_ahb_clk); > +DEFINE_CLOCK(sdma_ahb_clk, 0, CCM_CGCR0, 26, NULL, NULL, NULL); > DEFINE_CLOCK(fec_ahb_clk, 0, CCM_CGCR0, 23, NULL, NULL, NULL); > DEFINE_CLOCK(lcdc_ahb_clk, 0, CCM_CGCR0, 24, NULL, NULL, NULL); > DEFINE_CLOCK(lcdc_per_clk, 0, CCM_CGCR0, 7, NULL, NULL, &lcdc_ahb_clk); > @@ -253,6 +254,7 @@ DEFINE_CLOCK(lcdc_clk, 0, CCM_CGCR1, 29, get_rate_lcdc, NULL, &lcdc_per_clk); > DEFINE_CLOCK(wdt_clk, 0, CCM_CGCR2, 19, get_rate_ipg, NULL, NULL); > DEFINE_CLOCK(ssi1_clk, 0, CCM_CGCR2, 11, get_rate_ssi1, NULL, &ssi1_per_clk); > DEFINE_CLOCK(ssi2_clk, 1, CCM_CGCR2, 12, get_rate_ssi2, NULL, &ssi2_per_clk); > +DEFINE_CLOCK(sdma_clk, 0, CCM_CGCR2, 6, get_rate_ipg, NULL, &sdma_ahb_clk); > DEFINE_CLOCK(esdhc1_clk, 0, CCM_CGCR1, 13, get_rate_esdhc1, NULL, > &esdhc1_per_clk); > DEFINE_CLOCK(esdhc2_clk, 1, CCM_CGCR1, 14, get_rate_esdhc2, NULL, > @@ -304,6 +306,7 @@ static struct clk_lookup lookups[] = { > _REGISTER_CLOCK(NULL, "audmux", audmux_clk) > _REGISTER_CLOCK("flexcan.0", NULL, can1_clk) > _REGISTER_CLOCK("flexcan.1", NULL, can2_clk) > + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) > }; > > int __init mx25_clocks_init(void) struct imx_imx_sdma_data imx25_imx_sdma_data __initconst = - imx_imx_sdma_data_entry_single(MX25, 1, "imx25", 0); + imx_imx_sdma_data_entry_single(MX25, 1, "imx25", 1); #endif /* ifdef CONFIG_SOC_IMX25 */ But in order to load a build in kernel there is some problem with the _to_version composition. Michael Trimarchi ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect 2011-02-25 12:49 [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect Eric Bénard 2011-02-25 12:49 ` [PATCH 2/2] i.MX25: add sdma clock definitions Eric Bénard @ 2011-02-25 12:53 ` Wolfram Sang 2011-02-26 16:00 ` Wolfram Sang 1 sibling, 1 reply; 5+ messages in thread From: Wolfram Sang @ 2011-02-25 12:53 UTC (permalink / raw) To: linux-arm-kernel On Fri, Feb 25, 2011 at 01:49:14PM +0100, Eric B?nard wrote: > Signed-off-by: Eric B?nard <eric@eukrea.com> Please wait with those patches until the final driver modifications are applied to mmc-next. mx51-issues may cause some changes. -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110225/3fb8c45b/attachment.sig> ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect 2011-02-25 12:53 ` [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect Wolfram Sang @ 2011-02-26 16:00 ` Wolfram Sang 0 siblings, 0 replies; 5+ messages in thread From: Wolfram Sang @ 2011-02-26 16:00 UTC (permalink / raw) To: linux-arm-kernel On Fri, Feb 25, 2011 at 01:53:58PM +0100, Wolfram Sang wrote: > On Fri, Feb 25, 2011 at 01:49:14PM +0100, Eric B?nard wrote: > > Signed-off-by: Eric B?nard <eric@eukrea.com> > > Please wait with those patches until the final driver modifications are > applied to mmc-next. mx51-issues may cause some changes. Sascha, you can go ahead now. All of Eric's SD-related patches are: Acked-by: Wolfram Sang <w.sang@pengutronix.de> -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ | -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 197 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110226/817dfe99/attachment.sig> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-15 18:46 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-02-25 12:49 [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect Eric Bénard 2011-02-25 12:49 ` [PATCH 2/2] i.MX25: add sdma clock definitions Eric Bénard 2011-03-15 18:46 ` Michael Trimarchi 2011-02-25 12:53 ` [PATCH 1/2] eukrea_mbimxsd25-baseboard: add SD card detect Wolfram Sang 2011-02-26 16:00 ` Wolfram Sang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).