Skip to contentSkip to conversation

ARM: SoC: add a new platform, UniPhier (arch/arm/mach-uniphier)

PATCH Superseded Masahiro Yamada 4 participants 15 messages Apr 16, 2015 – Apr 17, 2015

Subsystems (5)

v1 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

cover ARM: SoC: add a new platform, UniPhier (arch/arm/mach-uniphier)

This is an initial series for supporting Socionext UniPhier SoCs, based on ARM Cortex-A9, mainly used for digital TVs, video recorders, etc.

Masahiro Yamada (4):
ARM: UniPhier: add basic support for UniPhier architecture
ARM: multi_v7_defconfig: enable UniPhier SoC family
ARM: dts: UniPhier: add support for UniPhier SoCs and boards
MAINTAINERS: add myself as ARM/UniPhier maintainer

 MAINTAINERS                                  |  7 +++
 arch/arm/Kconfig                             |  2 +
 arch/arm/Makefile                            |  1 +
 arch/arm/boot/dts/Makefile                   |  5 ++
 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts   | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi      | 78 +++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts  | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi     | 85 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts  | 52 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi     | 85 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts  | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi     | 78 +++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-support-card.dtsi | 39 +++++++++++++
 arch/arm/configs/multi_v7_defconfig          |  1 +
 arch/arm/mach-uniphier/Kconfig               | 11 ++++
 arch/arm/mach-uniphier/Makefile              |  2 +
 arch/arm/mach-uniphier/headsmp.S             | 21 +++++++
 arch/arm/mach-uniphier/platsmp.c             | 78 +++++++++++++++++++++++++
 arch/arm/mach-uniphier/uniphier.c            | 31 ++++++++++
 19 files changed, 729 insertions(+)
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-support-card.dtsi
 create mode 100644 arch/arm/mach-uniphier/Kconfig
 create mode 100644 arch/arm/mach-uniphier/Makefile
 create mode 100644 arch/arm/mach-uniphier/headsmp.S
 create mode 100644 arch/arm/mach-uniphier/platsmp.c
 create mode 100644 arch/arm/mach-uniphier/uniphier.c
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/4 ARM: UniPhier: add basic support for UniPhier architecture

Initial commit for a new SoC family, UniPhier, developed by Socionext Inc. (formerly, System LSI Business Division of Panasonic Corporation).

This commit includes a minimal set of components for booting the kernel, including SMP support.

---

 arch/arm/Kconfig                  |  2 +
 arch/arm/Makefile                 |  1 +
 arch/arm/mach-uniphier/Kconfig    | 11 ++++++
 arch/arm/mach-uniphier/Makefile   |  2 +
 arch/arm/mach-uniphier/headsmp.S  | 21 +++++++++++
 arch/arm/mach-uniphier/platsmp.c  | 78 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-uniphier/uniphier.c | 31 ++++++++++++++++
 7 files changed, 146 insertions(+)
 create mode 100644 arch/arm/mach-uniphier/Kconfig
 create mode 100644 arch/arm/mach-uniphier/Makefile
 create mode 100644 arch/arm/mach-uniphier/headsmp.S
 create mode 100644 arch/arm/mach-uniphier/platsmp.c
 create mode 100644 arch/arm/mach-uniphier/uniphier.c
arch/arm/Kconfig +2 -0
index 392e7ae..c332b98 100644
@@ -963,6 +963,8 @@ source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-u300/Kconfig"
 
+source "arch/arm/mach-uniphier/Kconfig"
+
 source "arch/arm/mach-ux500/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
arch/arm/Makefile +1 -0
index 5575d9f..9de6aa6 100644
@@ -201,6 +201,7 @@ machine-$(CONFIG_ARCH_SUNXI)		+= sunxi
 machine-$(CONFIG_ARCH_TEGRA)		+= tegra
 machine-$(CONFIG_ARCH_U300)		+= u300
 machine-$(CONFIG_ARCH_U8500)		+= ux500
+machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 machine-$(CONFIG_ARCH_VERSATILE)	+= versatile
 machine-$(CONFIG_ARCH_VEXPRESS)		+= vexpress
 machine-$(CONFIG_ARCH_VT8500)		+= vt8500
arch/arm/mach-uniphier/Kconfig new file +11 -0
new file mode 100644
index 0000000..a017b1d
@@ -0,0 +1,11 @@
+config ARCH_UNIPHIER
+	bool "Socionext UniPhier SoCs"
+	depends on ARCH_MULTI_V7
+	select ARM_AMBA
+	select ARM_GLOBAL_TIMER
+	select ARM_GIC
+	select HAVE_ARM_SCU
+	select HAVE_ARM_TWD
+	help
+	  Support for UniPhier SoC family developed by Socionext Inc.
+	  (formerly, System LSI Business Division of Panasonic Corporation)
arch/arm/mach-uniphier/Makefile new file +2 -0
new file mode 100644
index 0000000..46cfa54
@@ -0,0 +1,2 @@
+obj-y			:= uniphier.o
+obj-$(CONFIG_SMP)	+= headsmp.o platsmp.o
arch/arm/mach-uniphier/headsmp.S new file +21 -0
new file mode 100644
index 0000000..8d94877
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 Socionext Inc.
+ *   Author: Masahiro Yamada <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/linkage.h>
+
+ENTRY(uniphier_secondary_startup)
+	bl	v7_invalidate_l1
+	b	secondary_startup
+ENDPROC(uniphier_secondary_startup)
arch/arm/mach-uniphier/platsmp.c new file +78 -0

78 lines not on this page · raw message

arch/arm/mach-uniphier/uniphier.c new file +31 -0
new file mode 100644
index 0000000..f08ccf5
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 Socionext Inc.
+ *   Author: Masahiro Yamada <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <asm/mach/arch.h>
+
+static const char * const uniphier_board_dt_compat[] __initconst = {
+	"socionext,ph1-sld3",
+	"socionext,ph1-ld4",
+	"socionext,ph1-pro4",
+	"socionext,ph1-sld8",
+	"socionext,ph1-pro5",
+	"socionext,ph1-proxstream2",
+	"socionext,ph1-ld6b",
+	NULL,
+};
+
+DT_MACHINE_START(UNIPHIER, "Socionext UniPhier")
+	.dt_compat	= uniphier_board_dt_compat,
+MACHINE_END
Signature · 1 line
1.9.1
maintainer
#2 lore raw

PATCH 1/4 ARM: UniPhier: add basic support for UniPhier architecture

arch/arm/mach-uniphier/headsmp.S line 21

Quoted 4 lines · On Thursday 16 April 2015 16:40:35 Masahiro Yamada wrote:
arch/arm/mach-uniphier/headsmp.S new file +4 -0
+ENTRY(uniphier_secondary_startup)
+       bl      v7_invalidate_l1
+       b       secondary_startup
+ENDPROC(uniphier_secondary_startup)

Since this file is really trivial, I wonder if you could just use a 'naked' inline assembly function from C code here, to have the entire SMP support in one file.

Review

Quoted 2 lines
(quoted diff) +2 -0
+
+#define ROM_BOOT_ROMRSV2		0x59801208

Please don't hardcode any physical addresses, instead find the DT node or syscon device in the _boot_secondary implementation.

Which device is this register part of?

arch/arm/mach-uniphier/uniphier.c line 27

Quoted 11 lines
arch/arm/mach-uniphier/uniphier.c new file +11 -0
+
+static const char * const uniphier_board_dt_compat[] __initconst = {
+	"socionext,ph1-sld3",
+	"socionext,ph1-ld4",
+	"socionext,ph1-pro4",
+	"socionext,ph1-sld8",
+	"socionext,ph1-pro5",
+	"socionext,ph1-proxstream2",
+	"socionext,ph1-ld6b",
+	NULL,
+};

Are these chip names or board names? The list should normally have just the socs, which I assume you do, but it's not completely clear from the source.

