Merge branch 'master' of git://git.denx.de/u-boot-uniphier

Kconfig

@@ -178,7 +178,7 @@ config SYS_EXTRA_OPTIONS
 	  new boards should not use this option.
 
 config SYS_TEXT_BASE
-	depends on SPARC || ARC || X86
+	depends on SPARC || ARC || X86 || ARCH_UNIPHIER
 	hex "Text Base"
 	help
 	  TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture

arch/arm/Kconfig

@@ -786,7 +786,7 @@ config TARGET_JORNADA
 	select CPU_SA1100
 
 config ARCH_UNIPHIER
-	bool "Panasonic UniPhier platform"
+	bool "Socionext UniPhier SoCs"
 	select CPU_V7
 	select SUPPORT_SPL
 	select SPL
@@ -794,6 +794,9 @@ config ARCH_UNIPHIER
 	select DM
 	select DM_SERIAL
 	select DM_I2C
+	help
+	  Support for UniPhier SoC family developed by Socionext Inc.
+	  (formerly, System LSI Business Division of Panasonic Corporation)
 
 config TARGET_STM32F429_DISCOVERY
 	bool "Support STM32F429 Discovery"

arch/arm/mach-uniphier/Kconfig

@@ -1,5 +1,4 @@
-menu "Panasonic UniPhier platform"
-	depends on ARCH_UNIPHIER
+if ARCH_UNIPHIER
 
 config SYS_CONFIG_NAME
 	default "uniphier"
@@ -9,7 +8,7 @@ config UNIPHIER_SMP
 
 choice
 	prompt "UniPhier SoC select"
-	optional
+	default MACH_PH1_PRO4
 
 config MACH_PH1_PRO4
 	bool "PH1-Pro4"
@@ -78,4 +77,4 @@ config DDR_FREQ
 	default 1333 if DDR_FREQ_1333
 	default 1600 if DDR_FREQ_1600
 
-endmenu
+endif

arch/arm/mach-uniphier/board_late_init.c

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -8,7 +7,7 @@
 #include <common.h>
 #include <spl.h>
 #include <nand.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <../drivers/mtd/nand/denali.h>
 
 static void nand_denali_wp_disable(void)

arch/arm/mach-uniphier/cache_uniphier.c

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2012-2014 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/armv7.h>
 #include <mach/ssc-regs.h>
 

arch/arm/mach-uniphier/cmd_ddrphy.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/ddrphy-regs.h>
 
 /* Select either decimal or hexadecimal */

arch/arm/mach-uniphier/cpu_info.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2013-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2013-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 int print_cpuinfo(void)

arch/arm/mach-uniphier/ddrphy_training.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/ddrphy-regs.h>
 
 void ddrphy_prepare_training(struct ddrphy __iomem *phy, int rank)
@@ -116,10 +115,8 @@ int ddrphy_training(struct ddrphy __iomem *phy)
 
 	do {
 		if (--timeout < 0) {
-#ifndef CONFIG_SPL_BUILD
 			printf("%s: error: timeout during DDR training\n",
 								__func__);
-#endif
 			return -1;
 		}
 		udelay(1);
@@ -128,10 +125,8 @@ int ddrphy_training(struct ddrphy __iomem *phy)
 
 	for (i = 0; i < ARRAY_SIZE(init_sequence); i++) {
 		if (pgsr0 & init_sequence[i].err_flag) {
-#ifndef CONFIG_SPL_BUILD
 			printf("%s: error: %s failed\n", __func__,
 						init_sequence[i].description);
-#endif
 			return -1;
 		}
 	}

arch/arm/mach-uniphier/include/mach/ddrphy-regs.h

@@ -1,8 +1,7 @@
 /*
  * UniPhier DDR PHY registers
  *
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -37,7 +36,10 @@ struct ddrphy {
 	u32 dtar[4];		/* Data Training Address Register */
 	u32 dtdr[2];		/* Data Training Data Register */
 	u32 dtedr[2];		/* Data Training Eye Data Register */
-	u32 rsv0[13];		/* Reserved */
+	u32 pgcr2;		/* PHY General Configuration Register 2 */
+	u32 rsv0[8];		/* Reserved */
+	u32 rdimmgcr[2];	/* RDIMM General Configuration Register */
+	u32 rdimmcr0[2];	/* RDIMM Control Register */
 	u32 dcuar;		/* DCU Address Register */
 	u32 dcudr;		/* DCU Data Register */
 	u32 dcurr;		/* DCU Run Register */
@@ -70,7 +72,8 @@ struct ddrphy {
 		u32 lcdlr[3];	/* Local Calibrated Delay Line Register */
 		u32 mdlr;	/* Master Delay Line Register */
 		u32 gtr;	/* General Timing Register */
-		u32 rsv[3];	/* Reserved */
+		u32 gsr2;	/* General Status Register 2 */
+		u32 rsv[2];	/* Reserved */
 	} dx[9];
 };
 

