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

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

ARM: OMAP2+: Drop plat/cpu.h for omap2plus 



The cpu_is_omap macros are now local to arch/arm/mach-omap2
in soc.h and plat/cpu.h can finally be dropped for omap2+.
Thanks everybody for help with fixing the drivers.

Note that we can now also remove the unused plat/cpu.h from
smartreflex.c and isp.c as they will cause compile errors
with ARCH_MULTIPLATFORM enabled.

Cc: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: default avatarJean Pihet <jean.pihet@newoldbits.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 16d60bb8

arch/arm/mach-omap2/drm.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include "omap_device.h"

#include "omap_hwmod.h"

#include <plat/cpu.h>



#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)

arch/arm/mach-omap2/dss-common.c

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
#include <video/omap-panel-nokia-dsi.h>

#include <video/omap-panel-picodlp.h>



#include <plat/cpu.h>



#include "soc.h"

#include "dss-common.h"

#include "mux.h"

arch/arm/mach-omap2/prm2xxx.c

+1 −2
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ 
#include <linux/io.h>

#include <linux/irq.h>



#include "soc.h"

#include "common.h"

#include <plat/cpu.h>



#include "vp.h"

#include "powerdomain.h"

#include "clockdomain.h"

arch/arm/mach-omap2/prm3xxx.c

+1 −2
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ 
#include <linux/io.h>

#include <linux/irq.h>



#include "soc.h"

#include "common.h"

#include <plat/cpu.h>



#include "vp.h"

#include "powerdomain.h"

#include "prm3xxx.h"

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

+0 −4
Original line number Diff line number Diff line
@@ -32,8 +32,4 @@ 
#include <mach/soc.h>

#endif



#ifdef CONFIG_ARCH_OMAP2PLUS

#include "../../mach-omap2/soc.h"

#endif



#endif