Commit b0efb424 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'ep93xx' into devel

parents bd78512e 40702432

arch/arm/configs/ep93xx_defconfig

+547 −306

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-ep93xx/Kconfig

+65 −17
Original line number Diff line number Diff line
@@ -9,55 +9,100 @@ config CRUNCH 


comment "EP93xx Platforms"



choice

	prompt "EP93xx first SDRAM bank selection"

	default EP93XX_SDCE3_SYNC_PHYS_OFFSET



config EP93XX_SDCE3_SYNC_PHYS_OFFSET

	bool "0x00000000 - SDCE3/SyncBoot"

	help

	  Select this option if you want support for EP93xx boards with the

	  first SDRAM bank at 0x00000000



config EP93XX_SDCE0_PHYS_OFFSET

	bool "0xc0000000 - SDCEO"

	help

	  Select this option if you want support for EP93xx boards with the

	  first SDRAM bank at 0xc0000000



endchoice



config MACH_ADSSPHERE

	bool "Support ADS Sphere"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	help

	  Say 'Y' here if you want your kernel to support the ADS

	  Sphere board.



config MACH_EDB93XX

	bool



config MACH_EDB9301

	bool "Support Cirrus Logic EDB9301"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9301 Evaluation Board.



config MACH_EDB9302

	bool "Support Cirrus Logic EDB9302"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9302 Evaluation Board.



config MACH_EDB9302A

	bool "Support Cirrus Logic EDB9302A"

	depends on EP93XX_SDCE0_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9302A Evaluation Board.



config MACH_EDB9307

	bool "Support Cirrus Logic EDB9307"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9307 Evaluation Board.



config MACH_EDB9307A

	bool "Support Cirrus Logic EDB9307A"

	depends on EP93XX_SDCE0_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9307A Evaluation Board.



config MACH_EDB9312

	bool "Support Cirrus Logic EDB9312"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9312 Evaluation Board.



config MACH_EDB9315

	bool "Support Cirrus Logic EDB9315"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9315 Evaluation Board.



config MACH_EDB9315A

	bool "Support Cirrus Logic EDB9315A"

	depends on EP93XX_SDCE0_PHYS_OFFSET

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9315A Evaluation Board.



config MACH_GESBC9312

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	bool "Support Glomation GESBC-9312-sx"

	help

	  Say 'Y' here if you want your kernel to support the Glomation
@@ -65,10 +110,10 @@ config MACH_GESBC9312 


config MACH_MICRO9

	bool

        default n



config MACH_MICRO9H

	bool "Support Contec Hypercontrol Micro9-H"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_MICRO9

	help

	  Say 'Y' here if you want your kernel to support the
@@ -76,6 +121,7 @@ config MACH_MICRO9H 


config MACH_MICRO9M

	bool "Support Contec Hypercontrol Micro9-M"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_MICRO9

	help

	  Say 'Y' here if you want your kernel to support the
@@ -83,6 +129,7 @@ config MACH_MICRO9M 


config MACH_MICRO9L

	bool "Support Contec Hypercontrol Micro9-L"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	select MACH_MICRO9

	help

	  Say 'Y' here if you want your kernel to support the
@@ -90,6 +137,7 @@ config MACH_MICRO9L 


config MACH_TS72XX

	bool "Support Technologic Systems TS-72xx SBC"

	depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET

	help

	  Say 'Y' here if you want your kernel to support the

	  Technologic Systems TS-72xx board.

arch/arm/mach-ep93xx/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -7,13 +7,7 @@ obj-n := 
obj-			:=



obj-$(CONFIG_MACH_ADSSPHERE)	+= adssphere.o

obj-$(CONFIG_MACH_EDB9302)	+= edb9302.o

obj-$(CONFIG_MACH_EDB9302A)	+= edb9302a.o

obj-$(CONFIG_MACH_EDB9307)	+= edb9307.o

obj-$(CONFIG_MACH_EDB9307A)	+= edb9307a.o

obj-$(CONFIG_MACH_EDB9312)	+= edb9312.o

obj-$(CONFIG_MACH_EDB9315)	+= edb9315.o

obj-$(CONFIG_MACH_EDB9315A)	+= edb9315a.o

obj-$(CONFIG_MACH_EDB93XX)	+= edb93xx.o

obj-$(CONFIG_MACH_GESBC9312)	+= gesbc9312.o

obj-$(CONFIG_MACH_MICRO9)	+= micro9.o

obj-$(CONFIG_MACH_TS72XX)	+= ts72xx.o

arch/arm/mach-ep93xx/Makefile.boot

+5 −2
Original line number Diff line number Diff line 
   zreladdr-y	:= 0x00008000

params_phys-y	:= 0x00000100
 
   zreladdr-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET)	:= 0x00008000

params_phys-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET)	:= 0x00000100



   zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET)		:= 0xc0008000

params_phys-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET)		:= 0xc0000100

arch/arm/mach-ep93xx/clock.c

+27 −27
Original line number Diff line number Diff line
@@ -72,58 +72,58 @@ static struct clk clk_h; 
static struct clk clk_p;

static struct clk clk_pll2;

static struct clk clk_usb_host = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= EP93XX_SYSCON_CLOCK_USH_EN,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_USH_EN,

};



/* DMA Clocks */

static struct clk clk_m2p0 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00020000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P0,

};

static struct clk clk_m2p1 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00010000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P1,

};

static struct clk clk_m2p2 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00080000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P2,

};

static struct clk clk_m2p3 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00040000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P3,

};

static struct clk clk_m2p4 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00200000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P4,

};

static struct clk clk_m2p5 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00100000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P5,

};

static struct clk clk_m2p6 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00800000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P6,

};

static struct clk clk_m2p7 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x00400000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P7,

};

static struct clk clk_m2p8 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x02000000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P8,

};

static struct clk clk_m2p9 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x01000000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2P9,

};

static struct clk clk_m2m0 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x04000000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2M0,

};

static struct clk clk_m2m1 = {

	.enable_reg	= EP93XX_SYSCON_CLOCK_CONTROL,

	.enable_mask	= 0x08000000,

	.enable_reg	= EP93XX_SYSCON_PWRCNT,

	.enable_mask	= EP93XX_SYSCON_PWRCNT_DMA_M2M1,

};



#define INIT_CK(dev,con,ck)					\
@@ -138,7 +138,7 @@ static struct clk_lookup clocks[] = { 
	INIT_CK(NULL, "hclk", &clk_h),

	INIT_CK(NULL, "pclk", &clk_p),

	INIT_CK(NULL, "pll2", &clk_pll2),

	INIT_CK(NULL, "usb_host", &clk_usb_host),

	INIT_CK("ep93xx-ohci", NULL, &clk_usb_host),

	INIT_CK(NULL, "m2p0", &clk_m2p0),

	INIT_CK(NULL, "m2p1", &clk_m2p1),

	INIT_CK(NULL, "m2p2", &clk_m2p2),