Skip to contentSkip to conversation

ARM: UniPhier: bug fixes, refactorings and new features

PATCH Superseded Masahiro Yamada 3 participants 23 messages Feb 17, 2015 – Feb 24, 2015

Subsystems (5)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

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 (14):
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: 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: 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    |  26 +++++
 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_pro4_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                   |  85 +++++++++++++++
 include/configs/uniphier.h                         |   3 +
 41 files changed, 538 insertions(+), 442 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
#1 lore raw

PATCH 1/14 ARM: UniPhier: fix comments in PH1-Pro4 SBC code

---

 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
index 3c82a1a..6877029 100644
@@ -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
#2 lore raw

PATCH 2/14 ARM: UniPhier: fix SBC init code

In reply to Masahiro Yamada

Now 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.

---

 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
index 4839c94..3246465 100644
@@ -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
index 6877029..be2d8fe 100644
@@ -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
index 5efee9c..a2ba5dc 100644
@@ -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
#3 lore raw

PATCH 3/14 ARM: UniPhier: split clkrst_init() into two functions

In reply to Masahiro Yamada

Split 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.

This commit fixes a bug of Denali NAND controller initialization for PH1-LD4. For that SoC, NAND I/O pins must be set up before deasserting the NAND core reset signal. Otherwise, the NAND core hangs up.

---

 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
index d25bbae..2aaebef 100644
@@ -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
index 72f4663..927640a 100644
@@ -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
index 18965a9..00a21f5 100644
@@ -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
new file mode 100644
index 0000000..d7ef16b
@@ -0,0 +1 @@
+#include "../ph1-pro4/early_clkrst_init.c"
arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile +2 -2
index e330fda..0390506 100644
@@ -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
index 18965a9..00a21f5 100644
@@ -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
new file mode 100644
index 0000000..b5a4623
@@ -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
index 72f4663..927640a 100644
@@ -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
index 18965a9..8d3435d 100644
@@ -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
new file mode 100644
index 0000000..dd236b7
@@ -0,0 +1 @@
+#include "../ph1-ld4/early_clkrst_init.c"
arch/arm/cpu/armv7/uniphier/spl.c +2 -2
index 8a4eafc..ee6cce3 100644
@@ -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
#4 lore raw

PATCH 4/14 ARM: UniPhier: enable STDMAC for EHCI

In reply to Masahiro Yamada

Deassert the reset signal and provide the clock for STDMAC core. This is necessary for the USB 2.0 host controllers.

---

 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
index 00a21f5..fe9936a 100644
@@ -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
index 00a21f5..fe9936a 100644
@@ -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
index 1197bb5..daeeec9 100644
@@ -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
#5 lore raw

PATCH 5/14 ARM: UniPhier: remove EHCI platform devices

In reply to Masahiro Yamada

Now 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 CONFIG_SPL_DM.

---

 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
index 9d51299..6b69d3c 100644
@@ -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
index 31ee2a2..8625255 100644
@@ -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
index ea0691d..b3847d4 100644
@@ -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
index e9c5fb4..3ba3183 100644
@@ -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
index 62a5126..cdf7d13 100644
@@ -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
index 30d1457..0e005c2 100644
@@ -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
index 32a4375..d40b540 100644
@@ -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
#6 lore raw

PATCH 6/14 ARM: UniPhier: move uniphier_ehci_reset() function

In reply to Masahiro Yamada

Because uniphier_ehci_reset() is only called from ehci-uniphier.c, it can be a static function there.

---

 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
deleted file mode 100644
index 3ba3183..0000000
@@ -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
index d40b540..f5ea075 100644
@@ -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
#7 lore raw

PATCH 7/14 ARM: UniPhier: replace "usb-ehci" with "generic-ehci"

In reply to Masahiro Yamada

EHCI host controllers have a common register interface. We may wish to implement a generic EHCI driver someday.

---

 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
index 2a3dd73..8ed7bbf 100644
@@ -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
index 49e375e..3f1001b 100644
@@ -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
index f5529d2..88322c6 100644
@@ -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
index 0ea76e5..1b3eb22 100644
@@ -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
#8 lore raw