arch/arm/mach-uniphier/include/mach/debug-uart.S

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -17,8 +16,8 @@
 
 	.macro		init_debug_uart, ra, rb, rc
 	addruart	\ra, \rb, \rc
-	mov		\rb, #UART_LCR_WLEN8
-	strb		\rb, [\ra, #0x11]
+	mov		\rb, #UART_LCR_WLEN8 << 8
+	str		\rb, [\ra, #0x10]
 	ldr		\rb, =DIVISOR
 	str		\rb, [\ra, #0x24]
 	.endm

arch/arm/mach-uniphier/include/mach/led.h

@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -77,7 +76,7 @@
 
 #else /* __ASSEMBLY__ */
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 #define led_write(C0, C1, C2, C3)		\
 do {						\

arch/arm/mach-uniphier/include/mach/sbc-regs.h

@@ -1,7 +1,7 @@
 /*
  * UniPhier SBC (System Bus Controller) registers
  *
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -99,7 +99,7 @@
 #define ROM_BOOT_ROMRSV2		0x59801208
 
 #ifndef __ASSEMBLY__
-#include <asm/io.h>
+#include <linux/io.h>
 static inline int boot_is_swapped(void)
 {
 	return !(readl(SBBASE0) & SBBASE_BANK_ENABLE);

arch/arm/mach-uniphier/include/mach/sg-regs.h

@@ -1,7 +1,7 @@
 /*
  * UniPhier SG (SoC Glue) block registers
  *
- * Copyright (C) 2011-2015 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -108,7 +108,7 @@
 #else
 
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 static inline void sg_set_pinsel(int n, int value)
 {

arch/arm/mach-uniphier/lowlevel_init.S

@@ -1,7 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -67,20 +65,6 @@ secondary_startup:
 	 *  jump to Linux
 	 *  kick secondaries   ---(sev)--->    jump to Linux
 	 */
-	/*
-	 * ACTLR (Auxiliary Control Register) for Cortex-A9
-	 * bit[9]  Parity on
-	 * bit[8]  Alloc in one way
-	 * bit[7]  EXCL (Exclusive cache bit)
-	 * bit[6]  SMP
-	 * bit[3]  Write full line of zeros mode
-	 * bit[2]  L1 prefetch enable
-	 * bit[1]  L2 prefetch enable
-	 * bit[0]  FW (Cache and TLB maintenance broadcast)
-	 */
-	mrc	p15, 0, r0, c1, c0, 1	@ ACTLR (Auxiliary Control Register)
-	orr	r0, r0, #0x41		@ enable SMP, FW bit
-	mcr	p15, 0, r0, c1, c0, 1
 
 	/* branch by CPU ID */
 	mrc	p15, 0, r0, c0, c0, 5	@ MPIDR (Multiprocessor Affinity Register)
@@ -112,12 +96,6 @@ primary_cpu:
 	str	r0, [r1]
 	ldr	r0, [r1]		@ make sure str is complete before sev
 	sev				@ kick the secondary CPU
-	mrc	p15, 4, r1, c15, c0, 0	@ Configuration Base Address Register
-	bfc	r1, #0, #13		@ clear bit 12-0
-	mov	r0, #-1
-	str	r0, [r1, #SCU_INV_ALL]	@ SCU Invalidate All Register
-	mov	r0, #1			@ SCU enable
-	str	r0, [r1, #SCU_CTRL]	@ SCU Control Register
 #endif
 
 	bl	setup_init_ram		@ RAM area for temporary stack pointer

arch/arm/mach-uniphier/memconf.c

@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/sizes.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 static inline u32 sg_memconf_val_ch0(unsigned long size, int num)

arch/arm/mach-uniphier/ph1-ld4/bcu_init.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/bcu-regs.h>
 
 #define ch(x) ((x) >= 32 ? 0 : (x) < 0 ? 0x11111111 : 0x11111111 << (x))

arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 
 void clkrst_init(void)

arch/arm/mach-uniphier/ph1-ld4/ddrphy_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/ddrphy-regs.h>
 
 void ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)

arch/arm/mach-uniphier/ph1-ld4/pinctrl.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 void pin_init(void)

arch/arm/mach-uniphier/ph1-ld4/pll_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-ld4/sbc_init.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sbc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-ld4/sbc_init_3cs.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sbc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-ld4/sg_init.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 void sg_init(void)

arch/arm/mach-uniphier/ph1-ld4/umc_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/umc-regs.h>
 #include <mach/ddrphy-regs.h>
 

arch/arm/mach-uniphier/ph1-pro4/boot-mode.c

@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <spl.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/boot-device.h>
 #include <mach/sg-regs.h>
 #include <mach/sbc-regs.h>

arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 
 void clkrst_init(void)

arch/arm/mach-uniphier/ph1-pro4/ddrphy_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/ddrphy-regs.h>
 
 void ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)

arch/arm/mach-uniphier/ph1-pro4/early_clkrst_init.c

@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.m@jp.panasonic.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <spl.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 
 void early_clkrst_init(void)

arch/arm/mach-uniphier/ph1-pro4/early_pinctrl.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 void early_pin_init(void)

arch/arm/mach-uniphier/ph1-pro4/pinctrl.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 void pin_init(void)
@@ -28,6 +27,8 @@ void pin_init(void)
 	sg_set_pinsel(52, 0);	/* XNFWP  -> XNFWP */
 	sg_set_pinsel(53, 0);	/* XNFCE0 -> XNFCE0 */
 	sg_set_pinsel(54, 0);	/* NRYBY0 -> NRYBY0 */
+	/* sg_set_pinsel(131, 1); */	/* RXD2   -> NRYBY1 */
+	/* sg_set_pinsel(132, 1); */	/* TXD2   -> XNFCE1 */
 #endif
 
 #ifdef CONFIG_USB_XHCI_UNIPHIER

arch/arm/mach-uniphier/ph1-pro4/pll_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-pro4/pll_spectrum.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 
 void enable_dpll_ssc(void)

arch/arm/mach-uniphier/ph1-pro4/sbc_init.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sbc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-pro4/sbc_init_3cs.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sbc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-pro4/sg_init.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 void sg_init(void)

arch/arm/mach-uniphier/ph1-pro4/umc_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/umc-regs.h>
 #include <mach/ddrphy-regs.h>
 

arch/arm/mach-uniphier/ph1-sld8/ddrphy_init.c

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <config.h>
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/ddrphy-regs.h>
 
 void ddrphy_init(struct ddrphy __iomem *phy, int freq, int size)

arch/arm/mach-uniphier/ph1-sld8/pinctrl.c

@@ -1,11 +1,10 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sg-regs.h>
 
 void pin_init(void)
@@ -46,7 +45,7 @@ void pin_init(void)
 	sg_set_pinsel(42, 0);	/* USB0OD   -> USB0OD */
 	sg_set_pinsel(43, 0);	/* USB1VBUS -> USB1VBUS */
 	sg_set_pinsel(44, 0);	/* USB1OD   -> USB1OD */
-	/* sg_set_pinsel(114, 4); */ /* TXD1 -> USB2VBUS (shared with UART) */
-	/* sg_set_pinsel(115, 4); */ /* RXD1 -> USB2OD */
+	/* sg_set_pinsel(114, 1); */ /* TXD1 -> USB2VBUS (shared with UART) */
+	/* sg_set_pinsel(115, 1); */ /* RXD1 -> USB2OD */
 #endif
 }

arch/arm/mach-uniphier/ph1-sld8/pll_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-sld8/sbc_init_3cs.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2011-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sbc-regs.h>
 #include <mach/sg-regs.h>
 

arch/arm/mach-uniphier/ph1-sld8/umc_init.c

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2011-2014 Panasonic Corporation
+ * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/umc-regs.h>
 #include <mach/ddrphy-regs.h>
 

arch/arm/mach-uniphier/reset.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2012-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/sc-regs.h>
 
 void reset_cpu(unsigned long ignored)

arch/arm/mach-uniphier/support_card.c

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2012-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/board.h>
 
 #if defined(CONFIG_PFC_MICRO_SUPPORT_CARD)

arch/arm/mach-uniphier/timer.c

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2012-2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/arm-mpcore.h>
 
 #define PERIPHCLK (50 * 1000 * 1000) /* 50 MHz */

configs/ph1_ld4_defconfig

@@ -3,6 +3,8 @@ CONFIG_ARCH_UNIPHIER=y
 CONFIG_SPL_DM=y
 CONFIG_MACH_PH1_LD4=y
 CONFIG_PFC_MICRO_SUPPORT_CARD=y
+CONFIG_NET=y
+CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -30,6 +32,7 @@ CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
+CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8

configs/ph1_pro4_defconfig

@@ -1,8 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SPL_DM=y
-CONFIG_MACH_PH1_PRO4=y
 CONFIG_PFC_MICRO_SUPPORT_CARD=y
+CONFIG_NET=y
+CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -30,6 +31,7 @@ CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
+CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8

configs/ph1_sld8_defconfig

@@ -3,6 +3,8 @@ CONFIG_ARCH_UNIPHIER=y
 CONFIG_SPL_DM=y
 CONFIG_MACH_PH1_SLD8=y
 CONFIG_PFC_MICRO_SUPPORT_CARD=y
+CONFIG_NET=y
+CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
@@ -30,6 +32,7 @@ CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_NFS=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
+CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NAND_DENALI=y
 CONFIG_SYS_NAND_DENALI_64BIT=y
 CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8

drivers/i2c/Kconfig

@@ -63,13 +63,13 @@ config SYS_I2C_UNIPHIER
 	depends on ARCH_UNIPHIER && DM_I2C
 	default y
 	help
-	  Support for Panasonic UniPhier I2C controller driver.  This I2C
-	  controller is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
+	  Support for UniPhier I2C controller driver.  This I2C controller
+	  is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
 
 config SYS_I2C_UNIPHIER_F
 	bool "UniPhier FIFO-builtin I2C driver"
 	depends on ARCH_UNIPHIER && DM_I2C
 	default y
 	help
-	  Support for Panasonic UniPhier FIFO-builtin I2C controller driver.
+	  Support for UniPhier FIFO-builtin I2C controller driver.
 	  This I2C controller is used on PH1-Pro4 or newer UniPhier SoCs.

drivers/i2c/i2c-uniphier-f.c

@@ -1,14 +1,12 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/errno.h>
 #include <dm/device.h>
 #include <dm/root.h>

drivers/i2c/i2c-uniphier.c

@@ -1,14 +1,12 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/types.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/errno.h>
 #include <dm/device.h>
 #include <dm/root.h>

drivers/serial/Kconfig

@@ -77,7 +77,8 @@ config DEBUG_UART_SHIFT
 	  registers, 2=32-bit word registers, etc.
 
 config UNIPHIER_SERIAL
-	bool "UniPhier on-chip UART support"
+	bool "Support for UniPhier on-chip UART"
 	depends on ARCH_UNIPHIER && DM_SERIAL
 	help
-	  Support for the on-chip UARTs on the Panasonic UniPhier platform.
+	  If you have a UniPhier based board and want to use the on-chip
+	  serial ports, say Y to this option. If unsure, say N.

drivers/serial/serial_uniphier.c

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2012-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#include <linux/io.h>
 #include <linux/serial_reg.h>
-#include <asm/io.h>
 #include <asm/errno.h>
 #include <dm/device.h>
 #include <dm/platform_data/serial-uniphier.h>

drivers/usb/host/Kconfig

@@ -18,12 +18,11 @@ config USB_XHCI
 if USB_XHCI_HCD
 
 config USB_XHCI_UNIPHIER
-	bool "Support for Panasonic UniPhier on-chip xHCI USB controller"
+	bool "Support for 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.
+	  Enables support for the on-chip xHCI controller on UniPhier SoCs.
 
 endif
 
@@ -54,11 +53,10 @@ config USB_EHCI
 if USB_EHCI_HCD
 
 config USB_EHCI_UNIPHIER
-	bool "Support for Panasonic UniPhier on-chip EHCI USB controller"
+	bool "Support for UniPhier on-chip EHCI USB controller"
 	depends on ARCH_UNIPHIER && OF_CONTROL
 	default y
 	---help---
-	  Enables support for the on-chip EHCI controller on Panasonic
-	  UniPhier SoCs.
+	  Enables support for the on-chip EHCI controller on UniPhier SoCs.
 
 endif

drivers/usb/host/ehci-uniphier.c

@@ -1,14 +1,12 @@
 /*
- * Copyright (C) 2014 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/err.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <usb.h>
 #include <mach/mio-regs.h>
 #include <fdtdec.h>

drivers/usb/host/xhci-uniphier.c

@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2015 Panasonic Corporation
- * Copyright (C) 2015 Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/err.h>
+#include <linux/io.h>
 #include <usb.h>
 #include <fdtdec.h>
 #include "xhci.h"

include/configs/uniphier.h

@@ -1,7 +1,5 @@
 /*
- * Copyright (C) 2012-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -252,6 +250,8 @@
 /* Open Firmware flat tree */
 #define CONFIG_OF_LIBFDT
 
+#define CONFIG_LIB_RAND
+
 #define CONFIG_HAVE_ARM_SECURE
 
 /* Memory Size & Mapping */
@@ -266,8 +266,6 @@
 #define CONFIG_SYS_SDRAM_SIZE	(CONFIG_SDRAM0_SIZE)
 #endif
 
-#define CONFIG_SYS_TEXT_BASE		0x84000000
-
 #if defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8)
 #define CONFIG_SPL_TEXT_BASE		0x00040000
 #endif