This series includes a set of clean-ups, new features. I want to merge them when the merge window opens.
Masahiro Yamada (7): ARM: uniphier: kill bogus header includes ARM: uniphier: move cmd_ddrphy.c to dram subdirectory ARM: uniphier: move cmd_pinmon.c to boot-mode subdirectory ARM: uniphier: move headers out of include/mach directory ARM: uniphier: add DRAM init code for ProXstream2/PH1-LD6b ARM: uniphier: add dump command for DDR Multi PHY registers ARM: uniphier: fix recommended board setting in document
arch/arm/mach-uniphier/Kconfig | 9 + arch/arm/mach-uniphier/Makefile | 2 - .../mach-uniphier/{include/mach => }/arm-mpcore.h | 0 arch/arm/mach-uniphier/bcu/bcu-ph1-ld4.c | 5 +- arch/arm/mach-uniphier/bcu/bcu-ph1-sld3.c | 5 +- .../mach-uniphier/{include/mach => bcu}/bcu-regs.h | 0 arch/arm/mach-uniphier/board_common.c | 3 +- arch/arm/mach-uniphier/board_early_init_f.c | 6 +- arch/arm/mach-uniphier/board_early_init_r.c | 3 +- arch/arm/mach-uniphier/boards.c | 3 +- arch/arm/mach-uniphier/boot-mode/Makefile | 2 + .../{include/mach => boot-mode}/boot-device.h | 0 .../mach-uniphier/boot-mode/boot-mode-ph1-ld4.c | 6 +- .../mach-uniphier/boot-mode/boot-mode-ph1-pro5.c | 6 +- .../mach-uniphier/boot-mode/boot-mode-ph1-sld3.c | 6 +- .../boot-mode/boot-mode-proxstream2.c | 7 +- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 8 +- .../arm/mach-uniphier/{ => boot-mode}/cmd_pinmon.c | 7 +- arch/arm/mach-uniphier/cache_uniphier.c | 3 +- arch/arm/mach-uniphier/clk/clk-ph1-ld4.c | 5 +- arch/arm/mach-uniphier/clk/clk-ph1-pro4.c | 5 +- arch/arm/mach-uniphier/clk/clk-ph1-pro5.c | 5 +- arch/arm/mach-uniphier/clk/clk-proxstream2.c | 5 +- arch/arm/mach-uniphier/cmd_ddrmphy.c | 329 ++++++++++ arch/arm/mach-uniphier/cpu_info.c | 3 +- arch/arm/mach-uniphier/debug_ll.S | 7 +- arch/arm/mach-uniphier/dram/Makefile | 5 + arch/arm/mach-uniphier/{ => dram}/cmd_ddrphy.c | 3 +- arch/arm/mach-uniphier/dram/ddrmphy-regs.h | 146 +++++ arch/arm/mach-uniphier/dram/ddrphy-ph1-ld4.c | 3 +- arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c | 3 +- arch/arm/mach-uniphier/dram/ddrphy-ph1-sld8.c | 3 +- .../{include/mach => dram}/ddrphy-regs.h | 0 arch/arm/mach-uniphier/dram/ddrphy-training.c | 3 +- arch/arm/mach-uniphier/dram/umc-ph1-ld4.c | 7 +- arch/arm/mach-uniphier/dram/umc-ph1-pro4.c | 7 +- arch/arm/mach-uniphier/dram/umc-ph1-sld8.c | 7 +- arch/arm/mach-uniphier/dram/umc-proxstream2.c | 669 +++++++++++++++++++++ .../{include/mach => dram}/umc-regs.h | 0 .../mach-uniphier/early-clk/early-clk-ph1-ld4.c | 5 +- .../mach-uniphier/early-clk/early-clk-ph1-pro5.c | 5 +- .../early-clk/early-clk-proxstream2.c | 5 +- .../early-pinctrl/early-pinctrl-ph1-sld3.c | 4 +- arch/arm/mach-uniphier/{include/mach => }/init.h | 1 + arch/arm/mach-uniphier/init/init-ph1-ld4.c | 6 +- arch/arm/mach-uniphier/init/init-ph1-pro4.c | 6 +- arch/arm/mach-uniphier/init/init-ph1-pro5.c | 6 +- arch/arm/mach-uniphier/init/init-ph1-sld3.c | 6 +- arch/arm/mach-uniphier/init/init-ph1-sld8.c | 6 +- arch/arm/mach-uniphier/init/init-proxstream2.c | 14 +- arch/arm/mach-uniphier/init/init.c | 5 +- arch/arm/mach-uniphier/late_lowlevel_init.S | 3 +- arch/arm/mach-uniphier/lowlevel_init.S | 5 +- arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c | 5 +- .../mach-uniphier/memconf/memconf-proxstream2.c | 5 +- arch/arm/mach-uniphier/memconf/memconf.c | 5 +- arch/arm/mach-uniphier/micro-support-card.c | 4 +- .../{include/mach => }/micro-support-card.h | 0 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c | 5 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c | 5 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c | 5 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c | 5 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c | 4 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c | 5 +- .../mach-uniphier/pinctrl/pinctrl-proxstream2.c | 5 +- arch/arm/mach-uniphier/pll/pll-init-ph1-ld4.c | 7 +- arch/arm/mach-uniphier/pll/pll-init-ph1-pro4.c | 7 +- arch/arm/mach-uniphier/pll/pll-init-ph1-sld3.c | 2 +- arch/arm/mach-uniphier/pll/pll-init-ph1-sld8.c | 7 +- arch/arm/mach-uniphier/pll/pll-spectrum-ph1-ld4.c | 5 +- arch/arm/mach-uniphier/pll/pll-spectrum-ph1-sld3.c | 5 +- arch/arm/mach-uniphier/print_misc_info.c | 5 +- arch/arm/mach-uniphier/reset.c | 3 +- arch/arm/mach-uniphier/sbc/sbc-ph1-ld4.c | 7 +- arch/arm/mach-uniphier/sbc/sbc-ph1-pro4.c | 7 +- arch/arm/mach-uniphier/sbc/sbc-ph1-sld3.c | 7 +- arch/arm/mach-uniphier/sbc/sbc-proxstream2.c | 7 +- .../mach-uniphier/{include/mach => sbc}/sbc-regs.h | 0 .../arm/mach-uniphier/{include/mach => }/sc-regs.h | 0 .../arm/mach-uniphier/{include/mach => }/sg-regs.h | 0 .../{include/mach/soc_info.h => soc-info.h} | 0 arch/arm/mach-uniphier/soc_info.c | 5 +- .../mach-uniphier/{include/mach => }/ssc-regs.h | 0 arch/arm/mach-uniphier/timer.c | 3 +- doc/README.uniphier | 2 +- 85 files changed, 1358 insertions(+), 147 deletions(-) rename arch/arm/mach-uniphier/{include/mach => }/arm-mpcore.h (100%) rename arch/arm/mach-uniphier/{include/mach => bcu}/bcu-regs.h (100%) rename arch/arm/mach-uniphier/{include/mach => boot-mode}/boot-device.h (100%) rename arch/arm/mach-uniphier/{ => boot-mode}/cmd_pinmon.c (93%) create mode 100644 arch/arm/mach-uniphier/cmd_ddrmphy.c rename arch/arm/mach-uniphier/{ => dram}/cmd_ddrphy.c (99%) create mode 100644 arch/arm/mach-uniphier/dram/ddrmphy-regs.h rename arch/arm/mach-uniphier/{include/mach => dram}/ddrphy-regs.h (100%) create mode 100644 arch/arm/mach-uniphier/dram/umc-proxstream2.c rename arch/arm/mach-uniphier/{include/mach => dram}/umc-regs.h (100%) rename arch/arm/mach-uniphier/{include/mach => }/init.h (97%) rename arch/arm/mach-uniphier/{include/mach => }/micro-support-card.h (100%) rename arch/arm/mach-uniphier/{include/mach => sbc}/sbc-regs.h (100%) rename arch/arm/mach-uniphier/{include/mach => }/sc-regs.h (100%) rename arch/arm/mach-uniphier/{include/mach => }/sg-regs.h (100%) rename arch/arm/mach-uniphier/{include/mach/soc_info.h => soc-info.h} (100%) rename arch/arm/mach-uniphier/{include/mach => }/ssc-regs.h (100%)