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

Masahiro Yamada yamada.masahiro at socionext.com
Sun Feb 14 09:54:45 CET 2016


Hi Tom,


This PR includes the first clk driver support, new boards support,
various fixes and cleanups for UniPhier SoC family.

Please note that I picked up a change of arch/arm/include/asm/spl.h
("spl: define BOOT_DEVICE_USB") necessary for this PR and I think it
is innocent.



The following changes since commit 9ef2835f26652092a61b0cb0551ef4f36be27946:

  Merge branch 'master' of git://git.denx.de/u-boot-video (2016-02-11
18:18:15 -0500)

are available in the git repository at:


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

for you to fetch changes up to 3f23111722ebf5b2416c7989eab7eb77be5ad0cf:

  ARM: uniphier: add support for PH1-Pro4 Ace and Sanji boards
(2016-02-14 17:07:46 +0900)

----------------------------------------------------------------
Masahiro Yamada (28):
      ARM: uniphier: fix NOR boot command
      ARM: uniphier: add default bootm_low to fix FIT boot
      ARM: uniphier: factor out common part of boot commands
      ARM: uniphier: fix nfsboot command
      ARM: uniphier: support some more DRAM use cases on PH1-Pro4 boards
      ARM: uniphier: update U-Boot file names in workflow
      spl: define BOOT_DEVICE_USB
      ARM: uniphier: change stack pointer address for SPL
      ARM: uniphier: create early page table at run-time
      ARM: uniphier: add missing static qualifier
      ARM: uniphier: support USB boot mode for ProXstream2 / PH1-LD6b SoC
      clk: uniphier: add Media I/O clock driver for UniPhier SoCs
      ARM: dts: uniphier: add reference clock nodes
      ARM: dts: uniphier: add device nodes for System Control blocks
      ARM: dts: uniphier: add device nodes for Peripheral control block
      ARM: dts: uniphier: add device nodes for MIO control block
      ARM: dts: uniphier: add clocks properties to EHCI nodes
      ARM: uniphier: switch over to generic EHCI driver
      usb: remove UniPhier EHCI driver
      ARM: uniphier: drop unneeded EHCI pin mux settings
      ARM: uniphier: remove unused header mio-regs.h
      ARM: uniphier: fix makefiles to build cmd_ddr(m)phy.c
      ARM: uniphier: move cmd_ddrmphy.c to fix build error
      ARM: uniphier: adjust DDR clock delay line for ProXstream2
      ARM: uniphier: drop unnecessary "bootm_low" environment define
      ARM: dts: uniphier: add EEPROM node for ProXstream2 Gentil board
      ARM: dts: uniphier: enable I2C channel 2 of ProXstream2 Gentil board
      ARM: uniphier: add support for PH1-Pro4 Ace and Sanji boards

 arch/arm/Kconfig                                         |   1 +
 arch/arm/dts/Makefile                                    |   2 +
 arch/arm/dts/uniphier-common32.dtsi                      |  27 +++++++
 arch/arm/dts/uniphier-ph1-ld4.dtsi                       |  23 ++++++
 arch/arm/dts/uniphier-ph1-pro4-ace.dts                   | 105
+++++++++++++++++++++++++++
 arch/arm/dts/uniphier-ph1-pro4-sanji.dts                 | 100
++++++++++++++++++++++++++
 arch/arm/dts/uniphier-ph1-pro4.dtsi                      |  22 ++++++
 arch/arm/dts/uniphier-ph1-pro5.dtsi                      |  20 ++++++
 arch/arm/dts/uniphier-ph1-sld3.dtsi                      |  26 +++++++
 arch/arm/dts/uniphier-ph1-sld8.dtsi                      |  23 ++++++
 arch/arm/dts/uniphier-proxstream2-gentil.dts             |  11 +++
 arch/arm/dts/uniphier-proxstream2.dtsi                   |  20 ++++++
 arch/arm/include/asm/spl.h                               |   1 +
 arch/arm/mach-uniphier/Makefile                          |   4 +-
 arch/arm/mach-uniphier/board_late_init.c                 |  10 ++-
 arch/arm/mach-uniphier/boards.c                          |  14 ++++
 arch/arm/mach-uniphier/boot-mode/boot-device.h           |   2 +
 arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c |   5 +-
 arch/arm/mach-uniphier/boot-mode/boot-mode.c             |  11 ++-
 arch/arm/mach-uniphier/clk/clk-ph1-ld4.c                 |   4 +-
 arch/arm/mach-uniphier/clk/clk-ph1-pro4.c                |   4 +-
 arch/arm/mach-uniphier/dram/Makefile                     |   6 ++
 arch/arm/mach-uniphier/{ => dram}/cmd_ddrmphy.c          |   0
 arch/arm/mach-uniphier/dram/umc-ph1-pro4.c               |  80
++++++++++++++-------
 arch/arm/mach-uniphier/dram/umc-proxstream2.c            |  12 +++-
 arch/arm/mach-uniphier/include/mach/mio-regs.h           |  20 ------
 arch/arm/mach-uniphier/init_page_table.S                 |  32 ---------
 arch/arm/mach-uniphier/lowlevel_init.S                   | 102
+++++++++++++++++++++++---
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c         |   9 ---
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c        |   7 --
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c        |   2 +-
 arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c        |   9 ---
 configs/uniphier_ld4_sld8_defconfig                      |   2 +
 configs/uniphier_sld3_defconfig                          |   2 +
 doc/README.uniphier                                      |   6 +-
 drivers/clk/Kconfig                                      |   2 +
 drivers/clk/Makefile                                     |   1 +
 drivers/clk/uniphier/Kconfig                             |  13 ++++
 drivers/clk/uniphier/Makefile                            |   3 +
 drivers/clk/uniphier/clk-uniphier-core.c                 | 159
+++++++++++++++++++++++++++++++++++++++++
 drivers/clk/uniphier/clk-uniphier-mio.c                  | 178
++++++++++++++++++++++++++++++++++++++++++++++
 drivers/clk/uniphier/clk-uniphier.h                      |  57 +++++++++++++++
 drivers/usb/host/Kconfig                                 |   7 --
 drivers/usb/host/Makefile                                |   1 -
 drivers/usb/host/ehci-uniphier.c                         |  75
-------------------
 include/configs/uniphier.h                               |  40 ++++++-----
 46 files changed, 1033 insertions(+), 227 deletions(-)
 create mode 100644 arch/arm/dts/uniphier-ph1-pro4-ace.dts
 create mode 100644 arch/arm/dts/uniphier-ph1-pro4-sanji.dts
 rename arch/arm/mach-uniphier/{ => dram}/cmd_ddrmphy.c (100%)
 delete mode 100644 arch/arm/mach-uniphier/include/mach/mio-regs.h
 delete mode 100644 arch/arm/mach-uniphier/init_page_table.S
 create mode 100644 drivers/clk/uniphier/Kconfig
 create mode 100644 drivers/clk/uniphier/Makefile
 create mode 100644 drivers/clk/uniphier/clk-uniphier-core.c
 create mode 100644 drivers/clk/uniphier/clk-uniphier-mio.c
 create mode 100644 drivers/clk/uniphier/clk-uniphier.h
 delete mode 100644 drivers/usb/host/ehci-uniphier.c



-- 
Best Regards
Masahiro Yamada


More information about the U-Boot mailing list