January 2013 - U-Boot

[U-Boot] [PATCH 2/2] Exynos: clock: add CLK_DIV_FSYS3 at set_mmc_clk
by Jaehoon Chung 11 Jan '13

11 Jan '13

Mobile storage is used the CLK_DIV_FSYS3 value. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/cpu/armv7/exynos/clock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index 973b84e..d2edb8c 100644 --- a/arch/arm/cpu/armv7/exynos/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -591,9 +591,14 @@ static void exynos4_set_mmc_clk(int dev_index, unsigned int div) * MMC0_PRE_RATIO [15:8], MMC1_PRE_RATIO [31:24] * CLK_DIV_FSYS2 * MMC2_PRE_RATIO [15:8], MMC3_PRE_RATIO [31:24] + * CLK_DIV_FSYS3 + * MMC4_PRE_RATIO [15:8] */ if (dev_index < 2) { addr = (unsigned int)&clk->div_fsys1; + } else if (dev_index == 4) { + addr = (unsigned int)&clk->div_fsys3; + dev_index -= 4; } else { addr = (unsigned int)&clk->div_fsys2; dev_index -= 2; -- 1.7.5.4

2 1

[U-Boot] [PATCH 1/2] Exynos: clock: support get_mmc_clk for exynos
by Jaehoon Chung 11 Jan '13

11 Jan '13

To get exactly clock value for mmc, support the get_mmc_clk() like set_mmc_clk(). Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/cpu/armv7/exynos/clock.c | 102 ++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/clk.h | 1 + 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index ae6d7fe..973b84e 100644 --- a/arch/arm/cpu/armv7/exynos/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -484,6 +484,100 @@ static unsigned long exynos5_get_uart_clk(int dev_index) return uclk; } +static unsigned long exynos4_get_mmc_clk(int dev_index) +{ + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); + unsigned long uclk, sclk; + unsigned int sel, ratio, pre_ratio; + int shift; + + sel = readl(&clk->src_fsys); + sel = (sel >> (dev_index << 2)) & 0xf; + + if (sel == 0x6) + sclk = get_pll_clk(MPLL); + else if (sel == 0x7) + sclk = get_pll_clk(EPLL); + else if (sel == 0x8) + sclk = get_pll_clk(VPLL); + else + return 0; + + switch (dev_index) { + case 0: + case 1: + ratio = readl(&clk->div_fsys1); + pre_ratio = readl(&clk->div_fsys1); + break; + case 2: + case 3: + ratio = readl(&clk->div_fsys2); + pre_ratio = readl(&clk->div_fsys2); + break; + case 4: + ratio = readl(&clk->div_fsys3); + pre_ratio = readl(&clk->div_fsys3); + break; + default: + return 0; + } + + if (dev_index == 1 || dev_index == 3) + shift = 16; + + ratio = (ratio >> shift) & 0xf; + pre_ratio = (pre_ratio >> (shift + 8)) & 0xff; + uclk = (sclk / (ratio + 1)) / (pre_ratio + 1); + + return uclk; +} + +static unsigned long exynos5_get_mmc_clk(int dev_index) +{ + struct exynos5_clock *clk = + (struct exynos5_clock *)samsung_get_base_clock(); + unsigned long uclk, sclk; + unsigned int sel, ratio, pre_ratio; + int shift; + + sel = readl(&clk->src_fsys); + sel = (sel >> (dev_index << 2)) & 0xf; + + if (sel == 0x6) + sclk = get_pll_clk(MPLL); + else if (sel == 0x7) + sclk = get_pll_clk(EPLL); + else if (sel == 0x8) + sclk = get_pll_clk(VPLL); + else + return 0; + + switch (dev_index) { + case 0: + case 1: + ratio = readl(&clk->div_fsys1); + pre_ratio = readl(&clk->div_fsys1); + break; + case 2: + case 3: + ratio = readl(&clk->div_fsys2); + pre_ratio = readl(&clk->div_fsys2); + break; + default: + return 0; + } + + if (dev_index == 1 || dev_index == 3) + shift = 16; + + ratio = (ratio >> shift) & 0xf; + pre_ratio = (pre_ratio >> (shift + 8)) & 0xff; + uclk = (sclk / (ratio + 1)) / (pre_ratio + 1); + + return uclk; +} + /* exynos4: set the mmc clock */ static void exynos4_set_mmc_clk(int dev_index, unsigned int div) { @@ -1130,6 +1224,14 @@ unsigned long get_uart_clk(int dev_index) } } +unsigned long get_mmc_clk(int dev_index) +{ + if (cpu_is_exynos5()) + return exynos5_get_mmc_clk(dev_index); + else + return exynos4_get_mmc_clk(dev_index); +} + void set_mmc_clk(int dev_index, unsigned int div) { if (cpu_is_exynos5()) diff --git a/arch/arm/include/asm/arch-exynos/clk.h b/arch/arm/include/asm/arch-exynos/clk.h index cd12323..1935b0b 100644 --- a/arch/arm/include/asm/arch-exynos/clk.h +++ b/arch/arm/include/asm/arch-exynos/clk.h @@ -34,6 +34,7 @@ unsigned long get_arm_clk(void); unsigned long get_i2c_clk(void); unsigned long get_pwm_clk(void); unsigned long get_uart_clk(int dev_index); +unsigned long get_mmc_clk(int dev_index); void set_mmc_clk(int dev_index, unsigned int div); unsigned long get_lcd_clk(void); void set_lcd_clk(void); -- 1.7.5.4

2 1

[U-Boot] About fixup_memory_node()
by Dennis Lan (dlan) 11 Jan '13

11 Jan '13

HI Forks： I have question about why memory info from fdt (memory size) will be overwritten by those come from u-boot source code. function fixup_memory_node() in bootm.c when CONFIG_OF_LIBFDT is defined, then memory node information will be updated says that, if I set memory 2G in fdt file, then 512M in uboot config.h, then final fdt info will show 512M (you may wonder why we set 512M in uboot, but others in fdt file, because we may have differnet boards with differnet memory size) Thanks fixup_memory_node() -> fdt_fixup_memory_banks() int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) { ..... for (bank = 0, len = 0; bank < banks; bank++) { write_cell(tmp + len, start[bank], addr_cell_len); len += addr_cell_len; write_cell(tmp + len, size[bank], size_cell_len); len += size_cell_len; } err = fdt_setprop(blob, nodeoffset, "reg", tmp, len); Dennis

1 1

[U-Boot] [PATCH 0/3 V5] EXYNOS5: MAX77686 add FDT support
by Rajeshwari Shinde 11 Jan '13

11 Jan '13

Add FDT support to PMIC MAX77686 chip. Changes in V2: - Changed chip address from 06 to 6. - Corrected indentation errors. Changes in V3: - Rebased on top of the latest implementation of PMIC Changes in V4: - Corrected PMIC register address Changes in V5: - Rebased on latest u-boot-samsung tree. Rajeshwari Shinde (3): EXYNOS5: FDT: Add compatible strings for PMIC EXYNOS5: Add device node for PMIC PMIC: MAX77686: Add FDT Support board/samsung/dts/exynos5250-smdk5250.dts | 7 +++++ drivers/power/pmic/pmic_max77686.c | 37 ++++++++++++++++++++++++++-- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 4 files changed, 43 insertions(+), 3 deletions(-) -- 1.7.4.4

4 7

[U-Boot] [PATCH 12/12] sf: Pass rd_qeb_req variable as 0 for status and config reg reads
by Jagannadha Sutradharudu Teki 11 Jan '13

11 Jan '13

Config and Status register reads doesn't require to set the quad enable bit, hence rd_qeb_req variable passed as 0. Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com> --- drivers/mtd/spi/spi_flash.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 15ad05c..7a15a69 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -293,7 +293,8 @@ int spi_flash_cmd_read_status(struct spi_flash *flash, void *data) int ret; cmd = CMD_READ_STATUS; - ret = spi_flash_read_common(flash, &cmd, sizeof(cmd), (void *)data, 1); + ret = spi_flash_read_common(flash, &cmd, 0, + sizeof(cmd), (void *)data, 1); if (ret < 0) { debug("SF: fail to read status register\n"); return ret; @@ -343,7 +344,8 @@ int spi_flash_cmd_read_config(struct spi_flash *flash, void *data) int ret; cmd = CMD_READ_CONFIG; - ret = spi_flash_read_common(flash, &cmd, sizeof(cmd), (void *)data, 1); + ret = spi_flash_read_common(flash, &cmd, 0, + sizeof(cmd), (void *)data, 1); if (ret < 0) { debug("SF: fail to read config register\n"); return ret; -- 1.7.0.4

2 1

[U-Boot] [RFC] Is anyone interested IPv6 support for u-boot
by Chris Packham 10 Jan '13

10 Jan '13

Hi, Here at $dayjob we make embedded network devices (routers & switches). Because we have an interest in getting people to adopt IPv6 we've added code to our local u-boot repository to add basic IPv6 support on our boards. It's not a fully conformant IPv6 host implementation but it is enough to be able to statically configure an IPv6 address and download images from a v6 capable TFTP server. We're trying to be better FLOSS citizens so I'm proposing to my colleagues that we put some effort in getting this pushed upstream. The first step of which would be to see if anyone wants the feature and is the /net maintainer willing to take on this code (not that we intend to dump and run). Our existing code is a little too tightly coupled to our out of tree board support so I don't have a preliminary patchset to provide. If there is interest I'll work on porting it from our tree to a vanilla u-boot tree (we have a couple of supported eval boards around). Thanks for reading, Chris Packham

2 3

[U-Boot] Please pull u-boot-cfi-flash/master
by Stefan Roese 10 Jan '13

10 Jan '13

Hi Tom, please pull the following patches pending for quite some time: The following changes since commit 642ef40bdc95bef829ae3aadc217f829c4c298c4: Merge branch 'master' of git://git.denx.de/u-boot-arm (2013-01-09 08:13:22 -0700) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git master for you to fetch changes up to d2af028db3f75390f56f018e16c0f269521e07c5: cfi_flash: Report Advanced Sector Protection (PPB) with flinfo cmd (2013-01-10 14:40:00 +0100) ---------------------------------------------------------------- Angelo Dureghello (1): mtd/cfi: add support for SST 4KB sector granularity Stefan Roese (4): cfi_flash: Add manufact_match helper function cfi_flash: Read PPB sector protection from device for AMD/Spansion chips cfi_flash: Enable PPB protection for all AMD cmdset flash chips cfi_flash: Report Advanced Sector Protection (PPB) with flinfo cmd drivers/mtd/cfi_flash.c | 71 ++++++++++++++++++++++++++++++++++++++++--------- include/flash.h | 1 + 2 files changed, 59 insertions(+), 13 deletions(-)

2 1

[U-Boot] [PATCH] bootm: relocate names of sub-command table for archs with CONFIG_NEEDS_MANUAL_RELOC
by daniel.schwierzeck＠gmail.com 10 Jan '13

10 Jan '13

From: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> To make bootm sub-command feature working on archs with CONFIG_NEEDS_MANUAL_RELOC, the name pointers in the sub-command table need to be relocated. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- common/cmd_bootm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index f7595c0..1b8a8c1 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -592,12 +592,18 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_NEEDS_MANUAL_RELOC static int relocated = 0; - /* relocate boot function table */ if (!relocated) { int i; + + /* relocate boot function table */ for (i = 0; i < ARRAY_SIZE(boot_os); i++) if (boot_os[i] != NULL) boot_os[i] += gd->reloc_off; + + /* relocate names of sub-command table */ + for (i = 0; i < ARRAY_SIZE(cmd_bootm_sub); i++) + cmd_bootm_sub[i].name += gd->reloc_off; + relocated = 1; } #endif -- 1.8.0.3

2 1

[U-Boot] [PATCH v3] SMDK5250: Enable VBus for USB 2.0 controller
by Vivek Gautam 10 Jan '13

10 Jan '13

This patch enables Vbus required for USB 2.0 controller. Signed-off-by: Vivek Gautam <gautam.vivek(a)samsung.com> Signed-off-by: Rajeshwari Shinde <rajeshwari.s(a)samsung.com> --- Changes from v2: - Rebased on top of u-boot-usb/next - Enclosed the function definition for board_usb_vbus_init() inside "CONFIG_USB_EHCI_EXYNOS" Changes from v1: - Using the old school method of setting up gpio instead of using the pinmux method, since the required gpio line here is board specific. board/samsung/smdk5250/smdk5250.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index a5816e4..cf7f801 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -60,9 +60,28 @@ static int smc9115_pre_init(void) } #endif +#ifdef CONFIG_USB_EHCI_EXYNOS +int board_usb_vbus_init(void) +{ + struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *) + samsung_get_base_gpio_part1(); + + /* Enable VBUS power switch */ + s5p_gpio_direction_output(&gpio1->x2, 6, 1); + + /* VBUS turn ON time */ + mdelay(3); + + return 0; +} +#endif + int board_init(void) { gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); +#ifdef CONFIG_USB_EHCI_EXYNOS + board_usb_vbus_init(); +#endif return 0; } -- 1.7.6.5

