| Message ID | 1400522571-10799-1-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 19, 2014 at 08:02:51PM +0200, Sebastian Hesselbarth wrote: > DT-enabled Dove moved 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. This slipped through the cracks and now is > a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Acked-by: Jason Cooper <jason@lakedaemon.net> Tested-by: Andrew Lunn <andrew@lunn.ch> Thanks Sebastian Andrew > --- > Cc: Chris Ball <chris@printf.net> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Gregory Clement <gregory.clement@free-electrons.com> > Cc: linux-mmc@vger.kernel.org > 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(-) > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 8aaf8c1f3f63..37665553ef33 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 > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Mon, May 19, 2014@08:02:51PM +0200, Sebastian Hesselbarth wrote: > DT-enabled Dove moved 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. This slipped through the cracks and now is > a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. Dove cubox has usually rootfs on mmc, so this patch is very much needed for using multiplatform kernel on dove cubox. Tested-by: Riku Voipio <riku.voipio@iki.fi> > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Acked-by: Jason Cooper <jason@lakedaemon.net> > --- > Cc: Chris Ball <chris@printf.net> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Gregory Clement <gregory.clement@free-electrons.com> > Cc: linux-mmc@vger.kernel.org > 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(-) > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 8aaf8c1f3f63..37665553ef33 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 > -- > 1.9.1 > >
On 19 May 2014 20:02, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> wrote: > DT-enabled Dove moved 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. This slipped through the cracks and now is > a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > Acked-by: Jason Cooper <jason@lakedaemon.net> Thanks! Picked up for the PR I send to Chris. Kind regards Ulf Hansson > --- > Cc: Chris Ball <chris@printf.net> > Cc: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Andrew Lunn <andrew@lunn.ch> > Cc: Gregory Clement <gregory.clement@free-electrons.com> > Cc: linux-mmc@vger.kernel.org > 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(-) > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 8aaf8c1f3f63..37665553ef33 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 > -- > 1.9.1 >
On 05/22/2014 11:09 AM, Ulf Hansson wrote: > On 19 May 2014 20:02, Sebastian Hesselbarth > <sebastian.hesselbarth@gmail.com> wrote: >> DT-enabled Dove moved 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. This slipped through the cracks and now is >> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. >> >> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >> Acked-by: Jason Cooper <jason@lakedaemon.net> > > Thanks! Picked up for the PR I send to Chris. Ulf, thanks for picking it up. I noticed it will now end up in v3.16 and not as a fix for v3.15. I'll come back to it, if v3.15 will ever become a stable version ;) Anyway, great you are helping Chris to pre-select the mmc patches! Sebastian
On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote: > On 19 May 2014 20:02, Sebastian Hesselbarth > <sebastian.hesselbarth@gmail.com> wrote: >> DT-enabled Dove moved 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. This slipped through the cracks and now is >> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. >> >> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >> Acked-by: Jason Cooper <jason@lakedaemon.net> > > Thanks! Picked up for the PR I send to Chris. Ulf, you might consider adding your tree to linux-next if this is going to be a common work flow for you guys. It's partially up to Chris though, if he's OK with patches going into your branch more or less being guaranteed to make it into his as well. -Olof
On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote: > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote: >> On 19 May 2014 20:02, Sebastian Hesselbarth >> <sebastian.hesselbarth@gmail.com> wrote: >>> DT-enabled Dove moved 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. This slipped through the cracks and now is >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. >>> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >>> Acked-by: Jason Cooper <jason@lakedaemon.net> >> >> Thanks! Picked up for the PR I send to Chris. > > Ulf, you might consider adding your tree to linux-next if this is > going to be a common work flow for you guys. That's done already. :-) There are patches which makes this visible in the MAINTAINERS as well, queued for 3.16. git://git.linaro.org/people/ulf.hansson/mmc.git next Though due to merge conflicts, during this release cycle, I didn't want to queue any patches besides for the mmci host driver. > > It's partially up to Chris though, if he's OK with patches going into > your branch more or less being guaranteed to make it into his as well. > Yes, we need to figure out a good work flow when using two separate trees. Thanks for bringing this up! Kind regards Ulf Hansson
On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote: > On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote: > > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote: > >> On 19 May 2014 20:02, Sebastian Hesselbarth > >> <sebastian.hesselbarth@gmail.com> wrote: > >>> DT-enabled Dove moved 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. This slipped through the cracks and now is > >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. > >>> > >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > >>> Acked-by: Jason Cooper <jason@lakedaemon.net> > >> > >> Thanks! Picked up for the PR I send to Chris. > > > > Ulf, you might consider adding your tree to linux-next if this is > > going to be a common work flow for you guys. > > That's done already. :-) There are patches which makes this visible in > the MAINTAINERS as well, queued for 3.16. > > git://git.linaro.org/people/ulf.hansson/mmc.git next > > Though due to merge conflicts, during this release cycle, I didn't > want to queue any patches besides for the mmci host driver. > > > > > It's partially up to Chris though, if he's OK with patches going into > > your branch more or less being guaranteed to make it into his as well. > > > > Yes, we need to figure out a good work flow when using two separate > trees. Thanks for bringing this up! If you have any questions, please ask. mvebu has been doing this for several release cycles now, and I'm also doing it for irqchip now. The biggest rule is that once you sign a tag and send a pull-request for it, the branch is immutable up to and including that tag. thx, Jason.
On Fri, May 23, 2014 at 6:41 AM, Jason Cooper <jason@lakedaemon.net> wrote: > On Fri, May 23, 2014 at 09:40:55AM +0200, Ulf Hansson wrote: >> On 23 May 2014 09:16, Olof Johansson <olof@lixom.net> wrote: >> > On Thu, May 22, 2014 at 2:09 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote: >> >> On 19 May 2014 20:02, Sebastian Hesselbarth >> >> <sebastian.hesselbarth@gmail.com> wrote: >> >>> DT-enabled Dove moved 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. This slipped through the cracks and now is >> >>> a fix to allow to build Dove's SDHCI driver for mach-mvebu on v3.15-rc. >> >>> >> >>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> >> >>> Acked-by: Jason Cooper <jason@lakedaemon.net> >> >> >> >> Thanks! Picked up for the PR I send to Chris. >> > >> > Ulf, you might consider adding your tree to linux-next if this is >> > going to be a common work flow for you guys. >> >> That's done already. :-) There are patches which makes this visible in >> the MAINTAINERS as well, queued for 3.16. >> >> git://git.linaro.org/people/ulf.hansson/mmc.git next >> >> Though due to merge conflicts, during this release cycle, I didn't >> want to queue any patches besides for the mmci host driver. >> >> > >> > It's partially up to Chris though, if he's OK with patches going into >> > your branch more or less being guaranteed to make it into his as well. >> > >> >> Yes, we need to figure out a good work flow when using two separate >> trees. Thanks for bringing this up! > > If you have any questions, please ask. mvebu has been doing this for > several release cycles now, and I'm also doing it for irqchip now. > > The biggest rule is that once you sign a tag and send a pull-request for > it, the branch is immutable up to and including that tag. ...unless you get asked to respin based on review from the person you're sending the request to. This is the main problem with multi-level maintainer trees: It's hard to run a stable non-rebasing tree as a downstream tree since there's no actual guarantee that it'll go in as-is. -Olof
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 8aaf8c1f3f63..37665553ef33 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