PATCH 8/14 ARM: UniPhier: add I/O pin settings for xHCI on PH1-Pro4

In reply to Masahiro Yamada

This is necessary to use the xHCI core for PH1-Pro4.

---

 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
index 4e3d476..3335fb3 100644
@@ -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
#9 lore raw

PATCH 9/14 ARM: UniPhier: enable xHCI and GIO cores for PH1-Pro4

In reply to Masahiro Yamada

This is necessary to use the USB 3.0 host controller on PH1-Pro4.

---

 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
index fe9936a..f735a9c 100644
@@ -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
index daeeec9..397ace8 100644
@@ -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
#10 lore raw

PATCH 10/14 ARM: UniPhier: add xHCI device nodes to PH1-Pro4 device tree

In reply to Masahiro Yamada

Each 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

---

 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
index d9e7a8c..685b5a6 100644
@@ -54,7 +54,3 @@
 &usb0 {
 	status = "okay";
 };
-
-&usb1 {
-	status = "okay";
-};
arch/arm/dts/uniphier-ph1-pro4.dtsi +14 -2
index 3f1001b..1247779 100644
@@ -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
#11 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

In reply to Masahiro Yamada

Support xHCI host driver used on Panasonic UniPhier platform.

---
Hi Marek,

I want apply this patch onto u-boot-uniphier/master to avoid conflicts.

If you are OK with it, could you issue your Acked-by tag, please?

Thanks,
Masahiro

 doc/README.uniphier              |  3 +-
 drivers/usb/host/Kconfig         |  8 ++++
 drivers/usb/host/Makefile        |  1 +
 drivers/usb/host/xhci-uniphier.c | 85 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 drivers/usb/host/xhci-uniphier.c
doc/README.uniphier +2 -1
index aaeb50c..4902533 100644
@@ -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
index 0e005c2..24a595f 100644
@@ -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
index 66d6e9a..eb6f34b 100644
@@ -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 +85 -0

85 lines not on this page · raw message

Signature · 1 line
1.9.1
#12 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

Quoted 10 lines · Masahiro Yamada

Support xHCI host driver used on Panasonic UniPhier platform.

---
Hi Marek,

I want apply this patch onto u-boot-uniphier/master to avoid conflicts.

If you are OK with it, could you issue your Acked-by tag, please?

[...]

