ARM: OMAP2+: Timer build warnings and error fixes

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:489:20: warning: ‘realtime_counter_init’ defined but not used [-Wunused-function]

Commit fa6d79d also introduced the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER. If this option is not selected then the a stub function for realtime_counter_init() is defined.

The option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function are not really needed because ...

1. For non-OMAP5 devices, there is no realtime counter and so realtime_counter_init() function is not used.
2. For OMAP5 devices, CONFIG_SOC_HAS_REALTIME_COUNTER is always selected and cannot be disabled, so the stub function for realtime_counter_init() is never used.

Fix this warning by removing the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function, and only include the function realtime_counter_init() if CONFIG_SOC_OMAP5 is selected.

Cc Santosh Shilimkar <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---

From e000aa13e47e29fbe3473bfd0277cb057c3160cc Mon Sep 17 00:00:00 2001

Quoted 27 lines · Jon Hunter

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:489:20: warning: ?realtime_counter_init? defined but not used [-Wunused-function]

Commit fa6d79d also introduced the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER. If this option is not selected then the a stub function for realtime_counter_init() is defined.

The option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function are not really needed because ...

1. For non-OMAP5 devices, there is no realtime counter and so realtime_counter_init() function is not used.
2. For OMAP5 devices, CONFIG_SOC_HAS_REALTIME_COUNTER is always selected and cannot be disabled, so the stub function for
realtime_counter_init()
is never used.

Fix this warning by removing the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function, and only include the function realtime_counter_init() if CONFIG_SOC_OMAP5 is selected.

Quoted 5 lines

Cc Santosh Shilimkar <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---

The #ifdef was avoided because the real-time counter can be used on other future SOCs. And the those SOCs just select SOC_HAS_REALTIME_COUNTER. And that stub was added because OMAP5 can work without real-time counter configuration enabled using 32K counter. But since we are any way have that SOC_HAS_REALTIME_COUNTER always set for SOC which wants to use it, we can actually remove the stub and hence avoid the warning. Let me know if below patch is ok with you ? attached the same for mailer issues

From e000aa13e47e29fbe3473bfd0277cb057c3160cc Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email protected]>
Date: Wed, 28 Nov 2012 11:28:57 +0530
Subject: [PATCH] ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:489:20: warning: ?realtime_counter_init? defined but not used [-Wunused-function]

It is because of the stub init function which was added for the cases where realtime_counter_init() is called with !CONFIG_SOC_HAS_REALTIME_COUNTER.
This is actually not necessary since the SOC which need this feature will explicitly select the configuration.

So just drop the unused stub to avoid the build warning.

Patch is made after seeing Jon's patch which was wrapping the real-time counter code under needed SOC #ifdef

Cc Jon Hunter <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Santosh Shilimkar <[email protected]>

---
 arch/arm/mach-omap2/timer.c |    3 ---
 1 file changed, 3 deletions(-)

arch/arm/mach-omap2/timer.c +0 -0

index 69e4663..79d8e6b 100644

Quoted 91 lines · Santosh Shilimkar

Quoted 27 lines · Jon Hunter

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:489:20: warning: ‘realtime_counter_init’ defined but not used [-Wunused-function]

Commit fa6d79d also introduced the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER. If this option is not selected then the a stub function for realtime_counter_init() is defined.

The option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function are not really needed because ...

1. For non-OMAP5 devices, there is no realtime counter and so realtime_counter_init() function is not used.
2. For OMAP5 devices, CONFIG_SOC_HAS_REALTIME_COUNTER is always selected and cannot be disabled, so the stub function for
realtime_counter_init()
is never used.

Fix this warning by removing the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function, and only include the function realtime_counter_init() if CONFIG_SOC_OMAP5 is selected.

Quoted 5 lines

Cc Santosh Shilimkar <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---

The #ifdef was avoided because the real-time counter can be used on other future SOCs. And the those SOCs just select SOC_HAS_REALTIME_COUNTER. And that stub was added because OMAP5 can work without real-time counter configuration enabled using 32K counter. But since we are any way have that SOC_HAS_REALTIME_COUNTER always set for SOC which wants to use it, we can actually remove the stub and hence avoid the warning. Let me know if below patch is ok with you ? attached the same for mailer issues

