ARM: UniPhier: bug fixes, refactorings and new features
Subsystems (5)
v2 cover ARM: UniPhier: bug fixes, refactorings and new features
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
Signature · 1 line
1.9.1
PATCH v2 1/16 ARM: UniPhier: fix comments in PH1-Pro4 SBC code
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c +3 -3
@@ -1,5 +1,5 @@/* -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -35,8 +35,8 @@ void sbc_init(void)/* * Boot Swap Off: boot from mask ROM * 0x00000000-0x01ffffff: mask ROM -* 0x02000000-0x3effffff: memory bank (31MB) -* 0x03f00000-0x3fffffff: peripherals (1MB) +* 0x02000000-0x03efffff: memory bank (31MB) +* 0x03f00000-0x03ffffff: peripherals (1MB) */ writel (0x0000be01 ,SBBASE0 );/* dummy */ writel (0x0200be01 ,SBBASE1 );
Signature · 1 line
1.9.1
PATCH v2 2/16 ARM: UniPhier: fix SBC init code
In reply to Masahiro YamadaNow UniPhier SoCs only work with CONFIG_SPL and the function sbc_init() is called from SPL.
The conditional #if !defined(CONFIG_SPL_BUILD) has no point any more.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c | 11 +++++----- arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 10 ++++----- arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c | 28 ++++++++++++------------- 3 files changed, 24 insertions(+), 25 deletions(-)
arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c +5 -6
@@ -1,5 +1,5 @@/* -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -25,13 +25,12 @@ void sbc_init(void)writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL12 );writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL14 ); -#if !defined(CONFIG_SPL_BUILD )/* XECS0: boot/sub memory (boot swap = off/on) */ writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL00 );writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL01 );writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL02 );writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL04 ); -#endif +/* XECS3: peripherals */ writel (SBCTRL0_SAVEPIN_PERI_VALUE ,SBCTRL30 );writel (SBCTRL1_SAVEPIN_PERI_VALUE ,SBCTRL31 );
@@ -43,9 +42,9 @@ void sbc_init(void)writel (0x0400bc01 ,SBBASE1 );writel (0x0800bf01 ,SBBASE3 ); -#if !defined(CONFIG_SPL_BUILD )/* enable access to sub memory when boot swap is on */ -sg_set_pinsel (155 ,1 );/* PORT24 -> XECS0 */ -#endif +if (boot_is_swapped ()) +sg_set_pinsel (155 ,1 );/* PORT24 -> XECS0 */ +sg_set_pinsel (156 ,1 );/* PORT25 -> XECS3 */ }
arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c +5 -5
@@ -42,13 +42,12 @@ void sbc_init(void) writel(0x0200be01, SBBASE1); }#elif defined(CONFIG_DCC_MICRO_SUPPORT_CARD) -#if !defined(CONFIG_SPL_BUILD )/* XECS0: boot/sub memory (boot swap = off/on) */ writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL00 );writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL01 );writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL02 );writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL04 ); -#endif +/* XECS1: sub/boot memory (boot swap = off/on) */ writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL10 );writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL11 );
@@ -65,9 +64,10 @@ void sbc_init(void)writel (0x0400bc01 ,SBBASE1 );/* sub memory */ writel (0x0800bf01 ,SBBASE3 );/* peripherals */ -#if !defined(CONFIG_SPL_BUILD ) -sg_set_pinsel (318 ,5 );/* PORT22 -> XECS0 */ -#endif +/* enable access to sub memory when boot swap is on */ +if (boot_is_swapped ()) +sg_set_pinsel (318 ,5 );/* PORT22 -> XECS0 */ +sg_set_pinsel (313 ,5 );/* PORT15 -> XECS3 */ writel (0x00000001 ,SG_LOADPINCTRL );
arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c +14 -14
@@ -1,5 +1,5 @@/* -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -19,18 +19,18 @@ void sbc_init(void) tmp &=0xfffffcff ;writel (tmp,PC0CTRL ); -#if !defined(CONFIG_SPL_BUILD ) -/* XECS0 : dummy */ -writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL00 ); -writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL01 ); -writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL02 ); -writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL04 ); -#endif -/* XECS1 : boot memory (always boot swap = on) */ -writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL10 ); -writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL11 ); -writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL12 ); -writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL14 ); +/* +* SBCTRL0* does not need settings because PH1-sLD8 has no support for +* XECS0. The boot swap must be enabled to boot from the support card. +*/ + +if (boot_is_swapped ()) { +/* XECS1 : boot memory if boot swap is on */ +writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL10 ); +writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL11 ); +writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL12 ); +writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL14 ); + }/* XECS4 : sub memory */ writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL40 );
@@ -54,5 +54,5 @@ void sbc_init(void)sg_set_pinsel (135 ,16 );/* XIRQ7 -> XECS5 */ /* dummy read to assure write process */ -readl (SG_PINCTRL (33 )); +readl (SG_PINCTRL (0 )); }
Signature · 1 line
1.9.1
PATCH v2 3/16 ARM: UniPhier: split clkrst_init() into two functions
In reply to Masahiro YamadaSplit the current clkrst_init() into two functions:
- early_clkrst_init(): called from SPL
Deassert the reset signals of the memory controller and some other basic cores.
- clkrst_init(): called from main U-boot
Deassert the reset signals that are necessary for the access to peripherals etc.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/board_early_init_f.c | 5 ++++ arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile | 4 +-- arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c | 22 +++++++++++----- .../cpu/armv7/uniphier/ph1-ld4/early_clkrst_init.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile | 4 +-- arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c | 22 +++++++++++----- .../armv7/uniphier/ph1-pro4/early_clkrst_init.c | 26 +++++++++++++++++++ arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile | 4 +-- 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/spl.c | 4 +-- 11 files changed, 74 insertions(+), 49 deletions(-) create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/early_clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/early_clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/early_clkrst_init.c
arch/arm/cpu/armv7/uniphier/board_early_init_f.c +5 -0
@@ -9,6 +9,7 @@#include <asm/arch/board.h> void pin_init (void ); +void clkrst_init (void );int board_early_init_f (void ) {
@@ -18,5 +19,9 @@ int board_early_init_f(void) led_write(U, 1, , ); +clkrst_init (); + + led_write(U, 2, , ); +return 0 ; }
arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile +2 -2
@@ -4,10 +4,10 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o -obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o clkrst_init.o \ +obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \ pll_spectrum.o umc_init.o ddrphy_init.o else -obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o +obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o endif
arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c +16 -6
@@ -1,11 +1,10 @@/* -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> #include <asm/io.h> #include <asm/arch/sc-regs.h>
@@ -15,15 +14,26 @@ void clkrst_init(void)/* deassert reset */ tmp =readl (SC_RSTCTRL ); - tmp |=SC_RSTCTRL_NRST_ETHER |SC_RSTCTRL_NRST_UMC1 - |SC_RSTCTRL_NRST_UMC0 |SC_RSTCTRL_NRST_NAND ; +#ifdef CONFIG_UNIPHIER_ETH + tmp |=SC_RSTCTRL_NRST_ETHER ; +#endif +#ifdef CONFIG_NAND_DENALI + tmp |=SC_RSTCTRL_NRST_NAND ; +#endif writel (tmp,SC_RSTCTRL );readl (SC_RSTCTRL );/* dummy read */ /* privide clocks */ tmp =readl (SC_CLKCTRL ); - tmp |=SC_CLKCTRL_CLK_ETHER |SC_CLKCTRL_CLK_MIO |SC_CLKCTRL_CLK_UMC - |SC_CLKCTRL_CLK_NAND |SC_CLKCTRL_CLK_SBC |SC_CLKCTRL_CLK_PERI ; +#ifdef CONFIG_UNIPHIER_ETH + tmp |=SC_CLKCTRL_CLK_ETHER ; +#endif +#ifdef CONFIG_USB_EHCI_UNIPHIER + tmp |=SC_CLKCTRL_CLK_MIO ; +#endif +#ifdef CONFIG_NAND_DENALI + tmp |=SC_CLKCTRL_CLK_NAND ; +#endif writel (tmp,SC_CLKCTRL );readl (SC_CLKCTRL );/* dummy read */ }
arch/arm/cpu/armv7/uniphier/ph1-ld4/early_clkrst_init.c new file +1 -0
@@ -0,0 +1 @@ +#include "../ph1-pro4/early_clkrst_init.c"
arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile +2 -2
@@ -4,10 +4,10 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o -obj-y += sbc_init.o sg_init.o pll_init.o clkrst_init.o \ +obj-y += sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \ pll_spectrum.o umc_init.o ddrphy_init.o else -obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o +obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o endif
arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c +16 -6
@@ -1,11 +1,10 @@/* -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> #include <asm/io.h> #include <asm/arch/sc-regs.h>
@@ -15,15 +14,26 @@ void clkrst_init(void)/* deassert reset */ tmp =readl (SC_RSTCTRL ); - tmp |=SC_RSTCTRL_NRST_ETHER |SC_RSTCTRL_NRST_UMC1 - |SC_RSTCTRL_NRST_UMC0 |SC_RSTCTRL_NRST_NAND ; +#ifdef CONFIG_UNIPHIER_ETH + tmp |=SC_RSTCTRL_NRST_ETHER ; +#endif +#ifdef CONFIG_NAND_DENALI + tmp |=SC_RSTCTRL_NRST_NAND ; +#endif writel (tmp,SC_RSTCTRL );readl (SC_RSTCTRL );/* dummy read */ /* privide clocks */ tmp =readl (SC_CLKCTRL ); - tmp |=SC_CLKCTRL_CLK_ETHER |SC_CLKCTRL_CLK_MIO |SC_CLKCTRL_CLK_UMC - |SC_CLKCTRL_CLK_NAND |SC_CLKCTRL_CLK_SBC |SC_CLKCTRL_CLK_PERI ; +#ifdef CONFIG_UNIPHIER_ETH + tmp |=SC_CLKCTRL_CLK_ETHER ; +#endif +#ifdef CONFIG_USB_EHCI_UNIPHIER + tmp |=SC_CLKCTRL_CLK_MIO ; +#endif +#ifdef CONFIG_NAND_DENALI + tmp |=SC_CLKCTRL_CLK_NAND ; +#endif writel (tmp,SC_CLKCTRL );readl (SC_CLKCTRL );/* dummy read */ }
arch/arm/cpu/armv7/uniphier/ph1-pro4/early_clkrst_init.c new file +26 -0
@@ -0,0 +1,26 @@ +/* +* Copyright (C) 2011-2015 Panasonic Corporation +* Author: Masahiro Yamada <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <asm/io.h> +#include <asm/arch/sc-regs.h> + +void early_clkrst_init (void ) +{ +u32 tmp; + +/* deassert reset */ + tmp =readl (SC_RSTCTRL ); + tmp |=SC_RSTCTRL_NRST_UMC1 |SC_RSTCTRL_NRST_UMC0 ; +writel (tmp,SC_RSTCTRL ); +readl (SC_RSTCTRL );/* dummy read */ + +/* privide clocks */ + tmp =readl (SC_CLKCTRL ); + tmp |=SC_CLKCTRL_CLK_UMC |SC_CLKCTRL_CLK_SBC |SC_CLKCTRL_CLK_PERI ; +writel (tmp,SC_CLKCTRL ); +readl (SC_CLKCTRL );/* dummy read */ +}
arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile +2 -2
@@ -4,10 +4,10 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o -obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o clkrst_init.o \ +obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \ pll_spectrum.o umc_init.o ddrphy_init.o else -obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o +obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o endif
arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c +1 -29
@@ -1,29 +1 @@ -/* -* Copyright (C) 2011-2014 Panasonic Corporation -* Author: Masahiro Yamada <[email protected]> -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -#include <common.h> -#include <asm/io.h> -#include <asm/arch/sc-regs.h> - -void clkrst_init (void ) -{ -u32 tmp; - -/* deassert reset */ - tmp =readl (SC_RSTCTRL ); - tmp |=SC_RSTCTRL_NRST_ETHER |SC_RSTCTRL_NRST_UMC1 - |SC_RSTCTRL_NRST_UMC0 |SC_RSTCTRL_NRST_NAND ; -writel (tmp,SC_RSTCTRL ); -readl (SC_RSTCTRL );/* dummy read */ - -/* privide clocks */ - tmp =readl (SC_CLKCTRL ); - tmp |=SC_CLKCTRL_CLK_ETHER |SC_CLKCTRL_CLK_MIO |SC_CLKCTRL_CLK_UMC - |SC_CLKCTRL_CLK_NAND |SC_CLKCTRL_CLK_SBC |SC_CLKCTRL_CLK_PERI ; -writel (tmp,SC_CLKCTRL ); -readl (SC_CLKCTRL );/* dummy read */ -} +#include "../ph1-ld4/clkrst_init.c"
arch/arm/cpu/armv7/uniphier/ph1-sld8/early_clkrst_init.c new file +1 -0
@@ -0,0 +1 @@ +#include "../ph1-ld4/early_clkrst_init.c"
arch/arm/cpu/armv7/uniphier/spl.c +2 -2
@@ -18,7 +18,7 @@ void sbc_init(void);void sg_init (void );void pll_init (void );void pin_init (void ); -void clkrst_init (void ); +void early_clkrst_init (void );int umc_init (void );void enable_dpll_ssc (void );
@@ -38,7 +38,7 @@ void spl_board_init(void) led_write(L, 0, , ); -clkrst_init (); +early_clkrst_init (); led_write(L, 1, , );
Signature · 1 line
1.9.1
PATCH v2 4/16 ARM: UniPhier: reset NAND core in SPL for non-NAND boot mode
In reply to Masahiro YamadaFor all the UniPhier SoCs so far, the reset signal of the NAND core is automatically deasserted after the PLL gets stabled. (The bit 2 of SC_RSTCTRL is default to one.)
This causes a fatal problem on the NAND controller of PH1-LD4. For that SoC, the NAND I/O pins are not set up yet at the power-on reset except the NAND boot mode. As a result, the NAND controller begins automatic device scanning with wrong I/O pins and finally hangs up.
Actually, U-Boot dies after printing "NAND:" on the console unless the boot mode latch detected the NAND boot mode.
To work around this problem, reset the NAND core in SPL for non-NAND boot modes. If CONFIG_NAND_DENALI is enabled, the reset signal is deasserted again in U-Boot proper. At this time, I/O pins have been correctly set up, the device scanning should succeed.
---
Changes in v2:
- Added
arch/arm/cpu/armv7/uniphier/ph1-pro4/early_clkrst_init.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/cpu/armv7/uniphier/ph1-pro4/early_clkrst_init.c +5 -0
@@ -5,6 +5,8 @@* SPDX-License-Identifier: GPL-2.0+ */ +#include <common.h> +#include <spl.h> #include <asm/io.h> #include <asm/arch/sc-regs.h>
@@ -14,7 +16,10 @@ void early_clkrst_init(void)/* deassert reset */ tmp =readl (SC_RSTCTRL ); + tmp |=SC_RSTCTRL_NRST_UMC1 |SC_RSTCTRL_NRST_UMC0 ; +if (spl_boot_device () !=BOOT_DEVICE_NAND ) + tmp &= ~SC_RSTCTRL_NRST_NAND ;writel (tmp,SC_RSTCTRL );readl (SC_RSTCTRL );/* dummy read */
Signature · 1 line
1.9.1
PATCH v2 5/16 ARM: UniPhier: enable STDMAC for EHCI
In reply to Masahiro YamadaDeassert the reset signal and provide the clock for STDMAC core. This is necessary for the USB 2.0 host controllers.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c | 5 ++++- arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c | 5 ++++- arch/arm/include/asm/arch-uniphier/sc-regs.h | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c +4 -1
@@ -17,6 +17,9 @@ void clkrst_init(void)#ifdef CONFIG_UNIPHIER_ETH tmp |=SC_RSTCTRL_NRST_ETHER ;#endif +#ifdef CONFIG_USB_EHCI_UNIPHIER + tmp |=SC_RSTCTRL_NRST_STDMAC ; +#endif #ifdef CONFIG_NAND_DENALI tmp |=SC_RSTCTRL_NRST_NAND ;#endif
@@ -29,7 +32,7 @@ void clkrst_init(void) tmp |=SC_CLKCTRL_CLK_ETHER ;#endif #ifdef CONFIG_USB_EHCI_UNIPHIER - tmp |=SC_CLKCTRL_CLK_MIO ; + tmp |=SC_CLKCTRL_CLK_MIO |SC_CLKCTRL_CLK_STDMAC ;#endif #ifdef CONFIG_NAND_DENALI tmp |=SC_CLKCTRL_CLK_NAND ;
arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c +4 -1
@@ -17,6 +17,9 @@ void clkrst_init(void)#ifdef CONFIG_UNIPHIER_ETH tmp |=SC_RSTCTRL_NRST_ETHER ;#endif +#ifdef CONFIG_USB_EHCI_UNIPHIER + tmp |=SC_RSTCTRL_NRST_STDMAC ; +#endif #ifdef CONFIG_NAND_DENALI tmp |=SC_RSTCTRL_NRST_NAND ;#endif
@@ -29,7 +32,7 @@ void clkrst_init(void) tmp |=SC_CLKCTRL_CLK_ETHER ;#endif #ifdef CONFIG_USB_EHCI_UNIPHIER - tmp |=SC_CLKCTRL_CLK_MIO ; + tmp |=SC_CLKCTRL_CLK_MIO |SC_CLKCTRL_CLK_STDMAC ;#endif #ifdef CONFIG_NAND_DENALI tmp |=SC_CLKCTRL_CLK_NAND ;
arch/arm/include/asm/arch-uniphier/sc-regs.h +2 -0
@@ -39,6 +39,7 @@#define SC_RSTCTRL (SC_BASE_ADDR | 0x2000)#define SC_RSTCTRL_NRST_ETHER (0x1 << 12) +#define SC_RSTCTRL_NRST_STDMAC (0x1 << 10)#define SC_RSTCTRL_NRST_UMC1 (0x1 << 5)#define SC_RSTCTRL_NRST_UMC0 (0x1 << 4)#define SC_RSTCTRL_NRST_NAND (0x1 << 2)
@@ -49,6 +50,7 @@#define SC_CLKCTRL (SC_BASE_ADDR | 0x2104)#define SC_CLKCTRL_CLK_ETHER (0x1 << 12)#define SC_CLKCTRL_CLK_MIO (0x1 << 11) +#define SC_CLKCTRL_CLK_STDMAC (0x1 << 10)#define SC_CLKCTRL_CLK_UMC (0x1 << 4)#define SC_CLKCTRL_CLK_NAND (0x1 << 2)#define SC_CLKCTRL_CLK_SBC (0x1 << 1)
Signature · 1 line
1.9.1
PATCH v2 6/16 ARM: UniPhier: remove EHCI platform devices
In reply to Masahiro YamadaNow UniPhier platform highly depends on Device Tree configuration (CONFIG_OF_CONTROL is select'ed by Kconfig). Since the EHCI is only used on main U-Boot, we can drop platform devices of the EHCI controllers. We still keep UART platform devices because they might be useful for SPL.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/ph1-ld4/platdevice.c | 14 +------------- arch/arm/cpu/armv7/uniphier/ph1-pro4/platdevice.c | 11 +---------- arch/arm/cpu/armv7/uniphier/ph1-sld8/platdevice.c | 14 +------------- arch/arm/include/asm/arch-uniphier/ehci-uniphier.h | 8 +------- arch/arm/include/asm/arch-uniphier/platdevice.h | 2 -- drivers/usb/host/Kconfig | 2 +- drivers/usb/host/ehci-uniphier.c | 14 +------------- 7 files changed, 6 insertions(+), 59 deletions(-)
arch/arm/cpu/armv7/uniphier/ph1-ld4/platdevice.c +1 -13
@@ -1,5 +1,5 @@/* -* Copyright (C) 2014 Panasonic Corporation +* Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -13,15 +13,3 @@ SERIAL_DEVICE(0, 0x54006800, UART_MASTER_CLK) SERIAL_DEVICE(1, 0x54006900, UART_MASTER_CLK) SERIAL_DEVICE(2, 0x54006a00, UART_MASTER_CLK)SERIAL_DEVICE (3 ,0x54006b00 ,UART_MASTER_CLK ) - -struct uniphier_ehci_platform_data uniphier_ehci_platdata[] = { - { - .base =0x5a800100 , - }, - { - .base =0x5a810100 , - }, - { - .base =0x5a820100 , - }, -};
arch/arm/cpu/armv7/uniphier/ph1-pro4/platdevice.c +1 -10
@@ -1,5 +1,5 @@/* -* Copyright (C) 2014 Panasonic Corporation +* Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -13,12 +13,3 @@ SERIAL_DEVICE(0, 0x54006800, UART_MASTER_CLK) SERIAL_DEVICE(1, 0x54006900, UART_MASTER_CLK) SERIAL_DEVICE(2, 0x54006a00, UART_MASTER_CLK)SERIAL_DEVICE (3 ,0x54006b00 ,UART_MASTER_CLK ) - -struct uniphier_ehci_platform_data uniphier_ehci_platdata[] = { - { - .base =0x5a800100 , - }, - { - .base =0x5a810100 , - }, -};
arch/arm/cpu/armv7/uniphier/ph1-sld8/platdevice.c +1 -13
@@ -1,5 +1,5 @@/* -* Copyright (C) 2014 Panasonic Corporation +* Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -13,15 +13,3 @@ SERIAL_DEVICE(0, 0x54006800, UART_MASTER_CLK) SERIAL_DEVICE(1, 0x54006900, UART_MASTER_CLK) SERIAL_DEVICE(2, 0x54006a00, UART_MASTER_CLK)SERIAL_DEVICE (3 ,0x54006b00 ,UART_MASTER_CLK ) - -struct uniphier_ehci_platform_data uniphier_ehci_platdata[] = { - { - .base =0x5a800100 , - }, - { - .base =0x5a810100 , - }, - { - .base =0x5a820100 , - }, -};
arch/arm/include/asm/arch-uniphier/ehci-uniphier.h +1 -7
@@ -1,5 +1,5 @@/* -* Copyright (C) 2014 Panasonic Corporation +* Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -12,12 +12,6 @@#include <asm/io.h> #include "mio-regs.h" -struct uniphier_ehci_platform_data { -unsigned long base; -}; - -extern struct uniphier_ehci_platform_data uniphier_ehci_platdata[]; -static inline void uniphier_ehci_reset (int index,int on) {u32 tmp;
arch/arm/include/asm/arch-uniphier/platdevice.h +0 -2
@@ -21,6 +21,4 @@ U_BOOT_DEVICE(serial##n) = { \ .platdata = &serial_device##n \ }; -#include <asm/arch/ehci-uniphier.h> -#endif /* ARCH_PLATDEVICE_H */
drivers/usb/host/Kconfig +1 -1
@@ -47,7 +47,7 @@ if USB_EHCI_HCD config USB_EHCI_UNIPHIER bool "Support for Panasonic UniPhier on-chip EHCI USB controller" - depends on ARCH_UNIPHIER + depends on ARCH_UNIPHIER && OF_CONTROL default y ---help--- Enables support for the on-chip EHCI controller on Panasonic
drivers/usb/host/ehci-uniphier.c +1 -13
@@ -9,10 +9,9 @@#include <linux/err.h> #include <usb.h> #include <asm/arch/ehci-uniphier.h> +#include <fdtdec.h> #include "ehci.h" -#ifdef CONFIG_OF_CONTROL -#include <fdtdec.h> DECLARE_GLOBAL_DATA_PTR ;#define FDT gd->fdt_blob
@@ -35,18 +34,7 @@ static int get_uniphier_ehci_base(int index, struct ehci_hccr **base)return -ENODEV ;/* not found */ } -#else -static int get_uniphier_ehci_base (int index,struct ehci_hccr **base) -{ - *base = (struct ehci_hccr *)uniphier_ehci_platdata[index].base; -return 0 ; -} -#endif -/* -* Create the appropriate control structures to manage -* a new EHCI host controller. -*/ int ehci_hcd_init (int index,enum usb_init_type init,struct ehci_hccr **hccr,struct ehci_hcor **hcor) {
Signature · 1 line
1.9.1
PATCH v2 6/16 ARM: UniPhier: remove EHCI platform devices
Quoted 7 lines · Masahiro Yamada
Now UniPhier platform highly depends on Device Tree configuration (
CONFIG_OF_CONTROLis select'ed byKconfig). Since the EHCI is only used on main U-Boot, we can drop platform devices of the EHCI controllers. We still keep UART platform devices because they might be useful for SPL.Signed-off-by Masahiro Yamada <[email protected]>
Best regards,
Marek Vasut
PATCH v2 7/16 ARM: UniPhier: move uniphier_ehci_reset() function
In reply to Masahiro YamadaBecause uniphier_ehci_reset() is only called from ehci-uniphier.c, it can be a static function there.
---
Changes in v2: None
arch/arm/include/asm/arch-uniphier/ehci-uniphier.h | 27 ---------------------- drivers/usb/host/ehci-uniphier.c | 15 +++++++++++- 2 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 arch/arm/include/asm/arch-uniphier/ehci-uniphier.h
arch/arm/include/asm/arch-uniphier/ehci-uniphier.h deleted +0 -27
@@ -1,27 +0,0 @@ -/* -* Copyright (C) 2014-2015 Panasonic Corporation -* Author: Masahiro Yamada <[email protected]> -* -* SPDX-License-Identifier: GPL-2.0+ -*/ - -#ifndef __PLAT_UNIPHIER_EHCI_H -#define __PLAT_UNIPHIER_EHCI_H - -#include <linux/types.h> -#include <asm/io.h> -#include "mio-regs.h" - -static inline void uniphier_ehci_reset (int index,int on) -{ -u32 tmp; - - tmp =readl (MIO_USB_RSTCTRL (index)); -if (on) - tmp &= ~MIO_USB_RSTCTRL_XRST ; -else - tmp |=MIO_USB_RSTCTRL_XRST ; -writel (tmp,MIO_USB_RSTCTRL (index)); -} - -#endif /* __PLAT_UNIPHIER_EHCI_H */
drivers/usb/host/ehci-uniphier.c +14 -1
@@ -7,8 +7,9 @@#include <common.h> #include <linux/err.h> +#include <asm/io.h> #include <usb.h> -#include <asm/arch/ehci-uniphier.h> +#include <asm/arch/mio-regs.h> #include <fdtdec.h> #include "ehci.h"
@@ -35,6 +36,18 @@ static int get_uniphier_ehci_base(int index, struct ehci_hccr **base)return -ENODEV ;/* not found */ } +static void uniphier_ehci_reset (int index,int on) +{ +u32 tmp; + + tmp =readl (MIO_USB_RSTCTRL (index)); +if (on) + tmp &= ~MIO_USB_RSTCTRL_XRST ; +else + tmp |=MIO_USB_RSTCTRL_XRST ; +writel (tmp,MIO_USB_RSTCTRL (index)); +} +int ehci_hcd_init (int index,enum usb_init_type init,struct ehci_hccr **hccr,struct ehci_hcor **hcor) {
Signature · 1 line
1.9.1
PATCH v2 7/16 ARM: UniPhier: move uniphier_ehci_reset() function
Quoted 4 lines · Masahiro Yamada
Because
uniphier_ehci_reset()is only called fromehci-uniphier.c, it can be a static function there.Signed-off-by Masahiro Yamada <[email protected]>
Best regards,
Marek Vasut
PATCH v2 8/16 ARM: UniPhier: replace "usb-ehci" with "generic-ehci"
In reply to Masahiro YamadaEHCI host controllers have a common register interface. We may wish to implement a generic EHCI driver someday.
---
Changes in v2: None
arch/arm/dts/uniphier-ph1-ld4.dtsi | 8 ++++---- arch/arm/dts/uniphier-ph1-pro4.dtsi | 6 +++--- arch/arm/dts/uniphier-ph1-sld3.dtsi | 10 +++++----- arch/arm/dts/uniphier-ph1-sld8.dtsi | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/dts/uniphier-ph1-ld4.dtsi +4 -4
@@ -1,7 +1,7 @@ /* * Device Tree Source for UniPhier PH1-LD4 SoC * - * Copyright (C) 2014 Panasonic Corporation + * Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -94,19 +94,19 @@ }; usb0: usb at 5a800100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; }; usb1: usb at 5a810100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; }; usb2: usb at 5a820100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a820100 0x100>; };
arch/arm/dts/uniphier-ph1-pro4.dtsi +3 -3
@@ -1,7 +1,7 @@ /* * Device Tree Source for UniPhier PH1-Pro4 SoC * - * Copyright (C) 2014 Panasonic Corporation + * Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -120,13 +120,13 @@ }; usb0: usb at 5a800100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; }; usb1: usb at 5a810100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; };
arch/arm/dts/uniphier-ph1-sld3.dtsi +5 -5
@@ -1,7 +1,7 @@ /* * Device Tree Source for UniPhier PH1-sLD3 SoC * - * Copyright (C) 2014 Panasonic Corporation + * Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -93,25 +93,25 @@ }; usb0: usb at 5a800100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; }; usb1: usb at 5a810100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; }; usb2: usb at 5a820100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a820100 0x100>; }; usb3: usb at 5a830100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a830100 0x100>; };
arch/arm/dts/uniphier-ph1-sld8.dtsi +4 -4
@@ -1,7 +1,7 @@ /* * Device Tree Source for UniPhier PH1-sLD8 SoC * - * Copyright (C) 2014 Panasonic Corporation + * Copyright (C) 2014-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+
@@ -94,19 +94,19 @@ }; usb0: usb at 5a800100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; }; usb1: usb at 5a810100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; }; usb2: usb at 5a820100 { - compatible = "panasonic,uniphier-ehci", "usb-ehci"; + compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a820100 0x100>; };
Signature · 1 line
1.9.1
PATCH v2 9/16 ARM: UniPhier: add I/O pin settings for xHCI on PH1-Pro4
In reply to Masahiro YamadaThis is necessary to use the xHCI cores for PH1-Pro4.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c +7 -0
@@ -41,6 +41,13 @@ void pin_init(void)sg_set_pinsel (54 ,0 );/* NRYBY0 -> NRYBY0 */ #endif +#ifdef CONFIG_USB_XHCI_UNIPHIER +sg_set_pinsel (180 ,0 );/* USB0VBUS -> USB0VBUS */ +sg_set_pinsel (181 ,0 );/* USB0OD -> USB0OD */ +sg_set_pinsel (182 ,0 );/* USB1VBUS -> USB1VBUS */ +sg_set_pinsel (183 ,0 );/* USB1OD -> USB1OD */ +#endif +#ifdef CONFIG_USB_EHCI_UNIPHIER sg_set_pinsel (184 ,0 );/* USB2VBUS -> USB2VBUS */ sg_set_pinsel (185 ,0 );/* USB2OD -> USB2OD */
Signature · 1 line
1.9.1
PATCH v2 10/16 ARM: UniPhier: enable xHCI and GIO cores for PH1-Pro4
In reply to Masahiro YamadaThis is necessary to use the USB 3.0 host controllers on PH1-Pro4.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c | 15 +++++++++++++++ arch/arm/include/asm/arch-uniphier/sc-regs.h | 11 ++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-)
arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c +15 -0
@@ -14,6 +14,10 @@ void clkrst_init(void)/* deassert reset */ tmp =readl (SC_RSTCTRL ); +#ifdef CONFIG_USB_XHCI_UNIPHIER + tmp |=SC_RSTCTRL_NRST_USB3B0 |SC_RSTCTRL_NRST_USB3C0 | +SC_RSTCTRL_NRST_GIO ; +#endif #ifdef CONFIG_UNIPHIER_ETH tmp |=SC_RSTCTRL_NRST_ETHER ;#endif
@@ -26,6 +30,13 @@ void clkrst_init(void)writel (tmp,SC_RSTCTRL );readl (SC_RSTCTRL );/* dummy read */ +#ifdef CONFIG_USB_XHCI_UNIPHIER + tmp =readl (SC_RSTCTRL2 ); + tmp |=SC_RSTCTRL2_NRST_USB3B1 |SC_RSTCTRL2_NRST_USB3C1 ; +writel (tmp,SC_RSTCTRL2 ); +readl (SC_RSTCTRL2 );/* dummy read */ +#endif +/* privide clocks */ tmp =readl (SC_CLKCTRL );#ifdef CONFIG_UNIPHIER_ETH
@@ -34,6 +45,10 @@ void clkrst_init(void)#ifdef CONFIG_USB_EHCI_UNIPHIER tmp |=SC_CLKCTRL_CLK_MIO |SC_CLKCTRL_CLK_STDMAC ;#endif +#ifdef CONFIG_USB_XHCI_UNIPHIER + tmp |=SC_CLKCTRL_CLK_USB31 |SC_CLKCTRL_CLK_USB30 | +SC_CLKCTRL_CLK_GIO ; +#endif #ifdef CONFIG_NAND_DENALI tmp |=SC_CLKCTRL_CLK_NAND ;#endif
arch/arm/include/asm/arch-uniphier/sc-regs.h +10 -1
@@ -1,7 +1,7 @@/* * UniPhier SC (System Control) block registers * -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * * SPDX-License-Identifier: GPL-2.0+ */
@@ -38,19 +38,28 @@#define SC_VPLL27BCTRL3 (SC_BASE_ADDR | 0x1298)#define SC_RSTCTRL (SC_BASE_ADDR | 0x2000) +#define SC_RSTCTRL_NRST_USB3B0 (0x1 << 17) +#define SC_RSTCTRL_NRST_USB3C0 (0x1 << 16)#define SC_RSTCTRL_NRST_ETHER (0x1 << 12)#define SC_RSTCTRL_NRST_STDMAC (0x1 << 10) +#define SC_RSTCTRL_NRST_GIO (0x1 << 6)#define SC_RSTCTRL_NRST_UMC1 (0x1 << 5)#define SC_RSTCTRL_NRST_UMC0 (0x1 << 4)#define SC_RSTCTRL_NRST_NAND (0x1 << 2)#define SC_RSTCTRL2 (SC_BASE_ADDR | 0x2004) +#define SC_RSTCTRL2_NRST_USB3B1 (0x1 << 17) +#define SC_RSTCTRL2_NRST_USB3C1 (0x1 << 16) +#define SC_RSTCTRL3 (SC_BASE_ADDR | 0x2008)#define SC_CLKCTRL (SC_BASE_ADDR | 0x2104) +#define SC_CLKCTRL_CLK_USB31 (0x1 << 17) +#define SC_CLKCTRL_CLK_USB30 (0x1 << 16)#define SC_CLKCTRL_CLK_ETHER (0x1 << 12)#define SC_CLKCTRL_CLK_MIO (0x1 << 11)#define SC_CLKCTRL_CLK_STDMAC (0x1 << 10) +#define SC_CLKCTRL_CLK_GIO (0x1 << 6)#define SC_CLKCTRL_CLK_UMC (0x1 << 4)#define SC_CLKCTRL_CLK_NAND (0x1 << 2)#define SC_CLKCTRL_CLK_SBC (0x1 << 1)
Signature · 1 line
1.9.1
PATCH v2 11/16 ARM: UniPhier: add xHCI device nodes to PH1-Pro4 device tree
In reply to Masahiro YamadaEach USB port corresponds to the following IP core:
port0: xHCI (0x65a00000) SS+HS
port1: xHCI (0x65c00000) HS (SS PHY is not implemented)
port2: EHCI (0x5a800100) HS
port3: EHCI (0x5a810100) HS
---
Changes in v2: None
arch/arm/dts/uniphier-ph1-pro4-ref.dts | 4 ---- arch/arm/dts/uniphier-ph1-pro4.dtsi | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-)
arch/arm/dts/uniphier-ph1-pro4-ref.dts +0 -4
@@ -54,7 +54,3 @@ &usb0 { status = "okay"; }; - -&usb1 { - status = "okay"; -};
arch/arm/dts/uniphier-ph1-pro4.dtsi +14 -2
@@ -119,18 +119,30 @@ status = "ok"; }; - usb0: usb at 5a800100 { + usb2: usb at 5a800100 { compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a800100 0x100>; }; - usb1: usb at 5a810100 { + usb3: usb at 5a810100 { compatible = "panasonic,uniphier-ehci", "generic-ehci"; status = "disabled"; reg = <0x5a810100 0x100>; }; + usb0: usb at 65a00000 { + compatible = "panasonic,uniphier-xhci", "generic-xhci"; + status = "disabled"; + reg = <0x65a00000 0x100>; + }; + + usb1: usb at 65c00000 { + compatible = "panasonic,uniphier-xhci", "generic-xhci"; + status = "disabled"; + reg = <0x65c00000 0x100>; + }; + nand: nand at 68000000 { compatible = "denali,denali-nand-dt"; reg = <0x68000000 0x20>, <0x68100000 0x1000>;
Signature · 1 line
1.9.1
PATCH v2 12/16 usb: UniPhier: add UniPhier on-chip xHCI host driver support
In reply to Masahiro YamadaSupport xHCI host driver used on Panasonic UniPhier platform.
---
Changes in v2:
- add the error check of fdtdec_get_addr()
doc/README.uniphier | 3 +- drivers/usb/host/Kconfig | 8 ++++ drivers/usb/host/Makefile | 1 + drivers/usb/host/xhci-uniphier.c | 90 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 drivers/usb/host/xhci-uniphier.c
doc/README.uniphier +2 -1
@@ -73,7 +73,8 @@ Supported devices - UART (on-chip) - NAND - - USB (2.0) + - USB 2.0 (EHCI) + - USB 3.0 (xHCI) - LAN (on-board SMSC9118) - I2C - EEPROM (connected to the on-board I2C bus)
drivers/usb/host/Kconfig +8 -0
@@ -17,6 +17,14 @@ config USB_XHCI if USB_XHCI_HCD +config USB_XHCI_UNIPHIER + bool "Support for Panasonic UniPhier on-chip xHCI USB controller" + depends on ARCH_UNIPHIER + default y + ---help--- + Enables support for the on-chip xHCI controller on Panasonic + UniPhier SoCs. + endif config USB_EHCI_HCD
drivers/usb/host/Makefile +1 -0
@@ -48,6 +48,7 @@ obj-$(CONFIG_USB_XHCI_KEYSTONE) += xhci-keystone.o obj-$(CONFIG_USB_XHCI_EXYNOS) += xhci-exynos5.o obj-$(CONFIG_USB_XHCI_OMAP) += xhci-omap.o obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o +obj-$(CONFIG_USB_XHCI_UNIPHIER) += xhci-uniphier.o # designware obj-$(CONFIG_USB_DWC2) += dwc2.o
drivers/usb/host/xhci-uniphier.c new file +90 -0
90 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 13/16 ARM: UniPhier: switch to xHCI for PH1-Pro4
In reply to Masahiro YamadaPH1-Pro4 includes both EHCI and xHCI IP cores. Unfortunately, U-Boot cannot enable EHCI and xHCI support simultaneously. Some users may wish Super-Speed connection. Disable CONFIG_USB_EHCI_HCD and enable CONFIG_USB_XHCI_HCD.
---
Changes in v2: None
configs/ph1_pro4_defconfig | 2 +- include/configs/uniphier.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
configs/ph1_pro4_defconfig +1 -1
@@ -37,6 +37,6 @@ CONFIG_DM_SERIAL=y CONFIG_UNIPHIER_SERIAL=y CONFIG_DM_I2C=y CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y S:CONFIG_SPL_NAND_DENALI=y
include/configs/uniphier.h +3 -0
@@ -88,6 +88,8 @@/* #define CONFIG_SYS_ICACHE_OFF */ /* #define CONFIG_SYS_DCACHE_OFF */ +#define CONFIG_SYS_CACHELINE_SIZE 32 +/* Comment out the following to enable L2 cache */ #define CONFIG_UNIPHIER_L2CACHE_ON
@@ -186,6 +188,7 @@/* USB */ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 4#define CONFIG_CMD_FAT #define CONFIG_FAT_WRITE #define CONFIG_DOS_PARTITION
Signature · 1 line
1.9.1
PATCH v2 14/16 ARM: UniPhier: support 1CS support card for all the UniPhier SoCs
In reply to Masahiro YamadaTwo support card variants are used with UniPhier reference boards:
- 1 chip select support card (original CPLD)
- 3 chip selects support card (ARIMA-compatible CPLD)
Currently, the former is only supported on PH1-Pro4, but it can be expanded to PH1-LD4, PH1-sLD8 with a little code change.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile | 4 +- arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c | 51 +------------------ arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init_3cs.c | 50 ++++++++++++++++++ arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile | 4 +- arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 32 ------------ .../arm/cpu/armv7/uniphier/ph1-pro4/sbc_init_3cs.c | 43 ++++++++++++++++ arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile | 4 +- arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c | 59 +--------------------- .../arm/cpu/armv7/uniphier/ph1-sld8/sbc_init_3cs.c | 58 +++++++++++++++++++++ 9 files changed, 162 insertions(+), 143 deletions(-) create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init_3cs.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/sbc_init_3cs.c
arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile +3 -1
@@ -4,8 +4,10 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o -obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \ +obj-y += bcu_init.o sg_init.o pll_init.o early_clkrst_init.o \ pll_spectrum.o umc_init.o ddrphy_init.o +obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o +obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o else obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c +1 -50
51 lines not on this page · raw message
arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init_3cs.c new file +50 -0
50 lines not on this page · raw message
arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile +3 -1
@@ -4,8 +4,10 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o -obj-y += sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \ +obj-y += sg_init.o pll_init.o early_clkrst_init.o \ pll_spectrum.o umc_init.o ddrphy_init.o +obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o +obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o else obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c +0 -32
@@ -12,7 +12,6 @@void sbc_init (void ) { -#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD )/* * Only CS1 is connected to support card. * BKSZ[1:0] should be set to "01".
@@ -41,35 +40,4 @@ void sbc_init(void)writel (0x0000be01 ,SBBASE0 );/* dummy */ writel (0x0200be01 ,SBBASE1 ); } -#elif defined(CONFIG_DCC_MICRO_SUPPORT_CARD ) -/* XECS0: boot/sub memory (boot swap = off/on) */ -writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL00 ); -writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL01 ); -writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL02 ); -writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL04 ); - -/* XECS1: sub/boot memory (boot swap = off/on) */ -writel (SBCTRL0_SAVEPIN_MEM_VALUE ,SBCTRL10 ); -writel (SBCTRL1_SAVEPIN_MEM_VALUE ,SBCTRL11 ); -writel (SBCTRL2_SAVEPIN_MEM_VALUE ,SBCTRL12 ); -writel (SBCTRL4_SAVEPIN_MEM_VALUE ,SBCTRL14 ); - -/* XECS3: peripherals */ -writel (SBCTRL0_SAVEPIN_PERI_VALUE ,SBCTRL30 ); -writel (SBCTRL1_SAVEPIN_PERI_VALUE ,SBCTRL31 ); -writel (SBCTRL2_SAVEPIN_PERI_VALUE ,SBCTRL32 ); -writel (SBCTRL4_SAVEPIN_PERI_VALUE ,SBCTRL34 ); - -writel (0x0000bc01 ,SBBASE0 );/* boot memory */ -writel (0x0400bc01 ,SBBASE1 );/* sub memory */ -writel (0x0800bf01 ,SBBASE3 );/* peripherals */ - -/* enable access to sub memory when boot swap is on */ -if (boot_is_swapped ()) -sg_set_pinsel (318 ,5 );/* PORT22 -> XECS0 */ - -sg_set_pinsel (313 ,5 );/* PORT15 -> XECS3 */ -writel (0x00000001 ,SG_LOADPINCTRL ); - -#endif /* CONFIG_XXX_MICRO_SUPPORT_CARD */ }
arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init_3cs.c new file +43 -0
43 lines not on this page · raw message
arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile +3 -1
@@ -4,8 +4,10 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o -obj-y += bcu_init.o sbc_init.o sg_init.o pll_init.o early_clkrst_init.o \ +obj-y += bcu_init.o sg_init.o pll_init.o early_clkrst_init.o \ pll_spectrum.o umc_init.o ddrphy_init.o +obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o +obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o else obj-$(CONFIG_BOARD_EARLY_INIT_F) += pinctrl.o clkrst_init.o obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o
arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c +1 -58
59 lines not on this page · raw message
arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init_3cs.c new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 15/16 ARM: UniPhier: switch to 1CS support card
In reply to Masahiro YamadaThe 3CS support card (CONFIG_DCC_MICRO_SUPPORT_CARD) used to be used very often before, but it is recently getting a minority. Swith to the 1CS support card (CONFIG_PFC_MICRO_SUPPORT_CARD).
---
Changes in v2:
- Added
configs/ph1_ld4_defconfig | 2 +- configs/ph1_pro4_defconfig | 2 +- configs/ph1_sld8_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
configs/ph1_ld4_defconfig +1 -1
@@ -3,7 +3,7 @@ CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_UNIPHIER=y +S:CONFIG_MACH_PH1_LD4=y -+S:CONFIG_DCC_MICRO_SUPPORT_CARD=y ++S:CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y
configs/ph1_pro4_defconfig +1 -1
@@ -3,7 +3,7 @@ CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_UNIPHIER=y +S:CONFIG_MACH_PH1_PRO4=y -+S:CONFIG_DCC_MICRO_SUPPORT_CARD=y ++S:CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y
configs/ph1_sld8_defconfig +1 -1
@@ -3,7 +3,7 @@ CONFIG_FIT_VERBOSE=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_UNIPHIER=y +S:CONFIG_MACH_PH1_SLD8=y -+S:CONFIG_DCC_MICRO_SUPPORT_CARD=y ++S:CONFIG_PFC_MICRO_SUPPORT_CARD=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BDI=y CONFIG_CMD_CONSOLE=y
Signature · 1 line
1.9.1
PATCH v2 16/16 ARM: UniPhier: consolidate MEMCONF setting code
In reply to Masahiro YamadaThis code is duplicated in ph1-ld4/sg_init.c and ph1-pro4/sg_init.c. Merge the same code into a new file, memconf.c.
The helper functions no longer have to be placed in the header file. Also, move them into memconf.c.
---
Changes in v2: None
arch/arm/cpu/armv7/uniphier/Makefile | 1 + arch/arm/cpu/armv7/uniphier/memconf.c | 104 +++++++++++++++++++++ arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c | 11 +-- arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c | 11 +-- arch/arm/cpu/armv7/uniphier/spl.c | 11 ++- arch/arm/include/asm/arch-uniphier/sg-regs.h | 119 +------------------------ 6 files changed, 116 insertions(+), 141 deletions(-) create mode 100644 arch/arm/cpu/armv7/uniphier/memconf.c
arch/arm/cpu/armv7/uniphier/Makefile +1 -0
@@ -7,6 +7,7 @@ ifdef CONFIG_SPL_BUILD obj-y += lowlevel_init.o obj-y += init_page_table.o obj-y += spl.o +obj-y += memconf.o obj-y += ddrphy_training.o else
arch/arm/cpu/armv7/uniphier/memconf.c new file +104 -0
104 lines not on this page · raw message
arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c +1 -10
@@ -1,11 +1,10 @@/* -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> #include <asm/io.h> #include <asm/arch/sg-regs.h>
@@ -13,14 +12,6 @@ void sg_init(void) {u32 tmp; -/* Set DDR size */ - tmp =sg_memconf_val_ch0 (CONFIG_SDRAM0_SIZE ,CONFIG_DDR_NUM_CH0 ); - tmp |=sg_memconf_val_ch1 (CONFIG_SDRAM1_SIZE ,CONFIG_DDR_NUM_CH1 ); -#if CONFIG_SDRAM0_BASE +CONFIG_SDRAM0_SIZE <CONFIG_SDRAM1_BASE - tmp |=SG_MEMCONF_SPARSEMEM ; -#endif -writel (tmp,SG_MEMCONF ); -/* Input ports must be enabled before deasserting reset of cores */ tmp =readl (SG_IECTRL ); tmp |=0x1 ;
arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c +1 -10
@@ -1,11 +1,10 @@/* -* Copyright (C) 2011-2014 Panasonic Corporation +* Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <[email protected]> * * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> #include <asm/io.h> #include <asm/arch/sg-regs.h>
@@ -13,14 +12,6 @@ void sg_init(void) {u32 tmp; -/* Set DDR size */ - tmp =sg_memconf_val_ch0 (CONFIG_SDRAM0_SIZE ,CONFIG_DDR_NUM_CH0 ); - tmp |=sg_memconf_val_ch1 (CONFIG_SDRAM1_SIZE ,CONFIG_DDR_NUM_CH1 ); -#if CONFIG_SDRAM0_BASE +CONFIG_SDRAM0_SIZE <CONFIG_SDRAM1_BASE - tmp |=SG_MEMCONF_SPARSEMEM ; -#endif -writel (tmp,SG_MEMCONF ); -/* Input ports must be enabled before deasserting reset of cores */ tmp =readl (SG_IECTRL ); tmp |=1 <<6 ;
arch/arm/cpu/armv7/uniphier/spl.c +8 -3
@@ -18,6 +18,7 @@ void sbc_init(void);void sg_init (void );void pll_init (void );void pin_init (void ); +void memconf_init (void );void early_clkrst_init (void );int umc_init (void );void enable_dpll_ssc (void );
@@ -38,10 +39,14 @@ void spl_board_init(void) led_write(L, 0, , ); -early_clkrst_init (); +memconf_init (); led_write(L, 1, , ); +early_clkrst_init (); + + led_write(L, 2, , ); + {int res;
@@ -51,9 +56,9 @@ void spl_board_init(void) ; } } - led_write(L, 2, , ); + led_write(L, 3, , );enable_dpll_ssc (); - led_write(L, 3, , ); + led_write(L, 4, , ); }
arch/arm/include/asm/arch-uniphier/sg-regs.h +1 -118
137 lines not on this page · raw message
Signature · 1 line
1.9.1