[PATCH] ARM: OMAP: watchdog: Fix compiler errors

[PATCH] ARM: OMAP: watchdog: Fix compiler errors

[Alexander Shiyan]

Fix for "ARM: OMAP: Rework watchdog code" commit.

Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
 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(-)

diff --git a/arch/arm/boards/myirtech-x335x/lowlevel.c b/arch/arm/boards/myirtech-x335x/lowlevel.c
index 4d32d2da1e..c394253320 100644
--- a/arch/arm/boards/myirtech-x335x/lowlevel.c
+++ b/arch/arm/boards/myirtech-x335x/lowlevel.c
@@ -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) {
diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile
index 88c6b1d594..6b42196b23 100644
--- a/arch/arm/mach-omap/Makefile
+++ b/arch/arm/mach-omap/Makefile
@@ -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
diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c
index c0f8cea999..6bb26a6ef0 100644
--- a/arch/arm/mach-omap/omap_generic.c
+++ b/arch/arm/mach-omap/omap_generic.c
@@ -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
-- 
2.32.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: OMAP: watchdog: Fix compiler errors

[Sascha Hauer]

On Thu, Jun 09, 2022 at 12:43:00PM +0300, Alexander Shiyan wrote:
> Fix for "ARM: OMAP: Rework watchdog code" commit.
> 
> Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
> ---
>  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

> 
> diff --git a/arch/arm/boards/myirtech-x335x/lowlevel.c b/arch/arm/boards/myirtech-x335x/lowlevel.c
> index 4d32d2da1e..c394253320 100644
> --- a/arch/arm/boards/myirtech-x335x/lowlevel.c
> +++ b/arch/arm/boards/myirtech-x335x/lowlevel.c
> @@ -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) {
> diff --git a/arch/arm/mach-omap/Makefile b/arch/arm/mach-omap/Makefile
> index 88c6b1d594..6b42196b23 100644
> --- a/arch/arm/mach-omap/Makefile
> +++ b/arch/arm/mach-omap/Makefile
> @@ -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
> diff --git a/arch/arm/mach-omap/omap_generic.c b/arch/arm/mach-omap/omap_generic.c
> index c0f8cea999..6bb26a6ef0 100644
> --- a/arch/arm/mach-omap/omap_generic.c
> +++ b/arch/arm/mach-omap/omap_generic.c
> @@ -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
> -- 
> 2.32.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox