Re: [PATCH 1/2] ARM: OMAP: Trivial driver changes to remove include plat/cpu.h
* Péter Ujfalusi [121009 02:03]: > On 10/08/2012 07:35 PM, Tony Lindgren wrote: > > > - omap-dma.c and omap-pcm.c can test the arch locally as > > omap1 and omap2 cannot be compiled together because of > > conflicting compiler flags > > > sound/soc/omap/omap-pcm.c |9 +++-- > > Tony: is this going to be included in 3.7? Hmm I guess we could try to get this out of the way to cut down the dependencies. Let's if maintainers of the other affected drivers this is OK for the -rc series. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] mmc: mxcmmc: Fix MODULE_ALIAS
The correct name for the driver is "mxc-mmc".
Signed-off-by: Fabio Estevam
---
drivers/mmc/host/mxcmmc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 565c2e4..6290b7f 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -1134,4 +1134,4 @@ module_platform_driver(mxcmci_driver);
MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver");
MODULE_AUTHOR("Sascha Hauer, Pengutronix");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:imx-mmc");
+MODULE_ALIAS("platform:mxc-mmc");
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC PATCH 03/13] ARM: edma: add DT and runtime PM support for AM335x
On Fri, Sep 21, 2012 at 08:53:06AM +, Hebbar, Gururaja wrote:
> On Thu, Sep 20, 2012 at 20:13:36, Porter, Matt wrote:
> > Adds support for parsing the TI EDMA DT data into the required
> > EDMA private API platform data.
> >
> > Calls runtime PM API only in the DT case in order to unidle the
> > associated hwmods on AM335x.
> >
> > Signed-off-by: Matt Porter
> > ---
> > arch/arm/common/edma.c | 252
> > --
> > arch/arm/include/asm/mach/edma.h |8 +-
> > 2 files changed, 244 insertions(+), 16 deletions(-)
>
> The binding documentation should be updated along with the driver
> change that does introduce the binding. You could just merged patch #4
> and #5.
Hi Gururaja,
Sorry I missed these comments for this long...
I've been asked by maintainers to keep the binding separate in other
drivers. It is documentation that is independent of the driver in
any case...I'll move the binding before this implementation though.
> > diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
> > index 001d268..f337f81 100644
> > --- a/arch/arm/common/edma.c
> > +++ b/arch/arm/common/edma.c
> > @@ -24,6 +24,13 @@
> > #include
> > #include
> > #include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> >
> > #include
> >
> > @@ -1366,30 +1373,236 @@ void edma_clear_event(unsigned channel)
> > EXPORT_SYMBOL(edma_clear_event);
> >
> > /*---*/
> > +static int edma_of_read_u32_to_s8_array(const struct device_node *np,
> > +const char *propname, s8 *out_values,
> > +size_t sz)
> > +{
> > + struct property *prop = of_find_property(np, propname, NULL);
> > + const __be32 *val;
> > +
> > + if (!prop)
> > + return -EINVAL;
> > + if (!prop->value)
> > + return -ENODATA;
> > + if ((sz * sizeof(u32)) > prop->length)
> > + return -EOVERFLOW;
> > +
> > + val = prop->value;
> > +
> > + while (sz--)
> > + *out_values++ = (s8)(be32_to_cpup(val++) & 0xff);
> > +
> > + /* Terminate it */
> > + *out_values++ = -1;
> > + *out_values++ = -1;
> > +
> > + return 0;
> > +}
> > +
> > +static int edma_of_read_u32_to_s16_array(const struct device_node *np,
> > +const char *propname, s16 *out_values,
> > +size_t sz)
> > +{
> > + struct property *prop = of_find_property(np, propname, NULL);
> > + const __be32 *val;
> > +
> > + if (!prop)
> > + return -EINVAL;
> > + if (!prop->value)
> > + return -ENODATA;
> > + if ((sz * sizeof(u32)) > prop->length)
> > + return -EOVERFLOW;
> > +
> > + val = prop->value;
> > +
> > + while (sz--)
> > + *out_values++ = (s16)(be32_to_cpup(val++) & 0x);
> > +
> > + /* Terminate it */
> > + *out_values++ = -1;
> > + *out_values++ = -1;
> > +
> > + return 0;
> > +}
> > +
> > +static int edma_of_parse_dt(struct device *dev,
> > + struct device_node *node,
> > + struct edma_soc_info *pdata)
> > +{
> > + int ret = 0;
> > + u32 value;
> > + struct property *prop;
> > + size_t sz;
> > + struct edma_rsv_info *rsv_info;
> > + s16 (*rsv_chans)[2], (*rsv_slots)[2];
> > + s8 (*queue_tc_map)[2], (*queue_priority_map)[2];
> > +
> > + ret = of_property_read_u32(node, "dma-channels", &value);
> > + if (ret < 0)
> > + return ret;
> > + pdata->n_channel = value;
> > +
> > + ret = of_property_read_u32(node, "ti,edma-regions", &value);
> > + if (ret < 0)
> > + return ret;
> > + pdata->n_region = value;
> > +
> > + ret = of_property_read_u32(node, "ti,edma-slots", &value);
> > + if (ret < 0)
> > + return ret;
> > + pdata->n_slot = value;
> > +
> > + pdata->n_cc = 1;
> > + /* This is unused */
> > + pdata->n_tc = 3;
> > +
> > + rsv_info =
> > + devm_kzalloc(dev, sizeof(struct edma_rsv_info), GFP_KERNEL);
> > + if (!rsv_info)
> > + return -ENOMEM;
> > + pdata->rsv = rsv_info;
> > +
> > + /* Build the reserved channel/slots arrays */
> > + prop = of_find_property(node, "ti,edma-reserved-channels", &sz);
> > + if (!prop)
> > + return -EINVAL;
> > +
> > + rsv_chans =
> > + devm_kzalloc(dev, sz/sizeof(s16) + 2*sizeof(s16), GFP_KERNEL);
> > + if (!rsv_chans)
> > + return -ENOMEM;
> > + pdata->rsv->rsv_chans = rsv_chans;
> > +
> > + ret = edma_of_read_u32_to_s16_array(node, "ti,edma-reserved-channels",
> > + (s16 *)rsv_chans, sz/sizeof(u32));
> > + if (ret < 0)
> > + return ret;
> > +
> > + prop = of_find_property(node, "ti,edma-reserved-slots", &sz);
> > + if (!prop)
> > + return -EINVAL;
> > +
>
> Binding Documentation mentions edma-reserve
Re: [PATCH] mmc: mxs: fix build regression from mismerge
On Tuesday 09 October 2012, Chris Ball wrote: > I'll send Marek's change to Linus once the main MMC merge has been pulled. Ok, thanks! Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] mmc: mxs: fix build regression from mismerge
Dear Chris Ball, > Hi, > > On Tue, Oct 09 2012, Arnd Bergmann wrote: > > From all I can tell, the patches > > > > fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop" > > 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI" > > > > came in through separate branches and cause this build error when > > combined. [...] > > I'll send Marek's change to Linus once the main MMC merge has been pulled. > Thanks, > > - Chris. Thanks! Sorry from my previous reply from Android phone, I just saw what horrible email it generated :-( Best regards, Marek Vasut -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] mmc: mxs: fix build regression from mismerge
Hi,
On Tue, Oct 09 2012, Arnd Bergmann wrote:
> From all I can tell, the patches
>
> fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop"
> 829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI"
>
> came in through separate branches and cause this build error when
> combined.
>
> drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq':
> drivers/mmc/host/mxs-mmc.c:527:78: error: 'struct mxs_mmc_host' has no member
> named 'base'
> drivers/mmc/host/mxs-mmc.c:527:95: error: 'struct mxs_mmc_host' has no member
> named 'devid'
>
> This does the obvious missing change.
>
> Signed-off-by: Arnd Bergmann
> Cc: Attila Kinali
> Cc: Lauri Hintsala
> Cc: Marek Vasut
> Cc: Chris Ball
> Cc: Shawn Guo
> Cc: Mark Brown
>
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index bb4c2bf..80d1e6d 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc,
> int enable)
> writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
> ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
> writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
> -host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
> +ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
> } else {
> writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
> ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
>
I'll send Marek's change to Linus once the main MMC merge has been pulled.
Thanks,
- Chris.
--
Chris Ball
[PATCH] mmc: mxs: fix build regression from mismerge
>From all I can tell, the patches
fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop"
829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI"
came in through separate branches and cause this build error when
combined.
drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq':
drivers/mmc/host/mxs-mmc.c:527:78: error: 'struct mxs_mmc_host' has no member
named 'base'
drivers/mmc/host/mxs-mmc.c:527:95: error: 'struct mxs_mmc_host' has no member
named 'devid'
This does the obvious missing change.
Signed-off-by: Arnd Bergmann
Cc: Attila Kinali
Cc: Lauri Hintsala
Cc: Marek Vasut
Cc: Chris Ball
Cc: Shawn Guo
Cc: Mark Brown
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index bb4c2bf..80d1e6d 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc,
int enable)
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
- host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
+ ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
} else {
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] Disintegrate UAPI for mmc
Can you merge the following branch into the mmc tree please.
This is to complete part of the Userspace API (UAPI) disintegration for which
the preparatory patches were pulled recently. After these patches, userspace
headers will be segregated into:
include/uapi/linux/.../foo.h
for the userspace interface stuff, and:
include/linux/.../foo.h
for the strictly kernel internal stuff.
---
The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git
tags/disintegrate-mmc-20121009
for you to fetch changes up to ad1cfdcef1378adc7215a74772f7d06c4cc6ef50:
UAPI: (Scripted) Disintegrate include/linux/mmc (2012-10-09 09:48:45 +0100)
UAPI Disintegration 2012-10-09
David Howells (1):
UAPI: (Scripted) Disintegrate include/linux/mmc
include/linux/mmc/Kbuild | 1 -
include/uapi/linux/mmc/Kbuild| 1 +
include/{ => uapi}/linux/mmc/ioctl.h | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename include/{ => uapi}/linux/mmc/ioctl.h (100%)
.
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ARM: OMAP: Trivial driver changes to remove include plat/cpu.h
On 10/08/2012 07:35 PM, Tony Lindgren wrote: > - omap-dma.c and omap-pcm.c can test the arch locally as > omap1 and omap2 cannot be compiled together because of > conflicting compiler flags > sound/soc/omap/omap-pcm.c |9 +++-- Tony: is this going to be included in 3.7? Acked-by: Peter Ujfalusi -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
