| Message ID | 1390295561-3466-15-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/21/14 10:12, Ezequiel Garcia wrote: > After getting rid of all the mach-specific code, it's now possible > to allow builds in any Orion platform. > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > --- > drivers/watchdog/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 5be6e91..1689f72 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG > > config ORION_WATCHDOG > tristate "Orion watchdog" > - depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE > + depends on PLAT_ORION Ezequiel, while above is true now, I tend to rather have ARCH_MVEBU added here. We really want to get rid of both !ARCH_MVEBU and PLAT_ORION and this unnecessarily will make it more complicated. I haven't checked why ARCH_MVEBU at all added PLAT_ORION as dependency, but IIRC it was just because of a missing mbus driver? If it is just this, we should also remove PLAT_ORION from ARCH_MVEBU to have a clean cut between new common arch and existing sub-archs. Sebastian > select WATCHDOG_CORE > help > Say Y here if to include support for the watchdog timer >
On Tue, Jan 21, 2014 at 10:41:17AM +0100, Sebastian Hesselbarth wrote: > On 01/21/14 10:12, Ezequiel Garcia wrote: > >After getting rid of all the mach-specific code, it's now possible > >to allow builds in any Orion platform. > > > >Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > >--- > > drivers/watchdog/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > >index 5be6e91..1689f72 100644 > >--- a/drivers/watchdog/Kconfig > >+++ b/drivers/watchdog/Kconfig > >@@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG > > > > config ORION_WATCHDOG > > tristate "Orion watchdog" > >- depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE > >+ depends on PLAT_ORION > > Ezequiel, > > while above is true now, I tend to rather have ARCH_MVEBU added here. > We really want to get rid of both !ARCH_MVEBU and PLAT_ORION and this > unnecessarily will make it more complicated. > > I haven't checked why ARCH_MVEBU at all added PLAT_ORION as dependency, > but IIRC it was just because of a missing mbus driver? If it is just > this, we should also remove PLAT_ORION from ARCH_MVEBU to have a clean > cut between new common arch and existing sub-archs. I took a look at this when moving DT kirkwood into mach-mvebu. There is nothing in plat-orion which ARCH_MVEBU needs. So i agree with Sebastian, it should be PLAT_ORION || ARCH_MVEBU. Andrew
Hi Andrew, Sebastian: On Tue, Jan 21, 2014 at 10:45:01AM +0100, Andrew Lunn wrote: > On Tue, Jan 21, 2014 at 10:41:17AM +0100, Sebastian Hesselbarth wrote: > > On 01/21/14 10:12, Ezequiel Garcia wrote: > > >After getting rid of all the mach-specific code, it's now possible > > >to allow builds in any Orion platform. > > > > > >Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > >--- > > > drivers/watchdog/Kconfig | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > >diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > > >index 5be6e91..1689f72 100644 > > >--- a/drivers/watchdog/Kconfig > > >+++ b/drivers/watchdog/Kconfig > > >@@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG > > > > > > config ORION_WATCHDOG > > > tristate "Orion watchdog" > > >- depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE > > >+ depends on PLAT_ORION [..] > > > > while above is true now, I tend to rather have ARCH_MVEBU added here. > > We really want to get rid of both !ARCH_MVEBU and PLAT_ORION and this > > unnecessarily will make it more complicated. > > > > I haven't checked why ARCH_MVEBU at all added PLAT_ORION as dependency, > > but IIRC it was just because of a missing mbus driver? If it is just > > this, we should also remove PLAT_ORION from ARCH_MVEBU to have a clean > > cut between new common arch and existing sub-archs. > Hm... not sure why we depend on PLAT_ORION. I'll take a look. > I took a look at this when moving DT kirkwood into mach-mvebu. There > is nothing in plat-orion which ARCH_MVEBU needs. So i agree with > Sebastian, it should be PLAT_ORION || ARCH_MVEBU. > OK, will do. Thanks!
Sebastian, I'm picking on this discussion, with a new Subject. On Tue, Jan 21, 2014 at 10:41:17AM +0100, Sebastian Hesselbarth wrote: > On 01/21/14 10:12, Ezequiel Garcia wrote: > > After getting rid of all the mach-specific code, it's now possible > > to allow builds in any Orion platform. > > > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > --- > > drivers/watchdog/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > > index 5be6e91..1689f72 100644 > > --- a/drivers/watchdog/Kconfig > > +++ b/drivers/watchdog/Kconfig > > @@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG > > > > config ORION_WATCHDOG > > tristate "Orion watchdog" > > - depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE > > + depends on PLAT_ORION [..] > > I haven't checked why ARCH_MVEBU at all added PLAT_ORION as dependency, > but IIRC it was just because of a missing mbus driver? If it is just > this, we should also remove PLAT_ORION from ARCH_MVEBU to have a clean > cut between new common arch and existing sub-archs. > Well, I'm not sure if I'm following you. Many drivers currently depend on PLAT_ORION, so if we remove PLAT_ORION from ARCH_MVEBU we would have to replace: s/PLAT_ORION/ARCH_{MVEBU, KIRKWOOD, DOVE, ...}. Is this the suggested roadmap or I've completely misunderstood it?
On 01/21/14 12:06, Ezequiel Garcia wrote: > Sebastian, > > I'm picking on this discussion, with a new Subject. > > On Tue, Jan 21, 2014 at 10:41:17AM +0100, Sebastian Hesselbarth wrote: >> On 01/21/14 10:12, Ezequiel Garcia wrote: >>> After getting rid of all the mach-specific code, it's now possible >>> to allow builds in any Orion platform. >>> >>> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> >>> --- >>> drivers/watchdog/Kconfig | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig >>> index 5be6e91..1689f72 100644 >>> --- a/drivers/watchdog/Kconfig >>> +++ b/drivers/watchdog/Kconfig >>> @@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG >>> >>> config ORION_WATCHDOG >>> tristate "Orion watchdog" >>> - depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE >>> + depends on PLAT_ORION > [..] >> >> I haven't checked why ARCH_MVEBU at all added PLAT_ORION as dependency, >> but IIRC it was just because of a missing mbus driver? If it is just >> this, we should also remove PLAT_ORION from ARCH_MVEBU to have a clean >> cut between new common arch and existing sub-archs. >> > > Well, I'm not sure if I'm following you. Many drivers currently depend > on PLAT_ORION, so if we remove PLAT_ORION from ARCH_MVEBU we would have > to replace: s/PLAT_ORION/ARCH_{MVEBU, KIRKWOOD, DOVE, ...}. > > Is this the suggested roadmap or I've completely misunderstood it? Actually, you are right, PLAT_ORION is dependency for a bunch of drivers. But as PLAT_ORION - code-wise - almost only contains non-DT stuff, I'd prefer to use ARCH_MVEBU for DT enabled Marvell SoCs where possible. So for the above, just add ARCH_MVEBU and remove ARCH_KIRKWOOD, ARCH_DOVE later when we kill them, instead of hiding all behind PLAT_ORION. Also remove the dependency of ARCH_MVEBU to PLAT_ORION where possible or replace it with ARCH_MVEBU directly. This way we would have a clean ARCH_MVEBU config for DT-enabled SoCs and PLAT_ORION for non-DT ones. BTW, there is also PLAT_ORION_LEGACY which is just selecting PLAT_ORION. IIRC, I added that to distinguish non-DT and DT earlier, but ARCH_MVEBU selecting PLAT_ORION made that redundant. Sebastian
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 5be6e91..1689f72 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -282,7 +282,7 @@ config DAVINCI_WATCHDOG config ORION_WATCHDOG tristate "Orion watchdog" - depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE + depends on PLAT_ORION select WATCHDOG_CORE help Say Y here if to include support for the watchdog timer
After getting rid of all the mach-specific code, it's now possible to allow builds in any Orion platform. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)