Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f82d10 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Fix incorrect 730 vs 850 detection 



Commit cd922049 added
support for omap850. However, the patch accidentally
removed the wrong ifdef:

 #  define cpu_is_omap730()		1
 # endif
 #endif
+#else
+# if defined(CONFIG_ARCH_OMAP850)
+#  undef  cpu_is_omap850
+#  define cpu_is_omap850()		1
+# endif
+#endif

...

 void omap2_check_revision(void);

 #endif    /* defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) */
-
-#endif

Instead of removing removing the #endif at the end of the file,
the #endif before #else should have been removed.

But we cannot have multiple #else statements as pointed out by
Alistair Buxton <a.j.buxton@gmail.com>. So the fix is to:

- remove the non-multi-omap special handling, as we need to
  detect between omap730 and omap850 anyways.

- add the missing #endif back to the end of the file

Reported-by: default avatarSanjeev Premi <premi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 374576a8

arch/arm/plat-omap/include/mach/cpu.h

+14 −23
Original line number Diff line number Diff line
@@ -303,32 +303,21 @@ IS_OMAP_TYPE(3430, 0x3430) 
#define cpu_is_omap2430()		0

#define cpu_is_omap3430()		0



#if defined(MULTI_OMAP1)

/*

 * Whether we have MULTI_OMAP1 or not, we still need to distinguish

 * between 730 vs 850, 330 vs. 1510 and 1611B/5912 vs. 1710.

 */



#if defined(CONFIG_ARCH_OMAP730)

# undef  cpu_is_omap730

# define cpu_is_omap730()		is_omap730()

#endif



#if defined(CONFIG_ARCH_OMAP850)

# undef  cpu_is_omap850

# define cpu_is_omap850()		is_omap850()

#endif

#else

# if defined(CONFIG_ARCH_OMAP730)

#  undef  cpu_is_omap730

#  define cpu_is_omap730()		1

# endif

#endif

#else

# if defined(CONFIG_ARCH_OMAP850)

#  undef  cpu_is_omap850

#  define cpu_is_omap850()		1

# endif

#endif



/*

 * Whether we have MULTI_OMAP1 or not, we still need to distinguish

 * between 330 vs. 1510 and 1611B/5912 vs. 1710.

 */

#if defined(CONFIG_ARCH_OMAP15XX)

# undef  cpu_is_omap310

# undef  cpu_is_omap1510
@@ -433,3 +422,5 @@ IS_OMAP_TYPE(3430, 0x3430) 


int omap_chip_is(struct omap_chip_id oci);

void omap2_check_revision(void);



#endif