Arnd

#3 lore raw

PATCH 1/4 ARM: UniPhier: add basic support for UniPhier architecture

Hi Arnd,

2015-04-16 18:41 GMT+09:00 Arnd Bergmann <[email protected]>:

Quoted 10 lines · On Thursday 16 April 2015 16:40:35 Masahiro Yamada wrote:

arch/arm/mach-uniphier/headsmp.S line 21

Quoted 5 lines
arch/arm/mach-uniphier/headsmp.S new file +4 -0
+ENTRY(uniphier_secondary_startup)
+       bl      v7_invalidate_l1
+       b       secondary_startup
+ENDPROC(uniphier_secondary_startup)

Since this file is really trivial, I wonder if you could just use a 'naked' inline assembly function from C code here, to have the entire SMP support in one file.

I merged platsmp.c and headsmp.c into a single file in v3. I added __naked as you suggested.

Quoted 5 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+
+#define ROM_BOOT_ROMRSV2             0x59801208

Please don't hardcode any physical addresses, instead find the DT node or syscon device in the _boot_secondary implementation.

I implemented it as a syscon device in v3.

Quoted 1 line

Which device is this register part of?

It is just a simple register for storing destination address for the secondary CPU.

Quoted 7 lines
Quoted 7 lines
arch/arm/mach-uniphier/uniphier.c new file +7 -0
+
+static const char * const uniphier_board_dt_compat[] __initconst = {
+     "socionext,ph1-sld3",
+     "socionext,ph1-ld4",
+     "socionext,ph1-pro4",
+     "socionext,ph1-sld8",
+     "socionext,ph1-pro5",
Quoted 8 lines

arch/arm/mach-uniphier/uniphier.c line 27

Quoted 4 lines
arch/arm/mach-uniphier/uniphier.c new file +4 -0
+     "socionext,ph1-proxstream2",
+     "socionext,ph1-ld6b",
+     NULL,
+};

Are these chip names or board names? The list should normally have just the socs, which I assume you do, but it's not completely clear from the source.

SoC names.

Perhaps, the structure name "uniphier_board_dt_compat" might be confusing. I renamed it into "uniphier_dt_compat" in v3.

Many thanks!

BTW, I had solved the problem "not syncing: Attempted to kill init! exitcode=0x00000004 ?",
I posted about two weeks ago.
L2 cache had nothing to do with the issue.
With a little fix of the device tree and an initramdisk I regenerated using Buildroot,
I succeeded in booting the kernel.

Signature · 2 lines
Best Regards
Masahiro Yamada
#4 lore raw

PATCH 1/4 ARM: UniPhier: add basic support for UniPhier architecture

In reply to Masahiro Yamada
Quoted 14 lines · Masahiro Yamada
arch/arm/mach-uniphier/platsmp.c new file +8 -0
new file mode 100644
index 0000000..6b61f8d
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015 Socionext Inc.
+ *   Author: Masahiro Yamada <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.

arch/arm/mach-uniphier/platsmp.c line 18

Quoted 10 lines
arch/arm/mach-uniphier/platsmp.c new file +10 -0
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/sizes.h>
+#include <linux/init.h>
+#include <asm/io.h>

Please use linux/io.h rather than asm/io.h

Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
#5 lore raw

PATCH 1/4 ARM: UniPhier: add basic support for UniPhier architecture

Hi Russell,

2015-04-16 18:56 GMT+09:00 Russell King - ARM Linux <[email protected]>:

Quoted 19 lines · Masahiro Yamada
Quoted 18 lines
arch/arm/mach-uniphier/platsmp.c new file +12 -0
new file mode 100644
index 0000000..6b61f8d
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015 Socionext Inc.
+ *   Author: Masahiro Yamada <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
Quoted 9 lines

arch/arm/mach-uniphier/platsmp.c line 18

Quoted 6 lines
arch/arm/mach-uniphier/platsmp.c new file +6 -0
+ * GNU General Public License for more details.
+ */
+
+#include <linux/sizes.h>
+#include <linux/init.h>
+#include <asm/io.h>

