[U-Boot] pull request: u-boot-uniphier/master

Masahiro Yamada yamada.masahiro at socionext.com
Tue Jan 17 17:36:38 CET 2017


Hi Tom,

Please pull UniPhier SoC updates:
  - Enable eMMC driver for LD11/LD20 SoCs
  - Refactoring of SoC init code
  - Bug fix of pinctrl driver


The following changes since commit 035ebf85b09cf11c820ae9eec414097420741abd:

  Merge branch 'master' of git://git.denx.de/u-boot-spi (2017-01-15
13:33:30 -0500)

are available in the git repository at:

  git://git.denx.de/u-boot-uniphier.git master

for you to fetch changes up to 2cfa35c47b9c9b80c8ff084f55391a03fd575956:

  pinctrl: uniphier: fix Ethernet (RMII) pin-mux setting for LD20
(2017-01-18 01:24:14 +0900)

----------------------------------------------------------------
Masahiro Yamada (12):
      ARM: uniphier: enable Cadence eMMC controller for LD11/LD20
      ARM: dts: uniphier: add UniPhier specific compatible to eMMC node
      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
      pinctrl: uniphier: fix Ethernet (RMII) pin-mux setting for LD20

 arch/arm/dts/uniphier-ld11.dtsi                   |   3 +-
 arch/arm/dts/uniphier-ld20.dtsi                   |   3 +-
 arch/arm/mach-uniphier/Makefile                   |  10 +-
 arch/arm/mach-uniphier/bcu/bcu-ld4.c              |   8 +-
 arch/arm/mach-uniphier/bcu/bcu-sld3.c             |   8 +-
 arch/arm/mach-uniphier/board_init.c               | 237 +++++++++++++-------
 arch/arm/mach-uniphier/clk/Makefile               |  20 +-
 .../clk/{early-clk-ld11.c => clk-dram-ld11.c}     |  11 +-
 .../clk/{early-clk-ld20.c => clk-dram-ld20.c}     |  10 +-
 .../clk/{early-clk-pro5.c => clk-dram-pro5.c}     |  11 +-
 .../clk/{early-clk-pxs2.c => clk-dram-pxs2.c}     |  16 +-
 .../clk/{early-clk-ld4.c => clk-dram-sld3.c}      |  12 +-
 arch/arm/mach-uniphier/clk/clk-early-ld11.c       |  20 ++
 arch/arm/mach-uniphier/clk/clk-early-sld3.c       |  31 +++
 arch/arm/mach-uniphier/clk/clk-ld20.c             |  14 --
 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                     |  57 ++---
 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              |   9 +-
 arch/arm/mach-uniphier/sbc/sbc-pxs2.c             |   8 +-
 .../mach-uniphier/sbc/{sbc-savepin.c => sbc.c}    |  38 +++-
 arch/arm/mach-uniphier/spl_board_init.c           | 185 +++++++++++++++
 configs/uniphier_ld11_defconfig                   |   4 +-
 configs/uniphier_ld20_defconfig                   |   2 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c  |   2 +-
 49 files changed, 739 insertions(+), 1056 deletions(-)
 rename arch/arm/mach-uniphier/clk/{early-clk-ld11.c => clk-dram-ld11.c} (59%)
 rename arch/arm/mach-uniphier/clk/{early-clk-ld20.c => clk-dram-ld20.c} (69%)
 rename arch/arm/mach-uniphier/clk/{early-clk-pro5.c => clk-dram-pro5.c} (69%)
 rename arch/arm/mach-uniphier/clk/{early-clk-pxs2.c => clk-dram-pxs2.c} (64%)
 rename arch/arm/mach-uniphier/clk/{early-clk-ld4.c => clk-dram-sld3.c} (59%)
 create mode 100644 arch/arm/mach-uniphier/clk/clk-early-ld11.c
 create mode 100644 arch/arm/mach-uniphier/clk/clk-early-sld3.c
 delete mode 100644 arch/arm/mach-uniphier/clk/clk-ld20.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} (55%)
 create mode 100644 arch/arm/mach-uniphier/spl_board_init.c


-- 
Best Regards
Masahiro Yamada


More information about the U-Boot mailing list