[U-Boot] pull request: u-boot-uniphier/master (2nd round)

24 Sep 2015


      Hi Tom,
Here is a pretty big series for UniPhier SoC changes.
pinctrl drivers, various fixes, refactoring, new SoC/board support, etc.
Diff from the previous one:
  - fix memory over-run bug in a command to display boot-mode
  - sort pin-groups alphabetically in pinctrl drivers
  - Add one more patch to convert a license block to SPDX
The following changes since commit 8a5f6129d1450f5ff92a55cfcfd7b96ee019e303:
pinctrl: move dm_scan_fdt_node() out of pinctrl uclass (2015-09-19
15:42:15 -0600)
are available in the git repository at:
git://git.denx.de/u-boot-uniphier.git master
for you to fetch changes up to a4bb44b027705f8c05fc525180cabaa3769247bb:
ARM: dts: uniphier: use SPDX-License-Identifier (2015-09-25 01:01:37 +0900)
----------------------------------------------------------------
Masahiro Yamada (33):
      pinctrl: uniphier: add UniPhier pinctrl core support
      pinctrl: uniphier: add UniPhier PH1-LD4 pinctrl driver
      pinctrl: uniphier: add UniPhier PH1-Pro4 pinctrl driver
      pinctrl: uniphier: add UniPhier PH1-sLD8 pinctrl driver
      pinctrl: uniphier: add UniPhier PH1-Pro5 pinctrl driver
      pinctrl: uniphier: add UniPhier ProXstream2 pinctrl driver
      pinctrl: uniphier: add UniPhier PH1-LD6b pinctrl driver
      ARM: uniphier: enable simple-bus driver for SPL
      ARM: uniphier: increase CONFIG_SYS_MALLOC_F_LEN to bind all nodes
      ARM: dts: uniphier: prepare device trees to use pinctrl in SPL
      ARM: uniphier: enable PINCTRL and SPL_PINCTRL
      ARM: uniphier: drop ad-hoc early pin-muxing settings
      ARM: uniphier: drop ad-hoc input enable settings
      ARM: uniphier: drop DCC micro support card support
      ARM: uniphier: enable setexpr command
      ARM: uniphier: change the external bus address mapping
      ARM: uniphier: remove ifdef CONFIG_{SOC} conditionals from sg-regs.h
      ARM: uniphier: parse device tree to determine DRAM base and size
      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
      ARM: dts: uniphier: use SPDX-License-Identifier
