Message ID | 1393662801-17950-4-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sat, Mar 01, 2014 at 09:33:20AM +0100, Sebastian Hesselbarth wrote: > DT-enabled Dove will move over from ARCH_DOVE in mach-dove to MACH_DOVE in > mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new > DT-only MACH_DOVE Kconfig. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > --- > Chris, > > Mark Brown requested to take the corresponding ASoC patch through > his tree. Therefore, I have split the former patch into individual subsystem > patches. > > Cc: Chris Ball <chris@printf.net> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Gregory Clement <gregory.clement@free-electrons.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/mmc/host/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Jason Cooper <jason@lakedaemon.net> thx, Jason.
On 03/04/2014 05:03 AM, Jason Cooper wrote: > On Sat, Mar 01, 2014 at 09:33:20AM +0100, Sebastian Hesselbarth wrote: >> DT-enabled Dove will move over from ARCH_DOVE in mach-dove to MACH_DOVE in >> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new >> DT-only MACH_DOVE Kconfig. >> >> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >> --- >> Chris, >> >> Mark Brown requested to take the corresponding ASoC patch through >> his tree. Therefore, I have split the former patch into individual subsystem >> patches. >> >> Cc: Chris Ball <chris@printf.net> >> Cc: Jason Cooper <jason@lakedaemon.net> >> Cc: Andrew Lunn <andrew@lunn.ch> >> Cc: Gregory Clement <gregory.clement@free-electrons.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> --- >> drivers/mmc/host/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Jason Cooper <jason@lakedaemon.net> Ping. Chris, can you please take it in for v3.15-rc1? Sebastian
On 03/27/2014 04:24 PM, Sebastian Hesselbarth wrote: > On 03/04/2014 05:03 AM, Jason Cooper wrote: >> On Sat, Mar 01, 2014 at 09:33:20AM +0100, Sebastian Hesselbarth wrote: >>> DT-enabled Dove will move over from ARCH_DOVE in mach-dove to >>> MACH_DOVE in >>> mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new >>> DT-only MACH_DOVE Kconfig. >>> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >>> --- >>> Chris, >>> >>> Mark Brown requested to take the corresponding ASoC patch through >>> his tree. Therefore, I have split the former patch into individual >>> subsystem >>> patches. >>> >>> Cc: Chris Ball <chris@printf.net> >>> Cc: Jason Cooper <jason@lakedaemon.net> >>> Cc: Andrew Lunn <andrew@lunn.ch> >>> Cc: Gregory Clement <gregory.clement@free-electrons.com> >>> Cc: linux-arm-kernel@lists.infradead.org >>> Cc: linux-kernel@vger.kernel.org >>> --- >>> drivers/mmc/host/Kconfig | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> Acked-by: Jason Cooper <jason@lakedaemon.net> > > Ping. Chris, can you please take it in for v3.15-rc1? Ping again. Chris, anything wrong with this one? It still applies to v3.15-rc1 and is required to get sdhci working again on MULTI_V7 Dove. Sebastian
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 1384f67abe21..a69e48b582e5 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -168,7 +168,7 @@ config MMC_SDHCI_ESDHC_IMX config MMC_SDHCI_DOVE tristate "SDHCI support on Marvell's Dove SoC" - depends on ARCH_DOVE + depends on ARCH_DOVE || MACH_DOVE depends on MMC_SDHCI_PLTFM select MMC_SDHCI_IO_ACCESSORS help
DT-enabled Dove will move over from ARCH_DOVE in mach-dove to MACH_DOVE in mach-mvebu. As non-DT ARCH_DOVE will stay to rot for a while, add a new DT-only MACH_DOVE Kconfig. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Chris, Mark Brown requested to take the corresponding ASoC patch through his tree. Therefore, I have split the former patch into individual subsystem patches. Cc: Chris Ball <chris@printf.net> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/mmc/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)