Masahiro Yamada (14): 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-ld6b-ref.dts | 1 + arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 64 +++++++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 62 +++++++ arch/arm/dts/uniphier-proxstream2-vodka.dts | 62 +++++++ arch/arm/mach-uniphier/Kconfig | 76 +++++---- arch/arm/mach-uniphier/Makefile | 20 ++- arch/arm/mach-uniphier/bcu/Makefile | 3 + .../{ph1-ld4/bcu_init.c => bcu/bcu-ph1-ld4.c} | 8 +- .../{ph1-sld3/bcu_init.c => bcu/bcu-ph1-sld3.c} | 8 +- arch/arm/mach-uniphier/board_common.c | 11 +- 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 + .../boot-mode.c => boot-mode/boot-mode-ph1-ld4.c} | 21 ++- .../mach-uniphier/boot-mode/boot-mode-ph1-pro5.c | 75 +++++++++ .../boot-mode.c => boot-mode/boot-mode-ph1-sld3.c} | 23 ++- .../boot-mode/boot-mode-proxstream2.c | 75 +++++++++ arch/arm/mach-uniphier/boot-mode/boot-mode.c | 45 +++++ arch/arm/mach-uniphier/clk/Makefile | 7 + .../{ph1-ld4/clkrst_init.c => clk/clk-ph1-ld4.c} | 3 +- .../{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 + .../ddrphy_init.c => ddrphy/ddrphy-ph1-ld4.c} | 4 +- .../ddrphy_init.c => ddrphy/ddrphy-ph1-pro4.c} | 4 +- .../ddrphy_init.c => ddrphy/ddrphy-ph1-sld8.c} | 4 +- .../ddrphy-training.c} | 0 arch/arm/mach-uniphier/debug_ll.S | 185 +++++++++++++++++++++ arch/arm/mach-uniphier/early-clk/Makefile | 7 + .../early-clk-ph1-ld4.c} | 5 +- .../mach-uniphier/early-clk/early-clk-ph1-pro5.c | 39 +++++ .../early-clk/early-clk-proxstream2.c | 44 +++++ arch/arm/mach-uniphier/early-pinctrl/Makefile | 1 + .../early-pinctrl-ph1-sld3.c} | 5 +- 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 ----------- .../include/mach/{board.h => micro-support-card.h} | 23 ++- 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 | 10 +- 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 | 2 +- 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 +++++++ .../mach-uniphier/memconf/memconf-proxstream2.c | 64 +++++++ arch/arm/mach-uniphier/memconf/memconf.c | 104 ++++++++++++ .../{support_card.c => micro-support-card.c} | 86 +++++++++- arch/arm/mach-uniphier/ph1-ld4/Makefile | 14 -- 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/lowlevel_debug.S | 29 ---- arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c | 1 - arch/arm/mach-uniphier/ph1-pro4/Makefile | 14 -- arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S | 39 ----- arch/arm/mach-uniphier/ph1-sld3/Makefile | 14 -- arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c | 1 - .../arm/mach-uniphier/ph1-sld3/early_clkrst_init.c | 1 - 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/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 - .../arm/mach-uniphier/ph1-sld8/early_clkrst_init.c | 1 - arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S | 29 ---- arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c | 1 - arch/arm/mach-uniphier/ph1-sld8/sbc_init.c | 1 - arch/arm/mach-uniphier/pinctrl/Makefile | 7 + .../pinctrl.c => pinctrl/pinctrl-ph1-ld4.c} | 3 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c | 45 +++++ .../pinctrl.c => pinctrl/pinctrl-ph1-pro4.c} | 3 +- arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c | 43 +++++ .../pinctrl.c => pinctrl/pinctrl-ph1-sld3.c} | 3 +- .../pinctrl.c => pinctrl/pinctrl-ph1-sld8.c} | 3 +- .../mach-uniphier/pinctrl/pinctrl-proxstream2.c | 45 +++++ arch/arm/mach-uniphier/pll/Makefile | 8 + .../{ph1-ld4/pll_init.c => pll/pll-init-ph1-ld4.c} | 34 ++-- .../pll_init.c => pll/pll-init-ph1-pro4.c} | 36 ++-- .../pll_init.c => pll/pll-init-ph1-sld3.c} | 5 +- .../pll_init.c => pll/pll-init-ph1-sld8.c} | 5 +- .../pll_spectrum.c => pll/pll-spectrum-ph1-ld4.c} | 6 +- .../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 + .../{ph1-ld4/sbc_init.c => sbc/sbc-ph1-ld4.c} | 5 +- .../{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c} | 5 +- .../{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c} | 5 +- arch/arm/mach-uniphier/sbc/sbc-proxstream2.c | 48 ++++++ arch/arm/mach-uniphier/soc_info.c | 61 +++++++ arch/arm/mach-uniphier/spl.c | 83 --------- arch/arm/mach-uniphier/umc/Makefile | 3 + .../{ph1-ld4/umc_init.c => umc/umc-ph1-ld4.c} | 30 ++-- .../{ph1-pro4/umc_init.c => umc/umc-ph1-pro4.c} | 36 ++-- .../{ph1-sld8/umc_init.c => umc/umc-ph1-sld8.c} | 30 ++-- configs/ph1_ld4_defconfig | 2 +- configs/ph1_ld6b_defconfig | 30 ++++ configs/ph1_pro4_defconfig | 1 + configs/ph1_pro5_defconfig | 30 ++++ configs/ph1_sld3_defconfig | 2 +- configs/ph1_sld8_defconfig | 2 +- doc/README.uniphier | 12 ++ drivers/pinctrl/uniphier/Kconfig | 12 +- include/configs/uniphier.h | 90 ++-------- 122 files changed, 2542 insertions(+), 889 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 rename arch/arm/mach-uniphier/{ph1-sld3/early_pinctrl.c => early-pinctrl/early-pinctrl-ph1-sld3.c} (82%) 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 rename arch/arm/mach-uniphier/include/mach/{board.h => micro-support-card.h} (55%) 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} (67%) 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/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/Makefile delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S 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/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/memconf.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/lowlevel_debug.S delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c create mode 100644 arch/arm/mach-uniphier/pinctrl/Makefile rename arch/arm/mach-uniphier/{ph1-ld4/pinctrl.c => pinctrl/pinctrl-ph1-ld4.c} (97%) create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c rename arch/arm/mach-uniphier/{ph1-pro4/pinctrl.c => pinctrl/pinctrl-ph1-pro4.c} (97%) create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c rename arch/arm/mach-uniphier/{ph1-sld3/pinctrl.c => pinctrl/pinctrl-ph1-sld3.c} (91%) rename arch/arm/mach-uniphier/{ph1-sld8/pinctrl.c => pinctrl/pinctrl-ph1-sld8.c} (96%) 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-sld3/pll_spectrum.c => pll/pll-spectrum-ph1-ld4.c} (72%) rename arch/arm/mach-uniphier/{ph1-pro4/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} (92%) rename arch/arm/mach-uniphier/{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c} (91%) rename arch/arm/mach-uniphier/{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c} (92%) 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