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 (16): ARM: UniPhier: fix comments in PH1-Pro4 SBC code ARM: UniPhier: fix SBC init code 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
arch/arm/cpu/armv7/uniphier/Makefile | 1 + arch/arm/cpu/armv7/uniphier/board_early_init_f.c | 5 + arch/arm/cpu/armv7/uniphier/memconf.c | 104 ++++++++++++++++++ arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile | 6 +- arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c | 25 +++-- .../cpu/armv7/uniphier/ph1-ld4/early_clkrst_init.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-ld4/platdevice.c | 14 +-- arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c | 52 +-------- arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init_3cs.c | 50 +++++++++ arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c | 11 +- arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile | 6 +- arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c | 40 +++++-- .../armv7/uniphier/ph1-pro4/early_clkrst_init.c | 31 ++++++ arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c | 7 ++ arch/arm/cpu/armv7/uniphier/ph1-pro4/platdevice.c | 11 +- arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 38 +------ .../arm/cpu/armv7/uniphier/ph1-pro4/sbc_init_3cs.c | 43 ++++++++ arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c | 11 +- arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile | 6 +- arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c | 30 +----- .../armv7/uniphier/ph1-sld8/early_clkrst_init.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-sld8/platdevice.c | 14 +-- arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c | 59 +--------- .../arm/cpu/armv7/uniphier/ph1-sld8/sbc_init_3cs.c | 58 ++++++++++ arch/arm/cpu/armv7/uniphier/spl.c | 13 ++- arch/arm/dts/uniphier-ph1-ld4.dtsi | 8 +- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 4 - 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/include/asm/arch-uniphier/platdevice.h | 2 - arch/arm/include/asm/arch-uniphier/sc-regs.h | 13 ++- arch/arm/include/asm/arch-uniphier/sg-regs.h | 119 +-------------------- configs/ph1_ld4_defconfig | 2 +- configs/ph1_pro4_defconfig | 4 +- configs/ph1_sld8_defconfig | 2 +- doc/README.uniphier | 3 +- drivers/usb/host/Kconfig | 10 +- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-uniphier.c | 25 ++--- drivers/usb/host/xhci-uniphier.c | 90 ++++++++++++++++ include/configs/uniphier.h | 3 + 43 files changed, 551 insertions(+), 445 deletions(-) create mode 100644 arch/arm/cpu/armv7/uniphier/memconf.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/early_clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init_3cs.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/early_clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init_3cs.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/early_clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init_3cs.c delete mode 100644 arch/arm/include/asm/arch-uniphier/ehci-uniphier.h create mode 100644 drivers/usb/host/xhci-uniphier.c