[U-Boot] Pull request: u-boot-uniphier

Masahiro YAMADA yamada.m at jp.panasonic.com
Sat Feb 28 16:12:28 CET 2015


Hi Tom,

Please pull clean-ups, bug-fixes, new features for UniPhier platform.


The following changes since commit 1606b34aa50804227806971dbb6b82ea0bf81f55:

  Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
(2015-02-25 18:14:18 -0500)

are available in the git repository at:


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

for you to fetch changes up to 105a9e705efaeeac63e795e2a184b0a18db0ac5a:

  ARM: UniPhier: remove SSC_WAY_SIZE and SSC_NUM_ENTRIES macros
(2015-03-01 00:03:21 +0900)

----------------------------------------------------------------
Masahiro Yamada (25):
      ARM: UniPhier: move SoC sources to mach-uniphier
      ARM: UniPhier: move SoC headers to mach-uniphier/include/mach
      ARM: UniPhier: include <mach/*.h> instead of <asm/arch/*.h>
      ARM: UniPhier: update defconfigs using savedefconfig
      serial: UniPhier: use 32 bit register access
      serial: UniPhier: move LCR register setting to probe function
      ARM: UniPhier: fix comments in PH1-Pro4 SBC code
      ARM: UniPhier: fix SBC init code
      ARM: UniPhier: rename SC_CLKCTRL_CLK_* to SC_SCLKCTRL_CEN_*
      ARM: UniPhier: split clkrst_init() into two functions
      ARM: UniPhier: reset NAND core in SPL for non-NAND boot mode
      ARM: UniPhier: enable STDMAC for EHCI
      ARM: UniPhier: remove EHCI platform devices
      ARM: UniPhier: move uniphier_ehci_reset() function
      ARM: UniPhier: replace "usb-ehci" with "generic-ehci"
      ARM: UniPhier: add I/O pin settings for xHCI on PH1-Pro4
      ARM: UniPhier: enable xHCI and GIO cores for PH1-Pro4
      ARM: UniPhier: add xHCI device nodes to PH1-Pro4 device tree
      usb: UniPhier: add UniPhier on-chip xHCI host driver support
      ARM: UniPhier: switch to xHCI for PH1-Pro4
      ARM: UniPhier: support 1CS support card for all the UniPhier SoCs
      ARM: UniPhier: switch to 1CS support card
      ARM: UniPhier: consolidate MEMCONF setting code
      ARM: UniPhier: remove stop_mpll() from PH1-Pro4 PLL initialization
      ARM: UniPhier: remove SSC_WAY_SIZE and SSC_NUM_ENTRIES macros

 MAINTAINERS                                                            |   3 +-
 arch/arm/Kconfig                                                       |   2 +-
 arch/arm/Makefile                                                      |   1 +
 arch/arm/cpu/armv7/Makefile                                            |   1 -
 arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c
 |  28 --------
 arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c
 |  29 --------
 arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c
 |  75 --------------------
 arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c
 |  28 --------
 arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c
 |  29 --------
 arch/arm/dts/uniphier-ph1-ld4.dtsi
 |   8 +--
 arch/arm/dts/uniphier-ph1-pro4-ref.dts                                 |   5 +-
 arch/arm/dts/uniphier-ph1-pro4.dtsi
 |  22 ++++--
 arch/arm/dts/uniphier-ph1-sld3.dtsi
 |  10 +--
 arch/arm/dts/uniphier-ph1-sld8.dtsi
 |   8 +--
 arch/arm/include/asm/arch-uniphier/ehci-uniphier.h
 |  33 ---------
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Kconfig                 |   0
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Makefile                |   1 +
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_common.c          |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_early_init_f.c
 |   9 ++-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_early_init_r.c    |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_late_init.c       |   0
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cache_uniphier.c        |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_ddrphy.c            |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_pinmon.c            |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cpu_info.c              |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ddrphy_training.c       |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/dram_init.c             |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/arm-mpcore.h      |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/bcu-regs.h        |   0
 .../{include/asm/arch-uniphier => mach-uniphier/include/mach}/board.h  |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/boot-device.h     |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/ddrphy-regs.h     |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/debug-uart.S      |   0
 .../{include/asm/arch-uniphier => mach-uniphier/include/mach}/led.h    |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/mio-regs.h        |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/platdevice.h      |   2 -
 .../asm/arch-uniphier => mach-uniphier/include/mach}/sbc-regs.h        |   0
 .../asm/arch-uniphier => mach-uniphier/include/mach}/sc-regs.h
 |  29 +++++---
 .../asm/arch-uniphier => mach-uniphier/include/mach}/sg-regs.h
 | 119 +-------------------------------
 .../asm/arch-uniphier => mach-uniphier/include/mach}/ssc-regs.h        |   2 -
 .../asm/arch-uniphier => mach-uniphier/include/mach}/umc-regs.h        |   0
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/init_page_table.S       |   0
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/lowlevel_init.S
 |  16 +++--
 arch/arm/mach-uniphier/memconf.c
 | 104 ++++++++++++++++++++++++++++
 .../{cpu/armv7/uniphier/ph1-pro4 => mach-uniphier/ph1-ld4}/Makefile    |   6 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/bcu_init.c      |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/boot-mode.c     |   0
 arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c
 |  42 +++++++++++
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/ddrphy_init.c   |   2 +-
 arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c                     |   1 +
 .../arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/lowlevel_debug.S |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pinctrl.c       |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/platdevice.c
 |  16 +----
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_init.c      |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_spectrum.c  |   0
 arch/arm/mach-uniphier/ph1-ld4/sbc_init.c
 |  50 ++++++++++++++
 .../ph1-ld4/sbc_init.c => mach-uniphier/ph1-ld4/sbc_init_3cs.c}
 |  15 ++--
 arch/arm/mach-uniphier/ph1-ld4/sg_init.c
 |  19 +++++
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/umc_init.c      |   4 +-
 .../{cpu/armv7/uniphier/ph1-ld4 => mach-uniphier/ph1-pro4}/Makefile    |   6 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/boot-mode.c    |   6 +-
 arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c
 |  57 +++++++++++++++
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/ddrphy_init.c  |   2 +-
 .../clkrst_init.c => mach-uniphier/ph1-pro4/early_clkrst_init.c}
 |  16 +++--
 .../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/lowlevel_debug.S
 |   8 +--
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pinctrl.c
 |   9 ++-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/platdevice.c
 |  13 +---
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_init.c
 |  21 +-----
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_spectrum.c |   2 +-
 arch/arm/mach-uniphier/ph1-pro4/sbc_init.c
 |  43 ++++++++++++
 arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c
 |  43 ++++++++++++
 arch/arm/mach-uniphier/ph1-pro4/sg_init.c
 |  19 +++++
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/umc_init.c     |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/Makefile       |   6 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/bcu_init.c     |   0
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/boot-mode.c    |   0
 arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c                          |   1 +
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/ddrphy_init.c  |   2 +-
 arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c                    |   1 +
 .../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/lowlevel_debug.S    |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pinctrl.c      |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/platdevice.c
 |  16 +----
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_init.c     |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_spectrum.c |   0
 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c                             |   1 +
 .../ph1-sld8/sbc_init.c => mach-uniphier/ph1-sld8/sbc_init_3cs.c}
 |  32 ++++-----
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sg_init.c      |   0
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/umc_init.c     |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/print_misc_info.c       |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/reset.c                 |   2 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/smp.S                   |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/spl.c
 |  17 +++--
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/support_card.c          |   4 +-
 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/timer.c                 |   2 +-
 configs/ph1_ld4_defconfig
 |  18 ++---
 configs/ph1_pro4_defconfig
 |  20 +++---
 configs/ph1_sld8_defconfig
 |  18 ++---
 doc/README.uniphier                                                    |   3 +-
 drivers/serial/serial_uniphier.c
 |  64 ++++++++---------
 drivers/usb/host/Kconfig
 |  10 ++-
 drivers/usb/host/Makefile                                              |   1 +
 drivers/usb/host/ehci-uniphier.c
 |  25 +++----
 drivers/usb/host/xhci-uniphier.c
 |  85 +++++++++++++++++++++++
 include/configs/uniphier.h                                             |   3 +
 include/fdtdec.h                                                       |   1 +
 lib/fdtdec.c                                                           |   1 +
 106 files changed, 741 insertions(+), 608 deletions(-)
 delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c
 delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c
 delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c
 delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c
 delete mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c
 delete mode 100644 arch/arm/include/asm/arch-uniphier/ehci-uniphier.h
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Kconfig (100%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Makefile (97%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_common.c (95%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/board_early_init_f.c (71%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/board_early_init_r.c (89%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_late_init.c (100%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cache_uniphier.c (99%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_ddrphy.c (99%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_pinmon.c (90%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cpu_info.c (97%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ddrphy_training.c (98%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/dram_init.c (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/arm-mpcore.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/bcu-regs.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/board.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/boot-device.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/ddrphy-regs.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/debug-uart.S (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/led.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/mio-regs.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/platdevice.h (93%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/sbc-regs.h (100%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/sc-regs.h (64%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/sg-regs.h (68%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/ssc-regs.h (94%)
 rename arch/arm/{include/asm/arch-uniphier =>
mach-uniphier/include/mach}/umc-regs.h (100%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/init_page_table.S (100%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/lowlevel_init.S (94%)
 create mode 100644 arch/arm/mach-uniphier/memconf.c
 rename arch/arm/{cpu/armv7/uniphier/ph1-pro4 =>
mach-uniphier/ph1-ld4}/Makefile (50%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/bcu_init.c (96%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-ld4/boot-mode.c (100%)
 create mode 100644 arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-ld4/ddrphy_init.c (97%)
 create mode 100644 arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-ld4/lowlevel_debug.S (89%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pinctrl.c (98%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-ld4/platdevice.c (58%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_init.c (98%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-ld4/pll_spectrum.c (100%)
 create mode 100644 arch/arm/mach-uniphier/ph1-ld4/sbc_init.c
 rename arch/arm/{cpu/armv7/uniphier/ph1-ld4/sbc_init.c =>
mach-uniphier/ph1-ld4/sbc_init_3cs.c} (83%)
 create mode 100644 arch/arm/mach-uniphier/ph1-ld4/sg_init.c
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/umc_init.c (98%)
 rename arch/arm/{cpu/armv7/uniphier/ph1-ld4 =>
mach-uniphier/ph1-pro4}/Makefile (51%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-pro4/boot-mode.c (96%)
 create mode 100644 arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-pro4/ddrphy_init.c (97%)
 rename arch/arm/{cpu/armv7/uniphier/ph1-ld4/clkrst_init.c =>
mach-uniphier/ph1-pro4/early_clkrst_init.c} (52%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-pro4/lowlevel_debug.S (82%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pinctrl.c (85%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-pro4/platdevice.c (61%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_init.c (91%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-pro4/pll_spectrum.c (89%)
 create mode 100644 arch/arm/mach-uniphier/ph1-pro4/sbc_init.c
 create mode 100644 arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c
 create mode 100644 arch/arm/mach-uniphier/ph1-pro4/sg_init.c
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/umc_init.c (98%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/Makefile (50%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-sld8/bcu_init.c (100%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-sld8/boot-mode.c (100%)
 create mode 100644 arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-sld8/ddrphy_init.c (98%)
 create mode 100644 arch/arm/mach-uniphier/ph1-sld8/early_clkrst_init.c
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-sld8/lowlevel_debug.S (89%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pinctrl.c (98%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-sld8/platdevice.c (58%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_init.c (98%)
 rename arch/arm/{cpu/armv7/uniphier =>
mach-uniphier}/ph1-sld8/pll_spectrum.c (100%)
 create mode 100644 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c
 rename arch/arm/{cpu/armv7/uniphier/ph1-sld8/sbc_init.c =>
mach-uniphier/ph1-sld8/sbc_init_3cs.c} (63%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sg_init.c (100%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/umc_init.c (98%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/print_misc_info.c (88%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/reset.c (94%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/smp.S (95%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/spl.c (81%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/support_card.c (98%)
 rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/timer.c (96%)
 create mode 100644 drivers/usb/host/xhci-uniphier.c


-- 
Best Regards
Masahiro Yamada


More information about the U-Boot mailing list