From c029f83899d95decbee1934558eb8a7716ea6936 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Thu, 5 Jun 2014 17:43:38 +0400 Subject: [PATCH 1/3] ARM: clps711x: Prepare common init function to DT support Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/clep7212/lowlevel.c | 2 +- arch/arm/mach-clps711x/include/mach/clps711x.h | 2 +- arch/arm/mach-clps711x/lowlevel.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boards/clep7212/lowlevel.c b/arch/arm/boards/clep7212/lowlevel.c index 92fbb9b53..ac715065f 100644 --- a/arch/arm/boards/clep7212/lowlevel.c +++ b/arch/arm/boards/clep7212/lowlevel.c @@ -24,5 +24,5 @@ void __naked __bare_init barebox_arm_reset_vector(void) { arm_cpu_lowlevel_init(); - clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT); + clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT, NULL); } diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/arch/arm/mach-clps711x/include/mach/clps711x.h index cc65cc85f..f4a1f0ade 100644 --- a/arch/arm/mach-clps711x/include/mach/clps711x.h +++ b/arch/arm/mach-clps711x/include/mach/clps711x.h @@ -281,6 +281,6 @@ #define MEMCFG_WAITSTATE_2_0 (14 << 2) #define MEMCFG_WAITSTATE_1_0 (15 << 2) -void clps711x_barebox_entry(u32); +void clps711x_barebox_entry(u32, void *); #endif diff --git a/arch/arm/mach-clps711x/lowlevel.c b/arch/arm/mach-clps711x/lowlevel.c index 93a64a11c..ff23b05cc 100644 --- a/arch/arm/mach-clps711x/lowlevel.c +++ b/arch/arm/mach-clps711x/lowlevel.c @@ -17,7 +17,7 @@ #include -void __naked __bare_init clps711x_barebox_entry(u32 pllmult) +void __naked __bare_init clps711x_barebox_entry(u32 pllmult, void *data) { u32 cpu, bus; @@ -69,5 +69,5 @@ void __naked __bare_init clps711x_barebox_entry(u32 pllmult) /* Disable LED flasher */ writew(0, LEDFLSH); - barebox_arm_entry(SDRAM0_BASE, SZ_8M, NULL); + barebox_arm_entry(SDRAM0_BASE, SZ_8M, data); } From f662f9b62259e290ce19bf139744cc3f594c6f29 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Thu, 5 Jun 2014 17:43:39 +0400 Subject: [PATCH 2/3] ARM: clps711x: Remove unused UART bit definitions Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- .../arm/mach-clps711x/include/mach/clps711x.h | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/arch/arm/mach-clps711x/include/mach/clps711x.h index f4a1f0ade..957b2b847 100644 --- a/arch/arm/mach-clps711x/include/mach/clps711x.h +++ b/arch/arm/mach-clps711x/include/mach/clps711x.h @@ -98,16 +98,12 @@ #define RANDID2 (REGS_BASE + 0x2708) #define RANDID3 (REGS_BASE + 0x270c) -/* common bits: SYSCON1 / SYSCON2 */ -#define SYSCON_UARTEN (1 << 8) - #define SYSCON1_KBDSCAN(x) ((x) & 15) #define SYSCON1_KBDSCANMASK (15) #define SYSCON1_TC1M (1 << 4) #define SYSCON1_TC1S (1 << 5) #define SYSCON1_TC2M (1 << 6) #define SYSCON1_TC2S (1 << 7) -#define SYSCON1_UART1EN SYSCON_UARTEN #define SYSCON1_BZTOG (1 << 9) #define SYSCON1_BZMOD (1 << 10) #define SYSCON1_DBGEN (1 << 11) @@ -121,11 +117,6 @@ #define SYSCON1_WAKEDIS (1 << 19) #define SYSCON1_IRTXM (1 << 20) -/* common bits: SYSFLG1 / SYSFLG2 */ -#define SYSFLG_UBUSY (1 << 11) -#define SYSFLG_URXFE (1 << 22) -#define SYSFLG_UTXFF (1 << 23) - #define SYSFLG1_MCDR (1 << 0) #define SYSFLG1_DCDET (1 << 1) #define SYSFLG1_WUDR (1 << 2) @@ -133,13 +124,10 @@ #define SYSFLG1_CTS (1 << 8) #define SYSFLG1_DSR (1 << 9) #define SYSFLG1_DCD (1 << 10) -#define SYSFLG1_UBUSY SYSFLG_UBUSY #define SYSFLG1_NBFLG (1 << 12) #define SYSFLG1_RSTFLG (1 << 13) #define SYSFLG1_PFFLG (1 << 14) #define SYSFLG1_CLDFLG (1 << 15) -#define SYSFLG1_URXFE SYSFLG_URXFE -#define SYSFLG1_UTXFF SYSFLG_UTXFF #define SYSFLG1_CRXFE (1 << 24) #define SYSFLG1_CTXFF (1 << 25) #define SYSFLG1_SSIBUSY (1 << 26) @@ -154,9 +142,6 @@ #define SYSFLG2_SS2TXFF (1 << 4) #define SYSFLG2_SS2TXUF (1 << 5) #define SYSFLG2_CKMODE (1 << 6) -#define SYSFLG2_UBUSY SYSFLG_UBUSY -#define SYSFLG2_URXFE SYSFLG_URXFE -#define SYSFLG2_UTXFF SYSFLG_UTXFF #define LCDCON_GSEN (1 << 30) #define LCDCON_GSMD (1 << 31) @@ -169,30 +154,11 @@ #define SYSCON2_PCCARD1 (1 << 5) #define SYSCON2_PCCARD2 (1 << 6) #define SYSCON2_SS2RXEN (1 << 7) -#define SYSCON2_UART2EN SYSCON_UARTEN #define SYSCON2_SS2MAEN (1 << 9) #define SYSCON2_OSTB (1 << 12) #define SYSCON2_CLKENSL (1 << 13) #define SYSCON2_BUZFREQ (1 << 14) -/* common bits: UARTDR1 / UARTDR2 */ -#define UARTDR_FRMERR (1 << 8) -#define UARTDR_PARERR (1 << 9) -#define UARTDR_OVERR (1 << 10) - -/* common bits: UBRLCR1 / UBRLCR2 */ -#define UBRLCR_BAUD_MASK ((1 << 12) - 1) -#define UBRLCR_BREAK (1 << 12) -#define UBRLCR_PRTEN (1 << 13) -#define UBRLCR_EVENPRT (1 << 14) -#define UBRLCR_XSTOP (1 << 15) -#define UBRLCR_FIFOEN (1 << 16) -#define UBRLCR_WRDLEN5 (0 << 17) -#define UBRLCR_WRDLEN6 (1 << 17) -#define UBRLCR_WRDLEN7 (2 << 17) -#define UBRLCR_WRDLEN8 (3 << 17) -#define UBRLCR_WRDLEN_MASK (3 << 17) - #define SYNCIO_FRMLEN(x) (((x) & 0x1f) << 8) #define SYNCIO_SMCKEN (1 << 13) #define SYNCIO_TXFRMEN (1 << 14) From bad06f0a1a2de205da83e5ef0945100df9b0ff20 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Thu, 5 Jun 2014 17:43:40 +0400 Subject: [PATCH 3/3] ARM: clep7212: Make partition names more generic Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/clep7212/env/init/mtdparts-nor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boards/clep7212/env/init/mtdparts-nor b/arch/arm/boards/clep7212/env/init/mtdparts-nor index 7910299c8..8702b4059 100644 --- a/arch/arm/boards/clep7212/env/init/mtdparts-nor +++ b/arch/arm/boards/clep7212/env/init/mtdparts-nor @@ -5,7 +5,7 @@ if [ "$1" = menu ]; then exit fi -mtdparts="256k(barebox),256k(bareboxenv),3584k(kernel),-(root)" +mtdparts="256k(boot),256k(env),3584k(kernel),-(root)" kernelname="physmap-flash.0" mtdparts-add -d nor0 -k ${kernelname} -p ${mtdparts}