[U-Boot] [PATCH v5 0/26] ARM: UniPhier: bug fixes, refactorings and new features

Masahiro Yamada yamada.m at jp.panasonic.com
Thu Feb 26 18:26:41 CET 2015


This series contains:
 - bug fixes and refactoring of SBC init code
 - add missing reset controls
 - support 1CS support card for all the SoCs
 - add xHCI driver



Masahiro Yamada (26):
  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
  ARM: UniPhier: move CONFIG_SYS_TEXT_BASE to Kconfig

 Kconfig                                            |   2 +-
 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 ------
 .../{cpu/armv7/uniphier => mach-uniphier}/Kconfig  |   3 +
 .../{cpu/armv7/uniphier => mach-uniphier}/Makefile |   1 +
 .../uniphier => mach-uniphier}/board_common.c      |   2 +-
 .../board_early_init_f.c                           |   9 +-
 .../board_early_init_r.c                           |   2 +-
 .../uniphier => mach-uniphier}/board_late_init.c   |   0
 .../uniphier => mach-uniphier}/cache_uniphier.c    |   2 +-
 .../armv7/uniphier => mach-uniphier}/cmd_ddrphy.c  |   2 +-
 .../armv7/uniphier => mach-uniphier}/cmd_pinmon.c  |   4 +-
 .../armv7/uniphier => mach-uniphier}/cpu_info.c    |   2 +-
 .../uniphier => mach-uniphier}/ddrphy_training.c   |   2 +-
 .../armv7/uniphier => mach-uniphier}/dram_init.c   |   0
 .../include/mach}/arm-mpcore.h                     |   0
 .../include/mach}/bcu-regs.h                       |   0
 .../include/mach}/board.h                          |   0
 .../include/mach}/boot-device.h                    |   0
 .../include/mach}/ddrphy-regs.h                    |   0
 .../include/mach}/debug-uart.S                     |   0
 .../include/mach}/led.h                            |   0
 .../include/mach}/mio-regs.h                       |   0
 .../include/mach}/platdevice.h                     |   2 -
 .../include/mach}/sbc-regs.h                       |   0
 .../include/mach}/sc-regs.h                        |  29 +++--
 .../include/mach}/sg-regs.h                        | 119 +--------------------
 .../include/mach}/ssc-regs.h                       |   2 -
 .../include/mach}/umc-regs.h                       |   0
 .../uniphier => mach-uniphier}/init_page_table.S   |   0
 .../uniphier => mach-uniphier}/lowlevel_init.S     |  16 +--
 arch/arm/mach-uniphier/memconf.c                   | 104 ++++++++++++++++++
 .../ph1-pro4 => mach-uniphier/ph1-ld4}/Makefile    |   6 +-
 .../uniphier => mach-uniphier}/ph1-ld4/bcu_init.c  |   2 +-
 .../uniphier => mach-uniphier}/ph1-ld4/boot-mode.c |   0
 arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c       |  42 ++++++++
 .../ph1-ld4/ddrphy_init.c                          |   2 +-
 arch/arm/mach-uniphier/ph1-ld4/early_clkrst_init.c |   1 +
 .../ph1-ld4/lowlevel_debug.S                       |   4 +-
 .../uniphier => mach-uniphier}/ph1-ld4/pinctrl.c   |   2 +-
 .../ph1-ld4/platdevice.c                           |  16 +--
 .../uniphier => mach-uniphier}/ph1-ld4/pll_init.c  |   4 +-
 .../ph1-ld4/pll_spectrum.c                         |   0
 arch/arm/mach-uniphier/ph1-ld4/sbc_init.c          |  50 +++++++++
 .../ph1-ld4/sbc_init_3cs.c}                        |  15 ++-
 arch/arm/mach-uniphier/ph1-ld4/sg_init.c           |  19 ++++
 .../uniphier => mach-uniphier}/ph1-ld4/umc_init.c  |   4 +-
 .../ph1-ld4 => mach-uniphier/ph1-pro4}/Makefile    |   6 +-
 .../ph1-pro4/boot-mode.c                           |   6 +-
 arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c      |  57 ++++++++++
 .../ph1-pro4/ddrphy_init.c                         |   2 +-
 .../ph1-pro4/early_clkrst_init.c}                  |  16 +--
 .../ph1-pro4/lowlevel_debug.S                      |   8 +-
 .../uniphier => mach-uniphier}/ph1-pro4/pinctrl.c  |   9 +-
 .../ph1-pro4/platdevice.c                          |  13 +--
 .../uniphier => mach-uniphier}/ph1-pro4/pll_init.c |  21 +---
 .../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 ++++
 .../uniphier => mach-uniphier}/ph1-pro4/umc_init.c |   4 +-
 .../uniphier => mach-uniphier}/ph1-sld8/Makefile   |   6 +-
 .../uniphier => mach-uniphier}/ph1-sld8/bcu_init.c |   0
 .../ph1-sld8/boot-mode.c                           |   0
 arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c      |   1 +
 .../ph1-sld8/ddrphy_init.c                         |   2 +-
 .../arm/mach-uniphier/ph1-sld8/early_clkrst_init.c |   1 +
 .../ph1-sld8/lowlevel_debug.S                      |   4 +-
 .../uniphier => mach-uniphier}/ph1-sld8/pinctrl.c  |   2 +-
 .../ph1-sld8/platdevice.c                          |  16 +--
 .../uniphier => mach-uniphier}/ph1-sld8/pll_init.c |   4 +-
 .../ph1-sld8/pll_spectrum.c                        |   0
 arch/arm/mach-uniphier/ph1-sld8/sbc_init.c         |   1 +
 .../ph1-sld8/sbc_init_3cs.c}                       |  32 +++---
 .../uniphier => mach-uniphier}/ph1-sld8/sg_init.c  |   0
 .../uniphier => mach-uniphier}/ph1-sld8/umc_init.c |   4 +-
 .../uniphier => mach-uniphier}/print_misc_info.c   |   2 +-
 .../{cpu/armv7/uniphier => mach-uniphier}/reset.c  |   2 +-
 .../{cpu/armv7/uniphier => mach-uniphier}/smp.S    |   4 +-
 .../{cpu/armv7/uniphier => mach-uniphier}/spl.c    |  17 +--
 .../uniphier => mach-uniphier}/support_card.c      |   4 +-
 .../{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                         |   5 +-
 include/fdtdec.h                                   |   1 +
 lib/fdtdec.c                                       |   1 +
 107 files changed, 745 insertions(+), 611 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 (97%)
 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

-- 
1.9.1



More information about the U-Boot mailing list