From e000aa13e47e29fbe3473bfd0277cb057c3160cc Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email protected]>
Date: Wed, 28 Nov 2012 11:28:57 +0530
Subject: [PATCH] ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:489:20: warning: ‘realtime_counter_init’ defined but not used [-Wunused-function]

It is because of the stub init function which was added for the cases where realtime_counter_init() is called with !CONFIG_SOC_HAS_REALTIME_COUNTER.
This is actually not necessary since the SOC which need this feature will explicitly select the configuration.

So just drop the unused stub to avoid the build warning.

Patch is made after seeing Jon's patch which was wrapping the real-time counter code under needed SOC #ifdef

Cc Jon Hunter <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Santosh Shilimkar <[email protected]>

---
  arch/arm/mach-omap2/timer.c |    3 ---
  1 file changed, 3 deletions(-)

arch/arm/mach-omap2/timer.c +0 -3

index 69e4663..79d8e6b 100644
@@ -428,9 +428,6 @@ static void __init realtime_counter_init(void)
 
      iounmap(base);
  }
-#else
-static inline void __init realtime_counter_init(void)
-{}
  #endif
 

arch/arm/mach-omap2/timer.c static void __init realtime_counter_init(void) · line 433

Quoted 1 line

arch/arm/mach-omap2/timer.c +0 -0

  #define OMAP_SYS_TIMER_INIT(name, clkev_nr, clkev_src,            \

Hi Santosh,

Thanks for the feedback. Unfortunately, the above is not enough. If I disable SOC_OMAP5 and leave SOC_HAS_REALTIME_COUNTER enabled, then I still see the warning message. So I could see that people could still hit this with randconfig.

Understand the desire to make this a selectable configuration, but given to date only OMAP5 uses it, it was simpler and cleaner just to remove the option. However, we could keep the option and just do something like ...

arch/arm/mach-omap2/Kconfig +2 -1

index 813c267..500f2f6 100644
@@ -26,6 +26,8 @@ config SOC_HAS_OMAP2_SDRC
 
  config SOC_HAS_REALTIME_COUNTER
         bool "Real time free running counter"
+       depends on SOC_OMAP5
+       default y
 
  config ARCH_OMAP2
         bool "TI OMAP2"

@@ -79,7 +81,6 @@ config SOC_OMAP5
         select ARM_GIC
         select CPU_V7
         select HAVE_SMP
-       select SOC_HAS_REALTIME_COUNTER
         select COMMON_CLK
 

I have tested this and this resolves the warning.

Quoted 98 lines · Jon Hunter

Quoted 96 lines · Santosh Shilimkar

Quoted 30 lines · Jon Hunter

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

    CC      arch/arm/mach-omap2/timer.o
    arch/arm/mach-omap2/timer.c:489:20: warning:

?realtime_counter_init?
defined but not used [-Wunused-function]

Commit fa6d79d also introduced the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER. If this option is not selected then the
a stub function for realtime_counter_init() is defined.

The option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function are not really needed because ...

1. For non-OMAP5 devices, there is no realtime counter and so realtime_counter_init() function is not used.
2. For OMAP5 devices, CONFIG_SOC_HAS_REALTIME_COUNTER is always selected
and cannot be disabled, so the stub function for
realtime_counter_init()
is never used.

Fix this warning by removing the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function, and only include the function realtime_counter_init() if CONFIG_SOC_OMAP5 is selected.

Quoted 5 lines

Cc Santosh Shilimkar <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---

The #ifdef was avoided because the real-time counter can be used on other future SOCs. And the those SOCs just select SOC_HAS_REALTIME_COUNTER. And that stub was added because OMAP5 can work without real-time counter configuration enabled using 32K counter. But since we are any way have that SOC_HAS_REALTIME_COUNTER always set for SOC which wants to use it, we can actually remove the stub and hence avoid the warning. Let me know if below patch is ok with you ? attached the same for mailer issues