2 2

[U-Boot] [PATCH v2] mx6qsabresd: Fix booting the kernel from SDHC3
by Fabio Estevam 10 Jan '13

10 Jan '13

Since commit de7d02aeb (mx6qsabresd: add usdhc2 and usdhc4 support) SDHC3 device node is no longer 0, which breaks loading a uImage from SDHC3. Fix it by adapting the default environment to use CONFIG_SYS_MMC_ENV_DEV as the correct mmc node for loading the kernel from. While at it, go back to using SDHC3 as the default mmc, since we have Yocto images that generate an SD card containing U-boot,kernel and rootfs, so it is more convenient to keep using SDHC3 as it was originally. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Properly expand mmcdev macro - Improve commit log include/configs/mx6qsabre_common.h | 2 +- include/configs/mx6qsabresd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index bd2fb10..5d03b3d 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -86,7 +86,7 @@ "console=" CONFIG_CONSOLE_DEV "\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "mmcdev=0\0" \ + "mmcdev=" CONFIG_SYS_MMC_ENV_DEV "\0" \ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h index a1d9285..ccb7751 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6qsabresd.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 #if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_SYS_MMC_ENV_DEV 2 /* eMMC/uSDHC4 */ +#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ #define CONFIG_SYS_MMC_ENV_PART 1 /* Boot partition 1 */ #endif -- 1.7.9.5

3 2