Please use linux/io.h rather than asm/io.h

Yes. Fixed in v3.
Thanks!

Signature · 2 lines
Best Regards
Masahiro Yamada
#6 lore raw

PATCH 2/4 ARM: multi_v7_defconfig: enable UniPhier SoC family

In reply to Masahiro Yamada

Add UniPhier, a new citizen in the ARM multi platform.

---

 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v7_defconfig +1 -0
index d7f038d..24005cf 100644
@@ -81,6 +81,7 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_ARCH_UNIPHIER=y
 CONFIG_ARCH_U8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
Signature · 1 line
1.9.1
maintainer
#7 lore raw

PATCH 2/4 ARM: multi_v7_defconfig: enable UniPhier SoC family

Quoted 14 lines · On Thursday 16 April 2015 16:40:36 Masahiro Yamada wrote:

Add UniPhier, a new citizen in the ARM multi platform.

---

 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v7_defconfig +0 -0
index d7f038d..24005cf 100644

arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_3x_SOC=y · line 87

Quoted 7 lines
arch/arm/configs/multi_v7_defconfig +1 -0
@@ -81,6 +81,7 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_ARCH_UNIPHIER=y
 CONFIG_ARCH_U8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y

Any additional device drivers you need?

Arnd

#8 lore raw

PATCH 2/4 ARM: multi_v7_defconfig: enable UniPhier SoC family

Hi Arnd,

2015-04-16 18:42 GMT+09:00 Arnd Bergmann <[email protected]>:

Quoted 9 lines · On Thursday 16 April 2015 16:40:36 Masahiro Yamada wrote:
Quoted 8 lines

Add UniPhier, a new citizen in the ARM multi platform.

---

 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
Quoted 16 lines

arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_3x_SOC=y · line 87

Quoted 13 lines
arch/arm/configs/multi_v7_defconfig +1 -0
index d7f038d..24005cf 100644
@@ -81,6 +81,7 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_ARCH_UNIPHIER=y
 CONFIG_ARCH_U8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y

Any additional device drivers you need?

Our drivers are still based-on old kernel version (pre-DT) with local ugly hacking.
I need more time to re-write them based on the current coding style (almost from scratch),
so I'd like to do it as a second round.

This series is just mainlining a minimal support with a serial console. I think it is a good starting point.
The UART device is 16550-compatible, so I do not need any additional driver.

Signature · 2 lines
Best Regards
Masahiro Yamada
maintainer
#9 lore raw

PATCH 2/4 ARM: multi_v7_defconfig: enable UniPhier SoC family

Quoted 33 lines · On Saturday 18 April 2015 01:00:16 Masahiro Yamada wrote:

2015-04-16 18:42 GMT+09:00 Arnd Bergmann <[email protected]>:

Quoted 9 lines · On Thursday 16 April 2015 16:40:36 Masahiro Yamada wrote:
Quoted 8 lines

Add UniPhier, a new citizen in the ARM multi platform.

---

 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
Quoted 16 lines

arch/arm/configs/multi_v7_defconfig CONFIG_ARCH_TEGRA_3x_SOC=y · line 87

Quoted 13 lines
arch/arm/configs/multi_v7_defconfig +1 -0
index d7f038d..24005cf 100644
@@ -81,6 +81,7 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_ARCH_UNIPHIER=y
 CONFIG_ARCH_U8500=y
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y

Any additional device drivers you need?

Our drivers are still based-on old kernel version (pre-DT) with local ugly hacking.
I need more time to re-write them based on the current coding style (almost from scratch),
so I'd like to do it as a second round.

Quoted 4 lines

This series is just mainlining a minimal support with a serial console. I think it is a good starting point.
The UART device is 16550-compatible, so I do not need any additional driver.

Ok, seems fine then.

Arnd

#10 lore raw

PATCH 3/4 ARM: dts: UniPhier: add support for UniPhier SoCs and boards

