From mboxrd@z Thu Jan 1 00:00:00 1970 From: Masahiro Yamada Date: Thu, 23 Feb 2017 11:03:24 +0900 Subject: [U-Boot] pull request: u-boot-uniphier/master Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, Please pull the 4th round of UniPhier updates for v2017.03: - Fix regressions caused by the previous reworks - Add pin configuration support - Re-work SPL code - Update DRAM and PLL setup code - Enable needed configs, disable unneeded configs The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3: video: mxsfb: Fix reset hang when videomode variable is not present (2017-02-22 21:47:59 +0100) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to bc647958047cd03193e19cd8c08a6771fea828b7: ARM: uniphier: set up charge pump current for MPLL of LD11 SoC (2017-02-23 09:00:16 +0900) ---------------------------------------------------------------- Kotaro Hayashi (1): ARM: uniphier: add DRAM PHY clock duty adjustment for LD20 SoC Masahiro Yamada (22): ARM: uniphier: revive accidentally removed dcache_disable() ARM: uniphier: skip MEMCONF ch2 parsing if CH2_DISABLE bit is set ARM: uniphier: correct spelling of "invalid" ARM: uniphier: skip memreserve of unused DRAM bank of LD20 ARM: uniphier: print Support Card info very late ARM: uniphier: update README.uniphier for latest build instruction ARM: uniphier: remove DRAM base address from board parameters ARM: uniphier: enable generic EHCI driver for uniphier_v8_defconfig pinctrl: uniphier: support pin configuration ARM: uniphier: rename second stage loader name ARM: dts: uniphier: drop u-boot, dm-pre-reloc from system-bus pinctrl node ARM: uniphier: disable CONFIG_MTD_NOR_FLASH ARM: uniphier: move MMC code to a separate file ARM: uniphier: move spl_boot_mode() to a separate file ARM: uniphier: rework spl_boot_device() and related code ARM: uniphier: remove dram_nr_ch from board parameters ARM: uniphier: deassert RST_n of eMMC device for LD11/LD20 ARM: uniphier: disable CONFIG_SPL_DOS_PARTITION ARM: uniphier: enable CONFIG_CMD_GPT ARM: uniphier: enable CONFIG_CMD_CONFIG ARM: uniphier: add simple eMMC load APIs instead of ROM API ARM: uniphier: set up charge pump current for MPLL of LD11 SoC arch/arm/dts/uniphier-ld11-ref.dts | 4 - arch/arm/dts/uniphier-ld20-ref.dts | 4 - arch/arm/mach-uniphier/Makefile | 4 +- arch/arm/mach-uniphier/bcu/bcu-ld4.c | 2 +- arch/arm/mach-uniphier/bcu/bcu-sld3.c | 2 +- arch/arm/mach-uniphier/board_init.c | 1 + arch/arm/mach-uniphier/board_late_init.c | 4 +- arch/arm/mach-uniphier/boards.c | 42 +--- arch/arm/mach-uniphier/boot-device/Makefile | 19 ++ .../boot-mode-ld20.c => boot-device/boot-device-ld11.c} | 52 ++--- .../boot-mode-ld4.c => boot-device/boot-device-ld4.c} | 36 +--- .../boot-mode-pro5.c => boot-device/boot-device-pro5.c} | 36 +--- .../boot-mode-pxs2.c => boot-device/boot-device-pxs2.c} | 37 ++-- .../boot-mode-sld3.c => boot-device/boot-device-sld3.c} | 36 +--- arch/arm/mach-uniphier/boot-device/boot-device.c | 206 +++++++++++++++++++ arch/arm/mach-uniphier/boot-device/boot-device.h | 35 ++++ arch/arm/mach-uniphier/boot-device/spl_board.c | 262 +++++++++++++++++++++++++ arch/arm/mach-uniphier/boot-mode/Makefile | 21 -- arch/arm/mach-uniphier/boot-mode/boot-device.h | 29 --- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 140 ------------- arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c | 59 ------ arch/arm/mach-uniphier/boot-mode/spl_board.c | 125 ------------ arch/arm/mach-uniphier/clk/Makefile | 2 +- arch/arm/mach-uniphier/clk/clk-ld11.c | 8 +- arch/arm/mach-uniphier/clk/clk-ld20.c | 17 ++ arch/arm/mach-uniphier/clk/pll-base-ld20.c | 21 ++ arch/arm/mach-uniphier/clk/pll-ld11.c | 2 + arch/arm/mach-uniphier/clk/pll.h | 1 + arch/arm/mach-uniphier/dram/umc-ld11.c | 2 +- arch/arm/mach-uniphier/dram/umc-ld20.c | 25 ++- arch/arm/mach-uniphier/dram/umc-pxs2.c | 14 +- arch/arm/mach-uniphier/dram_init.c | 64 +++--- arch/arm/mach-uniphier/init.h | 9 +- arch/arm/mach-uniphier/memconf.c | 2 +- arch/arm/mach-uniphier/micro-support-card.c | 11 +- arch/arm/mach-uniphier/mmc-boot-mode.c | 34 ++++ arch/arm/mach-uniphier/mmc-first-dev.c | 46 +++++ arch/arm/mach-uniphier/spl_board_init.c | 4 + configs/uniphier_ld11_defconfig | 5 +- configs/uniphier_ld20_defconfig | 5 +- configs/uniphier_ld4_sld8_defconfig | 5 +- configs/uniphier_pro4_defconfig | 5 +- configs/uniphier_pxs2_ld6b_defconfig | 5 +- configs/uniphier_sld3_defconfig | 5 +- configs/uniphier_v8_defconfig | 5 +- doc/README.uniphier | 6 +- drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 134 ++++++++++++- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 3 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 3 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 3 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 1 + include/configs/uniphier.h | 2 +- 54 files changed, 948 insertions(+), 659 deletions(-) create mode 100644 arch/arm/mach-uniphier/boot-device/Makefile rename arch/arm/mach-uniphier/{boot-mode/boot-mode-ld20.c => boot-device/boot-device-ld11.c} (73%) rename arch/arm/mach-uniphier/{boot-mode/boot-mode-ld4.c => boot-device/boot-device-ld4.c} (77%) rename arch/arm/mach-uniphier/{boot-mode/boot-mode-pro5.c => boot-device/boot-device-pro5.c} (76%) rename arch/arm/mach-uniphier/{boot-mode/boot-mode-pxs2.c => boot-device/boot-device-pxs2.c} (76%) rename arch/arm/mach-uniphier/{boot-mode/boot-mode-sld3.c => boot-device/boot-device-sld3.c} (83%) create mode 100644 arch/arm/mach-uniphier/boot-device/boot-device.c create mode 100644 arch/arm/mach-uniphier/boot-device/boot-device.h create mode 100644 arch/arm/mach-uniphier/boot-device/spl_board.c delete mode 100644 arch/arm/mach-uniphier/boot-mode/Makefile delete mode 100644 arch/arm/mach-uniphier/boot-mode/boot-device.h delete mode 100644 arch/arm/mach-uniphier/boot-mode/boot-mode.c delete mode 100644 arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c delete mode 100644 arch/arm/mach-uniphier/boot-mode/spl_board.c create mode 100644 arch/arm/mach-uniphier/clk/clk-ld20.c create mode 100644 arch/arm/mach-uniphier/mmc-boot-mode.c create mode 100644 arch/arm/mach-uniphier/mmc-first-dev.c -- Best Regards Masahiro Yamada