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

Commit e10dd62f authored by Paul Walmsley's avatar Paul Walmsley Committed by Tony Lindgren
Browse files

ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files 



To facilitate the ARM single image work, split
arch/arm/plat-omap/include/plat/clkdev_omap.h into the
arch/arm/mach-omap1/clock.h and arch/arm/mach-omap2/clock.h files.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a135eaae

arch/arm/mach-omap1/clock.c

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


#include <plat/cpu.h>

#include <plat/usb.h>

#include <plat/clkdev_omap.h>



#include <mach/hardware.h>

arch/arm/mach-omap1/clock.h

+25 −0
Original line number Diff line number Diff line
@@ -16,9 +16,34 @@ 
#include <linux/clk.h>

#include <linux/list.h>



#include <linux/clkdev.h>



struct module;

struct clk;



struct omap_clk {

	u16				cpu;

	struct clk_lookup		lk;

};



#define CLK(dev, con, ck, cp)		\

	{				\

		 .cpu = cp,		\

		.lk = {			\

			.dev_id = dev,	\

			.con_id = con,	\

			.clk = ck,	\

		},			\

	}



/* Platform flags for the clkdev-OMAP integration code */

#define CK_310		(1 << 0)

#define CK_7XX		(1 << 1)	/* 7xx, 850 */

#define CK_1510		(1 << 2)

#define CK_16XX		(1 << 3)	/* 16xx, 17xx, 5912 */

#define CK_1710		(1 << 4)	/* 1710 extra for rate selection */





/* Temporary, needed during the common clock framework conversion */

#define __clk_get_name(clk)	(clk->name)

#define __clk_get_parent(clk)	(clk->parent)

arch/arm/mach-omap1/clock_data.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <asm/mach-types.h>  /* for machine_is_* */



#include <plat/cpu.h>

#include <plat/clkdev_omap.h>



#include <mach/hardware.h>

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

arch/arm/mach-omap1/opp_data.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * published by the Free Software Foundation.

 */



#include <plat/clkdev_omap.h>

#include "clock.h"

#include "opp.h"



/*-------------------------------------------------------------------------

arch/arm/mach-omap2/clock.h

+33 −0
Original line number Diff line number Diff line
@@ -19,6 +19,39 @@ 
#include <linux/kernel.h>

#include <linux/list.h>



#include <linux/clkdev.h>



struct omap_clk {

	u16				cpu;

	struct clk_lookup		lk;

};



#define CLK(dev, con, ck, cp)		\

	{				\

		 .cpu = cp,		\

		.lk = {			\

			.dev_id = dev,	\

			.con_id = con,	\

			.clk = ck,	\

		},			\

	}



/* Platform flags for the clkdev-OMAP integration code */

#define CK_242X		(1 << 0)

#define CK_243X		(1 << 1)	/* 243x, 253x */

#define CK_3430ES1	(1 << 2)	/* 34xxES1 only */

#define CK_3430ES2PLUS	(1 << 3)	/* 34xxES2, ES3, non-Sitara 35xx only */

#define CK_AM35XX	(1 << 4)	/* Sitara AM35xx */

#define CK_36XX		(1 << 5)	/* 36xx/37xx-specific clocks */

#define CK_443X		(1 << 6)

#define CK_TI816X	(1 << 7)

#define CK_446X		(1 << 8)

#define CK_AM33XX	(1 << 9)	/* AM33xx specific clocks */





#define CK_34XX		(CK_3430ES1 | CK_3430ES2PLUS)

#define CK_3XXX		(CK_34XX | CK_AM35XX | CK_36XX)



struct module;

struct clk;

struct clockdomain;