drivers/usb/host/xhci-uniphier.c line 28

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+	int offset;
+
+	for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+	     offset >= 0;
+	     offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+		if (index == 0) {
+			*base = (struct xhci_hccr *)
+					fdtdec_get_addr(FDT, offset, "reg");

Hi!

does it make sense to check if the value returned by fdtdec_get_addr() is valid here?

Otherwise,

Best regards,
Marek Vasut

#13 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

Hi Marek,

Quoted 27 lines · On Tue, 17 Feb 2015 20:51:48 +0100 Marek Vasut <[email protected]> wrote:
Quoted 10 lines · Masahiro Yamada

Support xHCI host driver used on Panasonic UniPhier platform.

---
Hi Marek,

I want apply this patch onto u-boot-uniphier/master to avoid conflicts.

If you are OK with it, could you issue your Acked-by tag, please?

[...]

drivers/usb/host/xhci-uniphier.c line 28

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+	int offset;
+
+	for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+	     offset >= 0;
+	     offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+		if (index == 0) {
+			*base = (struct xhci_hccr *)
+					fdtdec_get_addr(FDT, offset, "reg");

Hi!

Quoted 2 lines

does it make sense to check if the value returned by fdtdec_get_addr() is valid here?

Yes.
I knew it, but was lazy.
Finally, I fixed it in v2.

BTW, why did we invent FDT_ADDR_T_NONE?

We had already had the suitable error code, FDT_ERR_NOTFOUND in libfdt.h (or Linux error code in include/asm-generic/errno.h)

I do not think fdtdec functions are well-implemented.

Best Regards
Masahiro Yamada

#14 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

Quoted 1 line · Masahiro Yamada

Hi Marek,

Hi!

Quoted 30 lines

On Tue, 17 Feb 2015 20:51:48 +0100

Quoted 27 lines · Marek Vasut
Quoted 10 lines · Masahiro Yamada

Support xHCI host driver used on Panasonic UniPhier platform.

---
Hi Marek,

I want apply this patch onto u-boot-uniphier/master to avoid conflicts.

If you are OK with it, could you issue your Acked-by tag, please?

[...]

drivers/usb/host/xhci-uniphier.c line 28

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+	int offset;
+
+	for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+	     offset >= 0;
+	     offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+		if (index == 0) {
+			*base = (struct xhci_hccr *)
+					fdtdec_get_addr(FDT, offset, "reg");

Hi!

Quoted 6 lines
Quoted 2 lines

does it make sense to check if the value returned by fdtdec_get_addr() is valid here?

Yes.
I knew it, but was lazy.
Finally, I fixed it in v2.

Thank you ! :)

Quoted 6 lines

BTW, why did we invent FDT_ADDR_T_NONE?

We had already had the suitable error code, FDT_ERR_NOTFOUND in libfdt.h (or Linux error code in include/asm-generic/errno.h)

I do not think fdtdec functions are well-implemented.

That's for Simon to answer.

Best regards,
Marek Vasut

#15 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

In reply to Masahiro Yamada

Hi Masahiro,

Quoted 79 lines · Masahiro Yamada

Support xHCI host driver used on Panasonic UniPhier platform.

---
Hi Marek,

I want apply this patch onto u-boot-uniphier/master to avoid conflicts.

If you are OK with it, could you issue your Acked-by tag, please?

Thanks,
Masahiro

 doc/README.uniphier              |  3 +-
 drivers/usb/host/Kconfig         |  8 ++++
 drivers/usb/host/Makefile        |  1 +
 drivers/usb/host/xhci-uniphier.c | 85 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 drivers/usb/host/xhci-uniphier.c
doc/README.uniphier +2 -1
index aaeb50c..4902533 100644
@@ -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
index 0e005c2..24a595f 100644
@@ -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
index 66d6e9a..eb6f34b 100644
@@ -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 +6 -0
new file mode 100644
index 0000000..9bbd65f
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2015 Panasonic Corporation
+ *   Author: Masahiro Yamada <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */

drivers/usb/host/xhci-uniphier.c line 16

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+
+#include <common.h>
+#include <linux/err.h>
+#include <usb.h>
+#include <fdtdec.h>
+#include "xhci.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define FDT            gd->fdt_blob

Ick, please don't do this. Just use a local variable if you like.

drivers/usb/host/xhci-uniphier.c line 17

Quoted 1 line
drivers/usb/host/xhci-uniphier.c new file +1 -0
+#define COMPAT         "panasonic,uniphier-xhci"

This too.

Quoted 5 lines
drivers/usb/host/xhci-uniphier.c new file +5 -0
+
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+       int offset;
+

drivers/usb/host/xhci-uniphier.c line 32

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+       for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+            offset >= 0;
+            offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+               if (index == 0) {
+                       *base = (struct xhci_hccr *)
+                                       fdtdec_get_addr(FDT, offset, "reg");
+                       return 0;
+               }
+               index--;
+       }

How about this"

count = fdtdec_find_aliasses_for_id(gd->fdt_blob, "usb", COMPAT_PANASONIC_XHCI, node_list, 4);
if (index >= count)
return -ENOENT;
offset = node_list[index];

then aliases will work. You need to ad the COMPAT to include/fdtdec.h/c. See ehci-tegra.c for an example.

Quoted 54 lines
drivers/usb/host/xhci-uniphier.c new file +53 -1
+
+       return -ENODEV; /* not found */
+}
+
+#define USB3_RST_CTRL          0x00100040
+#define IOMMU_RST_N            (1 << 5)
+#define LINK_RST_N             (1 << 4)
+
+static void uniphier_xhci_reset(void __iomem *base, int on)
+{
+       u32 tmp;
+
+       tmp = readl(base + USB3_RST_CTRL);
+
+       if (on)
+               tmp &= ~(IOMMU_RST_N | LINK_RST_N);
+       else
+               tmp |= IOMMU_RST_N | LINK_RST_N;
+
+       writel(tmp, base + USB3_RST_CTRL);
+}
+
+int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor)
+{
+       int ret;
+       struct xhci_hccr *cr;
+       struct xhci_hcor *or;
+
+       ret = get_uniphier_xhci_base(index, &cr);
+       if (ret < 0)
+               return ret;
+
+       uniphier_xhci_reset(cr, 0);
+
+       or = (void *)cr + HC_LENGTH(xhci_readl(&cr->cr_capbase));
+
+       *hccr = cr;
+       *hcor = or;
+
+       return 0;
+}
+
+void xhci_hcd_stop(int index)
+{
+       int ret;
+       struct xhci_hccr *cr;
+
+       ret = get_uniphier_xhci_base(index, &cr);
+       if (ret < 0)
+               return;
+
+       uniphier_xhci_reset(cr, 1);
+}
--
Quoted 2 lines