In reply to Masahiro Yamada

Initial device trees for UniPhier SoCs: PH1-sLD3, PH1-LD4, PH1-Pro4, and PH1-sLD8.

---

 arch/arm/boot/dts/Makefile                   |  5 ++
 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts   | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi      | 78 +++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts  | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi     | 85 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts  | 52 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi     | 85 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts  | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi     | 78 +++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-support-card.dtsi | 39 +++++++++++++
 10 files changed, 575 insertions(+)
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-support-card.dtsi
arch/arm/boot/dts/Makefile +5 -0
index a1c776b..d639a90 100644
@@ -588,6 +588,11 @@ dtb-$(CONFIG_ARCH_U8500) += \
 	ste-hrefv60plus-tvk.dtb \
 	ste-ccu8540.dtb \
 	ste-ccu9540.dtb
+dtb-$(CONFIG_ARCH_UNIPHIER) += \
+	uniphier-ph1-sld3-ref.dtb \
+	uniphier-ph1-ld4-ref.dtb \
+	uniphier-ph1-pro4-ref.dtb \
+	uniphier-ph1-sld8-ref.dtb
 dtb-$(CONFIG_ARCH_VERSATILE) += \
 	versatile-ab.dtb \
 	versatile-pb.dtb
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts new file +51 -0

51 lines not on this page · raw message

arch/arm/boot/dts/uniphier-ph1-ld4.dtsi new file +78 -0

78 lines not on this page · raw message

arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts new file +51 -0

51 lines not on this page · raw message

arch/arm/boot/dts/uniphier-ph1-pro4.dtsi new file +85 -0

85 lines not on this page · raw message

arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts new file +52 -0

52 lines not on this page · raw message

arch/arm/boot/dts/uniphier-ph1-sld3.dtsi new file +85 -0

85 lines not on this page · raw message

arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts new file +51 -0

51 lines not on this page · raw message

arch/arm/boot/dts/uniphier-ph1-sld8.dtsi new file +78 -0

78 lines not on this page · raw message

