Merge branch 'master' of git://git.denx.de/u-boot-arm

7 files changed, 4 insertions, 454 deletions

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c
index dc155ad0e5..cebabe920a 100644
--- a/board/samsung/common/ums.c
+++ b/board/samsung/common/ums.c
@@ -66,11 +66,9 @@ static struct ums *ums_disk_init(struct mmc *mmc)
 
 struct ums *ums_init(unsigned int dev_num)
 {
-	struct mmc *mmc = NULL;
+	struct mmc *mmc = find_mmc_device(dev_num);
 
-	mmc = find_mmc_device(dev_num);
-	if (!mmc)
+	if (!mmc || mmc_init(mmc))
 		return NULL;
-
 	return ums_disk_init(mmc);
 }
diff --git a/board/samsung/goni/mem_setup.S b/board/samsung/goni/mem_setup.S
deleted file mode 100644
index 5dc980cf5b..0000000000
--- a/board/samsung/goni/mem_setup.S
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (C) 2009 Samsung Electrnoics
- * Minkyu Kang <mk7.kang@samsung.com>
- * Kyungmin Park <kyungmin.park@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <config.h>
-
-	.globl mem_ctrl_asm_init
-mem_ctrl_asm_init:
-	cmp	r7, r8
-
-	ldreq	r0, =S5PC100_DMC_BASE			@ 0xE6000000
-	ldrne	r0, =S5PC110_DMC0_BASE			@ 0xF0000000
-	ldrne	r6, =S5PC110_DMC1_BASE			@ 0xF1400000
-
-	/* DLL parameter setting */
-	ldr	r1, =0x50101000
-	str	r1, [r0, #0x018]			@ PHYCONTROL0_OFFSET
-	strne	r1, [r6, #0x018]			@ PHYCONTROL0_OFFSET
-	ldr	r1, =0x000000f4
-	str	r1, [r0, #0x01C]			@ PHYCONTROL1_OFFSET
-	strne	r1, [r6, #0x01C]			@ PHYCONTROL1_OFFSET
-	ldreq	r1, =0x0
-	streq	r1, [r0, #0x020]			@ PHYCONTROL2_OFFSET
-
-	/* DLL on */
-	ldr	r1, =0x50101002
-	str	r1, [r0, #0x018]			@ PHYCONTROL0_OFFSET
-	strne	r1, [r6, #0x018]			@ PHYCONTROL0_OFFSET
-
-	/* DLL start */
-	ldr	r1, =0x50101003
-	str	r1, [r0, #0x018]			@ PHYCONTROL0_OFFSET
-	strne	r1, [r6, #0x018]			@ PHYCONTROL0_OFFSET
-
-	mov	r2, #0x4000
-wait:	subs	r2, r2, #0x1
-	cmp	r2, #0x0
-	bne	wait
-
-	cmp	r7, r8
-	/* Force value locking for DLL off */
-	str	r1, [r0, #0x018]			@ PHYCONTROL0_OFFSET
-	strne	r1, [r6, #0x018]			@ PHYCONTROL0_OFFSET
-
-	/* DLL off */
-	ldr	r1, =0x50101009
-	str	r1, [r0, #0x018]			@ PHYCONTROL0_OFFSET
-	strne	r1, [r6, #0x018]			@ PHYCONTROL0_OFFSET
-
-	/* auto refresh off */
-	ldr	r1, =0xff001010 | (1 << 7)
-	ldr	r2, =0xff001010 | (1 << 7)
-	str	r1, [r0, #0x000]			@ CONCONTROL_OFFSET
-	strne	r2, [r6, #0x000]			@ CONCONTROL_OFFSET
-
-	/*
-	 * Burst Length 4, 2 chips, 32-bit, LPDDR
-	 * OFF: dynamic self refresh, force precharge, dynamic power down off
-	 */
-	ldr	r1, =0x00212100
-	ldr	r2, =0x00212100
-	str	r1, [r0, #0x004]			@ MEMCONTROL_OFFSET
-	strne	r2, [r6, #0x004]			@ MEMCONTROL_OFFSET
-
-	/*
-	 * Note:
-	 * If Bank0 has Mobile RAM we place it at 0x3800'0000 (s5pc100 only)
-	 * So finally Bank1 OneDRAM should address start at at 0x3000'0000
-	 */
-
-	/*
-	 * DMC0: CS0 : S5PC100/S5PC110
-	 * 0x30 -> 0x30000000
-	 * 0xf8 -> 0x37FFFFFF
-	 * [15:12] 0: Linear
-	 * [11:8 ] 2: 9 bits
-	 * [ 7:4 ] 2: 14 bits
-	 * [ 3:0 ] 2: 4 banks
-	 */
-	ldr	r3, =0x30f80222
-	ldr	r4, =0x40f00222
-swap_memory:
-	str	r3, [r0, #0x008]			@ MEMCONFIG0_OFFSET
-	str	r4, [r0, #0x00C]			@ dummy write
-
-	/*
-	 * DMC1: CS0 : S5PC110
-	 * 0x40 -> 0x40000000
-	 * 0xf8 -> 0x47FFFFFF (1Gib)
-	 * 0x40 -> 0x40000000
-	 * 0xf0 -> 0x4FFFFFFF (2Gib)
-	 * [15:12] 0: Linear
-	 * [11:8 ] 2: 9 bits  - Col (1Gib)
-	 * [11:8 ] 3: 10 bits - Col (2Gib)
-	 * [ 7:4 ] 2: 14 bits - Row
-	 * [ 3:0 ] 2: 4 banks
-	 */
-	/* Default : 2GiB */
-	ldr	r4, =0x40f01322				@ 2Gib: MCP B
-	ldr	r5, =0x50f81312				@ dummy: MCP D
-	cmp	r9, #1
-	ldreq	r4, =0x40f81222				@ 1Gib: MCP A
-	cmp	r9, #3
-	ldreq	r5, =0x50f81312				@ 2Gib + 1Gib: MCP D
-	cmp	r9, #4
-	ldreq	r5, =0x50f01312				@ 2Gib + 2Gib: MCP E
-
-	cmp	r7, r8
-	strne	r4, [r6, #0x008]			@ MEMCONFIG0_OFFSET
-	strne	r5, [r6, #0x00C]			@ MEMCONFIG1_OFFSET
-
-	/*
-	 * DMC0: CS1: S5PC100
-	 * 0x38 -> 0x38000000
-	 * 0xf8 -> 0x3fFFFFFF
-	 * [15:12] 0: Linear
-	 * [11:8 ] 2: 9 bits
-	 * [ 7:4 ] 2: 14 bits
-	 * [ 3:0 ] 2: 4 banks
-	 */
-	eoreq	r3, r3, #0x08000000
-	streq	r3, [r0, #0xc]				@ MEMCONFIG1_OFFSET
-
-	ldr	r1, =0x20000000
-	str	r1, [r0, #0x014]			@ PRECHCONFIG_OFFSET
-	strne	r1, [r0, #0x014]			@ PRECHCONFIG_OFFSET
-	strne	r1, [r6, #0x014]			@ PRECHCONFIG_OFFSET
-
-	/*
-	 * S5PC100:
-	 * DMC:  CS0: 166MHz
-	 *       CS1: 166MHz
-	 * S5PC110:
-	 * DMC0: CS0: 166MHz
-	 * DMC1: CS0: 200MHz
-	 *
-	 * 7.8us * 200MHz %LE %LONG1560(0x618)
-	 * 7.8us * 166MHz %LE %LONG1294(0x50E)
-	 * 7.8us * 133MHz %LE %LONG1038(0x40E),
-	 * 7.8us * 100MHz %LE %LONG780(0x30C),
-	 */
-	ldr	r1, =0x0000050E
-	str	r1, [r0, #0x030]			@ TIMINGAREF_OFFSET
-	ldrne	r1, =0x00000618
-	strne	r1, [r6, #0x030]			@ TIMINGAREF_OFFSET
-
-	ldr	r1, =0x14233287
-	str	r1, [r0, #0x034]			@ TIMINGROW_OFFSET
-	ldrne	r1, =0x182332c8
-	strne	r1, [r6, #0x034]			@ TIMINGROW_OFFSET
-
-	ldr	r1, =0x12130005
-	str	r1, [r0, #0x038]			@ TIMINGDATA_OFFSET
-	ldrne	r1, =0x13130005
-	strne	r1, [r6, #0x038]			@ TIMINGDATA_OFFSET
-
-	ldr	r1, =0x0E140222
-	str	r1, [r0, #0x03C]			@ TIMINGPOWER_OFFSET
-	ldrne	r1, =0x0E180222
-	strne	r1, [r6, #0x03C]			@ TIMINGPOWER_OFFSET
-
-	/* chip0 Deselect */
-	ldr	r1, =0x07000000
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip0 PALL */
-	ldr	r1, =0x01000000
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip0 REFA */
-	ldr	r1, =0x05000000
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-	/* chip0 REFA */
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip0 MRS */
-	ldr	r1, =0x00000032
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip0 EMRS */
-	ldr	r1, =0x00020020
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip1 Deselect */
-	ldr	r1, =0x07100000
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip1 PALL */
-	ldr	r1, =0x01100000
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip1 REFA */
-	ldr	r1, =0x05100000
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-	/* chip1 REFA */
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip1 MRS */
-	ldr	r1, =0x00100032
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* chip1 EMRS */
-	ldr	r1, =0x00120020
-	str	r1, [r0, #0x010]			@ DIRECTCMD_OFFSET
-	strne	r1, [r6, #0x010]			@ DIRECTCMD_OFFSET
-
-	/* auto refresh on */
-	ldr	r1, =0xFF002030 | (1 << 7)
-	str	r1, [r0, #0x000]			@ CONCONTROL_OFFSET
-	strne	r1, [r6, #0x000]			@ CONCONTROL_OFFSET
-
-	/* PwrdnConfig */
-	ldr	r1, =0x00100002
-	str	r1, [r0, #0x028]			@ PWRDNCONFIG_OFFSET
-	strne	r1, [r6, #0x028]			@ PWRDNCONFIG_OFFSET
-
-	ldr	r1, =0x00212113
-	str	r1, [r0, #0x004]			@ MEMCONTROL_OFFSET
-	strne	r1, [r6, #0x004]			@ MEMCONTROL_OFFSET
-
-	/* Skip when S5PC110 */
-	bne	1f
-
-	/* Check OneDRAM access area at s5pc100 */
-	ldreq	r3, =0x38f80222
-	ldreq	r1, =0x37ffff00
-	str	r3, [r1]
-	ldr	r2, [r1]
-	cmp	r2, r3
-	beq	swap_memory
-1:
-	mov	pc, lr
-
-	.ltorg
diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c
index d502f02d3d..a539267a1c 100644
--- a/board/samsung/origen/origen.c
+++ b/board/samsung/origen/origen.c
@@ -30,13 +30,6 @@ int board_usb_init(int index, enum usb_init_type init)
 	return 0;
 }
 
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
-{
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 int exynos_early_init_f(void)
 {
diff --git a/board/samsung/smdkc100/mem_setup.S b/board/samsung/smdkc100/mem_setup.S
deleted file mode 100644
index 2f2df0b7eb..0000000000
--- a/board/samsung/smdkc100/mem_setup.S
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Originates from Samsung's u-boot 1.1.6 port to S5PC1xx
- *
- * Copyright (C) 2009 Samsung Electrnoics
- * Inki Dae <inki.dae@samsung.com>
- * Heungjun Kim <riverful.kim@samsung.com>
- * Minkyu Kang <mk7.kang@samsung.com>
- * Kyungmin Park <kyungmin.park@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <config.h>
-
-	.globl mem_ctrl_asm_init
-mem_ctrl_asm_init:
-	ldr	r6, =S5PC100_DMC_BASE			@ 0xE6000000
-
-	/* DLL parameter setting */
-	ldr	r1, =0x50101000
-	str	r1, [r6, #0x018]			@ PHYCONTROL0
-	ldr	r1, =0xf4
-	str	r1, [r6, #0x01C]			@ PHYCONTROL1
-	ldr	r1, =0x0
-	str	r1, [r6, #0x020]			@ PHYCONTROL2
-
-	/* DLL on */
-	ldr	r1, =0x50101002
-	str	r1, [r6, #0x018]			@ PHYCONTROL0
-
-	/* DLL start */
-	ldr	r1, =0x50101003
-	str	r1, [r6, #0x018]			@ PHYCONTROL0
-
-	/* Force value locking for DLL off */
-	str	r1, [r6, #0x018]			@ PHYCONTROL0
-
-	/* DLL off */
-	ldr	r1, =0x50101001
-	str	r1, [r6, #0x018]			@ PHYCONTROL0
-
-	/* auto refresh off */
-	ldr	r1, =0xff001010
-	str	r1, [r6, #0x000]			@ CONCONTROL
-
-	/*
-	 * Burst Length 4, 2 chips, 32-bit, LPDDR
-	 * OFF: dynamic self refresh, force precharge, dynamic power down off
-	 */
-	ldr	r1, =0x00212100
-	str	r1, [r6, #0x004]			@ MEMCONTROL
-
-	/*
-	 * Note:
-	 * If Bank0 has OneDRAM we place it at 0x2800'0000
-	 * So finally Bank1 should address start at at 0x2000'0000
-	 */
-	mov	r4, #0x0
-
-swap_memory:
-	/*
-	 * Bank0
-	 * 0x30 -> 0x30000000
-	 * 0xf8 -> 0x37FFFFFF
-	 * [15:12] 0: Linear
-	 * [11:8 ] 2: 9 bits
-	 * [ 7:4 ] 2: 14 bits
-	 * [ 3:0 ] 2: 4 banks
-	 */
-	ldr	r1, =0x30f80222
-	/* if r4 is 1, swap the bank */
-	cmp	r4, #0x1
-	orreq	r1, r1, #0x08000000
-	str	r1, [r6, #0x008]			@ MEMCONFIG0
-
-	/*
-	 * Bank1
-	 * 0x38 -> 0x38000000
-	 * 0xf8 -> 0x3fFFFFFF
-	 * [15:12] 0: Linear
-	 * [11:8 ] 2: 9 bits
-	 * [ 7:4 ] 2: 14 bits
-	 * [ 3:0 ] 2: 4 banks
-	 */
-	ldr	r1, =0x38f80222
-	/* if r4 is 1, swap the bank */
-	cmp	r4, #0x1
-	biceq	r1, r1, #0x08000000
-	str	r1, [r6, #0x00c]			@ MEMCONFIG1
-
-	ldr	r1, =0x20000000
-	str	r1, [r6, #0x014]			@ PRECHCONFIG
-
-	/*
-	 * FIXME: Please verify these values
-	 * 7.8us * 166MHz %LE %LONG1294(0x50E)
-	 * 7.8us * 133MHz %LE %LONG1038(0x40E),
-	 * 7.8us * 100MHz %LE %LONG780(0x30C),
-	 * 7.8us * 20MHz  %LE %LONG156(0x9C),
-	 * 7.8us * 10MHz  %LE %LONG78(0x4E)
-	 */
-	ldr	r1, =0x0000050e
-	str	r1, [r6, #0x030]			@ TIMINGAREF
-
-	/* 166 MHz */
-	ldr	r1, =0x0c233287
-	str	r1, [r6, #0x034]			@ TIMINGROW
-
-	/* twtr=3 twr=2 trtp=3 cl=3 wl=3 rl=3 */
-	ldr	r1, =0x32330303
-	str	r1, [r6, #0x038]			@ TIMINGDATA
-
-	/* tfaw=4 sxsr=0x14 txp=0x14 tcke=3 tmrd=3 */
-	ldr	r1, =0x04141433
-	str	r1, [r6, #0x03C]			@ TIMINGPOWER
-
-	/* chip0 Deselect */
-	ldr	r1, =0x07000000
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* chip0 PALL */
-	ldr	r1, =0x01000000
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* chip0 REFA */
-	ldr	r1, =0x05000000
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-	/* chip0 REFA */
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* chip0 MRS, CL%LE %LONG3, BL%LE %LONG4 */
-	ldr	r1, =0x00000032
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* chip1 Deselect */
-	ldr	r1, =0x07100000
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* chip1 PALL */
-	ldr	r1, =0x01100000
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* chip1 REFA */
-	ldr	r1, =0x05100000
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-	/* chip1 REFA */
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* chip1 MRS, CL%LE %LONG3, BL%LE %LONG4 */
-	ldr	r1, =0x00100032
-	str	r1, [r6, #0x010]			@ DIRECTCMD
-
-	/* auto refresh on */
-	ldr	r1, =0xff002030
-	str	r1, [r6, #0x000]			@ CONCONTROL
-
-	/* PwrdnConfig */
-	ldr	r1, =0x00100002
-	str	r1, [r6, #0x028]			@ PWRDNCONFIG
-
-	/* BL%LE %LONG */
-	ldr	r1, =0xff212100
-	str	r1, [r6, #0x004]			@ MEMCONTROL
-
-
-	/* Try to test memory area */
-	cmp	r4, #0x1
-	beq	1f
-
-	mov	r4, #0x1
-	ldr	r1, =0x37ffff00
-	str	r4, [r1]
-	str	r4, [r1, #0x4]				@ dummy write
-	ldr	r0, [r1]
-	cmp	r0, r4
-	bne	swap_memory
-
-1:
-	mov	pc, lr
-
-	.ltorg
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 7c79e7b73a..ab0ad1d650 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -430,8 +430,7 @@ int board_usb_init(int index, enum usb_init_type init)
 	return s3c_udc_probe(&s5pc210_otg_data);
 }
 
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
+int g_dnl_board_usb_cable_connected(void)
 {
 	struct pmic *muic = pmic_get("MAX8997_MUIC");
 	if (!muic)
@@ -440,7 +439,6 @@ int usb_cable_connected(void)
 	return !!muic->chrg->chrg_type(muic);
 }
 #endif
-#endif
 
 static void pmic_reset(void)
 {
diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c
index f558ef97a9..47095252a7 100644
--- a/board/samsung/trats2/trats2.c
+++ b/board/samsung/trats2/trats2.c
@@ -312,8 +312,7 @@ int board_usb_init(int index, enum usb_init_type init)
 	return s3c_udc_probe(&s5pc210_otg_data);
 }
 
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
+int g_dnl_board_usb_cable_connected(void)
 {
 	struct pmic *muic = pmic_get("MAX77693_MUIC");
 	if (!muic)
@@ -322,7 +321,6 @@ int usb_cable_connected(void)
 	return !!muic->chrg->chrg_type(muic);
 }
 #endif
-#endif
 
 static int pmic_init_max77686(void)
 {
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index f9d71b617d..8e49195fe1 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -197,13 +197,6 @@ int board_usb_init(int index, enum usb_init_type init)
 	return s3c_udc_probe(&s5pc210_otg_data);
 }
 
-#ifdef CONFIG_USB_CABLE_CHECK
-int usb_cable_connected(void)
-{
-	return 0;
-}
-#endif
-
 int exynos_early_init_f(void)
 {
 	wdt_stop();