1.9.1

Regards,
Simon

#16 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

Hi Simon,

Quoted 12 lines · On Tue, 17 Feb 2015 22:01:53 -0700 Simon Glass <[email protected]> wrote:

drivers/usb/host/xhci-uniphier.c line 16

Quoted 9 lines
drivers/usb/host/xhci-uniphier.c new file +9 -0
+#include <common.h>
+#include <linux/err.h>
+#include <usb.h>
+#include <fdtdec.h>
+#include "xhci.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define FDT            gd->fdt_blob

Ick, please don't do this. Just use a local variable if you like.

Quoted 3 lines
Quoted 1 line

+#define COMPAT "panasonic,uniphier-xhci"

This too.

Why?
Each of them appears twice in the code.

Also, if I directly write the strings here, the line exceeds 80 columns and the code gets unreadable for line-wrapping.

Anyway, this is not a big deal.
You have already posted DM USB patch series.
Once it is merged into the mainline, I will not have to scan a device tree in my own driver.

Quoted 18 lines
Quoted 5 lines
drivers/usb/host/xhci-uniphier.c new file +5 -0
+
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+       int offset;
+

drivers/usb/host/xhci-uniphier.c line 32

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+       for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+            offset >= 0;
+            offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+               if (index == 0) {
+                       *base = (struct xhci_hccr *)
+                                       fdtdec_get_addr(FDT, offset, "reg");
+                       return 0;
+               }
+               index--;
+       }

How about this"

Quoted 8 lines

count = fdtdec_find_aliasses_for_id(gd->fdt_blob, "usb", COMPAT_PANASONIC_XHCI, node_list, 4);
if (index >= count)
return -ENOENT;
offset = node_list[index];

then aliases will work. You need to ad the COMPAT to include/fdtdec.h/c. See ehci-tegra.c for an example.

I do not like this idea.

fdt_compat_id is one of what I think should be removed asap because:

- The two separete tables, enum fdt_compat_id and compat_names[], must be maintained in sync. If someone modifies just one of them, it gets broken. Anybody who checks those two tables are arranged in the same order?

- It seems ridiculous to collect many devices from various platforms into the common place.
If everyone starts to follow this way, the table grows too big soon.

Moreover, I am not happy about adding aliases to my device tree again.

Rather, I am searching for an idea to avoid adding an alias to every device, like this.
http://patchwork.ozlabs.org/patch/441922/

Best Regards
Masahiro Yamada

#17 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

Hi Masahiro,

Quoted 19 lines · Masahiro Yamada

Hi Simon,

Quoted 12 lines · On Tue, 17 Feb 2015 22:01:53 -0700 Simon Glass <[email protected]> wrote:

drivers/usb/host/xhci-uniphier.c line 16

Quoted 9 lines
drivers/usb/host/xhci-uniphier.c new file +9 -0
+#include <common.h>
+#include <linux/err.h>
+#include <usb.h>
+#include <fdtdec.h>
+#include "xhci.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define FDT            gd->fdt_blob

Ick, please don't do this. Just use a local variable if you like.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

+#define COMPAT "panasonic,uniphier-xhci"

This too.

Why?
Each of them appears twice in the code.

In the first case you could just a local variable as is done elsewhere in the code:

const void *blob = gd->fdt_blob;

Then use 'blob'.

In the second case, you could easily restructure your loop to remove the duplication. But really you should use the alias function in fdtdec until you convert to driver model.