From e000aa13e47e29fbe3473bfd0277cb057c3160cc Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email protected]>
Date: Wed, 28 Nov 2012 11:28:57 +0530
Subject: [PATCH] ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

     CC      arch/arm/mach-omap2/timer.o
     arch/arm/mach-omap2/timer.c:489:20: warning:

?realtime_counter_init?
defined but not used [-Wunused-function]

It is because of the stub init function which was added for the cases where realtime_counter_init() is called with !CONFIG_SOC_HAS_REALTIME_COUNTER.
This is actually not necessary since the SOC which need this feature will explicitly select the configuration.

So just drop the unused stub to avoid the build warning.

Patch is made after seeing Jon's patch which was wrapping the real-time counter code under needed SOC #ifdef

Cc Jon Hunter <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Santosh Shilimkar <[email protected]>

---
  arch/arm/mach-omap2/timer.c |    3 ---
  1 file changed, 3 deletions(-)

arch/arm/mach-omap2/timer.c +0 -3

index 69e4663..79d8e6b 100644
@@ -428,9 +428,6 @@ static void __init realtime_counter_init(void)
 
      iounmap(base);
  }
-#else
-static inline void __init realtime_counter_init(void)
-{}
  #endif
 

Quoted 9 lines

arch/arm/mach-omap2/timer.c static void __init realtime_counter_init(void) · line 433

Quoted 1 line

arch/arm/mach-omap2/timer.c +0 -0

  #define OMAP_SYS_TIMER_INIT(name, clkev_nr, clkev_src,            \

Hi Santosh,

Thanks for the feedback. Unfortunately, the above is not enough. If I disable SOC_OMAP5 and leave SOC_HAS_REALTIME_COUNTER enabled, then I still see the warning message. So I could see that people could still hit this with randconfig.

I did mention that but since OMAP5 selects the feature, I was thinking it is fine.

Quoted 25 lines

Understand the desire to make this a selectable configuration, but given to date only OMAP5 uses it, it was simpler and cleaner just to remove the option. However, we could keep the option and just do something like ...

arch/arm/mach-omap2/Kconfig +2 -1

index 813c267..500f2f6 100644
@@ -26,6 +26,8 @@ config SOC_HAS_OMAP2_SDRC
 
  config SOC_HAS_REALTIME_COUNTER
         bool "Real time free running counter"
+       depends on SOC_OMAP5
+       default y
 
  config ARCH_OMAP2
         bool "TI OMAP2"

@@ -79,7 +81,6 @@ config SOC_OMAP5
         select ARM_GIC
         select CPU_V7
         select HAVE_SMP
-       select SOC_HAS_REALTIME_COUNTER
         select COMMON_CLK
 

Quoted 2 lines

I have tested this and this resolves the warning.

Go ahead and fold above change on top of my patch which drops the stub.

Quoted 136 lines · Santosh Shilimkar

Quoted 98 lines · Jon Hunter

Quoted 96 lines · Santosh Shilimkar

Quoted 30 lines · Jon Hunter

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

     CC      arch/arm/mach-omap2/timer.o
     arch/arm/mach-omap2/timer.c:489:20: warning:

‘realtime_counter_init’
defined but not used [-Wunused-function]

Commit fa6d79d also introduced the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER. If this option is not selected then the
a stub function for realtime_counter_init() is defined.

The option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function are not really needed because ...

1. For non-OMAP5 devices, there is no realtime counter and so realtime_counter_init() function is not used.
2. For OMAP5 devices, CONFIG_SOC_HAS_REALTIME_COUNTER is always selected
and cannot be disabled, so the stub function for
realtime_counter_init()
is never used.

Fix this warning by removing the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function, and only include the function realtime_counter_init() if CONFIG_SOC_OMAP5 is selected.

Quoted 5 lines

Cc Santosh Shilimkar <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---

The #ifdef was avoided because the real-time counter can be used on other future SOCs. And the those SOCs just select SOC_HAS_REALTIME_COUNTER. And that stub was added because OMAP5 can work without real-time counter configuration enabled using 32K counter. But since we are any way have that SOC_HAS_REALTIME_COUNTER always set for SOC which wants to use it, we can actually remove the stub and hence avoid the warning. Let me know if below patch is ok with you ? attached the same for mailer issues

