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

Commit 99541195 authored by Afzal Mohammed's avatar Afzal Mohammed Committed by Tony Lindgren
Browse files

ARM: OMAP: am33xx: Update common omap platform files 



This patch updates the common platform files with AM335X device
support (AM33XX family).

The approach taken in this patch is,
AM33XX device will be considered as OMAP3 variant, and a separate
SoC class created for AM33XX family of devices with a subclass type
for AM335X device, which is newly added device in the family.

This means, cpu_is_omap34xx(), cpu_is_am33xx() and cpu_is_am335x()
checks will return success on AM335X device.
A kernel config option CONFIG_SOC_OMAPAM33XX is added under OMAP3
to include support for AM33XX build.

Also, cpu_mask and RATE_IN_XXX flags have crossed 8 bit hence
struct clksel_rate.flags, struct prcm_config.flags and cpu_mask
are changed to u16 from u8.

Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Cc: Hemant Pedanekar <hemantp@ti.com>
[tony@atomide.com: left out CK_AM33XX for now]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent deee6d53

arch/arm/mach-omap2/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ config SOC_OMAPTI816X 
	depends on ARCH_OMAP3

	default y



config SOC_OMAPAM33XX

	bool "AM33XX support"

	depends on ARCH_OMAP3

	default y



config OMAP_PACKAGE_ZAF

       bool

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "cm-regbits-24xx.h"

#include "cm-regbits-34xx.h"



u8 cpu_mask;

u16 cpu_mask;



/*

 * clkdm_control: if true, then when a clock is enabled in the

arch/arm/mach-omap2/clock.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ void omap2_clk_print_new_rates(const char *hfclkin_ck_name, 
			       const char *core_ck_name,

			       const char *mpu_ck_name);



extern u8 cpu_mask;

extern u16 cpu_mask;



extern const struct clkops clkops_omap2_dflt_wait;

extern const struct clkops clkops_dummy;

arch/arm/mach-omap2/opp2xxx.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct prcm_config { 
	unsigned long cm_clksel2_pll;	/* dpllx1 or x2 out */

	unsigned long cm_clksel_mdm;	/* modem dividers 2430 only */

	unsigned long base_sdrc_rfr;	/* base refresh timing for a set */

	unsigned char flags;

	unsigned short flags;

};

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

+2 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct clkops { 
#define RATE_IN_4430		(1 << 5)

#define RATE_IN_TI816X		(1 << 6)

#define RATE_IN_4460		(1 << 7)

#define RATE_IN_AM33XX		(1 << 8)



#define RATE_IN_24XX		(RATE_IN_242X | RATE_IN_243X)

#define RATE_IN_34XX		(RATE_IN_3430ES1 | RATE_IN_3430ES2PLUS)
@@ -84,7 +85,7 @@ struct clkops { 
struct clksel_rate {

	u32			val;

	u8			div;

	u8			flags;

	u16			flags;

};



/**