Quoted 9 lines

Also, if I directly write the strings here, the line exceeds 80 columns and the code gets unreadable for line-wrapping.

Anyway, this is not a big deal.
You have already posted DM USB patch series.
Once it is merged into the mainline, I will not have to scan a device tree in my own driver.

Even now you don't need to do that, as above.

Quoted 35 lines
Quoted 20 lines
Quoted 7 lines
drivers/usb/host/xhci-uniphier.c new file +5 -0
+
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+       int offset;
+

drivers/usb/host/xhci-uniphier.c line 32

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+       for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+            offset >= 0;
+            offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+               if (index == 0) {
+                       *base = (struct xhci_hccr *)
+                                       fdtdec_get_addr(FDT, offset, "reg");
+                       return 0;
+               }
+               index--;
+       }

How about this"

Quoted 8 lines

count = fdtdec_find_aliasses_for_id(gd->fdt_blob, "usb", COMPAT_PANASONIC_XHCI, node_list, 4);
if (index >= count)
return -ENOENT;
offset = node_list[index];

then aliases will work. You need to ad the COMPAT to include/fdtdec.h/c. See ehci-tegra.c for an example.

I do not like this idea.

fdt_compat_id is one of what I think should be removed asap because:

Quoted 8 lines

- The two separete tables, enum fdt_compat_id and compat_names[], must be maintained in sync. If someone modifies just one of them, it gets broken. Anybody who checks those two tables are arranged in the same order?

- It seems ridiculous to collect many devices from various platforms into the common place.
If everyone starts to follow this way, the table grows too big soon.

The purpose is that we then know which drivers are directly looking at the device tree. As we add driver model support, we remove these strings. When the table is empty, we can remove all that support from fdtdec, including aliases.

Quoted 6 lines

Moreover, I am not happy about adding aliases to my device tree again.

Rather, I am searching for an idea to avoid adding an alias to every device, like this.
http://patchwork.ozlabs.org/patch/441922/

This is up to you.

Bu why? It allows people to make adjustments if needed. The numbering of devices is an important thing in U-Boot - most commands use this although I would like one day to allow devices to be named (just use dev->name with device tree).

Anyway this is up to you.

Regards,
Simon

#18 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

Hi Simon,

Quoted 29 lines · On Fri, 20 Feb 2015 10:21:27 -0700 Simon Glass <[email protected]> wrote:

Hi Masahiro,

Quoted 19 lines · Masahiro Yamada

Hi Simon,

Quoted 12 lines · On Tue, 17 Feb 2015 22:01:53 -0700 Simon Glass <[email protected]> wrote:

drivers/usb/host/xhci-uniphier.c line 16

Quoted 9 lines
drivers/usb/host/xhci-uniphier.c new file +9 -0
+#include <common.h>
+#include <linux/err.h>
+#include <usb.h>
+#include <fdtdec.h>
+#include "xhci.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define FDT            gd->fdt_blob

Ick, please don't do this. Just use a local variable if you like.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

+#define COMPAT "panasonic,uniphier-xhci"

This too.

Why?
Each of them appears twice in the code.

Quoted 6 lines

In the first case you could just a local variable as is done elsewhere in the code:

const void *blob = gd->fdt_blob;

Then use 'blob'.

Sounds reasonable.

Quoted 9 lines

In the second case, you could easily restructure your loop to remove the duplication. But really you should use the alias function in fdtdec until you convert to driver model.

Quoted 5 lines

Also, if I directly write the strings here, the line exceeds 80 columns and the code gets unreadable for line-wrapping.

Quoted 6 lines
Quoted 4 lines

Anyway, this is not a big deal.
You have already posted DM USB patch series.
Once it is merged into the mainline, I will not have to scan a device tree in my own driver.

Even now you don't need to do that, as above.

OK.

I am still not convinced with one thing of the fdtdec_find_aliases_for_id().

I think it could take the compatibility string directly like this:

   node_offset =  fdtdec_find_aliases_for_id(gd->fdt_blob, "usb", "panasonic,uniphier-xhci", index);

Anyway, that is OK if it is temporal.

