September 2015 - U-Boot

[U-Boot] [PATCH] ARM: dts: uniphier: use SPDX-License-Identifier
by Masahiro Yamada 24 Sep '15

24 Sep '15

Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- This patch is trivial, so I will apply it to u-boot-uniphier/master soon. arch/arm/dts/uniphier-pinctrl.dtsi | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi index f67445f..b584213 100644 --- a/arch/arm/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/dts/uniphier-pinctrl.dtsi @@ -3,43 +3,7 @@ * * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. + * SPDX-License-Identifier: GPL-2.0+ X11 */ &pinctrl { -- 1.9.1

1 1

[U-Boot] SPL boot with NAND on i.MX6 data abort
by Markus Stelzhammer 24 Sep '15

24 Sep '15

Hi all, I'm currently working on the port of u-boot for our custom boards. Previously we were using u-boot based on v2013.04 without SPL for our boards (we have boards with SD also) and this worked for all of our devices. As we now have new boards with different (bigger) RAM, I decided to use the newest bootloader (v2015.10) and enable SPL support. This is already working on a board with SD-Card but I'm not getting it to work on the boards with NAND. When I try to boot, SPL is detecting and loading u-boot but u-boot throws a "data abort" during "ubifs mount". The strange thing for me is that when I disable SPL, the board will boot properly. Could anyone give me a hint how I could trace this error? I can also provide logs or code snippets if needed! Best Regards Markus

3 4

[U-Boot] [PATCH v2] sunxi: mmc: Fix clk-delay settings
by Hans de Goede 24 Sep '15

24 Sep '15

In recent allwinner kernel sources the mmc/sdio clk-delay settings have been slightly tweaked, and for sun9i they are completely different then what we are using. This commit brings us in sync with what allwinner does, fixing problems accessing sdcards on some A33 devices (and likely others). For pre sun9i hardware this makes the following changes: -At 400Khz change the sample delay from 7 to 0 (first introduced in A31 sdk) -At 50 Mhz change the sample delay from 5 to 4 (first introduced in A23 sdk) -Above 50 MHz change the out delay from 2 to 1 (first introduced in A20 sdk) Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Changes in v2: -Improved commit message --- drivers/mmc/sunxi_mmc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 25f18ad..e717c44 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -120,17 +120,27 @@ static int mmc_set_mod_clk(struct sunxi_mmc_host *mmchost, unsigned int hz) /* determine delays */ if (hz <= 400000) { oclk_dly = 0; - sclk_dly = 7; + sclk_dly = 0; } else if (hz <= 25000000) { oclk_dly = 0; sclk_dly = 5; +#ifdef CONFIG_MACH_SUN9I } else if (hz <= 50000000) { - oclk_dly = 3; - sclk_dly = 5; + oclk_dly = 5; + sclk_dly = 4; } else { /* hz > 50000000 */ oclk_dly = 2; sclk_dly = 4; +#else + } else if (hz <= 50000000) { + oclk_dly = 3; + sclk_dly = 4; + } else { + /* hz > 50000000 */ + oclk_dly = 1; + sclk_dly = 4; +#endif } writel(CCM_MMC_CTRL_ENABLE | pll | CCM_MMC_CTRL_SCLK_DLY(sclk_dly) | -- 2.5.0

2 1

[U-Boot] [PATCH 3/4] exynos: be more verbose in process_nodes()
by Tobias Jakobi 24 Sep '15

24 Sep '15

In case sdhci_get_config() or do_sdhci_init() fail, show the error code that was returned. Signed-off-by: Tobias Jakobi <tjakobi(a)math.uni-bielefeld.de> --- drivers/mmc/s5p_sdhci.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index bc2102a..6be3609 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -171,7 +171,7 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host) static int process_nodes(const void *blob, int node_list[], int count) { struct sdhci_host *host; - int i, node; + int i, node, ret; debug("%s: count = %d\n", __func__, count); @@ -183,13 +183,15 @@ static int process_nodes(const void *blob, int node_list[], int count) host = &sdhci_host[i]; - if (sdhci_get_config(blob, node, host)) { - printf("%s: failed to decode dev %d\n", __func__, i); + ret = sdhci_get_config(blob, node, host); + if (ret) { + printf("%s: failed to decode dev %d (%d)\n", __func__, i, ret); return -1; } - if (do_sdhci_init(host)) { - printf("%s: failed to initialize dev %d\n", __func__, i); + ret = do_sdhci_init(host); + if (ret) { + printf("%s: failed to initialize dev %d (%d)\n", __func__, i, ret); return -2; } } -- 2.0.5

5 10

[U-Boot] [PATCH 0/4] Fix operation on Odroid devices
by Tobias Jakobi 24 Sep '15

24 Sep '15

Hello, currently operation on Exynos4412-based Odroid devices is broken. The bootloader stops with this message: Card did not respond to voltage select! *** Warning - MMC init failed, using default environment This series fixes error handling in the s5p sdhci driver and the cause of the issue, which is an inverted card detection check. Thanks goes to Marek Vasut and Sjoerd Simons who helped me on IRC to get this triaged. With best wishes, Tobias Tobias Jakobi (4): exynos: Properly initialize host_caps in s5p_sdhci_core_init() exynos: Fix passing of errors in exynos_mmc_init() exynos: be more verbose in process_nodes() exynos: fix and cleanup do_sdhci_init() drivers/mmc/s5p_sdhci.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) -- 2.0.5

5 13

[U-Boot] [PATCH] sunxi: mmc: Fix clk-delay settings
by Hans de Goede 24 Sep '15

24 Sep '15

In recent allwinner kernel sources the mmc clk-delay settings have been slightly tweaked, and for sun9i they are completely different then what we are using. This commit brings us in sync with what allwinner does, fixing problems accessing sdcards on some A33 devices (and likely others). For pre sun9i hardware this makes the following changes: -At 400Khz change the sample delay from 7 to 0 (first introduced in A31 sdk) -At 50 Mhz change the sample delay from 5 to 4 (first introduced in A23 sdk) Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/mmc/sunxi_mmc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 25f18ad..e717c44 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -120,17 +120,27 @@ static int mmc_set_mod_clk(struct sunxi_mmc_host *mmchost, unsigned int hz) /* determine delays */ if (hz <= 400000) { oclk_dly = 0; - sclk_dly = 7; + sclk_dly = 0; } else if (hz <= 25000000) { oclk_dly = 0; sclk_dly = 5; +#ifdef CONFIG_MACH_SUN9I } else if (hz <= 50000000) { - oclk_dly = 3; - sclk_dly = 5; + oclk_dly = 5; + sclk_dly = 4; } else { /* hz > 50000000 */ oclk_dly = 2; sclk_dly = 4; +#else + } else if (hz <= 50000000) { + oclk_dly = 3; + sclk_dly = 4; + } else { + /* hz > 50000000 */ + oclk_dly = 1; + sclk_dly = 4; +#endif } writel(CCM_MMC_CTRL_ENABLE | pll | CCM_MMC_CTRL_SCLK_DLY(sclk_dly) | -- 2.5.0

2 5

[U-Boot] Pull request: u-boot-uniphier/master
by Masahiro Yamada 24 Sep '15

24 Sep '15

Hi Tom, Here is a pretty big series for UniPhier SoC changes. pinctrl drivers, various fixes, refactoring, new SoC/board support, etc. The following changes since commit 8a5f6129d1450f5ff92a55cfcfd7b96ee019e303: pinctrl: move dm_scan_fdt_node() out of pinctrl uclass (2015-09-19 15:42:15 -0600) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to 7c040c9a6099ec83706fd8658eeb3e61f31ff431: ARM: uniphier: fix init page table for ProXstream2/PH1-LD6b USB boot (2015-09-23 23:21:33 +0900) ---------------------------------------------------------------- Masahiro Yamada (32): pinctrl: uniphier: add UniPhier pinctrl core support pinctrl: uniphier: add UniPhier PH1-LD4 pinctrl driver pinctrl: uniphier: add UniPhier PH1-Pro4 pinctrl driver pinctrl: uniphier: add UniPhier PH1-sLD8 pinctrl driver pinctrl: uniphier: add UniPhier PH1-Pro5 pinctrl driver pinctrl: uniphier: add UniPhier ProXstream2 pinctrl driver pinctrl: uniphier: add UniPhier PH1-LD6b pinctrl driver ARM: uniphier: enable simple-bus driver for SPL ARM: uniphier: increase CONFIG_SYS_MALLOC_F_LEN to bind all nodes ARM: dts: uniphier: prepare device trees to use pinctrl in SPL ARM: uniphier: enable PINCTRL and SPL_PINCTRL ARM: uniphier: drop ad-hoc early pin-muxing settings ARM: uniphier: drop ad-hoc input enable settings ARM: uniphier: drop DCC micro support card support ARM: uniphier: enable setexpr command ARM: uniphier: change the external bus address mapping ARM: uniphier: remove ifdef CONFIG_{SOC} conditionals from sg-regs.h ARM: uniphier: parse device tree to determine DRAM base and size ARM: uniphier: remove unused header file ARM: uniphier: remove useless wrapper functions ARM: uniphier: refactor LED function ARM: uniphier: move CONFIG_SUPPORT_CARD_* macros to local file ARM: uniphier: allow to disable CONFIG_MICRO_SUPPORT_CARD ARM: uniphier: rename CONFIG_MACH_* to CONFIG_ARCH_UNIPHIER_* ARM: uniphier: delete unneeded input enable for low-level debug ARM: uniphier: fix glitch signal problem for low-level debug ARM: uniphier: unify low-level debug init code ARM: uniphier: remove kernel parameter settings from environment ARM: uniphier: allow to enable multiple SoCs ARM: uniphier: add PH1-Pro5 support ARM: uniphier: add ProXstream2 and PH1-LD6b support ARM: uniphier: fix init page table for ProXstream2/PH1-LD6b USB boot arch/arm/dts/Makefile | 5 +- arch/arm/dts/uniphier-ph1-ld4-ref.dts | 16 ++- arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 17 ++- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 16 ++- arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 64 +++++++++++ arch/arm/dts/uniphier-ph1-sld8-ref.dts | 16 ++- arch/arm/dts/uniphier-proxstream2-gentil.dts | 62 ++++++++++ arch/arm/dts/uniphier-proxstream2-vodka.dts | 62 ++++++++++ arch/arm/mach-uniphier/Kconfig | 95 +++++++-------- arch/arm/mach-uniphier/Makefile | 21 ++-- arch/arm/mach-uniphier/bcu/Makefile | 3 + arch/arm/mach-uniphier/{ph1-ld4/bcu_init.c => bcu/bcu-ph1-ld4.c} | 8 +- arch/arm/mach-uniphier/{ph1-sld3/bcu_init.c => bcu/bcu-ph1-sld3.c} | 8 +- arch/arm/mach-uniphier/board_common.c | 23 +--- arch/arm/mach-uniphier/board_early_init_f.c | 73 +++++++++--- arch/arm/mach-uniphier/board_early_init_r.c | 7 +- arch/arm/mach-uniphier/boards.c | 130 +++++++++++++++++++++ arch/arm/mach-uniphier/boot-mode/Makefile | 9 ++ .../{ph1-pro4/boot-mode.c => boot-mode/boot-mode-ph1-ld4.c} | 21 +++- arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c | 75 ++++++++++++ .../{ph1-sld3/boot-mode.c => boot-mode/boot-mode-ph1-sld3.c} | 23 ++-- arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c | 75 ++++++++++++ arch/arm/mach-uniphier/boot-mode/boot-mode.c | 45 ++++++++ arch/arm/mach-uniphier/clk/Makefile | 7 ++ .../arm/mach-uniphier/{ph1-ld4/clkrst_init.c => clk/clk-ph1-ld4.c} | 3 +- .../mach-uniphier/{ph1-pro4/clkrst_init.c => clk/clk-ph1-pro4.c} | 3 +- arch/arm/mach-uniphier/clk/clk-ph1-pro5.c | 44 +++++++ arch/arm/mach-uniphier/clk/clk-proxstream2.c | 50 ++++++++ arch/arm/mach-uniphier/cmd_pinmon.c | 43 +++++-- arch/arm/mach-uniphier/ddrphy/Makefile | 3 + .../{ph1-ld4/ddrphy_init.c => ddrphy/ddrphy-ph1-ld4.c} | 4 +- .../{ph1-pro4/ddrphy_init.c => ddrphy/ddrphy-ph1-pro4.c} | 4 +- .../{ph1-sld8/ddrphy_init.c => ddrphy/ddrphy-ph1-sld8.c} | 4 +- .../mach-uniphier/{ddrphy_training.c => ddrphy/ddrphy-training.c} | 0 arch/arm/mach-uniphier/debug_ll.S | 185 ++++++++++++++++++++++++++++++ arch/arm/mach-uniphier/dram_init.c | 51 +++++++- arch/arm/mach-uniphier/early-clk/Makefile | 7 ++ .../early_clkrst_init.c => early-clk/early-clk-ph1-ld4.c} | 5 +- arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c | 39 +++++++ arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c | 44 +++++++ arch/arm/mach-uniphier/early-pinctrl/Makefile | 1 + arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c | 26 +++++ arch/arm/mach-uniphier/include/mach/board.h | 42 ------- arch/arm/mach-uniphier/include/mach/boot-device.h | 15 ++- arch/arm/mach-uniphier/include/mach/ddrphy-regs.h | 7 +- arch/arm/mach-uniphier/include/mach/debug-uart.S | 23 ---- arch/arm/mach-uniphier/include/mach/init.h | 99 ++++++++++++++++ arch/arm/mach-uniphier/include/mach/led.h | 100 ---------------- arch/arm/mach-uniphier/include/mach/micro-support-card.h | 39 +++++++ arch/arm/mach-uniphier/include/mach/platdevice.h | 24 ---- arch/arm/mach-uniphier/include/mach/sc-regs.h | 25 +++- arch/arm/mach-uniphier/include/mach/sg-regs.h | 50 ++++---- arch/arm/mach-uniphier/include/mach/soc_info.h | 63 ++++++++++ arch/arm/mach-uniphier/init/Makefile | 9 ++ arch/arm/mach-uniphier/init/init-ph1-ld4.c | 60 ++++++++++ arch/arm/mach-uniphier/init/init-ph1-pro4.c | 58 ++++++++++ arch/arm/mach-uniphier/init/init-ph1-pro5.c | 42 +++++++ arch/arm/mach-uniphier/init/init-ph1-sld3.c | 53 +++++++++ arch/arm/mach-uniphier/init/init-ph1-sld8.c | 60 ++++++++++ arch/arm/mach-uniphier/init/init-proxstream2.c | 41 +++++++ arch/arm/mach-uniphier/init/init.c | 58 ++++++++++ arch/arm/mach-uniphier/init_page_table.S | 6 +- arch/arm/mach-uniphier/lowlevel_init.S | 3 +- arch/arm/mach-uniphier/memconf.c | 103 ----------------- arch/arm/mach-uniphier/memconf/Makefile | 4 + arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c | 59 ++++++++++ arch/arm/mach-uniphier/memconf/memconf-proxstream2.c | 64 +++++++++++ arch/arm/mach-uniphier/memconf/memconf.c | 104 +++++++++++++++++ arch/arm/mach-uniphier/{support_card.c => micro-support-card.c} | 169 ++++++++++++++------------- arch/arm/mach-uniphier/ph1-ld4/Makefile | 15 --- arch/arm/mach-uniphier/ph1-ld4/boot-mode.c | 1 - arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c | 1 - arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c | 27 ----- arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S | 29 ----- arch/arm/mach-uniphier/ph1-ld4/pinctrl.c | 48 -------- arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c | 1 - arch/arm/mach-uniphier/ph1-ld4/sbc_init_3cs.c | 49 -------- arch/arm/mach-uniphier/ph1-ld4/sg_init.c | 18 --- arch/arm/mach-uniphier/ph1-pro4/Makefile | 15 --- arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c | 26 ----- arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S | 39 ------- arch/arm/mach-uniphier/ph1-pro4/pinctrl.c | 49 -------- arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c | 42 ------- arch/arm/mach-uniphier/ph1-pro4/sg_init.c | 18 --- arch/arm/mach-uniphier/ph1-sld3/Makefile | 15 --- 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 | 33 ------ arch/arm/mach-uniphier/ph1-sld3/memconf.c | 52 --------- arch/arm/mach-uniphier/ph1-sld3/pinctrl.c | 24 ---- 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 --- arch/arm/mach-uniphier/ph1-sld8/Makefile | 1 - arch/arm/mach-uniphier/ph1-sld8/bcu_init.c | 1 - arch/arm/mach-uniphier/ph1-sld8/boot-mode.c | 1 - arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c | 1 - arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c | 1 - arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c | 27 ----- arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S | 29 ----- arch/arm/mach-uniphier/ph1-sld8/pinctrl.c | 51 -------- arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c | 1 - arch/arm/mach-uniphier/ph1-sld8/sbc_init.c | 1 - arch/arm/mach-uniphier/ph1-sld8/sbc_init_3cs.c | 57 --------- arch/arm/mach-uniphier/ph1-sld8/sg_init.c | 1 - arch/arm/mach-uniphier/pinctrl/Makefile | 7 ++ arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c | 49 ++++++++ arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c | 45 ++++++++ arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c | 50 ++++++++ arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c | 43 +++++++ arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c | 25 ++++ arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c | 43 +++++++ arch/arm/mach-uniphier/pinctrl/pinctrl-proxstream2.c | 45 ++++++++ arch/arm/mach-uniphier/pll/Makefile | 8 ++ .../mach-uniphier/{ph1-ld4/pll_init.c => pll/pll-init-ph1-ld4.c} | 34 ++++-- .../mach-uniphier/{ph1-pro4/pll_init.c => pll/pll-init-ph1-pro4.c} | 36 ++++-- .../mach-uniphier/{ph1-sld3/pll_init.c => pll/pll-init-ph1-sld3.c} | 5 +- .../mach-uniphier/{ph1-sld8/pll_init.c => pll/pll-init-ph1-sld8.c} | 5 +- .../{ph1-pro4/pll_spectrum.c => pll/pll-spectrum-ph1-ld4.c} | 6 +- .../{ph1-sld3/pll_spectrum.c => pll/pll-spectrum-ph1-sld3.c} | 5 +- arch/arm/mach-uniphier/print_misc_info.c | 2 +- arch/arm/mach-uniphier/sbc/Makefile | 7 ++ arch/arm/mach-uniphier/{ph1-ld4/sbc_init.c => sbc/sbc-ph1-ld4.c} | 17 +-- arch/arm/mach-uniphier/{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c} | 17 +-- arch/arm/mach-uniphier/{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c} | 19 +-- arch/arm/mach-uniphier/sbc/sbc-proxstream2.c | 48 ++++++++ arch/arm/mach-uniphier/soc_info.c | 61 ++++++++++ arch/arm/mach-uniphier/spl.c | 76 ------------ arch/arm/mach-uniphier/umc/Makefile | 3 + arch/arm/mach-uniphier/{ph1-ld4/umc_init.c => umc/umc-ph1-ld4.c} | 30 ++--- arch/arm/mach-uniphier/{ph1-pro4/umc_init.c => umc/umc-ph1-pro4.c} | 36 +++--- arch/arm/mach-uniphier/{ph1-sld8/umc_init.c => umc/umc-ph1-sld8.c} | 30 ++--- configs/ph1_ld4_defconfig | 9 +- configs/ph1_ld6b_defconfig | 30 +++++ configs/ph1_pro4_defconfig | 8 +- configs/ph1_pro5_defconfig | 30 +++++ configs/ph1_sld3_defconfig | 5 +- configs/ph1_sld8_defconfig | 9 +- doc/README.uniphier | 12 ++ drivers/pinctrl/Kconfig | 2 + drivers/pinctrl/Makefile | 2 + drivers/pinctrl/uniphier/Kconfig | 42 +++++++ drivers/pinctrl/uniphier/Makefile | 8 ++ drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c | 133 +++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c | 133 +++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c | 129 +++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | 144 +++++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c | 141 +++++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-proxstream2.c | 140 ++++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 154 +++++++++++++++++++++++++ drivers/pinctrl/uniphier/pinctrl-uniphier.h | 113 ++++++++++++++++++ include/configs/uniphier.h | 113 +++--------------- 153 files changed, 4059 insertions(+), 1587 deletions(-) create mode 100644 arch/arm/dts/uniphier-ph1-pro5-4kbox.dts create mode 100644 arch/arm/dts/uniphier-proxstream2-gentil.dts create mode 100644 arch/arm/dts/uniphier-proxstream2-vodka.dts create mode 100644 arch/arm/mach-uniphier/bcu/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/bcu_init.c => bcu/bcu-ph1-ld4.c} (84%) rename arch/arm/mach-uniphier/{ph1-sld3/bcu_init.c => bcu/bcu-ph1-sld3.c} (84%) create mode 100644 arch/arm/mach-uniphier/boards.c create mode 100644 arch/arm/mach-uniphier/boot-mode/Makefile rename arch/arm/mach-uniphier/{ph1-pro4/boot-mode.c => boot-mode/boot-mode-ph1-ld4.c} (88%) create mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c rename arch/arm/mach-uniphier/{ph1-sld3/boot-mode.c => boot-mode/boot-mode-ph1-sld3.c} (89%) create mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c create mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode.c create mode 100644 arch/arm/mach-uniphier/clk/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/clkrst_init.c => clk/clk-ph1-ld4.c} (94%) rename arch/arm/mach-uniphier/{ph1-pro4/clkrst_init.c => clk/clk-ph1-pro4.c} (96%) create mode 100644 arch/arm/mach-uniphier/clk/clk-ph1-pro5.c create mode 100644 arch/arm/mach-uniphier/clk/clk-proxstream2.c create mode 100644 arch/arm/mach-uniphier/ddrphy/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/ddrphy_init.c => ddrphy/ddrphy-ph1-ld4.c} (95%) rename arch/arm/mach-uniphier/{ph1-pro4/ddrphy_init.c => ddrphy/ddrphy-ph1-pro4.c} (95%) rename arch/arm/mach-uniphier/{ph1-sld8/ddrphy_init.c => ddrphy/ddrphy-ph1-sld8.c} (95%) rename arch/arm/mach-uniphier/{ddrphy_training.c => ddrphy/ddrphy-training.c} (100%) create mode 100644 arch/arm/mach-uniphier/debug_ll.S create mode 100644 arch/arm/mach-uniphier/early-clk/Makefile rename arch/arm/mach-uniphier/{ph1-pro4/early_clkrst_init.c => early-clk/early-clk-ph1-ld4.c} (86%) create mode 100644 arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c create mode 100644 arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c create mode 100644 arch/arm/mach-uniphier/early-pinctrl/Makefile create mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c delete mode 100644 arch/arm/mach-uniphier/include/mach/board.h delete mode 100644 arch/arm/mach-uniphier/include/mach/debug-uart.S create mode 100644 arch/arm/mach-uniphier/include/mach/init.h delete mode 100644 arch/arm/mach-uniphier/include/mach/led.h create mode 100644 arch/arm/mach-uniphier/include/mach/micro-support-card.h delete mode 100644 arch/arm/mach-uniphier/include/mach/platdevice.h create mode 100644 arch/arm/mach-uniphier/include/mach/soc_info.h create mode 100644 arch/arm/mach-uniphier/init/Makefile create mode 100644 arch/arm/mach-uniphier/init/init-ph1-ld4.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-pro4.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-pro5.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-sld3.c create mode 100644 arch/arm/mach-uniphier/init/init-ph1-sld8.c create mode 100644 arch/arm/mach-uniphier/init/init-proxstream2.c create mode 100644 arch/arm/mach-uniphier/init/init.c delete mode 100644 arch/arm/mach-uniphier/memconf.c create mode 100644 arch/arm/mach-uniphier/memconf/Makefile create mode 100644 arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c create mode 100644 arch/arm/mach-uniphier/memconf/memconf-proxstream2.c create mode 100644 arch/arm/mach-uniphier/memconf/memconf.c rename arch/arm/mach-uniphier/{support_card.c => micro-support-card.c} (53%) delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/boot-mode.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/sg_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/sg_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/early_clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/memconf.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/sg_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/umc_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/bcu_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/boot-mode.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/pinctrl.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init_3cs.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sg_init.c create mode 100644 arch/arm/mach-uniphier/pinctrl/Makefile create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-proxstream2.c create mode 100644 arch/arm/mach-uniphier/pll/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/pll_init.c => pll/pll-init-ph1-ld4.c} (90%) rename arch/arm/mach-uniphier/{ph1-pro4/pll_init.c => pll/pll-init-ph1-pro4.c} (88%) rename arch/arm/mach-uniphier/{ph1-sld3/pll_init.c => pll/pll-init-ph1-sld3.c} (62%) rename arch/arm/mach-uniphier/{ph1-sld8/pll_init.c => pll/pll-init-ph1-sld8.c} (97%) rename arch/arm/mach-uniphier/{ph1-pro4/pll_spectrum.c => pll/pll-spectrum-ph1-ld4.c} (72%) rename arch/arm/mach-uniphier/{ph1-sld3/pll_spectrum.c => pll/pll-spectrum-ph1-sld3.c} (73%) create mode 100644 arch/arm/mach-uniphier/sbc/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/sbc_init.c => sbc/sbc-ph1-ld4.c} (67%) rename arch/arm/mach-uniphier/{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c} (64%) rename arch/arm/mach-uniphier/{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c} (62%) create mode 100644 arch/arm/mach-uniphier/sbc/sbc-proxstream2.c create mode 100644 arch/arm/mach-uniphier/soc_info.c delete mode 100644 arch/arm/mach-uniphier/spl.c create mode 100644 arch/arm/mach-uniphier/umc/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/umc_init.c => umc/umc-ph1-ld4.c} (88%) rename arch/arm/mach-uniphier/{ph1-pro4/umc_init.c => umc/umc-ph1-pro4.c} (85%) rename arch/arm/mach-uniphier/{ph1-sld8/umc_init.c => umc/umc-ph1-sld8.c} (87%) create mode 100644 configs/ph1_ld6b_defconfig create mode 100644 configs/ph1_pro5_defconfig create mode 100644 drivers/pinctrl/uniphier/Kconfig create mode 100644 drivers/pinctrl/uniphier/Makefile create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-proxstream2.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier.h -- Best Regards Masahiro Yamada

