July 2015 - U-Boot

[U-Boot] [PATCH] armv8/cache: Fix page table creation
by Stephen Warren 23 Jul '15

23 Jul '15

From: Thierry Reding <treding(a)nvidia.com> While generating the page tables, a running integer index is shifted by SECTION_SHIFT (29) and causes overflow for any integer bigger than 7. The page tables therefore alias to the same 8 sections and cause U-Boot to hang once the MMU is enabled. Fix this by making the index a 64-bit unsigned integer and so avoid the overflow. swarren notes: currently "i" ranges from 0..8191 on all ARM64 boards, and "j" varies depending on RAM size; from 4 to 11 for a board with 4GB at physical address 2GB, as some Tegra boards have. Signed-off-by: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Tom Warren <twarren(a)nvidia.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/cpu/armv8/cache_v8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index c5ec5297cd39..254a629a3b8c 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -25,9 +25,9 @@ void set_pgtable_section(u64 *page_table, u64 index, u64 section, /* to activate the MMU we need to set up virtual memory */ static void mmu_setup(void) { - int i, j, el; bd_t *bd = gd->bd; - u64 *page_table = (u64 *)gd->arch.tlb_addr; + u64 *page_table = (u64 *)gd->arch.tlb_addr, i, j; + int el; /* Setup an identity-mapping for all spaces */ for (i = 0; i < (PGTABLE_SIZE >> 3); i++) { -- 1.9.1

2 1

[U-Boot] [PATCH] arm64: Handle arbitrary CONFIG_SYS_MALLOC_F_LEN values
by Stephen Warren 23 Jul '15

23 Jul '15

From: Thierry Reding <treding(a)nvidia.com> The encoding of the sub instruction used to handle CONFIG_SYS_MALLOC_F_LEN can only accept certain values, and the set of acceptable values differs between the AArch32 and AArch64 instructions sets. The default value of CONFIG_SYS_MALLOC_F_LEN works with either ISA. Tegra uses a non-default value that can only be encoded in the AArch32 ISA. Fix the AArch64 crt0 assembly so it can handle completely arbitrary values. Signed-off-by: Thierry Reding <treding(a)nvidia.com> [twarren: trimmed Thierry's patch to remove changes already present] Signed-off-by: Tom Warren <twarren(a)nvidia.com> [swarren, cleaned up patch, wrote description, re-wrote subject] Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/lib/crt0_64.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index bc9c53c308de..98a906ee111c 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -74,7 +74,8 @@ zero_gd: cmp x0, x18 b.gt zero_gd #if defined(CONFIG_SYS_MALLOC_F_LEN) - sub x0, x18, #CONFIG_SYS_MALLOC_F_LEN + ldr x0, =CONFIG_SYS_MALLOC_F_LEN + sub x0, x18, x0 str x0, [x18, #GD_MALLOC_BASE] #endif bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */ -- 1.9.1

2 1

[U-Boot] [PATCH] ARM: tegra: Build warning fixes for 64-bit
by Stephen Warren 23 Jul '15

23 Jul '15

From: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Tom Warren <twarren(a)nvidia.com> [swarren, stripped out changes not strictly related to warnings] Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Tom, if you look at https://github.com/swarren/u-boot/tree/t210-testing you'll see commit "ARM: tegra: parts of 64-bit port". Those changes were originally included in Thierry's version of this patch, but aren't strictly related to build warnings. I separated them out to keep warning fixes and 64-bit support separate. I think you should squash "ARM: tegra: parts of 64-bit port" into your T210 support series. Does that seem reasonable? arch/arm/mach-tegra/ap.c | 4 ++-- arch/arm/mach-tegra/pinmux-common.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c index 0b94e8aaf9c3..7b89c0107196 100644 --- a/arch/arm/mach-tegra/ap.c +++ b/arch/arm/mach-tegra/ap.c @@ -131,8 +131,8 @@ static u32 get_odmdata(void) * on BCTs for currently supported SoCs, which are locked down. * If this changes in new chips, we can revisit this algorithm. */ - - u32 bct_start, odmdata; + unsigned long bct_start; + u32 odmdata; bct_start = readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BCTPTR); odmdata = readl(bct_start + BCT_ODMDATA_OFFSET); diff --git a/arch/arm/mach-tegra/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c index b4a1432afcb1..5862c4ac3dc6 100644 --- a/arch/arm/mach-tegra/pinmux-common.c +++ b/arch/arm/mach-tegra/pinmux-common.c @@ -78,7 +78,7 @@ (((hsm) >= PMUX_HSM_DISABLE) && ((hsm) <= PMUX_HSM_ENABLE)) #endif -#define _R(offset) (u32 *)(NV_PA_APB_MISC_BASE + (offset)) +#define _R(offset) (u32 *)((unsigned long)NV_PA_APB_MISC_BASE + (offset)) #if defined(CONFIG_TEGRA20) -- 1.9.1

2 1

[U-Boot] [PATCH] mmc: tegra: Build warning fixes for 64-bit
by Stephen Warren 23 Jul '15

23 Jul '15

From: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Tom Warren <twarren(a)nvidia.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/mmc/tegra_mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index d555692f7fc0..31b6c56900b6 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -67,7 +67,7 @@ static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data, bbstate->bounce_buffer, bbstate->user_buffer, data->blocks, data->blocksize); - writel((u32)bbstate->bounce_buffer, &host->reg->sysad); + writel((u32)(unsigned long)bbstate->bounce_buffer, &host->reg->sysad); /* * DMASEL[4:3] * 00 = Selects SDMA @@ -233,8 +233,8 @@ static int mmc_send_cmd_bounced(struct mmc *mmc, struct mmc_cmd *cmd, if (cmd->resp_type & MMC_RSP_136) { /* CRC is stripped so we need to do some shifting. */ for (i = 0; i < 4; i++) { - unsigned int offset = - (unsigned int)(&host->reg->rspreg3 - i); + unsigned long offset = + (unsigned long)(&host->reg->rspreg3 - i); cmd->response[i] = readl(offset) << 8; if (i != 3) { -- 1.9.1

2 1

[U-Boot] [PATCH] i2c: tegra: Build warning fixes for 64-bit
by Stephen Warren 23 Jul '15

23 Jul '15

From: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Thierry Reding <treding(a)nvidia.com> Signed-off-by: Tom Warren <twarren(a)nvidia.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/i2c/tegra_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index fc9564699489..a4289788a65c 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -235,7 +235,7 @@ static int send_recv_packets(struct i2c_bus *i2c_bus, if ((words == 1) && last_bytes) { local = 0; memcpy(&local, dptr, last_bytes); - } else if ((unsigned)dptr & 3) { + } else if ((unsigned long)dptr & 3) { memcpy(&local, dptr, sizeof(u32)); } else { local = *wptr; @@ -258,7 +258,7 @@ static int send_recv_packets(struct i2c_bus *i2c_bus, local = readl(&control->rx_fifo); if ((words == 1) && last_bytes) memcpy(dptr, (char *)&local, last_bytes); - else if ((unsigned)dptr & 3) + else if ((unsigned long)dptr & 3) memcpy(dptr, &local, sizeof(u32)); else *wptr = local; -- 1.9.1

3 3

[U-Boot] pull request: u-boot-uniphier/master
by Masahiro Yamada 23 Jul '15

23 Jul '15

Hi Tom, Please pull some updates specific to UniPhier SoCs. The following changes since commit b217c89e8565ade3aaa9f74c33c93236bf151187: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2015-07-20 17:12:52 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 62102bee1ff32e7eda8b31558b0b646df74fecfd: ARM: UniPhier: document reference support card (2015-07-23 23:42:37 +0900) ---------------------------------------------------------------- Masahiro Yamada (8): ARM: dts: UniPhier: add device-specific compatible string for EEPROM ARM: UniPhier: add environment sets for non-FIT Linux boot ARM: UniPhier: add environment variable for TFTP boot ARM: UniPhier: disable CONFIG_FIT ARM: UniPhier: update CONFIG_BOOTARGS ARM: UniPhier: add PH1-sLD3 SoC support ARM: dts: UniPhier: add I2C ch4 device node for PH1-sLD3 ARM: UniPhier: document reference support card arch/arm/dts/uniphier-ph1-sld3.dtsi | 9 +++++ arch/arm/dts/uniphier-ref-daughter.dtsi | 2 +- arch/arm/mach-uniphier/Kconfig | 12 ++++-- arch/arm/mach-uniphier/Makefile | 7 ++-- arch/arm/mach-uniphier/include/mach/sc-regs.h | 6 ++- arch/arm/mach-uniphier/include/mach/sg-regs.h | 5 ++- arch/arm/mach-uniphier/ph1-sld3/Makefile | 16 ++++++++ arch/arm/mach-uniphier/ph1-sld3/bcu_init.c | 36 ++++++++++++++++++ arch/arm/mach-uniphier/ph1-sld3/boot-mode.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c | 1 + arch/arm/mach-uniphier/ph1-sld3/early_clkrst_init.c | 1 + arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c | 23 +++++++++++ arch/arm/mach-uniphier/ph1-sld3/lowlevel_debug.S | 31 +++++++++++++++ arch/arm/mach-uniphier/ph1-sld3/memconf.c | 52 +++++++++++++++++++++++++ arch/arm/mach-uniphier/ph1-sld3/pinctrl.c | 24 ++++++++++++ arch/arm/mach-uniphier/ph1-sld3/platdevice.c | 1 + arch/arm/mach-uniphier/ph1-sld3/pll_init.c | 10 +++++ arch/arm/mach-uniphier/ph1-sld3/pll_spectrum.c | 18 +++++++++ arch/arm/mach-uniphier/ph1-sld3/sbc_init.c | 45 ++++++++++++++++++++++ arch/arm/mach-uniphier/ph1-sld3/sbc_init_3cs.c | 37 ++++++++++++++++++ arch/arm/mach-uniphier/ph1-sld3/sg_init.c | 9 +++++ arch/arm/mach-uniphier/ph1-sld3/umc_init.c | 15 ++++++++ configs/ph1_ld4_defconfig | 2 - configs/ph1_pro4_defconfig | 2 - configs/ph1_sld3_defconfig | 28 ++++++++++++++ configs/ph1_sld8_defconfig | 2 - doc/README.uniphier | 54 ++++++++++++++++++++++++-- include/configs/uniphier.h | 103 ++++++++++++++++++++++++++++++++++++++------------ 28 files changed, 603 insertions(+), 45 deletions(-) create mode 100644 arch/arm/mach-uniphier/ph1-sld3/Makefile create mode 100644 arch/arm/mach-uniphier/ph1-sld3/bcu_init.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/boot-mode.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/early_clkrst_init.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/lowlevel_debug.S create mode 100644 arch/arm/mach-uniphier/ph1-sld3/memconf.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/pinctrl.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/platdevice.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/pll_init.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/pll_spectrum.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/sbc_init.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/sbc_init_3cs.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/sg_init.c create mode 100644 arch/arm/mach-uniphier/ph1-sld3/umc_init.c create mode 100644 configs/ph1_sld3_defconfig -- Best Regards Masahiro Yamada

2 1

[U-Boot] Please pull u-boot-marvell master (v2)
by Luka Perkov 23 Jul '15

23 Jul '15

Hi Tom, can you please pull the mvebu tree? This series contains mvebu DDR training code and couple of bug fixes. Also, this version of pull request has the correct messages. Thanks, Luka PS. It turns out that when you try to download patches from gitolite as email patches the commit message is not sent. The following changes since commit b217c89e8565ade3aaa9f74c33c93236bf151187: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2015-07-20 17:12:52 -0400) are available in the git repository at: git://git.denx.de/u-boot-marvell.git for you to fetch changes up to 9e30b31d20f0b793465d07f056b3d9885f578c0d: arm: mvebu: db-88f6820: Add SPL support with DDR init code (2015-07-23 10:39:35 +0200) ---------------------------------------------------------------- Anton Schubert (1): arm: mvebu: add Armada XP SATA support Stefan Roese (11): arm: mvebu: Call timer_init early before PHY and DDR init arm: mvebu: Use default reg base address for SPL on A38x arm: mvebu: spl.c: Add call to board_early_init_f() arm: mvebu: Disable MMU before changing register base address Makefile: Fix mvebu build target to use SPL load and exe-address arm: mvebu: serdes: Move Armada XP SERDES / PHY init code into new directory arm: mvebu: Add Armada 38x SERDES / PHY init code from Marvell bin_hdr arm: mvebu: drivers/ddr: Move Armada XP DDR init code into new directory arm: mvebu: Add Armada 38x DDR3 training code from Marvell bin_hdr arm: mvebu: a38x: Use correct PEX register access macros arm: mvebu: db-88f6820: Add SPL support with DDR init code Makefile | 2 +- arch/arm/mach-mvebu/Makefile | 4 +- arch/arm/mach-mvebu/cpu.c | 18 + arch/arm/mach-mvebu/include/mach/cpu.h | 2 +- arch/arm/mach-mvebu/include/mach/soc.h | 11 + arch/arm/mach-mvebu/serdes/a38x/Makefile | 10 + arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c | 347 +++ arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h | 86 + .../serdes/a38x/high_speed_env_spec-38x.c | 158 ++ .../mach-mvebu/serdes/a38x/high_speed_env_spec.c | 2228 +++++++++++++++++ .../mach-mvebu/serdes/a38x/high_speed_env_spec.h | 251 ++ .../serdes/a38x/high_speed_topology_spec-38x.c | 1009 ++++++++ .../serdes/a38x/high_speed_topology_spec.h | 124 + arch/arm/mach-mvebu/serdes/a38x/seq_exec.c | 170 ++ arch/arm/mach-mvebu/serdes/a38x/seq_exec.h | 65 + arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c | 388 +++ arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h | 371 +++ arch/arm/mach-mvebu/serdes/{ => axp}/Makefile | 0 .../mach-mvebu/serdes/{ => axp}/board_env_spec.h | 0 .../serdes/{ => axp}/high_speed_env_lib.c | 0 .../serdes/{ => axp}/high_speed_env_spec.c | 0 .../serdes/{ => axp}/high_speed_env_spec.h | 2 +- arch/arm/mach-mvebu/spl.c | 9 + arch/arm/mach-mvebu/timer.c | 7 + board/Marvell/db-88f6820-gp/README | 18 + board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 31 + board/Marvell/db-88f6820-gp/kwbimage.cfg | 2 +- board/maxbcm/maxbcm.c | 4 +- configs/db-88f6820-gp_defconfig | 1 + drivers/block/mvsata_ide.c | 41 + drivers/ddr/marvell/a38x/Makefile | 19 + drivers/ddr/marvell/a38x/ddr3_a38x.c | 741 ++++++ drivers/ddr/marvell/a38x/ddr3_a38x.h | 98 + drivers/ddr/marvell/a38x/ddr3_a38x_mc_static.h | 226 ++ drivers/ddr/marvell/a38x/ddr3_a38x_topology.h | 22 + drivers/ddr/marvell/a38x/ddr3_a38x_training.c | 40 + drivers/ddr/marvell/a38x/ddr3_debug.c | 1551 ++++++++++++ drivers/ddr/marvell/a38x/ddr3_hws_hw_training.c | 148 ++ drivers/ddr/marvell/a38x/ddr3_hws_hw_training.h | 49 + .../ddr/marvell/a38x/ddr3_hws_hw_training_def.h | 467 ++++ drivers/ddr/marvell/a38x/ddr3_hws_sil_training.h | 17 + drivers/ddr/marvell/a38x/ddr3_init.c | 852 +++++++ drivers/ddr/marvell/a38x/ddr3_init.h | 395 +++ drivers/ddr/marvell/a38x/ddr3_logging_def.h | 101 + drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h | 924 +++++++ drivers/ddr/marvell/a38x/ddr3_topology_def.h | 76 + drivers/ddr/marvell/a38x/ddr3_training.c | 2644 ++++++++++++++++++++ drivers/ddr/marvell/a38x/ddr3_training_bist.c | 289 +++ .../marvell/a38x/ddr3_training_centralization.c | 714 ++++++ drivers/ddr/marvell/a38x/ddr3_training_db.c | 652 +++++ drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c | 686 +++++ drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h | 14 + drivers/ddr/marvell/a38x/ddr3_training_ip.h | 180 ++ drivers/ddr/marvell/a38x/ddr3_training_ip_bist.h | 54 + .../marvell/a38x/ddr3_training_ip_centralization.h | 15 + drivers/ddr/marvell/a38x/ddr3_training_ip_db.h | 34 + drivers/ddr/marvell/a38x/ddr3_training_ip_def.h | 173 ++ drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c | 1354 ++++++++++ drivers/ddr/marvell/a38x/ddr3_training_ip_engine.h | 85 + drivers/ddr/marvell/a38x/ddr3_training_ip_flow.h | 349 +++ drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h | 41 + drivers/ddr/marvell/a38x/ddr3_training_ip_prv_if.h | 107 + drivers/ddr/marvell/a38x/ddr3_training_ip_static.h | 31 + drivers/ddr/marvell/a38x/ddr3_training_leveling.c | 1836 ++++++++++++++ drivers/ddr/marvell/a38x/ddr3_training_leveling.h | 17 + drivers/ddr/marvell/a38x/ddr3_training_pbs.c | 995 ++++++++ drivers/ddr/marvell/a38x/ddr3_training_static.c | 538 ++++ drivers/ddr/marvell/a38x/ddr_topology_def.h | 112 + drivers/ddr/marvell/a38x/ddr_training_ip_db.h | 16 + drivers/ddr/marvell/a38x/silicon_if.h | 17 + drivers/ddr/marvell/a38x/xor.c | 356 +++ drivers/ddr/marvell/a38x/xor.h | 92 + drivers/ddr/marvell/a38x/xor_regs.h | 236 ++ drivers/ddr/{mvebu => marvell/axp}/Makefile | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_axp.h | 0 .../ddr/{mvebu => marvell/axp}/ddr3_axp_config.h | 0 .../{mvebu => marvell/axp}/ddr3_axp_mc_static.h | 0 .../axp}/ddr3_axp_training_static.h | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_axp_vars.h | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_dfs.c | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_dqs.c | 0 .../ddr/{mvebu => marvell/axp}/ddr3_hw_training.c | 0 .../ddr/{mvebu => marvell/axp}/ddr3_hw_training.h | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_init.c | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_init.h | 0 .../{mvebu => marvell/axp}/ddr3_patterns_64bit.h | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_pbs.c | 0 .../{mvebu => marvell/axp}/ddr3_read_leveling.c | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_sdram.c | 0 drivers/ddr/{mvebu => marvell/axp}/ddr3_spd.c | 0 .../{mvebu => marvell/axp}/ddr3_write_leveling.c | 0 drivers/ddr/{mvebu => marvell/axp}/xor.c | 0 drivers/ddr/{mvebu => marvell/axp}/xor.h | 0 drivers/ddr/{mvebu => marvell/axp}/xor_regs.h | 0 include/configs/db-88f6820-gp.h | 35 + include/configs/db-mv784mp-gp.h | 31 +- include/configs/maxbcm.h | 2 +- scripts/Makefile.spl | 3 +- 98 files changed, 22783 insertions(+), 10 deletions(-) create mode 100644 arch/arm/mach-mvebu/serdes/a38x/Makefile create mode 100644 arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c create mode 100644 arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h create mode 100644 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c create mode 100644 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c create mode 100644 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.h create mode 100644 arch/arm/mach-mvebu/serdes/a38x/high_speed_topology_spec-38x.c create mode 100644 arch/arm/mach-mvebu/serdes/a38x/high_speed_topology_spec.h create mode 100644 arch/arm/mach-mvebu/serdes/a38x/seq_exec.c create mode 100644 arch/arm/mach-mvebu/serdes/a38x/seq_exec.h create mode 100644 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c create mode 100644 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h rename arch/arm/mach-mvebu/serdes/{ => axp}/Makefile (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/board_env_spec.h (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_lib.c (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_spec.c (100%) rename arch/arm/mach-mvebu/serdes/{ => axp}/high_speed_env_spec.h (97%) create mode 100644 board/Marvell/db-88f6820-gp/README create mode 100644 drivers/ddr/marvell/a38x/Makefile create mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x_mc_static.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x_topology.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_a38x_training.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_debug.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_hw_training.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_hw_training.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_hw_training_def.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_hws_sil_training.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_init.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_init.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_logging_def.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_patterns_64bit.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_topology_def.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_bist.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_centralization.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_db.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_hw_algo.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_hw_algo.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_bist.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_centralization.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_db.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_def.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_engine.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_flow.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_pbs.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_prv_if.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_ip_static.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_leveling.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_leveling.h create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_pbs.c create mode 100644 drivers/ddr/marvell/a38x/ddr3_training_static.c create mode 100644 drivers/ddr/marvell/a38x/ddr_topology_def.h create mode 100644 drivers/ddr/marvell/a38x/ddr_training_ip_db.h create mode 100644 drivers/ddr/marvell/a38x/silicon_if.h create mode 100644 drivers/ddr/marvell/a38x/xor.c create mode 100644 drivers/ddr/marvell/a38x/xor.h create mode 100644 drivers/ddr/marvell/a38x/xor_regs.h rename drivers/ddr/{mvebu => marvell/axp}/Makefile (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_axp.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_axp_config.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_axp_mc_static.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_axp_training_static.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_axp_vars.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_dfs.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_dqs.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_hw_training.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_hw_training.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_init.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_init.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_patterns_64bit.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_pbs.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_read_leveling.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_sdram.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_spd.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/ddr3_write_leveling.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/xor.c (100%) rename drivers/ddr/{mvebu => marvell/axp}/xor.h (100%) rename drivers/ddr/{mvebu => marvell/axp}/xor_regs.h (100%)

2 1

[U-Boot] Please pull u-boot-dm
by Simon Glass 23 Jul '15

23 Jul '15

Hi Tom, This contains Hans's USB fixes and changes, some preliminary patches for Masahiro's devres stuff and various new uclasses mostly aimed at Rockchip support. There is also the driver model device tree SPL support, USB Ethernet work, PMIC improvements to auto-set regulators and some changes to allow PCI devices to be probed in driver model without needing device tree (as we do with USB). I have left out pinctrl for now since I hope we will pick up Masahiro's implementation instead and then add my simple one on top. The following changes since commit b217c89e8565ade3aaa9f74c33c93236bf151187: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2015-07-20 17:12:52 -0400) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 6b9f9eadffb5f64801746593784e12f07f2fadd0: linux_compat: handle __GFP_ZERO in kmalloc() (2015-07-22 07:30:44 -0600) ---------------------------------------------------------------- Hans de Goede (16): usb: Drop device-model specific copy of usb_legacy_port_reset usb: usb_setup_device: Drop unneeded portnr function argument usb: Pass device instead of portnr to usb_legacy_port_reset usb: Add an usb_device parameter to usb_reset_root_port dm: Export device_remove_children / device_unbind_children dm: usb: Fix "usb tree" output dm: usb: Document that mixing DM_DEVICE_REMOVE and DM_USB is a bad idea dm: usb: Use device_unbind_children to clean up usb devs on stop dm: usb: Rename usb_find_child to usb_find_emul_child dm: usb: Allow usb host drivers to implement usb_reset_root_port dm: usb: Do not assume that first child is always a hub musb: Allow musb_platform_enable to return an error code musb: Update usb-compat to work with struct usb_device without a parent ptr musb: Rename and wrap public functions musb: Add musb_host_data struct to hold global data musb: Add device-model support to the musb-host u-boot glue Masahiro Yamada (7): dm: change dm_warn() message into debug() in uclass_add() dm: do not set DM_FLAG_ACTIVATED twice dm: remove redundant CONFIG_DM from driver/core/Makefile x86: delete unneeded declarations of disable_irq() and enable_irq() linux_compat: remove cpu_relax() define linux_compat: move vzalloc() to header file as an inline function linux_compat: handle __GFP_ZERO in kmalloc() Simon Glass (81): Add a dhrystone benchmark command sandbox: Enable dhry command mkimage: Display a better list of available image types fdt: Add a function to remove unused strings from a device tree fdt: Add fdt_first/next_region() functions fdt: Add fdtgrep tool dm: Reduce SPL device tree size dm: arm: Put driver model I2C drivers before legacy ones Add a way of checking the position of a structure member debug_uart: Remove use of asmlinkage dm: Allow debug UART to support an early console sandbox: Drop special-case sandbox console code dm: Move the tree/uclass dump code into its own file dm: core: Use debug() instead of printf() for failures dm: core: Add a function to find any device from device tree dm: core: Correct device_get_child_by_of_offset() parameter dm: gpio: Allow GPIO uclass to be used in SPL dm: gpio: Add dm_gpio_lookup_name() to look up a GPIO name dm: gpio: Add dm_gpio_request() to manually request a GPIO dm: Add support for register maps (regmap) dm: Add support for generic system controllers (syscon) dm: Add support for LEDs dm: led: Add a driver for GPIO-controlled LEDs spl: Add debugging info for spl_mmc boot dm: mmc: Add an MMC uclass mmc: Add debug() output on read errors dm: mmc: Allow driver model to be used for MMC in SPL mmc: Add structure comments for dwmmc dm: power: Avoid case-insensitve match for child names dm: power: Add regulator flags to centralise auto-set logic dm: pmic: Split output from function dm: power: Add a function to set up all regulators dm: power: Use debug() for errors in regulator uclass dm: pmic: Add functions to adjust PMIC registers dm: power: Allow use of regulators in SPL Drop CONFIG_ERRNO_STR from SPL dm: Add support for RAM drivers dm: spi: Make local functions static ns16550: Improve debug UART so it can work with 32-bit access Add rivest cipher 4 (rc4) implementation lib: Add function to extract a number from the end of a string fdt: Provide debug info when a device tree cannot be found dm: spl: Allow device tree/driver model in board_init_f() spl: Add a debug string before the jump to U-Boot mkimage: Set up a file size parameter and keep it updated dm: Add a system reset uclass zynq: Rename struct clk_ops to zynq_clk_ops dm: Add a clock uclass power: pmic: Use trailing_strtol() instead of a local function dm: Add platform data advice and admonishment dm: test: Allow test names to leave out the dm_test_ prefix dm: test: Add tests for the clk uclass sandbox: Support multiple reset types dm: reset: Allow reset_walk() to return sandbox: Add a warm and cold reset driver sandbox: Use the reset driver to handle reset dm: test: Add a test for the reset uclass dm: test: Add a test for the ram uclass dm: test: Add a test for the mmc uclass led: Return -ENODEV if the LED device cannot be found dm: test: Add a test for the LED uclass dm: test: Add a test for the system controller uclass dm: test: Add a size to each reg property test: Add a macro to check that a value is not an error pointer dm: core: Add device checking to syscon_get_regmap() test: Add a test for regmap dm: core: Add \n to two dm_warn() messages usb: ehci: Correct a missing hypen in an error message usb: Update some EHCI driver licenses to use SPDX dm: pci: Add support for PCI driver matching dm: eth: Add driver-model support to the rtl8169 driver dm: pci: Add a function to get the BDF for a device dm: usb: Correct the struct usb_driver_entry comment dm: usb: Avoid using USB ethernet with CONFIG_DM_USB and no DM_ETH dm: eth: Avoid blocking on packet reception dm: usb: eth: Support driver model with USB Ethernet dm: usb: Adjust the USB_DEVICE() macro naming x86: minnowmax: Drop the cache line size hack dm: usb: Add driver-model support to ehci-pci dm: usb: eth: Add driver-model support to the asix driver net: Allow drivers to return -ENOSYS with the write_hwaddr() method Makefile | 2 +- arch/arm/cpu/u-boot-spl.lds | 12 +- arch/arm/mach-zynq/clk.c | 6 +- arch/sandbox/cpu/cpu.c | 9 +- arch/sandbox/cpu/state.c | 4 + arch/sandbox/dts/test.dts | 67 ++++- arch/sandbox/include/asm/state.h | 3 + arch/sandbox/include/asm/test.h | 19 ++ arch/sandbox/include/asm/u-boot-sandbox.h | 3 + arch/x86/include/asm/interrupt.h | 4 - common/cmd_tsi148.c | 8 +- common/cmd_usb.c | 28 +- common/console.c | 25 +- common/image.c | 58 ++-- common/spl/spl.c | 36 ++- common/spl/spl_mmc.c | 26 +- common/usb.c | 20 +- common/usb_hub.c | 2 +- common/usb_kbd.c | 4 +- common/usb_storage.c | 2 +- configs/sandbox_defconfig | 8 + doc/device-tree-bindings/leds/common.txt | 23 ++ doc/device-tree-bindings/leds/leds-gpio.txt | 52 ++++ doc/driver-model/README.txt | 17 +- drivers/Kconfig | 6 + drivers/Makefile | 3 + drivers/clk/Kconfig | 19 ++ drivers/clk/Makefile | 9 + drivers/clk/clk-uclass.c | 58 ++++ drivers/clk/clk_sandbox.c | 85 ++++++ drivers/core/Kconfig | 4 + drivers/core/Makefile | 5 +- drivers/core/device-remove.c | 22 +- drivers/core/device.c | 34 ++- drivers/core/dump.c | 96 +++++++ drivers/core/lists.c | 6 +- drivers/core/regmap.c | 86 ++++++ drivers/core/syscon-uclass.c | 76 ++++++ drivers/core/uclass.c | 4 +- drivers/gpio/Makefile | 4 - drivers/gpio/gpio-uclass.c | 36 ++- drivers/led/Kconfig | 26 ++ drivers/led/Makefile | 9 + drivers/led/led-uclass.c | 49 ++++ drivers/led/led_gpio.c | 107 ++++++++ drivers/misc/Kconfig | 9 + drivers/misc/Makefile | 3 + drivers/misc/reset-uclass.c | 81 ++++++ drivers/misc/reset_sandbox.c | 100 +++++++ drivers/misc/syscon_sandbox.c | 27 ++ drivers/mmc/Kconfig | 10 + drivers/mmc/Makefile | 3 + drivers/mmc/mmc-uclass.c | 34 +++ drivers/mmc/mmc.c | 10 +- drivers/mmc/sandbox_mmc.c | 25 ++ drivers/net/designware.c | 2 +- drivers/net/rtl8169.c | 236 +++++++++++++---- drivers/net/sandbox-raw.c | 2 +- drivers/net/sandbox.c | 2 +- drivers/net/sunxi_emac.c | 2 +- drivers/pci/pci-uclass.c | 144 ++++++++-- drivers/pci/pci_compat.c | 8 +- drivers/power/pmic/pmic-uclass.c | 57 ++-- drivers/power/regulator/regulator-uclass.c | 134 +++++----- drivers/ram/Kconfig | 18 ++ drivers/ram/Makefile | 8 + drivers/ram/ram-uclass.c | 28 ++ drivers/ram/sandbox_ram.c | 38 +++ drivers/serial/ns16550.c | 36 +-- drivers/spi/spi-uclass.c | 8 +- drivers/usb/Kconfig | 4 +- drivers/usb/eth/asix.c | 237 +++++++++++++++-- drivers/usb/eth/usb_ether.c | 131 +++++++++- drivers/usb/host/ehci-hcd.c | 17 +- drivers/usb/host/ehci-pci.c | 112 +++++--- drivers/usb/host/ehci.h | 15 +- drivers/usb/host/r8a66597-hcd.c | 14 +- drivers/usb/host/r8a66597.h | 14 +- drivers/usb/host/usb-uclass.c | 79 ++---- drivers/usb/musb-new/am35x.c | 7 + drivers/usb/musb-new/musb_core.c | 20 ++ drivers/usb/musb-new/musb_core.h | 18 ++ drivers/usb/musb-new/musb_dsps.c | 6 + drivers/usb/musb-new/musb_gadget_ep0.c | 1 + drivers/usb/musb-new/musb_host.c | 4 + drivers/usb/musb-new/musb_uboot.c | 211 +++++++++++---- drivers/usb/musb-new/musb_uboot.h | 28 ++ drivers/usb/musb-new/omap2430.c | 5 + drivers/usb/musb-new/sunxi.c | 5 +- drivers/usb/musb-new/usb-compat.h | 70 +++++ dts/Kconfig | 12 + include/asm-generic/global_data.h | 1 + include/asm-generic/gpio.h | 25 ++ include/clk.h | 80 ++++++ include/common.h | 11 + include/configs/minnowmax.h | 3 - include/debug_uart.h | 22 +- include/dm/device-internal.h | 26 ++ include/dm/device.h | 16 +- include/dm/platdata.h | 9 + include/dm/uclass-id.h | 6 + include/dm/util.h | 6 + include/dwmmc.h | 18 +- include/image.h | 11 + include/led.h | 51 ++++ include/libfdt.h | 256 +++++++++++++++++- include/linux/compat.h | 28 +- include/mmc.h | 22 ++ include/net.h | 14 +- include/pci.h | 87 +++++- include/power/pmic.h | 34 +++ include/power/regulator.h | 53 +++- include/power/sandbox_pmic.h | 4 +- include/ram.h | 38 +++ include/rc4.h | 21 ++ include/regmap.h | 72 +++++ include/reset.h | 71 +++++ include/spl.h | 12 + include/syscon.h | 56 ++++ include/test/ut.h | 15 ++ include/usb.h | 49 ++-- include/usb_ether.h | 89 ++++++- include/vsprintf.h | 26 ++ lib/Kconfig | 2 + lib/Makefile | 5 +- lib/dhry/Kconfig | 7 + lib/dhry/Makefile | 7 + lib/dhry/cmd_dhry.c | 34 +++ lib/dhry/dhry.h | 442 +++++++++++++++++++++++++++++++ lib/dhry/dhry_1.c | 421 +++++++++++++++++++++++++++++ lib/dhry/dhry_2.c | 217 +++++++++++++++ lib/fdtdec.c | 21 +- lib/libfdt/Makefile | 2 +- lib/libfdt/fdt_region.c | 492 ++++++++++++++++++++++++++++++++++ lib/libfdt/fdt_rw.c | 32 +++ lib/linux_compat.c | 16 +- lib/rc4.c | 49 ++++ lib/vsprintf.c | 19 ++ net/eth.c | 11 +- scripts/Makefile.spl | 32 +++ test/dm/Makefile | 7 + test/dm/clk.c | 59 +++++ test/dm/cmd_dm.c | 82 +----- test/dm/led.c | 72 +++++ test/dm/mmc.c | 27 ++ test/dm/ram.c | 28 ++ test/dm/regmap.c | 82 ++++++ test/dm/regulator.c | 2 +- test/dm/reset.c | 74 ++++++ test/dm/syscon.c | 31 +++ test/dm/test-main.c | 15 +- tools/Makefile | 6 +- tools/fdtgrep.c | 1234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/imagetool.h | 1 + tools/mkimage.c | 77 +++++- 155 files changed, 7319 insertions(+), 736 deletions(-) create mode 100644 doc/device-tree-bindings/leds/common.txt create mode 100644 doc/device-tree-bindings/leds/leds-gpio.txt create mode 100644 drivers/clk/Kconfig create mode 100644 drivers/clk/Makefile create mode 100644 drivers/clk/clk-uclass.c create mode 100644 drivers/clk/clk_sandbox.c create mode 100644 drivers/core/dump.c create mode 100644 drivers/core/regmap.c create mode 100644 drivers/core/syscon-uclass.c create mode 100644 drivers/led/Kconfig create mode 100644 drivers/led/Makefile create mode 100644 drivers/led/led-uclass.c create mode 100644 drivers/led/led_gpio.c create mode 100644 drivers/misc/reset-uclass.c create mode 100644 drivers/misc/reset_sandbox.c create mode 100644 drivers/misc/syscon_sandbox.c create mode 100644 drivers/mmc/mmc-uclass.c create mode 100644 drivers/mmc/sandbox_mmc.c create mode 100644 drivers/ram/Kconfig create mode 100644 drivers/ram/Makefile create mode 100644 drivers/ram/ram-uclass.c create mode 100644 drivers/ram/sandbox_ram.c create mode 100644 drivers/usb/musb-new/musb_uboot.h create mode 100644 include/led.h create mode 100644 include/ram.h create mode 100644 include/rc4.h create mode 100644 include/regmap.h create mode 100644 include/reset.h create mode 100644 include/syscon.h create mode 100644 lib/dhry/Kconfig create mode 100644 lib/dhry/Makefile create mode 100644 lib/dhry/cmd_dhry.c create mode 100644 lib/dhry/dhry.h create mode 100644 lib/dhry/dhry_1.c create mode 100644 lib/dhry/dhry_2.c create mode 100644 lib/libfdt/fdt_region.c create mode 100644 lib/rc4.c create mode 100644 test/dm/clk.c create mode 100644 test/dm/led.c create mode 100644 test/dm/mmc.c create mode 100644 test/dm/ram.c create mode 100644 test/dm/regmap.c create mode 100644 test/dm/reset.c create mode 100644 test/dm/syscon.c create mode 100644 tools/fdtgrep.c Regards, Simon

2 1

[U-Boot] [PATCH] common/lcd_simplefb: Add support for 32bit organized framebuffers
by Hannes Petermaier 23 Jul '15

23 Jul '15

Signed-off-by: Hannes Petermaier <oe5hpm(a)oevsv.at> --- common/lcd_simplefb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index 8db2add..7153c40 100644 --- a/common/lcd_simplefb.c +++ b/common/lcd_simplefb.c @@ -16,11 +16,14 @@ DECLARE_GLOBAL_DATA_PTR; static int lcd_dt_simplefb_configure_node(void *blob, int off) { -#if LCD_BPP == LCD_COLOR16 int vl_col = lcd_get_pixel_width(); int vl_row = lcd_get_pixel_height(); +#if LCD_BPP == LCD_COLOR16 return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row, vl_col * 2, "r5g6b5"); +#elif LCD_BPP == LCD_COLOR32 + return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row, + vl_col * 4, "a8b8g8r8"); #else return -1; #endif -- 1.7.9.5

2 2

[U-Boot] [PATCH 09/10 v2] arm: mvebu: Enable USB EHCI support on Armada XP
by Stefan Roese 23 Jul '15

23 Jul '15

This patch enables the USB EHCI support for the Marvell Armada XP (AXP) SoCs. In compatism to the Armada 38x (A38x), the AXP needs to configure the USB PLL and the USB PHY's specifically in U-Boot. The A38x has done this already in the bin_hdr (SPL U-Boot). Without this, accessing the controller registers in U-Boot or Linux will hang the CPU. Additionally, the AXP uses a different USB EHCI base address. This patch also takes care of this by runtime SoC detection in the Marvell EHCI driver. Signed-off-by: Stefan Roese <sr(a)denx.de> Signed-off-by: Anton Schubert <anton.schubert(a)gmx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Luka Perkov <luka.perkov(a)sartura.hr> --- v2: - Use clrsetbits_le32() as suggested by Marek - Use additional bracket in macro as suggested by Marek arch/arm/mach-mvebu/cpu.c | 43 ++++++++++++++++++++++++++++++++++ arch/arm/mach-mvebu/include/mach/soc.h | 1 + drivers/usb/host/ehci-marvell.c | 9 ++++++- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 38e15aa..1c5f4c3 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -179,6 +179,46 @@ static void set_cbar(u32 addr) asm("mcr p15, 4, %0, c15, c0" : : "r" (addr)); } +#define MV_USB_PHY_BASE (MVEBU_AXP_USB_BASE + 0x800) +#define MV_USB_PHY_PLL_REG(reg) (MV_USB_PHY_BASE | (((reg) & 0xF) << 2)) +#define MV_USB_X3_BASE(addr) (MVEBU_AXP_USB_BASE | BIT(11) | \ + (((addr) & 0xF) << 6)) +#define MV_USB_X3_PHY_CHANNEL(dev, reg) (MV_USB_X3_BASE((dev) + 1) | \ + (((reg) & 0xF) << 2)) + +static void setup_usb_phys(void) +{ + int dev; + + /* + * USB PLL init + */ + + /* Setup PLL frequency */ + /* USB REF frequency = 25 MHz */ + clrsetbits_le32(MV_USB_PHY_PLL_REG(1), 0x3ff, 0x605); + + /* Power up PLL and PHY channel */ + clrsetbits_le32(MV_USB_PHY_PLL_REG(2), 0, BIT(9)); + + /* Assert VCOCAL_START */ + clrsetbits_le32(MV_USB_PHY_PLL_REG(1), 0, BIT(21)); + + mdelay(1); + + /* + * USB PHY init (change from defaults) specific for 40nm (78X30 78X60) + */ + + for (dev = 0; dev < 3; dev++) { + clrsetbits_le32(MV_USB_X3_PHY_CHANNEL(dev, 3), 0, BIT(15)); + + /* Assert REG_RCAL_START in channel REG 1 */ + clrsetbits_le32(MV_USB_X3_PHY_CHANNEL(dev, 1), 0, BIT(12)); + udelay(40); + clrsetbits_le32(MV_USB_X3_PHY_CHANNEL(dev, 1), BIT(12), 0); + } +} int arch_cpu_init(void) { @@ -246,6 +286,9 @@ int arch_cpu_init(void) clrsetbits_le32(ARMADA_XP_PUP_ENABLE, 0, GE0_PUP_EN | GE1_PUP_EN | LCD_PUP_EN | NAND_PUP_EN | SPI_PUP_EN); + + /* Configure USB PLL and PHYs on AXP */ + setup_usb_phys(); } /* Enable NAND and NAND arbiter */ diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 6115d6e..a8a6b27 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -65,6 +65,7 @@ #define MVEBU_EGIGA2_BASE (MVEBU_REGISTER(0x30000)) #define MVEBU_EGIGA3_BASE (MVEBU_REGISTER(0x34000)) #define MVEBU_REG_PCIE_BASE (MVEBU_REGISTER(0x40000)) +#define MVEBU_AXP_USB_BASE (MVEBU_REGISTER(0x50000)) #define MVEBU_USB20_BASE (MVEBU_REGISTER(0x58000)) #define MVEBU_EGIGA0_BASE (MVEBU_REGISTER(0x70000)) #define MVEBU_EGIGA1_BASE (MVEBU_REGISTER(0x74000)) diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 03c489c..826e7f7 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -33,7 +33,14 @@ DECLARE_GLOBAL_DATA_PTR; */ #ifdef CONFIG_ARMADA_XP -#define MVUSB0_BASE MVEBU_USB20_BASE +/* + * Armada XP and Armada 38x have different base addresses for + * the USB 2.0 EHCI host controller. So we need to provide + * a mechnism to support both here. + */ +#define MVUSB0_BASE \ + (mvebu_soc_family() == MVEBU_SOC_A38X ? \ + MVEBU_USB20_BASE : MVEBU_AXP_USB_BASE) /* * Once all the older Marvell SoC's (Orion, Kirkwood) are converted -- 2.4.6

2 3