arch/arm/boot/dts/uniphier-support-card.dtsi new file +39 -0
new file mode 100644
index 0000000..2abbec1
@@ -0,0 +1,39 @@
+/*
+ * Device Tree Source for UniPhier Support Card (Expansion Board)
+ *
+ * Copyright (C) 2015 Socionext Inc.
+ *   Author: Masahiro Yamada <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+&extbus {
+	support_card: support_card {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		ethsc: ethernet at 00000000 {
+			compatible = "smsc,lan9118", "smsc,lan9115";
+			reg = <0x00000000 0x1000>;
+			phy-mode = "mii";
+			reg-io-width = <4>;
+		};
+
+		serialsc: uart at 000b0000 {
+			compatible = "ns16550a";
+			reg = <0x000b0000 0x20>;
+			clock-frequency = <12288000>;
+			reg-shift = <1>;
+			fifo-size = <16>;
+		};
+	};
+};
Signature · 1 line
1.9.1
maintainer
#11 lore raw

PATCH 3/4 ARM: dts: UniPhier: add support for UniPhier SoCs and boards

arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts line 33

Quoted 13 lines · On Thursday 16 April 2015 16:40:37 Masahiro Yamada wrote:
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts new file +13 -0
+
+/ {
+	model = "UniPhier PH1-LD4 Reference Board";
+	compatible = "socionext,ph1-ld4-ref", "socionext,ph1-ld4";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x20000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200 earlyprintk";
+	};

I would remove the 'earlyprintk' option here. You don't add any options for the platform in Kconfig.debug, and I hope that we can eventually start using earlycon. Please add an appropriate stdio-path property here, but note that we are still lacking the fixmap patches to make earlycon work.

Otherwise looks good.

Arnd

#12 lore raw

PATCH 3/4 ARM: dts: UniPhier: add support for UniPhier SoCs and boards

Hi Arnd,

2015-04-16 18:44 GMT+09:00 Arnd Bergmann <[email protected]>:

Quoted 21 lines · On Thursday 16 April 2015 16:40:37 Masahiro Yamada wrote:

arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts line 33

Quoted 13 lines
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts new file +13 -0
+
+/ {
+     model = "UniPhier PH1-LD4 Reference Board";
+     compatible = "socionext,ph1-ld4-ref", "socionext,ph1-ld4";
+
+     memory {
+             device_type = "memory";
+             reg = <0x80000000 0x20000000>;
+     };
+
+     chosen {
+             bootargs = "console=ttyS0,115200 earlyprintk";
+     };

I would remove the 'earlyprintk' option here. You don't add any options for the platform in Kconfig.debug, and I hope that we can eventually start using earlycon. Please add an appropriate stdio-path property here, but note that we are still lacking the fixmap patches to make earlycon work.

Quoted 1 line

Otherwise looks good.

I dropped earlyprintk, added stdout-path in v3.

Thanks!

Signature · 2 lines
Best Regards
Masahiro Yamada
#13 lore raw

PATCH 3/4 ARM: dts: UniPhier: add support for UniPhier SoCs and boards

In reply to Masahiro Yamada
Quoted 55 lines · Masahiro Yamada

Initial device trees for UniPhier SoCs: PH1-sLD3, PH1-LD4, PH1-Pro4, and PH1-sLD8.

---

 arch/arm/boot/dts/Makefile                   |  5 ++
 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts   | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi      | 78 +++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts  | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi     | 85 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts  | 52 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi     | 85 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts  | 51 +++++++++++++++++
 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi     | 78 +++++++++++++++++++++++++
 arch/arm/boot/dts/uniphier-support-card.dtsi | 39 +++++++++++++
 10 files changed, 575 insertions(+)
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts
 create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-support-card.dtsi
arch/arm/boot/dts/Makefile +5 -0
index a1c776b..d639a90 100644
@@ -588,6 +588,11 @@ dtb-$(CONFIG_ARCH_U8500) += \
 	ste-hrefv60plus-tvk.dtb \
 	ste-ccu8540.dtb \
 	ste-ccu9540.dtb
+dtb-$(CONFIG_ARCH_UNIPHIER) += \
+	uniphier-ph1-sld3-ref.dtb \
+	uniphier-ph1-ld4-ref.dtb \
+	uniphier-ph1-pro4-ref.dtb \
+	uniphier-ph1-sld8-ref.dtb
 dtb-$(CONFIG_ARCH_VERSATILE) += \
 	versatile-ab.dtb \
 	versatile-pb.dtb
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts new file +6 -0
new file mode 100644
index 0000000..2e83363
@@ -0,0 +1,51 @@
+/*
+ * Device Tree Source for UniPhier PH1-LD4 Reference Board
+ *
+ * Copyright (C) 2015 Socionext Inc.
+ *   Author: Masahiro Yamada <[email protected]>
+ *

arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts line 16

Quoted 10 lines
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts new file +10 -0
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */

Hi Masahiro

There is a growing trend to license DT files dual GPL and X11. Having the X11 license can help with bootloaders also using the device tree files.

Please spend some time researching the issue and consider it.

Thanks
Andrew

#14 lore raw

PATCH 4/4 MAINTAINERS: add myself as ARM/UniPhier maintainer

In reply to Masahiro Yamada

---

 MAINTAINERS | 7 +++++++
 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
index d158405c..33804df 100644
@@ -1526,6 +1526,13 @@ F:	drivers/rtc/rtc-ab3100.c
 F:	drivers/rtc/rtc-coh901331.c
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 
+ARM/UNIPHIER ARCHITECTURE
+M:	Masahiro Yamada <[email protected]>
+L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
+S:	Maintained
+F:	arch/arm/mach-uniphier/
+N:	uniphier
+
 ARM/Ux500 ARM ARCHITECTURE
 M:	Linus Walleij <[email protected]>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
Signature · 1 line
1.9.1