2 2

[U-Boot] [PATCH v2 1/4] imx: mx7: discard unused global variable
by Peng Fan 24 Sep '15

24 Sep '15

Discard unused global variable. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Stefano Babic <sbabic(a)denx.de> --- Changes V2: none arch/arm/cpu/armv7/mx7/soc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/cpu/armv7/mx7/soc.c index 8d50149..af16ba7 100644 --- a/arch/arm/cpu/armv7/mx7/soc.c +++ b/arch/arm/cpu/armv7/mx7/soc.c @@ -15,8 +15,6 @@ #include <dm.h> #include <imx_thermal.h> -struct src *src_reg = (struct src *)SRC_BASE_ADDR; - #if defined(CONFIG_IMX_THERMAL) static const struct imx_thermal_plat imx7_thermal_plat = { .regs = (void *)ANATOP_BASE_ADDR, -- 1.8.4

2 4

[U-Boot] [PATCH] imx: boards: Add maintainers info
by Peng Fan 24 Sep '15

24 Sep '15

Add MAINTAINERS info for mx6slevk_spl, mx6ul_9x9_evk and mx6qpsabreauto. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Stefano Babic <sbabic(a)denx.de> --- board/freescale/mx6qsabreauto/MAINTAINERS | 2 ++ board/freescale/mx6slevk/MAINTAINERS | 2 ++ board/freescale/mx6ul_14x14_evk/MAINTAINERS | 1 + 3 files changed, 5 insertions(+) diff --git a/board/freescale/mx6qsabreauto/MAINTAINERS b/board/freescale/mx6qsabreauto/MAINTAINERS index fb65ce4..75a8862 100644 --- a/board/freescale/mx6qsabreauto/MAINTAINERS +++ b/board/freescale/mx6qsabreauto/MAINTAINERS @@ -1,7 +1,9 @@ MX6QSABREAUTO BOARD M: Fabio Estevam <fabio.estevam(a)freescale.com> +M: Peng Fan <Peng.Fan(a)freescale.com> S: Maintained F: board/freescale/mx6qsabreauto/ F: include/configs/mx6qsabreauto.h F: configs/mx6dlsabreauto_defconfig F: configs/mx6qsabreauto_defconfig +F: configs/mx6qpsabreauto_defconfig diff --git a/board/freescale/mx6slevk/MAINTAINERS b/board/freescale/mx6slevk/MAINTAINERS index 18d31a8..f4e74ba 100644 --- a/board/freescale/mx6slevk/MAINTAINERS +++ b/board/freescale/mx6slevk/MAINTAINERS @@ -1,7 +1,9 @@ MX6SLEVK BOARD M: Fabio Estevam <fabio.estevam(a)freescale.com> +M: Peng Fan <Peng.Fan(a)freescale.com> S: Maintained F: board/freescale/mx6slevk/ F: include/configs/mx6slevk.h F: configs/mx6slevk_defconfig +F: configs/mx6slevk_spl_defconfig F: configs/mx6slevk_spinor_defconfig diff --git a/board/freescale/mx6ul_14x14_evk/MAINTAINERS b/board/freescale/mx6ul_14x14_evk/MAINTAINERS index 611feca..d5f74b7 100644 --- a/board/freescale/mx6ul_14x14_evk/MAINTAINERS +++ b/board/freescale/mx6ul_14x14_evk/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/freescale/mx6ul_14x14_evk/ F: include/configs/mx6ul_14x14_evk.h F: configs/mx6ul_14x14_evk_defconfig +F: configs/mx6ul_9x9_evk_defconfig -- 1.8.4

