From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/6] ARM: mxs: dynamically allocate mmc device
Date: Tue, 22 Feb 2011 19:33:49 +0100 [thread overview]
Message-ID: <20110222183349.GC22310@pengutronix.de> (raw)
In-Reply-To: <20110222123940.GF19871@S2100-06.ap.freescale.net>
Hello Shawn,
On Tue, Feb 22, 2011 at 08:39:41PM +0800, Shawn Guo wrote:
> On Tue, Feb 22, 2011 at 09:31:13AM +0100, Uwe Kleine-K?nig wrote:
> > On Mon, Feb 21, 2011 at 06:42:56PM +0800, Shawn Guo wrote:
> > > Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
> > > ---
> > > arch/arm/mach-mxs/clock-mx23.c | 16 +++++
> > > arch/arm/mach-mxs/clock-mx28.c | 18 +++++
> > > arch/arm/mach-mxs/devices-mx23.h | 4 +
> > > arch/arm/mach-mxs/devices-mx28.h | 4 +
> > > arch/arm/mach-mxs/devices/Kconfig | 3 +
> > > arch/arm/mach-mxs/devices/Makefile | 1 +
> > > arch/arm/mach-mxs/devices/platform-mmc.c | 77 +++++++++++++++++++++++
> > > arch/arm/mach-mxs/include/mach/devices-common.h | 13 ++++
> > > 8 files changed, 136 insertions(+), 0 deletions(-)
> > > create mode 100644 arch/arm/mach-mxs/devices/platform-mmc.c
> > >
> > > diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c
> > > index c19b69a..a1ed5f4 100644
> > > --- a/arch/arm/mach-mxs/clock-mx23.c
> > > +++ b/arch/arm/mach-mxs/clock-mx23.c
> > > @@ -445,6 +445,7 @@ static struct clk_lookup lookups[] = {
> > > _REGISTER_CLOCK("rtc", NULL, rtc_clk)
> > > _REGISTER_CLOCK("mxs-dma-apbh", NULL, hbus_clk)
> > > _REGISTER_CLOCK("mxs-dma-apbx", NULL, xbus_clk)
> > > + _REGISTER_CLOCK("mxs-mmc.0", NULL, ssp_clk)
> > > _REGISTER_CLOCK(NULL, "usb", usb_clk)
> > > _REGISTER_CLOCK(NULL, "audio", audio_clk)
> > > _REGISTER_CLOCK(NULL, "pwm", pwm_clk)
> > > @@ -515,6 +516,15 @@ static int clk_misc_init(void)
> > > __raw_writel(BM_CLKCTRL_CPU_INTERRUPT_WAIT,
> > > CLKCTRL_BASE_ADDR + HW_CLKCTRL_CPU_SET);
> > >
> > > + /*
> > > + * 480 MHz seems too high to be ssp clock source directly,
> > > + * so set frac to get a 288 MHz ref_io.
> > > + */
> > > + reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC);
> > > + reg &= ~BM_CLKCTRL_FRAC_IOFRAC;
> > > + reg |= 30 << BP_CLKCTRL_FRAC_IOFRAC;
> > > + __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC);
> > > +
> > > return 0;
> > > }
> > >
> > > @@ -522,6 +532,12 @@ int __init mx23_clocks_init(void)
> > > {
> > > clk_misc_init();
> > >
> > > + /*
> > > + * source ssp clock from ref_io than ref_xtal,
> > > + * as ref_xtal only provides 24 MHz as maximum.
> > > + */
> > > + clk_set_parent(&ssp_clk, &ref_io_clk);
> > > +
> > > clk_enable(&cpu_clk);
> > > clk_enable(&hbus_clk);
> > > clk_enable(&xbus_clk);
> > > diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
> > > index 9f4ee36..aeb7b2c 100644
> > > --- a/arch/arm/mach-mxs/clock-mx28.c
> > > +++ b/arch/arm/mach-mxs/clock-mx28.c
> > > @@ -619,6 +619,8 @@ static struct clk_lookup lookups[] = {
> > > _REGISTER_CLOCK("pll2", NULL, pll2_clk)
> > > _REGISTER_CLOCK("mxs-dma-apbh", NULL, hbus_clk)
> > > _REGISTER_CLOCK("mxs-dma-apbx", NULL, xbus_clk)
> > > + _REGISTER_CLOCK("mxs-mmc.0", NULL, ssp0_clk)
> > > + _REGISTER_CLOCK("mxs-mmc.1", NULL, ssp1_clk)
> > > _REGISTER_CLOCK("flexcan.0", NULL, can0_clk)
> > > _REGISTER_CLOCK("flexcan.1", NULL, can1_clk)
> > > _REGISTER_CLOCK(NULL, "usb0", usb0_clk)
> > > @@ -730,6 +732,15 @@ static int clk_misc_init(void)
> > > reg |= BM_CLKCTRL_ENET_CLK_OUT_EN;
> > > __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_ENET);
> > >
> > > + /*
> > > + * 480 MHz seems too high to be ssp clock source directly,
> > > + * so set frac0 to get a 288 MHz ref_io0.
> > > + */
> > > + reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC0);
> > > + reg &= ~BM_CLKCTRL_FRAC0_IO0FRAC;
> > > + reg |= 30 << BP_CLKCTRL_FRAC0_IO0FRAC;
> > > + __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_FRAC0);
> > > +
> > > return 0;
> > > }
> > >
> > > @@ -737,6 +748,13 @@ int __init mx28_clocks_init(void)
> > > {
> > > clk_misc_init();
> > >
> > > + /*
> > > + * source ssp clock from ref_io0 than ref_xtal,
> > > + * as ref_xtal only provides 24 MHz as maximum.
> > > + */
> > > + clk_set_parent(&ssp0_clk, &ref_io0_clk);
> > > + clk_set_parent(&ssp1_clk, &ref_io0_clk);
> > > +
> > > clk_enable(&cpu_clk);
> > > clk_enable(&hbus_clk);
> > > clk_enable(&xbus_clk);
> > > diff --git a/arch/arm/mach-mxs/devices-mx23.h b/arch/arm/mach-mxs/devices-mx23.h
> > > index 1256788..4419390 100644
> > > --- a/arch/arm/mach-mxs/devices-mx23.h
> > > +++ b/arch/arm/mach-mxs/devices-mx23.h
> > > @@ -14,3 +14,7 @@
> > > extern const struct amba_device mx23_duart_device __initconst;
> > > #define mx23_add_duart() \
> > > mxs_add_duart(&mx23_duart_device)
> > > +
> > > +extern const struct mxs_mmc_data mx23_mmc_data[] __initconst;
> > > +#define mx23_add_mmc(id, pdata) \
> > > + mxs_add_mmc(&mx23_mmc_data[id], pdata)
> > mxs_mmc please (not sure about mxs_mxs_mmc_data, but it would be
> > consistent). At least mx23_add_mxs_mmc and mxs_add_mxs_mmc.
> >
> > > diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h
> > > index 3b18304..540639d 100644
> > > --- a/arch/arm/mach-mxs/devices-mx28.h
> > > +++ b/arch/arm/mach-mxs/devices-mx28.h
> > > @@ -32,3 +32,7 @@ extern const struct mxs_flexcan_data mx28_flexcan_data[] __initconst;
> > > mxs_add_flexcan(&mx28_flexcan_data[id], pdata)
> > > #define mx28_add_flexcan0(pdata) mx28_add_flexcan(0, pdata)
> > > #define mx28_add_flexcan1(pdata) mx28_add_flexcan(1, pdata)
> > > +
> > > +extern const struct mxs_mmc_data mx28_mmc_data[] __initconst;
> > > +#define mx28_add_mmc(id, pdata) \
> > > + mxs_add_mmc(&mx28_mmc_data[id], pdata)
> > This conflicts with my series, but it's trivial enough to let Sascha
> > handle that.
> >
> > > diff --git a/arch/arm/mach-mxs/devices/Kconfig b/arch/arm/mach-mxs/devices/Kconfig
> > > index 6c65b67..49307f8 100644
> > > --- a/arch/arm/mach-mxs/devices/Kconfig
> > > +++ b/arch/arm/mach-mxs/devices/Kconfig
> > > @@ -11,3 +11,6 @@ config MXS_HAVE_PLATFORM_FEC
> > > config MXS_HAVE_PLATFORM_FLEXCAN
> > > select HAVE_CAN_FLEXCAN if CAN
> > > bool
> > > +
> > > +config MXS_HAVE_PLATFORM_MMC
> > > + bool
> > ditto MXS_HAVE_PLATFORM_MXS_MMC
> >
> > > diff --git a/arch/arm/mach-mxs/devices/Makefile b/arch/arm/mach-mxs/devices/Makefile
> > > index ca7acc4..c0dacfd 100644
> > > --- a/arch/arm/mach-mxs/devices/Makefile
> > > +++ b/arch/arm/mach-mxs/devices/Makefile
> > > @@ -3,3 +3,4 @@ obj-$(CONFIG_MXS_HAVE_PLATFORM_AUART) += platform-auart.o
> > > obj-y += platform-dma.o
> > > obj-$(CONFIG_MXS_HAVE_PLATFORM_FEC) += platform-fec.o
> > > obj-$(CONFIG_MXS_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o
> > > +obj-$(CONFIG_MXS_HAVE_PLATFORM_MMC) += platform-mmc.o
> > > diff --git a/arch/arm/mach-mxs/devices/platform-mmc.c b/arch/arm/mach-mxs/devices/platform-mmc.c
> > > new file mode 100644
> > > index 0000000..868def1
> > > --- /dev/null
> > > +++ b/arch/arm/mach-mxs/devices/platform-mmc.c
> > > @@ -0,0 +1,77 @@
> > > +/*
> > > + * Copyright (C) 2010 Pengutronix
> > > + * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
> > > + *
> > > + * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
> > > + *
> > > + * This program is free software; you can redistribute it and/or modify it under
> > > + * the terms of the GNU General Public License version 2 as published by the
> > > + * Free Software Foundation.
> > > + */
> > > +
> > > +#include <linux/compiler.h>
> > > +#include <linux/err.h>
> > > +#include <linux/init.h>
> > > +
> > > +#include <mach/mx23.h>
> > > +#include <mach/mx28.h>
> > > +#include <mach/devices-common.h>
> > > +
> > > +#define mxs_mmc_data_entry_single(soc, _id, hwid) \
> > > + { \
> > > + .id = _id, \
> > > + .iobase = soc ## _SSP ## hwid ## _BASE_ADDR, \
> > > + .dma = soc ## _DMA_SSP ## hwid, \
> > > + .irq_err = soc ## _INT_SSP ## hwid ## _ERROR, \
> > > + .irq_dma = soc ## _INT_SSP ## hwid ## _DMA, \
> > > + }
> > > +
> > > +#define mxs_mmc_data_entry(soc, _id, hwid) \
> > > + [_id] = mxs_mmc_data_entry_single(soc, _id, hwid)
> > > +
> > > +
> > > +#ifdef CONFIG_SOC_IMX23
> > > +const struct mxs_mmc_data mx23_mmc_data[] __initconst = {
> > > +#define mx23_mmc_data_entry(_id, hwid) \
> > > + mxs_mmc_data_entry(MX23, _id, hwid)
> > > + mx23_mmc_data_entry(0, 1),
> > > + mx23_mmc_data_entry(1, 2),
> > > +};
> > hmm, maybe let mxs-mmc.1 use MX23_SSP1_BASE_ADDR?
> > BTW, Sascha pointed out that
> >
> > mxs_mmc_data_entry(MX23, 0, 1),
> > mxs_mmc_data_entry(MX23, 1, 2),
> >
> > is easier than
> >
> > #define mx23_mmc_data_entry(_id, hwid) \
> > mxs_mmc_data_entry(MX23, _id, hwid)
> > mx23_mmc_data_entry(0, 1),
> > mx23_mmc_data_entry(1, 2),
> >
> This approach was used in mx23 auart device code which Sascha has
> merged.
Yeah, I don't care that much. Do as you prefer. Sascha told me to
rework the existing code in a free minute to the two-line variant.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-02-22 18:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 10:42 [PATCH v3] Add mmc device for i.MX23/28 Shawn Guo
2011-02-21 10:42 ` [PATCH v3 1/6] ARM: mxs/clock: fix base address missing in name##_set_parent Shawn Guo
2011-02-21 10:42 ` [PATCH v3 2/6] ARM: mxs: make ssp error irq definition consistent Shawn Guo
2011-02-22 8:20 ` Uwe Kleine-König
2011-02-21 10:42 ` [PATCH v3 3/6] ARM: mxs: dynamically allocate mmc device Shawn Guo
2011-02-22 8:31 ` Uwe Kleine-König
2011-02-22 12:39 ` Shawn Guo
2011-02-22 18:33 ` Uwe Kleine-König [this message]
2011-03-16 10:31 ` [PATCH v4 " Uwe Kleine-König
2011-02-21 10:42 ` [PATCH v3 4/6] ARM: mxs: fix typo "GPO" in iomux-mx23.h Shawn Guo
2011-02-25 20:55 ` Uwe Kleine-König
2011-02-21 10:42 ` [PATCH v3 5/6] ARM: mxs/mx23evk: add mmc device Shawn Guo
2011-02-21 17:42 ` Wolfram Sang
2011-02-22 8:33 ` Uwe Kleine-König
2011-02-22 12:22 ` Shawn Guo
2011-02-22 8:49 ` [PATCH v4] " Shawn Guo
2011-02-22 10:35 ` Wolfram Sang
2011-02-21 10:42 ` [PATCH v3 6/6] ARM: mxs/mx28evk: " Shawn Guo
2011-02-22 8:50 ` [PATCH v4] " Shawn Guo
2011-02-22 10:35 ` Wolfram Sang
2011-03-25 11:46 ` mx28 sdio problems (was: Re: [PATCH v4] ARM: mxs/mx28evk: add mmc device) Marc Kleine-Budde
2011-03-26 14:13 ` Shawn Guo
2011-03-29 10:05 ` mx28 sdio problems Marc Kleine-Budde
2011-02-21 17:40 ` [PATCH v3] Add mmc device for i.MX23/28 Wolfram Sang
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=20110222183349.GC22310@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.