arch/arm/dts/Makefile
   |   5 +-
 arch/arm/dts/uniphier-ph1-ld4-ref.dts
   |  16 ++-
 arch/arm/dts/uniphier-ph1-ld6b-ref.dts
   |  17 ++-
 arch/arm/dts/uniphier-ph1-pro4-ref.dts
   |  16 ++-
 arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
   |  64 ++++++++++++
 arch/arm/dts/uniphier-ph1-sld8-ref.dts
   |  16 ++-
 arch/arm/dts/uniphier-pinctrl.dtsi
   |  38 +------
 arch/arm/dts/uniphier-proxstream2-gentil.dts
   |  62 +++++++++++
 arch/arm/dts/uniphier-proxstream2-vodka.dts
   |  62 +++++++++++
 arch/arm/mach-uniphier/Kconfig
   |  95 ++++++++---------
 arch/arm/mach-uniphier/Makefile
   |  21 ++--
 arch/arm/mach-uniphier/bcu/Makefile
   |   3 +
 arch/arm/mach-uniphier/{ph1-ld4/bcu_init.c => bcu/bcu-ph1-ld4.c}
   |   8 +-
 arch/arm/mach-uniphier/{ph1-sld3/bcu_init.c => bcu/bcu-ph1-sld3.c}
   |   8 +-
 arch/arm/mach-uniphier/board_common.c
   |  23 +---
 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 ++
 .../{ph1-pro4/boot-mode.c => boot-mode/boot-mode-ph1-ld4.c}
   |  21 ++--
 arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c
   |  75 +++++++++++++
 .../{ph1-sld3/boot-mode.c => boot-mode/boot-mode-ph1-sld3.c}
   |  23 ++--
 arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c
   |  75 +++++++++++++
 arch/arm/mach-uniphier/boot-mode/boot-mode.c
   |  45 ++++++++
 arch/arm/mach-uniphier/clk/Makefile
   |   7 ++
 arch/arm/mach-uniphier/{ph1-ld4/clkrst_init.c => clk/clk-ph1-ld4.c}
   |   3 +-
 arch/arm/mach-uniphier/{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 +
 .../arm/mach-uniphier/{ph1-ld4/ddrphy_init.c =>
ddrphy/ddrphy-ph1-ld4.c} |   4 +-
 .../mach-uniphier/{ph1-pro4/ddrphy_init.c =>
ddrphy/ddrphy-ph1-pro4.c}   |   4 +-
 .../mach-uniphier/{ph1-sld8/ddrphy_init.c =>
ddrphy/ddrphy-ph1-sld8.c}   |   4 +-
 arch/arm/mach-uniphier/{ddrphy_training.c => ddrphy/ddrphy-training.c}   |   0
 arch/arm/mach-uniphier/debug_ll.S
   | 185 +++++++++++++++++++++++++++++++++
 arch/arm/mach-uniphier/dram_init.c
   |  51 ++++++++-
 arch/arm/mach-uniphier/early-clk/Makefile
   |   7 ++
 .../{ph1-pro4/early_clkrst_init.c => early-clk/early-clk-ph1-ld4.c}
   |   5 +-
 arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c
   |  39 +++++++
 arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c
   |  44 ++++++++
 arch/arm/mach-uniphier/early-pinctrl/Makefile
   |   1 +
 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c
   |  26 +++++
 arch/arm/mach-uniphier/include/mach/board.h
   |  42 --------
 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 ------------------
 arch/arm/mach-uniphier/include/mach/micro-support-card.h
   |  39 +++++++
 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
   |  50 +++++----
 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
   |   6 +-
 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 +++++++++++
 arch/arm/mach-uniphier/memconf/memconf-proxstream2.c
   |  64 ++++++++++++
 arch/arm/mach-uniphier/memconf/memconf.c
   | 104 ++++++++++++++++++
 arch/arm/mach-uniphier/{support_card.c => micro-support-card.c}
   | 169 +++++++++++++++---------------
 arch/arm/mach-uniphier/ph1-ld4/Makefile
   |  15 ---
 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/early_pinctrl.c
   |  27 -----
 arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S
   |  29 ------
 arch/arm/mach-uniphier/ph1-ld4/pinctrl.c
   |  48 ---------
 arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c
   |   1 -
 arch/arm/mach-uniphier/ph1-ld4/sbc_init_3cs.c
   |  49 ---------
 arch/arm/mach-uniphier/ph1-ld4/sg_init.c
   |  18 ----
 arch/arm/mach-uniphier/ph1-pro4/Makefile
   |  15 ---
 arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c
   |  26 -----
 arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S
   |  39 -------
 arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
   |  49 ---------
 arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c
   |  42 --------
 arch/arm/mach-uniphier/ph1-pro4/sg_init.c
   |  18 ----
 arch/arm/mach-uniphier/ph1-sld3/Makefile
   |  15 ---
 arch/arm/mach-uniphier/ph1-sld3/clkrst_init.c
   |   1 -
 arch/arm/mach-uniphier/ph1-sld3/early_clkrst_init.c
   |   1 -
 arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c
   |  23 ----
 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/pinctrl.c
   |  24 -----
 arch/arm/mach-uniphier/ph1-sld3/sbc_init_3cs.c
   |  37 -------
 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 -
 arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c
   |   1 -
 arch/arm/mach-uniphier/ph1-sld8/early_pinctrl.c
   |  27 -----
 arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
   |  29 ------
 arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
   |  51 ---------
 arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c
   |   1 -
 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c
   |   1 -
 arch/arm/mach-uniphier/ph1-sld8/sbc_init_3cs.c
   |  57 ----------
 arch/arm/mach-uniphier/ph1-sld8/sg_init.c
   |   1 -
 arch/arm/mach-uniphier/pinctrl/Makefile
   |   7 ++
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
   |  49 +++++++++
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c
   |  45 ++++++++
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c
   |  50 +++++++++
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c
   |  43 ++++++++
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c
   |  25 +++++
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c
   |  43 ++++++++
 arch/arm/mach-uniphier/pinctrl/pinctrl-proxstream2.c
   |  45 ++++++++
 arch/arm/mach-uniphier/pll/Makefile
   |   8 ++
 arch/arm/mach-uniphier/{ph1-ld4/pll_init.c => pll/pll-init-ph1-ld4.c}
   |  34 ++++--
 arch/arm/mach-uniphier/{ph1-pro4/pll_init.c =>
pll/pll-init-ph1-pro4.c}  |  36 ++++---
 arch/arm/mach-uniphier/{ph1-sld3/pll_init.c =>
pll/pll-init-ph1-sld3.c}  |   5 +-
 arch/arm/mach-uniphier/{ph1-sld8/pll_init.c =>
pll/pll-init-ph1-sld8.c}  |   5 +-
 .../{ph1-pro4/pll_spectrum.c => pll/pll-spectrum-ph1-ld4.c}
   |   6 +-
 .../{ph1-sld3/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 ++
 arch/arm/mach-uniphier/{ph1-ld4/sbc_init.c => sbc/sbc-ph1-ld4.c}
   |  17 +--
 arch/arm/mach-uniphier/{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c}
   |  17 +--
 arch/arm/mach-uniphier/{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c}
   |  19 ++--
 arch/arm/mach-uniphier/sbc/sbc-proxstream2.c
   |  48 +++++++++
 arch/arm/mach-uniphier/soc_info.c
   |  61 +++++++++++
 arch/arm/mach-uniphier/spl.c
   |  76 --------------
 arch/arm/mach-uniphier/umc/Makefile
   |   3 +
 arch/arm/mach-uniphier/{ph1-ld4/umc_init.c => umc/umc-ph1-ld4.c}
   |  30 +++---
 arch/arm/mach-uniphier/{ph1-pro4/umc_init.c => umc/umc-ph1-pro4.c}
   |  36 ++++---
 arch/arm/mach-uniphier/{ph1-sld8/umc_init.c => umc/umc-ph1-sld8.c}
   |  30 +++---
 configs/ph1_ld4_defconfig
   |   9 +-
 configs/ph1_ld6b_defconfig
   |  30 ++++++
 configs/ph1_pro4_defconfig
   |   8 +-
 configs/ph1_pro5_defconfig
   |  30 ++++++
 configs/ph1_sld3_defconfig
   |   5 +-
 configs/ph1_sld8_defconfig
   |   9 +-
 doc/README.uniphier
   |  12 +++
 drivers/pinctrl/Kconfig
   |   2 +
 drivers/pinctrl/Makefile
   |   2 +
 drivers/pinctrl/uniphier/Kconfig
   |  42 ++++++++
 drivers/pinctrl/uniphier/Makefile
   |   8 ++
 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c
   | 133 ++++++++++++++++++++++++
 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c
   | 133 ++++++++++++++++++++++++
 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c
   | 130 +++++++++++++++++++++++
 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c
   | 144 +++++++++++++++++++++++++
 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c
   | 141 +++++++++++++++++++++++++
 drivers/pinctrl/uniphier/pinctrl-proxstream2.c
   | 140 +++++++++++++++++++++++++
 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
   | 154 +++++++++++++++++++++++++++
 drivers/pinctrl/uniphier/pinctrl-uniphier.h
   | 113 ++++++++++++++++++++
 include/configs/uniphier.h
   | 113 ++++----------------
 154 files changed, 4061 insertions(+), 1624 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
 create mode 100644
arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c
 delete mode 100644 arch/arm/mach-uniphier/include/mach/board.h
 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
 create mode 100644 arch/arm/mach-uniphier/include/mach/micro-support-card.h
 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} (53%)
 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/early_pinctrl.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S
 delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/pinctrl.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/sbc_init_3cs.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-ld4/sg_init.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/Makefile
 delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S
 delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-pro4/sg_init.c
 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/early_pinctrl.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/pinctrl.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-sld3/sbc_init_3cs.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/early_pinctrl.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
 delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init_3cs.c
 delete mode 100644 arch/arm/mach-uniphier/ph1-sld8/sg_init.c
 create mode 100644 arch/arm/mach-uniphier/pinctrl/Makefile
 create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
 create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c
 create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c
 create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c
 create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c
 create mode 100644 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c
 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-pro4/pll_spectrum.c =>
pll/pll-spectrum-ph1-ld4.c} (72%)
 rename arch/arm/mach-uniphier/{ph1-sld3/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} (67%)
 rename arch/arm/mach-uniphier/{ph1-pro4/sbc_init.c => sbc/sbc-ph1-pro4.c} (64%)
 rename arch/arm/mach-uniphier/{ph1-sld3/sbc_init.c => sbc/sbc-ph1-sld3.c} (62%)
 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
 create mode 100644 drivers/pinctrl/uniphier/Kconfig
 create mode 100644 drivers/pinctrl/uniphier/Makefile
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-proxstream2.c
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
 create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier.h
-- 
Best Regards
Masahiro Yamada