2 1

[U-Boot] [PATCH V2] imx-common: consider mux_ctrl_ofs when setting mux_mode
by Peng Fan 24 Sep '15

24 Sep '15

Some i.MXes use __NA_ or 0 to avoid setting mux_mode, but the following patch only take i.MX6/7 into consideration. "c3c8a5748897b24f18618047804317167a531dd3 imx-common: fix iomux settings" Use is_soc_type(MXC_CPU_MX7) to avoid breaking other i.MXes when setting mux_mode. In this patch, switch to use "asm/imx-common/sys_proto.h" to avoid build break for "is_soc_type" for vf610 and mx25. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Bhuvanchandra DV <bhuvanchandra.dv(a)toradex.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes v2: refine commit msg, "add mx25". use cleaner way to for setting mux code, following Benoît's suggestion. arch/arm/imx-common/iomux-v3.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c index 9b9cf58..228d5f8 100644 --- a/arch/arm/imx-common/iomux-v3.c +++ b/arch/arm/imx-common/iomux-v3.c @@ -11,10 +11,8 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> -#if !defined(CONFIG_MX25) && !defined(CONFIG_VF610) -#include <asm/arch/sys_proto.h> -#endif #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/sys_proto.h> static void *base = (void *)IOMUXC_BASE_ADDR; @@ -53,7 +51,8 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) } #endif - __raw_writel(mux_mode, base + mux_ctrl_ofs); + if (is_soc_type(MXC_SOC_MX7) || mux_ctrl_ofs) + __raw_writel(mux_mode, base + mux_ctrl_ofs); if (sel_input_ofs) __raw_writel(sel_input, base + sel_input_ofs); -- 1.8.4

3 3