Mostly cleanups of SoC init code.
Masahiro Yamada (9): ARM: uniphier: remove unneeded argument of uniphier_ld20_pll_init() ARM: uniphier: split out UMC clock enable ARM: uniphier: refactor MEMCONF init code ARM: uniphier: refactor SBC init code ARM: uniphier: refactor Support Card init code ARM: uniphier: make BCU init into void function ARM: uniphier: refactor board_init() ARM: uniphier: refactor spl_init_board() ARM: uniphier: move SBC and Support Card init code to U-Boot proper
arch/arm/mach-uniphier/Makefile | 10 +- arch/arm/mach-uniphier/bcu/bcu-ld4.c | 4 +- arch/arm/mach-uniphier/bcu/bcu-sld3.c | 4 +- arch/arm/mach-uniphier/board_init.c | 237 +++++++++++++-------- arch/arm/mach-uniphier/clk/Makefile | 18 +- .../clk/{early-clk-ld11.c => clk-dram-ld11.c} | 8 +- .../clk/{early-clk-ld20.c => clk-dram-ld20.c} | 8 +- .../clk/{early-clk-pro5.c => clk-dram-pro5.c} | 9 +- .../clk/{early-clk-pxs2.c => clk-dram-pxs2.c} | 14 +- .../clk/{early-clk-ld4.c => clk-dram-sld3.c} | 9 +- arch/arm/mach-uniphier/clk/clk-early-ld11.c | 21 ++ arch/arm/mach-uniphier/clk/clk-early-sld3.c | 30 +++ arch/arm/mach-uniphier/clk/dpll-pro5.c | 6 + arch/arm/mach-uniphier/clk/dpll-pxs2.c | 6 + arch/arm/mach-uniphier/clk/pll-ld20.c | 4 +- arch/arm/mach-uniphier/dram/Makefile | 2 + arch/arm/mach-uniphier/dram/umc-pro5.c | 12 ++ arch/arm/mach-uniphier/dram/umc-sld3.c | 6 + arch/arm/mach-uniphier/init.h | 56 ++--- arch/arm/mach-uniphier/init/Makefile | 15 -- arch/arm/mach-uniphier/init/init-ld11.c | 63 ------ arch/arm/mach-uniphier/init/init-ld20.c | 62 ------ arch/arm/mach-uniphier/init/init-ld4.c | 59 ----- arch/arm/mach-uniphier/init/init-pro4.c | 56 ----- arch/arm/mach-uniphier/init/init-pro5.c | 42 ---- arch/arm/mach-uniphier/init/init-pxs2.c | 50 ----- arch/arm/mach-uniphier/init/init-sld3.c | 49 ----- arch/arm/mach-uniphier/init/init-sld8.c | 59 ----- arch/arm/mach-uniphier/init/init.c | 71 ------ arch/arm/mach-uniphier/memconf.c | 163 ++++++++++++++ arch/arm/mach-uniphier/memconf/Makefile | 9 - arch/arm/mach-uniphier/memconf/memconf-pxs2.c | 68 ------ arch/arm/mach-uniphier/memconf/memconf-sld3.c | 60 ------ arch/arm/mach-uniphier/memconf/memconf.c | 107 ---------- arch/arm/mach-uniphier/micro-support-card.c | 7 +- arch/arm/mach-uniphier/micro-support-card.h | 5 - arch/arm/mach-uniphier/sbc/Makefile | 17 +- arch/arm/mach-uniphier/sbc/sbc-admulti.c | 53 ----- arch/arm/mach-uniphier/sbc/sbc-ld11.c | 25 +++ arch/arm/mach-uniphier/sbc/sbc-ld4.c | 6 +- arch/arm/mach-uniphier/sbc/sbc-pxs2.c | 6 +- .../arm/mach-uniphier/sbc/{sbc-savepin.c => sbc.c} | 36 +++- arch/arm/mach-uniphier/spl_board_init.c | 185 ++++++++++++++++ 43 files changed, 713 insertions(+), 1024 deletions(-) rename arch/arm/mach-uniphier/clk/{early-clk-ld11.c => clk-dram-ld11.c} (74%) rename arch/arm/mach-uniphier/clk/{early-clk-ld20.c => clk-dram-ld20.c} (78%) rename arch/arm/mach-uniphier/clk/{early-clk-pro5.c => clk-dram-pro5.c} (76%) rename arch/arm/mach-uniphier/clk/{early-clk-pxs2.c => clk-dram-pxs2.c} (70%) rename arch/arm/mach-uniphier/clk/{early-clk-ld4.c => clk-dram-sld3.c} (69%) create mode 100644 arch/arm/mach-uniphier/clk/clk-early-ld11.c create mode 100644 arch/arm/mach-uniphier/clk/clk-early-sld3.c create mode 100644 arch/arm/mach-uniphier/clk/dpll-pro5.c create mode 100644 arch/arm/mach-uniphier/clk/dpll-pxs2.c create mode 100644 arch/arm/mach-uniphier/dram/umc-pro5.c create mode 100644 arch/arm/mach-uniphier/dram/umc-sld3.c delete mode 100644 arch/arm/mach-uniphier/init/Makefile delete mode 100644 arch/arm/mach-uniphier/init/init-ld11.c delete mode 100644 arch/arm/mach-uniphier/init/init-ld20.c delete mode 100644 arch/arm/mach-uniphier/init/init-ld4.c delete mode 100644 arch/arm/mach-uniphier/init/init-pro4.c delete mode 100644 arch/arm/mach-uniphier/init/init-pro5.c delete mode 100644 arch/arm/mach-uniphier/init/init-pxs2.c delete mode 100644 arch/arm/mach-uniphier/init/init-sld3.c delete mode 100644 arch/arm/mach-uniphier/init/init-sld8.c delete mode 100644 arch/arm/mach-uniphier/init/init.c create mode 100644 arch/arm/mach-uniphier/memconf.c delete mode 100644 arch/arm/mach-uniphier/memconf/Makefile delete mode 100644 arch/arm/mach-uniphier/memconf/memconf-pxs2.c delete mode 100644 arch/arm/mach-uniphier/memconf/memconf-sld3.c delete mode 100644 arch/arm/mach-uniphier/memconf/memconf.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-admulti.c create mode 100644 arch/arm/mach-uniphier/sbc/sbc-ld11.c rename arch/arm/mach-uniphier/sbc/{sbc-savepin.c => sbc.c} (58%) create mode 100644 arch/arm/mach-uniphier/spl_board_init.c