- Add pinctrl driver for sLD3 SoC - Do away with legacy pin-mux code - refactoring of clock/PLL init code - Add PLL init code for LD20 SoC - Improvement of DRAM init code for LD20 SoC - Misc cleanups
Masahiro Yamada (15): 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 | 2 + 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 | 6 +- arch/arm/mach-uniphier/board_init.c | 46 ++- arch/arm/mach-uniphier/clk/Makefile | 28 +- arch/arm/mach-uniphier/clk/dpll-ld20.c | 22 ++ arch/arm/mach-uniphier/clk/dpll-ld4.c | 55 +++ arch/arm/mach-uniphier/clk/dpll-pro4.c | 59 +++ .../{pll/pll-init-sld3.c => clk/dpll-sld3.c} | 2 +- arch/arm/mach-uniphier/clk/dpll-sld8.c | 61 +++ .../{pll/pll-spectrum-ld4.c => clk/dpll-tail.c} | 6 +- .../{early-clk => clk}/early-clk-ld11.c | 0 .../{early-clk => clk}/early-clk-ld20.c | 0 .../{early-clk => clk}/early-clk-ld4.c | 0 .../{early-clk => clk}/early-clk-pro5.c | 0 .../{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 ++ .../{pll/pll-init-ld4.c => clk/pll-ld4.c} | 58 +-- .../{pll/pll-init-pro4.c => clk/pll-pro4.c} | 61 +-- 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 | 76 ++-- 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 - .../early-pinctrl/early-pinctrl-ld20.c | 32 -- .../early-pinctrl/early-pinctrl-sld3.c | 28 -- arch/arm/mach-uniphier/init.h | 31 +- arch/arm/mach-uniphier/init/init-ld11.c | 2 +- arch/arm/mach-uniphier/init/init-ld20.c | 8 +- arch/arm/mach-uniphier/init/init-ld4.c | 6 +- arch/arm/mach-uniphier/init/init-pro4.c | 6 +- arch/arm/mach-uniphier/init/init-sld3.c | 8 +- arch/arm/mach-uniphier/init/init-sld8.c | 6 +- arch/arm/mach-uniphier/pinctrl-glue.c | 32 ++ arch/arm/mach-uniphier/pinctrl/Makefile | 13 - arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c | 39 -- arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c | 35 -- arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c | 35 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c | 37 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c | 37 -- arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c | 35 -- 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-sld3.c | 22 -- arch/arm/mach-uniphier/sc64-regs.h | 19 + configs/uniphier_ld11_defconfig | 2 - configs/uniphier_ld20_defconfig | 2 - configs/uniphier_ld4_sld8_defconfig | 2 - configs/uniphier_pro4_defconfig | 2 - configs/uniphier_pxs2_ld6b_defconfig | 2 - drivers/pinctrl/uniphier/Kconfig | 6 + drivers/pinctrl/uniphier/Makefile | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 20 +- drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c | 128 ++++++ drivers/pinctrl/uniphier/pinctrl-uniphier.h | 5 +- 62 files changed, 1185 insertions(+), 894 deletions(-) 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 rename arch/arm/mach-uniphier/{pll/pll-spectrum-ld4.c => clk/dpll-tail.c} (72%) 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} (78%) rename arch/arm/mach-uniphier/{pll/pll-init-pro4.c => clk/pll-pro4.c} (72%) 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-sld3.c create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-sld3.c