| Message ID | 20190808212234.2213262-12-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: omap1 multiplatform support | expand |
On 08/08/2019 23:22, Arnd Bergmann wrote: > As a preparation for future omap1 multiplatform support, stop > using mach/hardware.h and instead include the omap1-io.h > for low-level register access to MOD_CONF_CTRL_1. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- Do you want me to apply it through me tree?
On Fri, Aug 9, 2019 at 9:01 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 08/08/2019 23:22, Arnd Bergmann wrote: > > As a preparation for future omap1 multiplatform support, stop > > using mach/hardware.h and instead include the omap1-io.h > > for low-level register access to MOD_CONF_CTRL_1. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > Do you want me to apply it through me tree? Sorry, I should have included you in the cover letter. I would like to take the whole series through the soc tree, as there are dependencies between the patches and this cannot be applied by itself. Arnd
On 09/08/2019 09:33, Arnd Bergmann wrote: > On Fri, Aug 9, 2019 at 9:01 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: >> >> On 08/08/2019 23:22, Arnd Bergmann wrote: >>> As a preparation for future omap1 multiplatform support, stop >>> using mach/hardware.h and instead include the omap1-io.h >>> for low-level register access to MOD_CONF_CTRL_1. >>> >>> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >>> --- >> >> Do you want me to apply it through me tree? > > Sorry, I should have included you in the cover letter. I would > like to take the whole series through the soc tree, as there are > dependencies between the patches and this cannot be applied > by itself. Ok, Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 5394d9dbdfbc..422f96384dc5 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -448,7 +448,7 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) } #if defined(CONFIG_ARCH_OMAP1) -#include <mach/hardware.h> +#include <linux/soc/ti/omap1-io.h> static struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer) {
As a preparation for future omap1 multiplatform support, stop using mach/hardware.h and instead include the omap1-io.h for low-level register access to MOD_CONF_CTRL_1. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/clocksource/timer-ti-dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)