From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] imx-esdhc: update devices registration
Date: Tue, 12 Oct 2010 14:33:13 +0200 [thread overview]
Message-ID: <20101012123312.GK29673@pengutronix.de> (raw)
In-Reply-To: <1286886237-29014-1-git-send-email-eric@eukrea.com>
Hi Eric,
On Tue, Oct 12, 2010 at 02:23:55PM +0200, Eric B?nard wrote:
> Tested on i.MX25 and i.MX35 and i.MX51
>
> Signed-off-by: Eric B?nard <eric@eukrea.com>
> ---
> arch/arm/mach-mx25/devices-imx25.h | 10 ++--
> arch/arm/mach-mx3/devices-imx35.h | 12 ++--
> arch/arm/mach-mx5/devices-imx51.h | 11 +---
> arch/arm/plat-mxc/devices/platform-esdhc.c | 58 +++++++++++++++++++---
> arch/arm/plat-mxc/include/mach/devices-common.h | 12 ++++-
> arch/arm/plat-mxc/include/mach/mx25.h | 4 +-
> arch/arm/plat-mxc/include/mach/mx35.h | 6 +-
> arch/arm/plat-mxc/include/mach/mx51.h | 12 ++--
> 8 files changed, 85 insertions(+), 40 deletions(-)
>
> diff --git a/arch/arm/mach-mx25/devices-imx25.h b/arch/arm/mach-mx25/devices-imx25.h
> index 733aaee..86b2bea 100644
> --- a/arch/arm/mach-mx25/devices-imx25.h
> +++ b/arch/arm/mach-mx25/devices-imx25.h
> @@ -49,7 +49,9 @@ extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
> #define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)
> #define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)
>
> -#define imx25_add_esdhc0(pdata) \
> - imx_add_esdhc(0, MX25_ESDHC1_BASE_ADDR, SZ_16K, MX25_INT_MMC_SDHC1, pdata)
> -#define imx25_add_esdhc1(pdata) \
> - imx_add_esdhc(1, MX25_ESDHC2_BASE_ADDR, SZ_16K, MX25_INT_MMC_SDHC2, pdata)
> +extern const struct imx_esdhc_imx_data imx25_esdhc_data[] __initconst;
> +#define imx25_add_esdhc(id, pdata) \
> + imx_add_esdhc(&imx25_esdhc_data[id], pdata)
> +#define imx25_add_esdhc0(pdata) imx25_add_esdhc(0, pdata)
> +#define imx25_add_esdhc1(pdata) imx25_add_esdhc(1, pdata)
> +
> diff --git a/arch/arm/mach-mx3/devices-imx35.h b/arch/arm/mach-mx3/devices-imx35.h
> index 509b346..e4ef168 100644
> --- a/arch/arm/mach-mx3/devices-imx35.h
> +++ b/arch/arm/mach-mx3/devices-imx35.h
> @@ -46,9 +46,9 @@ extern const struct imx_spi_imx_data imx35_cspi_data[] __initconst;
> #define imx35_add_spi_imx0(pdata) imx35_add_cspi(0, pdata)
> #define imx35_add_spi_imx1(pdata) imx35_add_cspi(1, pdata)
>
> -#define imx35_add_esdhc0(pdata) \
> - imx_add_esdhc(0, MX35_ESDHC1_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC1, pdata)
> -#define imx35_add_esdhc1(pdata) \
> - imx_add_esdhc(1, MX35_ESDHC2_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC2, pdata)
> -#define imx35_add_esdhc2(pdata) \
> - imx_add_esdhc(2, MX35_ESDHC3_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC3, pdata)
> +extern const struct imx_esdhc_imx_data imx35_esdhc_data[] __initconst;
> +#define imx35_add_esdhc(id, pdata) \
> + imx_add_esdhc(&imx35_esdhc_data[id], pdata)
> +#define imx35_add_esdhc0(pdata) imx35_add_esdhc(0, pdata)
> +#define imx35_add_esdhc1(pdata) imx35_add_esdhc(1, pdata)
> +#define imx35_add_esdhc2(pdata) imx35_add_esdhc(2, pdata)
> diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
> index 547432d..5cc910e 100644
> --- a/arch/arm/mach-mx5/devices-imx51.h
> +++ b/arch/arm/mach-mx5/devices-imx51.h
> @@ -37,11 +37,6 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
> #define imx51_add_ecspi(id, pdata) \
> imx_add_spi_imx(&imx51_ecspi_data[id], pdata)
>
> -#define imx51_add_esdhc0(pdata) \
> - imx_add_esdhc(0, MX51_MMC_SDHC1_BASE_ADDR, SZ_16K, MX51_MXC_INT_MMC_SDHC1, pdata)
> -#define imx51_add_esdhc1(pdata) \
> - imx_add_esdhc(1, MX51_MMC_SDHC2_BASE_ADDR, SZ_16K, MX51_MXC_INT_MMC_SDHC2, pdata)
> -#define imx51_add_esdhc2(pdata) \
> - imx_add_esdhc(2, MX51_MMC_SDHC3_BASE_ADDR, SZ_16K, MX51_MXC_INT_MMC_SDHC3, pdata)
> -#define imx51_add_esdhc3(pdata) \
> - imx_add_esdhc(3, MX51_MMC_SDHC4_BASE_ADDR, SZ_16K, MX51_MXC_INT_MMC_SDHC4, pdata)
> +extern const struct imx_esdhc_imx_data imx51_esdhc_data[] __initconst;
> +#define imx51_add_esdhc(id, pdata) \
> + imx_add_esdhc(&imx51_esdhc_data[id], pdata)
> diff --git a/arch/arm/plat-mxc/devices/platform-esdhc.c b/arch/arm/plat-mxc/devices/platform-esdhc.c
> index 68db2a2..5669045 100644
> --- a/arch/arm/plat-mxc/devices/platform-esdhc.c
> +++ b/arch/arm/plat-mxc/devices/platform-esdhc.c
> @@ -6,26 +6,68 @@
> * Free Software Foundation.
> */
>
> +#include <mach/hardware.h>
> #include <mach/devices-common.h>
> #include <mach/esdhc.h>
>
> -struct platform_device *__init imx_add_esdhc(int id,
> - resource_size_t iobase, resource_size_t iosize,
> - resource_size_t irq,
> +#define imx_esdhc_imx_data_entry_single(soc, type, _devid, _id, hwid, _size) \
> + { \
> + .devid = _devid, \
> + .id = _id, \
> + .iobase = soc ## _ ## type ## hwid ## _BASE_ADDR, \
> + .iosize = _size, \
> + .irq = soc ## _INT_ ## type ## hwid, \
> + }
> +
> +#define imx_esdhc_imx_data_entry(soc, type, devid, id, hwid, size) \
> + [id] = imx_esdhc_imx_data_entry_single(soc, type, devid, id, hwid, size)
> +
> +#ifdef CONFIG_ARCH_MX25
> +const struct imx_esdhc_imx_data imx25_esdhc_data[] __initconst = {
> +#define imx25_esdhc_data_entry(_id, _hwid) \
> + imx_esdhc_imx_data_entry(MX25, MMC_SDHC, "sdhci-esdhc-imx", _id, _hwid, SZ_16K)
> + imx25_esdhc_data_entry(0, 1),
> + imx25_esdhc_data_entry(1, 2),
> +};
> +#endif /* ifdef CONFIG_ARCH_MX25 */
> +
> +#ifdef CONFIG_ARCH_MX35
> +const struct imx_esdhc_imx_data imx35_esdhc_data[] __initconst = {
> +#define imx35_esdhc_data_entry(_id, _hwid) \
> + imx_esdhc_imx_data_entry(MX35, MMC_SDHC, "sdhci-esdhc-imx", _id, _hwid, SZ_16K)
> + imx35_esdhc_data_entry(0, 1),
> + imx35_esdhc_data_entry(1, 2),
> + imx35_esdhc_data_entry(2, 3),
> +};
> +#endif /* ifdef CONFIG_ARCH_MX35 */
> +
> +#ifdef CONFIG_ARCH_MX51
> +const struct imx_esdhc_imx_data imx51_esdhc_data[] __initconst = {
> +#define imx51_esdhc_data_entry(_id, _hwid) \
> + imx_esdhc_imx_data_entry(MX51, MMC_SDHC, "sdhci-esdhc-imx", _id, _hwid, SZ_16K)
> + imx51_esdhc_data_entry(0, 1),
> + imx51_esdhc_data_entry(1, 2),
> + imx51_esdhc_data_entry(2, 3),
> + imx51_esdhc_data_entry(3, 4),
> +};
> +#endif /* ifdef CONFIG_ARCH_MX51 */
Hmmm, I think it's sensible to use the config struct only for data that
is actually different for the different socs. That is MMC_SDHC,
"sdhci-esdhc-imx" and SZ_16K doesn't need to be part of the data.
> +
> +struct platform_device *__init imx_add_esdhc(
> + const struct imx_esdhc_imx_data *data,
> const struct esdhc_platform_data *pdata)
> {
> struct resource res[] = {
> {
> - .start = iobase,
> - .end = iobase + iosize - 1,
> + .start = data->iobase,
> + .end = data->iobase + data->iosize - 1,
> .flags = IORESOURCE_MEM,
> }, {
> - .start = irq,
> - .end = irq,
> + .start = data->irq,
> + .end = data->irq,
> .flags = IORESOURCE_IRQ,
> },
> };
>
> - return imx_add_platform_device("sdhci-esdhc-imx", id, res,
> + return imx_add_platform_device(data->devid, data->id, res,
> ARRAY_SIZE(res), pdata, sizeof(*pdata));
> }
> diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
> index 0498978..ca1f922 100644
> --- a/arch/arm/plat-mxc/include/mach/devices-common.h
> +++ b/arch/arm/plat-mxc/include/mach/devices-common.h
> @@ -108,7 +108,13 @@ struct platform_device *__init imx_add_spi_imx(
> const struct spi_imx_master *pdata);
>
> #include <mach/esdhc.h>
> -struct platform_device *__init imx_add_esdhc(int id,
> - resource_size_t iobase, resource_size_t iosize,
> - resource_size_t irq,
> +struct imx_esdhc_imx_data {
> + const char *devid;
> + int id;
> + resource_size_t iobase;
> + resource_size_t iosize;
> + resource_size_t irq;
> +};
> +struct platform_device *__init imx_add_esdhc(
> + const struct imx_esdhc_imx_data *data,
> const struct esdhc_platform_data *pdata);
> diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/plat-mxc/include/mach/mx25.h
> index 153dd1b..31d9c4c 100644
> --- a/arch/arm/plat-mxc/include/mach/mx25.h
> +++ b/arch/arm/plat-mxc/include/mach/mx25.h
> @@ -50,8 +50,8 @@
> #define MX25_SSI1_BASE_ADDR 0x50034000
> #define MX25_NFC_BASE_ADDR 0xbb000000
> #define MX25_DRYICE_BASE_ADDR 0x53ffc000
> -#define MX25_ESDHC1_BASE_ADDR 0x53fb4000
> -#define MX25_ESDHC2_BASE_ADDR 0x53fb8000
> +#define MX25_MMC_SDHC1_BASE_ADDR 0x53fb4000
> +#define MX25_MMC_SDHC2_BASE_ADDR 0x53fb8000
> #define MX25_LCDC_BASE_ADDR 0x53fbc000
> #define MX25_KPP_BASE_ADDR 0x43fa8000
> #define MX25_OTG_BASE_ADDR 0x53ff4000
> diff --git a/arch/arm/plat-mxc/include/mach/mx35.h b/arch/arm/plat-mxc/include/mach/mx35.h
> index cb071b7..6f113fc 100644
> --- a/arch/arm/plat-mxc/include/mach/mx35.h
> +++ b/arch/arm/plat-mxc/include/mach/mx35.h
> @@ -53,9 +53,9 @@
> #define MX35_GPIO3_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xa4000)
> #define MX35_SCC_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xac000)
> #define MX35_RNGA_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xb0000)
> -#define MX35_ESDHC1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xb4000)
> -#define MX35_ESDHC2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xb8000)
> -#define MX35_ESDHC3_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xbc000)
> +#define MX35_MMC_SDHC1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xb4000)
> +#define MX35_MMC_SDHC2_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xb8000)
> +#define MX35_MMC_SDHC3_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xbc000)
> #define MX35_IPU_CTRL_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xc0000)
> #define MX35_AUDMUX_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xc4000)
> #define MX35_GPIO1_BASE_ADDR (MX35_AIPS2_BASE_ADDR + 0xcc000)
> diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
> index c54b5c3..38cf657 100644
> --- a/arch/arm/plat-mxc/include/mach/mx51.h
> +++ b/arch/arm/plat-mxc/include/mach/mx51.h
> @@ -139,7 +139,7 @@
> #define MX51_MIPI_HSC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xdc000)
> #define MX51_ATA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe0000)
> #define MX51_SIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe4000)
> -#define MX51_SSI3BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe8000)
> +#define MX51_SSI3_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe8000)
This is unrelated, no?
> #define MX51_FEC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xec000)
> #define MX51_TVE_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf0000)
> #define MX51_VPU_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf4000)
> @@ -280,10 +280,10 @@
> */
> #define MX51_MXC_INT_BASE 0
> #define MX51_MXC_INT_RESV0 0
> -#define MX51_MXC_INT_MMC_SDHC1 1
> -#define MX51_MXC_INT_MMC_SDHC2 2
> -#define MX51_MXC_INT_MMC_SDHC3 3
> -#define MX51_MXC_INT_MMC_SDHC4 4
> +#define MX51_INT_MMC_SDHC1 1
> +#define MX51_INT_MMC_SDHC2 2
> +#define MX51_INT_MMC_SDHC3 3
> +#define MX51_INT_MMC_SDHC4 4
> #define MX51_MXC_INT_RESV5 5
> #define MX51_INT_SDMA 6
> #define MX51_MXC_INT_IOMUX 7
> @@ -375,7 +375,7 @@
> #define MX51_MXC_INT_FIRI 93
> #define MX51_MXC_INT_PWM2 94
> #define MX51_MXC_INT_SLIM_EXP 95
> -#define MX51_MXC_INT_SSI3 96
> +#define MX51_INT_SSI3 96
ditto
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2010-10-12 12:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 12:23 [PATCH 1/3] imx-esdhc: update devices registration Eric Bénard
2010-10-12 12:23 ` [PATCH 2/3] mx25: fix compile error in platform-imx-dma.c Eric Bénard
2010-10-12 12:35 ` Uwe Kleine-König
2010-10-12 12:23 ` [PATCH 3/3] iomux-mx51: fix GPIO_1_xx 's IOMUX configuration Eric Bénard
2010-10-12 12:31 ` [PATCH v2 1/3] imx-esdhc: update devices registration Eric Bénard
2010-10-12 12:33 ` Uwe Kleine-König [this message]
2010-10-12 12:57 ` [PATCH " Eric Bénard
2010-10-12 13:04 ` Uwe Kleine-König
2010-10-12 14:58 ` [PATCH v3] " Eric Bénard
2010-10-12 15:08 ` Uwe Kleine-König
2010-10-12 15:16 ` Eric Bénard
2010-10-12 15:31 ` Wolfram Sang
2010-10-12 17:33 ` [PATCH v4] " Eric Bénard
2010-10-15 9:01 ` Uwe Kleine-König
2010-10-15 9:16 ` Eric Bénard
2010-10-20 14:55 ` Uwe Kleine-König
2010-10-20 15:05 ` Eric Bénard
2010-10-20 15:44 ` Uwe Kleine-König
2010-10-21 19:47 ` Eric Bénard
2010-10-22 7:20 ` [PATCH v2] ARM: mx3: fix build failure concerning MXC_INT_MMC_SDHC2 Uwe Kleine-König
2010-10-22 9:56 ` Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101012123312.GK29673@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).