I used this helper function in v4.
http://patchwork.ozlabs.org/patch/442791/

I hope DM USB is supported in the mainline soon.

Quoted 40 lines
Quoted 40 lines
Quoted 20 lines
Quoted 7 lines
drivers/usb/host/xhci-uniphier.c new file +5 -0
+
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+       int offset;
+

drivers/usb/host/xhci-uniphier.c line 32

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+       for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+            offset >= 0;
+            offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+               if (index == 0) {
+                       *base = (struct xhci_hccr *)
+                                       fdtdec_get_addr(FDT, offset, "reg");
+                       return 0;
+               }
+               index--;
+       }

How about this"

Quoted 8 lines

count = fdtdec_find_aliasses_for_id(gd->fdt_blob, "usb", COMPAT_PANASONIC_XHCI, node_list, 4);
if (index >= count)
return -ENOENT;
offset = node_list[index];

then aliases will work. You need to ad the COMPAT to include/fdtdec.h/c. See ehci-tegra.c for an example.

I do not like this idea.

fdt_compat_id is one of what I think should be removed asap because:

- The two separete tables, enum fdt_compat_id and compat_names[], must be maintained in sync. If someone modifies just one of them, it gets broken. Anybody who checks those two tables are arranged in the same order?

Quoted 9 lines
Quoted 3 lines

- It seems ridiculous to collect many devices from various platforms into the common place.
If everyone starts to follow this way, the table grows too big soon.

The purpose is that we then know which drivers are directly looking at the device tree. As we add driver model support, we remove these strings. When the table is empty, we can remove all that support from fdtdec, including aliases.

OK. If you assume this tabile is like a TODO list, it makes sense.

Quoted 6 lines
Quoted 5 lines

Moreover, I am not happy about adding aliases to my device tree again.

Rather, I am searching for an idea to avoid adding an alias to every device, like this.
http://patchwork.ozlabs.org/patch/441922/

Quoted 8 lines

This is up to you.

Bu why? It allows people to make adjustments if needed. The numbering of devices is an important thing in U-Boot - most commands use this although I would like one day to allow devices to be named (just use dev->name with device tree).

Anyway this is up to you.

I read your explanation and I am convinced.

Let's do not apply this series.

Best Regards
Masahiro Yamada

#19 lore raw

PATCH 11/14 usb: UniPhier: add UniPhier on-chip xHCI host driver support

Hi Masahiro,

Quoted 63 lines · Masahiro Yamada

Hi Simon,

Quoted 29 lines · On Fri, 20 Feb 2015 10:21:27 -0700 Simon Glass <[email protected]> wrote:

Hi Masahiro,

Quoted 19 lines · Masahiro Yamada

Hi Simon,

Quoted 12 lines · On Tue, 17 Feb 2015 22:01:53 -0700 Simon Glass <[email protected]> wrote:

drivers/usb/host/xhci-uniphier.c line 16

Quoted 9 lines
drivers/usb/host/xhci-uniphier.c new file +9 -0
+#include <common.h>
+#include <linux/err.h>
+#include <usb.h>
+#include <fdtdec.h>
+#include "xhci.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define FDT            gd->fdt_blob

Ick, please don't do this. Just use a local variable if you like.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

+#define COMPAT "panasonic,uniphier-xhci"

This too.

Why?
Each of them appears twice in the code.

Quoted 6 lines

In the first case you could just a local variable as is done elsewhere in the code:

const void *blob = gd->fdt_blob;

Then use 'blob'.

Sounds reasonable.

Quoted 9 lines

In the second case, you could easily restructure your loop to remove the duplication. But really you should use the alias function in fdtdec until you convert to driver model.

Quoted 5 lines

Also, if I directly write the strings here, the line exceeds 80 columns and the code gets unreadable for line-wrapping.

Quoted 6 lines
Quoted 4 lines

Anyway, this is not a big deal.
You have already posted DM USB patch series.
Once it is merged into the mainline, I will not have to scan a device tree in my own driver.

Even now you don't need to do that, as above.

OK.

Quoted 8 lines

I am still not convinced with one thing of the fdtdec_find_aliases_for_id().

