Hi Tom,
Here is the revised version of my pull request
for the v2016.11 development cycle.
The following UniPhier updates are included:
- DM migration
* remove legacy xHCI driver
* convert MMC driver to CONFIG_BLOCK
- Pinctrl driver improvements
* New pin-group
* Macro cleanup
* Remove ad-hoc pin-mux code
- Misc fixes, cleanups
* Fix DRAM size of LD21 SoC
* Consolidate board init functions
- PLL init code cleanups and new SoC support
- Update DRAM init code for LD20 SoC
Please pull!
The following changes since commit 8cbb389bb3da80cbf8911f8386cbff92c6a78afe:
Prepare v2016.09 (2016-09-12 10:05:51 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-uniphier.git master
for you to fetch changes up to f9d7e17e844f9e94c39a8c95f73a4454097a6948:
ARM: uniphier: update DRAM init code for LD20 SoC (2016-09-19 00:12:26 +0900)
----------------------------------------------------------------
Masahiro Yamada (27):
ARM: uniphier: sort select:s alphabetically
usb: uniphier: remove UniPhier xHCI driver and select DM_USB
ARM: uniphier: delete unnecessary xHCI pin-mux settings
ARM: uniphier: enable Generic EHCI driver for Pro4 SoC
mmc: uniphier-sd: migrate to CONFIG_BLK
pinctrl: uniphier: add System Bus pin-mux settings
pinctrl: uniphier: move register base macros from header to .c file
ARM: uniphier: remove IECTRL setup code of LD4 SoC
ARM: uniphier: use checkboard() instead of misc_init_f()
ARM: uniphier: merge board init functions into board_init()
ARM: uniphier: fix DRAM size of LD21 SoC package
ARM: uniphier: introduce flags to adjust DRAM timing for LD20/LD21
pinctrl: uniphier: support 4bit-width pin-mux register capability
pinctrl: uniphier: add UniPhier sLD3 pinctrl driver
ARM: dts: uniphier: add pinctrl device node and pinctrl properties
ARM: uniphier: select PINCTRL and SPL_PINCTRL
ARM: uniphier: remove redundant pin-muxing for EA24 pin of sLD3 SoC
ARM: uniphier: remove ad-hoc pin-mux code for sLD3
ARM: uniphier: consolidate NAND pin-mux settings
ARM: dts: uniphier: include System Bus pin group node in SPL DT
ARM: uniphier: consolidate System Bus pin-mux settings for LD11/LD20
ARM: uniphier: move XIRQ pin-mux settings of LD11/LD20
ARM: uniphier: rename CONFIG_DPLL_SSC_RATE_1PER
ARM: uniphier: move PLL init code to U-Boot proper where possible
ARM: uniphier: collect clock/PLL init code into a single directory
ARM: uniphier: add PLL init code for LD20 SoC
ARM: uniphier: update DRAM init code for LD20 SoC
arch/arm/Kconfig | 18 +-
arch/arm/dts/uniphier-ph1-ld11-ref.dts | 4 +
arch/arm/dts/uniphier-ph1-ld20-ref.dts | 4 +
arch/arm/dts/uniphier-ph1-sld3-ref.dts | 8 +
arch/arm/dts/uniphier-ph1-sld3.dtsi | 35 ++
arch/arm/mach-uniphier/Makefile | 11 +-
arch/arm/mach-uniphier/board_common.c | 20 --
arch/arm/mach-uniphier/board_early_init_r.c | 15 -
.../mach-uniphier/{board_early_init_f.c => board_init.c} | 62 +++-
arch/arm/mach-uniphier/boards.c | 27 +-
arch/arm/mach-uniphier/clk/Makefile | 28 +-
arch/arm/mach-uniphier/clk/dpll-ld20.c | 22 ++
arch/arm/mach-uniphier/clk/dpll-ld4.c | 56 ++++
arch/arm/mach-uniphier/clk/dpll-pro4.c | 60 ++++
.../{pll/pll-init-sld3.c => clk/dpll-sld3.c} | 2 +-
arch/arm/mach-uniphier/clk/dpll-sld8.c | 62 ++++
arch/arm/mach-uniphier/clk/dpll-tail.c | 21 ++
.../arm/mach-uniphier/{early-clk => clk}/early-clk-ld11.c | 0
.../arm/mach-uniphier/{early-clk => clk}/early-clk-ld20.c | 0
arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld4.c | 0
.../arm/mach-uniphier/{early-clk => clk}/early-clk-pro5.c | 0
.../arm/mach-uniphier/{early-clk => clk}/early-clk-pxs2.c | 0
arch/arm/mach-uniphier/clk/pll-base-ld20.c | 123 +++++++
arch/arm/mach-uniphier/clk/pll-ld20.c | 40 +++
.../mach-uniphier/{pll/pll-init-ld4.c => clk/pll-ld4.c} | 61 +---
.../mach-uniphier/{pll/pll-init-pro4.c => clk/pll-pro4.c} | 64 +---
arch/arm/mach-uniphier/clk/pll-sld3.c | 14 +
arch/arm/mach-uniphier/clk/pll.h | 21 ++
arch/arm/mach-uniphier/dram/ddrphy-ld20-regs.h | 78 +++--
arch/arm/mach-uniphier/dram/umc-ld20.c | 431
+++++++++++++++++++++++--
arch/arm/mach-uniphier/early-clk/Makefile | 13 -
arch/arm/mach-uniphier/early-pinctrl/Makefile | 7 -
arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c | 32 --
arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c | 28 --
arch/arm/mach-uniphier/init.h | 43 +--
arch/arm/mach-uniphier/init/init-ld11.c | 2 +-
arch/arm/mach-uniphier/init/init-ld20.c | 11 +-
arch/arm/mach-uniphier/init/init-ld4.c | 10 +-
arch/arm/mach-uniphier/init/init-pro4.c | 10 +-
arch/arm/mach-uniphier/init/init-sld3.c | 12 +-
arch/arm/mach-uniphier/init/init-sld8.c | 10 +-
arch/arm/mach-uniphier/micro-support-card.c | 2 +-
arch/arm/mach-uniphier/micro-support-card.h | 16 +-
arch/arm/mach-uniphier/pinctrl-glue.c | 32 ++
arch/arm/mach-uniphier/pinctrl/Makefile | 13 -
arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c | 51 ---
arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c | 41 ---
arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c | 46 ---
arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c | 44 ---
arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c | 44 ---
arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c | 46 ---
arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c | 48 ---
arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c | 35 --
arch/arm/mach-uniphier/pll/Makefile | 8 -
arch/arm/mach-uniphier/pll/pll-init-sld8.c | 205 ------------
arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c | 21 --
arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c | 22 --
arch/arm/mach-uniphier/print_misc_info.c | 12 -
arch/arm/mach-uniphier/sc64-regs.h | 22 +-
configs/uniphier_ld11_defconfig | 2 -
configs/uniphier_ld20_defconfig | 2 -
configs/uniphier_ld4_sld8_defconfig | 3 -
configs/uniphier_pro4_defconfig | 4 +-
configs/uniphier_pxs2_ld6b_defconfig | 2 -
configs/uniphier_sld3_defconfig | 1 -
drivers/mmc/Kconfig | 1 +
drivers/mmc/uniphier-sd.c | 50 ++-
drivers/pinctrl/uniphier/Kconfig | 6 +
drivers/pinctrl/uniphier/Makefile | 1 +
drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 24 +-
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 9 +
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 9 +
drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 18 ++
drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 21 ++
drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 30 ++
drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 30 ++
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 9 +
drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c | 128 ++++++++
drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 21 ++
drivers/pinctrl/uniphier/pinctrl-uniphier.h | 9 +-
drivers/usb/host/Kconfig | 7 -
drivers/usb/host/Makefile | 1 -
drivers/usb/host/xhci-uniphier.c | 85 -----
include/configs/uniphier.h | 3 -
include/fdtdec.h | 1 -
lib/fdtdec.c | 1 -
86 files changed, 1472 insertions(+), 1179 deletions(-)
delete mode 100644 arch/arm/mach-uniphier/board_common.c
delete mode 100644 arch/arm/mach-uniphier/board_early_init_r.c
rename arch/arm/mach-uniphier/{board_early_init_f.c => board_init.c} (61%)
create mode 100644 arch/arm/mach-uniphier/clk/dpll-ld20.c
create mode 100644 arch/arm/mach-uniphier/clk/dpll-ld4.c
create mode 100644 arch/arm/mach-uniphier/clk/dpll-pro4.c
rename arch/arm/mach-uniphier/{pll/pll-init-sld3.c => clk/dpll-sld3.c} (74%)
create mode 100644 arch/arm/mach-uniphier/clk/dpll-sld8.c
create mode 100644 arch/arm/mach-uniphier/clk/dpll-tail.c
rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld11.c (100%)
rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld20.c (100%)
rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-ld4.c (100%)
rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-pro5.c (100%)
rename arch/arm/mach-uniphier/{early-clk => clk}/early-clk-pxs2.c (100%)
create mode 100644 arch/arm/mach-uniphier/clk/pll-base-ld20.c
create mode 100644 arch/arm/mach-uniphier/clk/pll-ld20.c
rename arch/arm/mach-uniphier/{pll/pll-init-ld4.c => clk/pll-ld4.c} (76%)
rename arch/arm/mach-uniphier/{pll/pll-init-pro4.c => clk/pll-pro4.c} (70%)
create mode 100644 arch/arm/mach-uniphier/clk/pll-sld3.c
create mode 100644 arch/arm/mach-uniphier/clk/pll.h
delete mode 100644 arch/arm/mach-uniphier/early-clk/Makefile
delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/Makefile
delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c
delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c
create mode 100644 arch/arm/mach-uniphier/pinctrl-glue.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/Makefile
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
delete mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c
delete mode 100644 arch/arm/mach-uniphier/pll/Makefile
delete mode 100644 arch/arm/mach-uniphier/pll/pll-init-sld8.c
delete mode 100644 arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c
delete mode 100644 arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c
delete mode 100644 arch/arm/mach-uniphier/print_misc_info.c
create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c
delete mode 100644 drivers/usb/host/xhci-uniphier.c
--
Best Regards
Masahiro Yamada
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
