Message ID | 20190808212234.2213262-12-arnd@arndb.de |
---|---|
State | New |
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? -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
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(-) -- 2.20.0