I think it could take the compatibility string directly like this:

   node_offset =  fdtdec_find_aliases_for_id(gd->fdt_blob, "usb", "panasonic,uniphier-xhci", index);

Anyway, that is OK if it is temporal.

Yes it could - the current approach is really just to mark what needs conversion.

Quoted 5 lines

I used this helper function in v4.
http://patchwork.ozlabs.org/patch/442791/

I hope DM USB is supported in the mainline soon.

I think it will be. I posted a series a few weeks back and Vivek posted a different one. I'll ping him to see if he's had a look.

Quoted 47 lines
Quoted 47 lines
Quoted 46 lines
Quoted 23 lines
Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +5 -0
+
+static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
+{
+       int offset;
+

drivers/usb/host/xhci-uniphier.c line 32

Quoted 10 lines
drivers/usb/host/xhci-uniphier.c new file +10 -0
+       for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
+            offset >= 0;
+            offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
+               if (index == 0) {
+                       *base = (struct xhci_hccr *)
+                                       fdtdec_get_addr(FDT, offset, "reg");
+                       return 0;
+               }
+               index--;
+       }

How about this"

Quoted 8 lines

count = fdtdec_find_aliasses_for_id(gd->fdt_blob, "usb", COMPAT_PANASONIC_XHCI, node_list, 4);
if (index >= count)
return -ENOENT;
offset = node_list[index];

then aliases will work. You need to ad the COMPAT to include/fdtdec.h/c. See ehci-tegra.c for an example.

I do not like this idea.

fdt_compat_id is one of what I think should be removed asap because:

- The two separete tables, enum fdt_compat_id and compat_names[], must be maintained in sync. If someone modifies just one of them, it gets broken. Anybody who checks those two tables are arranged in the same order?

- It seems ridiculous to collect many devices from various platforms into the common place.
If everyone starts to follow this way, the table grows too big soon.

Quoted 7 lines
Quoted 5 lines

The purpose is that we then know which drivers are directly looking at the device tree. As we add driver model support, we remove these strings. When the table is empty, we can remove all that support from fdtdec, including aliases.

OK. If you assume this tabile is like a TODO list, it makes sense.

Yes, we should remove it. I am chipping away at it - this morning I sent a series that removed two fo them.

Quoted 17 lines
Quoted 17 lines
Quoted 9 lines

Moreover, I am not happy about adding aliases to my device tree again.

Rather, I am searching for an idea to avoid adding an alias to every device, like this.
http://patchwork.ozlabs.org/patch/441922/

This is up to you.

Bu why? It allows people to make adjustments if needed. The numbering of devices is an important thing in U-Boot - most commands use this although I would like one day to allow devices to be named (just use dev->name with device tree).

Quoted 5 lines
Quoted 1 line

Anyway this is up to you.

I read your explanation and I am convinced.

Let's do not apply this series.

OK.

Regards,
Simon

#20 lore raw

PATCH 12/14 ARM: UniPhier: switch to xHCI for PH1-Pro4

In reply to Masahiro Yamada

PH1-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.

---

 configs/ph1_pro4_defconfig | 2 +-
 include/configs/uniphier.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
configs/ph1_pro4_defconfig +1 -1
index 242bcf9..42a7a65 100644
@@ -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
index 9420e6b..efb67d4 100644
@@ -90,6 +90,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
 
@@ -188,6 +190,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
#21 lore raw

PATCH 13/14 ARM: UniPhier: support 1CS support card for all the UniPhier SoCs

In reply to Masahiro Yamada

Two 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 for PH1-LD4, PH1-sLD8 without any code change.

---

 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
index 927640a..5ce3d8a 100644
@@ -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
index 0390506..b88525c 100644
@@ -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
index be2d8fe..fa51e40 100644
@@ -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
index 927640a..5ce3d8a 100644
@@ -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
#22 lore raw

PATCH 14/14 ARM: UniPhier: consolidate MEMCONF setting code

In reply to Masahiro Yamada

This 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.

---

 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
index df418dd..e7a801b 100644
@@ -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
index 2cc5df6..ee2289f 100644
@@ -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
index b7c4b10..92c9190 100644
@@ -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
index ee6cce3..2bcdbd6 100644
@@ -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