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

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

ARM: OMAP: Split sram.h to local headers and minimal shared header 

Most of the defines are specific to omap1 and omap2+,
and should be in the local headers. Only minimal function
prototypes need to be shared.

As discussed on linux-arm-kernel, we want to avoid
relative includes for the arch/arm/*omap* shared code:

http://www.spinics.net/lists/linux-omap/msg80520.html



So this patch re-adds a minimal plat/sram.h.

The new plat/sram.h must not be included from drivers,
that will break build for omap2+ CONFIG_MULTIPLATFORM.

Note that this patch temporarily adds two more
relative includes; Those will be removed in the
following patch.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent eba36d77

arch/arm/mach-omap1/clock.c

+1 −2
Original line number Diff line number Diff line
@@ -24,12 +24,11 @@ 


#include <mach/hardware.h>



#include "../plat-omap/sram.h"



#include "soc.h"

#include "iomap.h"

#include "clock.h"

#include "opp.h"

#include "sram.h"



__u32 arm_idlect1_mask;

struct clk *api_ck_p, *ck_dpll1_p, *ck_ref_p;

arch/arm/mach-omap1/clock_data.c

+1 −2
Original line number Diff line number Diff line
@@ -27,10 +27,9 @@ 
#include <mach/hardware.h>

#include <mach/usb.h>   /* for OTG_BASE */



#include "../plat-omap/sram.h"



#include "iomap.h"

#include "clock.h"

#include "sram.h"



/* Some ARM_IDLECT1 bit shifts - used in struct arm_idlect1_clk */

#define IDL_CLKOUT_ARM_SHIFT			12

arch/arm/mach-omap1/devices.c

+1 −2
Original line number Diff line number Diff line
@@ -26,12 +26,11 @@ 
#include <mach/camera.h>

#include <mach/hardware.h>



#include "../plat-omap/sram.h"



#include "common.h"

#include "clock.h"

#include "dma.h"

#include "mmc.h"

#include "sram.h"



#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)

arch/arm/mach-omap1/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <linux/io.h>

#include <linux/atomic.h>



#include <asm/fncpy.h>

#include <asm/system_misc.h>

#include <asm/irq.h>

#include <asm/mach/time.h>
@@ -56,11 +57,10 @@ 


#include <mach/irqs.h>



#include "../plat-omap/sram.h"



#include "iomap.h"

#include "clock.h"

#include "pm.h"

#include "sram.h"



static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];

static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE];

arch/arm/mach-omap1/sram.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#include <plat/sram.h>



extern void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl);



/* Do not use these */

extern void omap1_sram_reprogram_clock(u32 ckctl, u32 dpllctl);

extern unsigned long omap1_sram_reprogram_clock_sz;