[PATCH 05/39] ARM: ux500: Stop passing MMC's platform data for Device Tree boots
It was required to pass DMA channel configuration information to the
MMC driver before the new DMA API was in place. Now that it is, and
is fully compatible with Device Tree we can stop doing that.
Reviewed-by: Linus Walleij
Signed-off-by: Lee Jones
---
arch/arm/mach-ux500/cpu-db8500.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 9b26fe2..96ddbae 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -234,10 +234,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[]
__initdata = {
OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL),
OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL),
OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0", &ssp0_plat),
- OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", &mop500_sdi0_data),
- OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data),
- OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", &mop500_sdi2_data),
- OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", &mop500_sdi4_data),
+ OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", NULL),
+ OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", NULL),
+ OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", NULL),
+ OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", NULL),
/* Requires clock name bindings. */
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/39] ARM: ux500: Stop passing MMC's platform data for Device Tree boots
On Wed, 15 May 2013, Linus Walleij wrote: > On Wed, May 15, 2013 at 11:51 AM, Lee Jones wrote: > > > It was required to pass DMA channel configuration information to the > > MMC driver before the new DMA API was in place. Now that it is, and > > is fully compatible with Device Tree we can stop doing that. > > > > Reviewed-by: Linus Walleij > > Signed-off-by: Lee Jones > > So since the use of dma_request_slave_channel() is not upstream, > I guess this will break DMA use (i.e slow down transfers!) on all > device tree boots? > > I'd be happy to apply it once the MMCI patch is in linux-next > indicating there may just be a window in the merge period > where it falls back to IRQ mode, but I don't want to disable > DMA on DT boots for an entire kernel cycle just like that. > > Not applied as of yet. I believe it's now okay to apply this. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/39] ARM: ux500: Stop passing MMC's platform data for Device Tree boots
On Mon, Jun 10, 2013 at 11:15 AM, Lee Jones wrote: > On Wed, 15 May 2013, Linus Walleij wrote: > >> On Wed, May 15, 2013 at 11:51 AM, Lee Jones wrote: >> >> > It was required to pass DMA channel configuration information to the >> > MMC driver before the new DMA API was in place. Now that it is, and >> > is fully compatible with Device Tree we can stop doing that. >> > >> > Reviewed-by: Linus Walleij >> > Signed-off-by: Lee Jones >> >> So since the use of dma_request_slave_channel() is not upstream, >> I guess this will break DMA use (i.e slow down transfers!) on all >> device tree boots? >> >> I'd be happy to apply it once the MMCI patch is in linux-next >> indicating there may just be a window in the merge period >> where it falls back to IRQ mode, but I don't want to disable >> DMA on DT boots for an entire kernel cycle just like that. >> >> Not applied as of yet. > > I believe it's now okay to apply this. Yep, I've rebased and applied it to the ux500-devicetree branch. I have some stuff on this branch which is queued up but may miss v3.11, because I need the 5 outstanding pull requests to land in ARM SoC so I get a merge base there before I can send any more stuff. It's mainly because this stuff isn't any orthogonal, everything just conflicts in the AUXDATA all the time. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/39] ARM: ux500: Stop passing MMC's platform data for Device Tree boots
On Wed, May 15, 2013 at 11:51 AM, Lee Jones wrote: > It was required to pass DMA channel configuration information to the > MMC driver before the new DMA API was in place. Now that it is, and > is fully compatible with Device Tree we can stop doing that. > > Reviewed-by: Linus Walleij > Signed-off-by: Lee Jones So since the use of dma_request_slave_channel() is not upstream, I guess this will break DMA use (i.e slow down transfers!) on all device tree boots? I'd be happy to apply it once the MMCI patch is in linux-next indicating there may just be a window in the merge period where it falls back to IRQ mode, but I don't want to disable DMA on DT boots for an entire kernel cycle just like that. Not applied as of yet. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
