ARM: OMAP: Sync core code with linux-omap

This patch syncs omap specific core code with linux-omap.
Most of the changes are needed to fix bitrot caused by
driver updates in linux-omap tree.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 57b7b93674a4..ffb94aa164ad 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -93,8 +93,12 @@ static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out)
          * in the kernel. */
         for (i = 0; i < omap_board_config_size; i++) {
                 if (omap_board_config[i].tag == tag) {
-                        kinfo = &omap_board_config[i];
-                        break;
+                        if (skip == 0) {
+                                kinfo = &omap_board_config[i];
+                                break;
+                        } else {
+                                skip--;
+                        }
                 }
         }
         if (kinfo == NULL)