From e000aa13e47e29fbe3473bfd0277cb057c3160cc Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email protected]>
Date: Wed, 28 Nov 2012 11:28:57 +0530
Subject: [PATCH] ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

      CC      arch/arm/mach-omap2/timer.o
      arch/arm/mach-omap2/timer.c:489:20: warning:

‘realtime_counter_init’
defined but not used [-Wunused-function]

It is because of the stub init function which was added for the cases where realtime_counter_init() is called with !CONFIG_SOC_HAS_REALTIME_COUNTER.
This is actually not necessary since the SOC which need this feature will explicitly select the configuration.

So just drop the unused stub to avoid the build warning.

Patch is made after seeing Jon's patch which was wrapping the real-time counter code under needed SOC #ifdef

Cc Jon Hunter <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Santosh Shilimkar <[email protected]>

---
   arch/arm/mach-omap2/timer.c |    3 ---
   1 file changed, 3 deletions(-)

arch/arm/mach-omap2/timer.c +0 -3

index 69e4663..79d8e6b 100644
@@ -428,9 +428,6 @@ static void __init realtime_counter_init(void)
 
       iounmap(base);
   }
-#else
-static inline void __init realtime_counter_init(void)
-{}
   #endif
 

Quoted 9 lines

arch/arm/mach-omap2/timer.c static void __init realtime_counter_init(void) · line 433

Quoted 1 line

arch/arm/mach-omap2/timer.c +0 -0

   #define OMAP_SYS_TIMER_INIT(name, clkev_nr, clkev_src,            \

Hi Santosh,

Thanks for the feedback. Unfortunately, the above is not enough. If I disable SOC_OMAP5 and leave SOC_HAS_REALTIME_COUNTER enabled, then I still see the warning message. So I could see that people could still hit this with randconfig.

I did mention that but since OMAP5 selects the feature, I was thinking it is fine.

Quoted 25 lines

Understand the desire to make this a selectable configuration, but given to date only OMAP5 uses it, it was simpler and cleaner just to remove the option. However, we could keep the option and just do something like ...

arch/arm/mach-omap2/Kconfig +2 -1

index 813c267..500f2f6 100644
@@ -26,6 +26,8 @@ config SOC_HAS_OMAP2_SDRC
 
   config SOC_HAS_REALTIME_COUNTER
          bool "Real time free running counter"
+       depends on SOC_OMAP5
+       default y
 
   config ARCH_OMAP2
          bool "TI OMAP2"

@@ -79,7 +81,6 @@ config SOC_OMAP5
          select ARM_GIC
          select CPU_V7
          select HAVE_SMP
-       select SOC_HAS_REALTIME_COUNTER
          select COMMON_CLK
 

Quoted 4 lines

Quoted 2 lines

I have tested this and this resolves the warning.

Go ahead and fold above change on top of my patch which drops the stub.

Well if we drop the stub then we cannot make it selectable for OMAP5. So in other words folding the above change on top of your patch will still not work ;-)

The above patch will only allow you to use the REALTIME COUNTER on OMAP5, but it makes it selectable and so the stub is needed now. If future devices wish to use the REALTIME COUNTER then they can be added to the "depends on" statement.

The above patch should be all we need.

Quoted 91 lines · Santosh Shilimkar

Quoted 27 lines · Jon Hunter

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:489:20: warning: ‘realtime_counter_init’ defined but not used [-Wunused-function]

Commit fa6d79d also introduced the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER. If this option is not selected then the a stub function for realtime_counter_init() is defined.

The option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function are not really needed because ...

1. For non-OMAP5 devices, there is no realtime counter and so realtime_counter_init() function is not used.
2. For OMAP5 devices, CONFIG_SOC_HAS_REALTIME_COUNTER is always selected and cannot be disabled, so the stub function for
realtime_counter_init()
is never used.

Fix this warning by removing the kernel configuration option CONFIG_SOC_HAS_REALTIME_COUNTER and stub function, and only include the function realtime_counter_init() if CONFIG_SOC_OMAP5 is selected.

Quoted 5 lines

Cc Santosh Shilimkar <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---

The #ifdef was avoided because the real-time counter can be used on other future SOCs. And the those SOCs just select SOC_HAS_REALTIME_COUNTER. And that stub was added because OMAP5 can work without real-time counter configuration enabled using 32K counter. But since we are any way have that SOC_HAS_REALTIME_COUNTER always set for SOC which wants to use it, we can actually remove the stub and hence avoid the warning. Let me know if below patch is ok with you ? attached the same for mailer issues

From e000aa13e47e29fbe3473bfd0277cb057c3160cc Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email protected]>
Date: Wed, 28 Nov 2012 11:28:57 +0530
Subject: [PATCH] ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit fa6d79d (ARM: OMAP: Add initialisation for the real-time counter), the function realtime_counter_init() was added. However, if the kernel configuration option CONFIG_SOC_OMAP5 is not selected then the following compiler warning is observed.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:489:20: warning: ‘realtime_counter_init’ defined but not used [-Wunused-function]

It is because of the stub init function which was added for the cases where realtime_counter_init() is called with !CONFIG_SOC_HAS_REALTIME_COUNTER.
This is actually not necessary since the SOC which need this feature will explicitly select the configuration.

So just drop the unused stub to avoid the build warning.

Patch is made after seeing Jon's patch which was wrapping the real-time counter code under needed SOC #ifdef

Cc Jon Hunter <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Santosh Shilimkar <[email protected]>

---
  arch/arm/mach-omap2/timer.c |    3 ---
  1 file changed, 3 deletions(-)

arch/arm/mach-omap2/timer.c +0 -3

index 69e4663..79d8e6b 100644
@@ -428,9 +428,6 @@ static void __init realtime_counter_init(void)
 
      iounmap(base);
  }
-#else
-static inline void __init realtime_counter_init(void)
-{}
  #endif
 

arch/arm/mach-omap2/timer.c static void __init realtime_counter_init(void) · line 433

Quoted 1 line

arch/arm/mach-omap2/timer.c +0 -0

  #define OMAP_SYS_TIMER_INIT(name, clkev_nr, clkev_src,            \

Hi Santosh,

Thanks for the feedback. Unfortunately, the above is not enough. If I disable SOC_OMAP5 and leave SOC_HAS_REALTIME_COUNTER enabled, then I still see the warning message. So I could see that people could still hit this with randconfig.

Understand the desire to make this a selectable configuration, but given to date only OMAP5 uses it, it was simpler and cleaner just to remove the option. However, we could keep the option and just do something like ...

arch/arm/mach-omap2/Kconfig +2 -1

index 813c267..500f2f6 100644
@@ -26,6 +26,8 @@ config SOC_HAS_OMAP2_SDRC
 
  config SOC_HAS_REALTIME_COUNTER
         bool "Real time free running counter"
+       depends on SOC_OMAP5
+       default y
 
  config ARCH_OMAP2
         bool "TI OMAP2"

@@ -79,7 +81,6 @@ config SOC_OMAP5
         select ARM_GIC
         select CPU_V7
         select HAVE_SMP
-       select SOC_HAS_REALTIME_COUNTER
         select COMMON_CLK
 

I have tested this and this resolves the warning.

When compiling the kernel with configuration option CONFIG_ARCH_OMAP4 enabled and CONFIG_LOCAL_TIMERS disabled, the following build error and warning is seen.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c: In function ‘omap4_local_timer_init’:
arch/arm/mach-omap2/timer.c:630:2: error: implicit declaration of
function ‘omap4_sync32_timer_init’ [-Werror=implicit-function-declaration]
arch/arm/mach-omap2/timer.c: At top level:
arch/arm/mach-omap2/timer.c:607:1: warning: ‘omap4_sync32k_timer_init’
defined but not used [-Wunused-function]
cc1: some warnings being treated as errors
make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1

This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the "k" is missing from the "sync32k" in the function name "omap4_sync32_timer_init". Therefore, correct this typo to resolve the above error and warning.

Cc Igor Grinberg <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---

When compiling the kernel with configuration option CONFIG_ARCH_OMAP4 enabled and CONFIG_LOCAL_TIMERS disabled, the following build error and warning is seen.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c: In function ?omap4_local_timer_init?:
arch/arm/mach-omap2/timer.c:630:2: error: implicit declaration of
function ?omap4_sync32_timer_init? [-Werror=implicit-function-declaration]
arch/arm/mach-omap2/timer.c: At top level:
arch/arm/mach-omap2/timer.c:607:1: warning: ?omap4_sync32k_timer_init?
defined but not used [-Wunused-function]
cc1: some warnings being treated as errors
make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1

This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the "k" is missing from the "sync32k" in the function name "omap4_sync32_timer_init". Therefore, correct this typo to resolve the above error and warning.

Cc Igor Grinberg <[email protected]>

Reported-by Tony Lindgren <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---
 arch/arm/mach-omap2/timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-omap2/timer.c +1 -1

index a9f99e3..eb96712 100644
@@ -627,7 +627,7 @@ static void __init omap4_local_timer_init(void)
 #else /* CONFIG_LOCAL_TIMERS */
 static inline void omap4_local_timer_init(void)
 {
-	omap4_sync32_timer_init();
+	omap4_sync32k_timer_init();
 }
 #endif /* CONFIG_LOCAL_TIMERS */
 OMAP_SYS_TIMER(4, local);

When compiling the kernel with configuration options ...

# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
# CONFIG_ARCH_OMAP4 is not set
# CONFIG_SOC_OMAP5 is not set
CONFIG_SOC_AM33XX=y

... the following build warning is seen.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:395:19: warning: ‘omap2_sync32k_clocksource_init’
defined but not used [-Wunused-function]

This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the omap2_sync32k_clocksource_init() is no longer referenced by the timer initialisation function for the AM335x device as it has no 32k-sync timer.

Fix this by only including the omap2_sync32k_clocksource_init() function if either OMAP2, OMAP3, OMAP4 or OMAP5 devices are enabled.

Cc Igor Grinberg <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---
  arch/arm/mach-omap2/timer.c |    3 +++
  1 file changed, 3 insertions(+)

arch/arm/mach-omap2/timer.c +0 -0

index eb96712..085c7e7 100644

Quoted 37 lines · Jon Hunter

When compiling the kernel with configuration options ...

# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
# CONFIG_ARCH_OMAP4 is not set
# CONFIG_SOC_OMAP5 is not set
CONFIG_SOC_AM33XX=y

... the following build warning is seen.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:395:19: warning: ?omap2_sync32k_clocksource_init?
defined but not used [-Wunused-function]

This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the omap2_sync32k_clocksource_init() is no longer referenced by the timer initialisation function for the AM335x device as it has no 32k-sync timer.

Fix this by only including the omap2_sync32k_clocksource_init() function if either OMAP2, OMAP3, OMAP4 or OMAP5 devices are enabled.

Cc Igor Grinberg <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---
  arch/arm/mach-omap2/timer.c |    3 +++
  1 file changed, 3 insertions(+)

arch/arm/mach-omap2/timer.c +0 -0

index eb96712..085c7e7 100644
@@ -386,6 +386,8 @@ static u32 notrace dmtimer_read_sched_clock(void)
      return 0;
  }
 

arch/arm/mach-omap2/timer.c static u32 notrace dmtimer_read_sched_clock(void) · line 390

Quoted 2 lines

arch/arm/mach-omap2/timer.c +2 -0

+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
+    defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)

#ifndef CONFIG_SOC_AM33XX ?

#ifdef things are really ugly and needs constant patching and hence something like CONFIG_HAS_32K kind of feature flags are better. But that will undo certain part of f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER).

Quoted 42 lines · Santosh Shilimkar

Quoted 34 lines · Jon Hunter

When compiling the kernel with configuration options ...

# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
# CONFIG_ARCH_OMAP4 is not set
# CONFIG_SOC_OMAP5 is not set
CONFIG_SOC_AM33XX=y

... the following build warning is seen.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:395:19: warning: ‘omap2_sync32k_clocksource_init’
defined but not used [-Wunused-function]

This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the omap2_sync32k_clocksource_init() is no longer referenced by the timer initialisation function for the AM335x device as it has no 32k-sync timer.

Fix this by only including the omap2_sync32k_clocksource_init() function if either OMAP2, OMAP3, OMAP4 or OMAP5 devices are enabled.

Cc Igor Grinberg <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---
   arch/arm/mach-omap2/timer.c |    3 +++
   1 file changed, 3 insertions(+)

arch/arm/mach-omap2/timer.c +0 -0

index eb96712..085c7e7 100644

arch/arm/mach-omap2/timer.c static u32 notrace dmtimer_read_sched_clock(void) · line 390

Quoted 5 lines

arch/arm/mach-omap2/timer.c +2 -0

@@ -386,6 +386,8 @@ static u32 notrace dmtimer_read_sched_clock(void)
       return 0;
   }
 
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
+    defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)

#ifndef CONFIG_SOC_AM33XX ?

Quoted 4 lines

#ifdef things are really ugly and needs constant patching and hence something like CONFIG_HAS_32K kind of feature flags are better. But that will undo certain part of f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER).

Agreed on ugliness of ifdefs.
What about adding __maybe_unused to the function signature? That will cover any future SoC also w/o the need to extend the ifdefs.

Quoted 50 lines · Igor Grinberg

Quoted 48 lines · Santosh Shilimkar

Quoted 36 lines · Jon Hunter

When compiling the kernel with configuration options ...

# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
# CONFIG_ARCH_OMAP4 is not set
# CONFIG_SOC_OMAP5 is not set
CONFIG_SOC_AM33XX=y

... the following build warning is seen.

    CC      arch/arm/mach-omap2/timer.o
    arch/arm/mach-omap2/timer.c:395:19: warning:

?omap2_sync32k_clocksource_init?
defined but not used [-Wunused-function]

This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the omap2_sync32k_clocksource_init() is no longer referenced by the timer initialisation function for the AM335x device as it has no 32k-sync timer.

Fix this by only including the omap2_sync32k_clocksource_init() function
if either OMAP2, OMAP3, OMAP4 or OMAP5 devices are enabled.

Cc Igor Grinberg <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---
   arch/arm/mach-omap2/timer.c |    3 +++
   1 file changed, 3 insertions(+)

arch/arm/mach-omap2/timer.c +0 -0

index eb96712..085c7e7 100644

arch/arm/mach-omap2/timer.c static u32 notrace dmtimer_read_sched_clock(void) · line 390

Quoted 5 lines

arch/arm/mach-omap2/timer.c +2 -0

@@ -386,6 +386,8 @@ static u32 notrace dmtimer_read_sched_clock(void)
       return 0;
   }
 
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
+    defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)

#ifndef CONFIG_SOC_AM33XX ?

#ifdef things are really ugly and needs constant patching and hence something like CONFIG_HAS_32K kind of feature flags are better. But that will undo certain part of f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER).

Quoted 4 lines

Agreed on ugliness of ifdefs.
What about adding __maybe_unused to the function signature? That will cover any future SoC also w/o the need to extend the ifdefs.

Sounds good to me.

When compiling the kernel with configuration options ...

# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
# CONFIG_ARCH_OMAP4 is not set
# CONFIG_SOC_OMAP5 is not set
CONFIG_SOC_AM33XX=y

... the following build warning is seen.

CC arch/arm/mach-omap2/timer.o
arch/arm/mach-omap2/timer.c:395:19: warning: ?omap2_sync32k_clocksource_init?
defined but not used [-Wunused-function]

This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the omap2_sync32k_clocksource_init() is no longer referenced by the timer initialisation function for the AM335x device as it has no 32k-sync timer.

Fix this by only including the omap2_sync32k_clocksource_init() function if either OMAP2, OMAP3, OMAP4 or OMAP5 devices are enabled.

Cc Igor Grinberg <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

---
 arch/arm/mach-omap2/timer.c |    3 +++
 1 file changed, 3 insertions(+)