ARM: OMAP: watchdog: Fix compiler errors
Subsystems (3)
PATCH 1/1 ARM: OMAP: watchdog: Fix compiler errors
Fix for "ARM: OMAP: Rework watchdog code" commit.
Signed-off-by Alexander Shiyan <[email protected]>
--- arch/arm/boards/myirtech-x335x/lowlevel.c | 2 +- arch/arm/mach-omap/Makefile | 2 +- arch/arm/mach-omap/omap_generic.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boards/myirtech-x335x/lowlevel.c +1 -1
@@ -69,7 +69,7 @@ ENTRY_FUNCTION(start_am33xx_myirtech_sram, bootinfo, r1, r2) fdt = __dtb_z_am335x_myirtech_myd_start; - omap_watchdog_disable(IOMEM((AM33XX_WDT_BASE)); +omap_watchdog_disable (IOMEM (AM33XX_WDT_BASE )); mpupll =MPUPLL_M_800 ;if (am33xx_get_cpu_rev () ==AM335X_ES2_1 ) {
arch/arm/mach-omap/Makefile +1 -1
@@ -16,7 +16,7 @@ # # obj-$(CONFIG_ARCH_OMAP) += syslib.o omap_devices.o omap_generic.o -pbl-$(CONFIG_ARCH_OMAP) += syslib.o +pbl-$(CONFIG_ARCH_OMAP) += syslib.o omap_generic.o obj-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o pbl-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o obj-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.o
arch/arm/mach-omap/omap_generic.c +1 -1
@@ -85,7 +85,7 @@ void omap_watchdog_disable(const void __iomem *wdt)do { }while (__raw_readl (wdt +OMAP_WDT_WWPS )); -__raw_writel (WDT_DISABLE_CODE2 , wdt +WSPR ); +__raw_writel (WDT_DISABLE_CODE2 , wdt +OMAP_WDT_WSPR ); }#ifdef CONFIG_BOOTM
Signature · 7 lines
2.32.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 8 lines · Alexander Shiyan
Fix for "ARM: OMAP: Rework watchdog code" commit.
Signed-off-by Alexander Shiyan <[email protected]>--- arch/arm/boards/myirtech-x335x/lowlevel.c | 2 +- arch/arm/mach-omap/Makefile | 2 +- arch/arm/mach-omap/omap_generic.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Applied, thanks
BTW I accept patches generated with git commit --fixup=xxx for commits sitting in next.
Sascha
Quoted 49 lines
arch/arm/boards/myirtech-x335x/lowlevel.c +1
-1@@ -69,7 +69,7 @@ ENTRY_FUNCTION(start_am33xx_myirtech_sram, bootinfo, r1, r2) fdt = __dtb_z_am335x_myirtech_myd_start; - omap_watchdog_disable(IOMEM((AM33XX_WDT_BASE)); +omap_watchdog_disable (IOMEM (AM33XX_WDT_BASE )); mpupll =MPUPLL_M_800 ;if (am33xx_get_cpu_rev () ==AM335X_ES2_1 ) {arch/arm/mach-omap/Makefile +1
-1@@ -16,7 +16,7 @@ # # obj-$(CONFIG_ARCH_OMAP) += syslib.o omap_devices.o omap_generic.o -pbl-$(CONFIG_ARCH_OMAP) += syslib.o +pbl-$(CONFIG_ARCH_OMAP) += syslib.o omap_generic.o obj-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o pbl-$(CONFIG_ARCH_OMAP3) += omap3_generic.o auxcr.o obj-$(CONFIG_ARCH_OMAP4) += omap4_generic.o omap4_clock.oarch/arm/mach-omap/omap_generic.c +1
-1@@ -85,7 +85,7 @@ void omap_watchdog_disable(const void __iomem *wdt)do { }while (__raw_readl (wdt +OMAP_WDT_WWPS )); -__raw_writel (WDT_DISABLE_CODE2 , wdt +WSPR ); +__raw_writel (WDT_DISABLE_CODE2 , wdt +OMAP_WDT_WSPR ); }#ifdef CONFIG_BOOTM Signature · 7 lines
2.32.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox