[PATCH v2] ARM: shmobile: bockw: add DT reference

[PATCH v2] ARM: shmobile: bockw: add DT reference

[Kuninori Morimoto]

This patch adds a sample DT-based Bock-W "reference" implementation.
The use of platform-specific C-code should be avoided
with this configuration as much as possible.

This patch adds new r8a7778_add_dt_devices() which was same stance
of r8a7790_add_dt_devices()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2

 - removed LAN support

 arch/arm/boot/dts/Makefile                     |    1 +
 arch/arm/boot/dts/r8a7778-bockw-reference.dts  |   32 ++++++++++++
 arch/arm/mach-shmobile/Kconfig                 |   14 ++++++
 arch/arm/mach-shmobile/Makefile                |    1 +
 arch/arm/mach-shmobile/Makefile.boot           |    1 +
 arch/arm/mach-shmobile/board-bockw-reference.c |   62 ++++++++++++++++++++++++
 arch/arm/mach-shmobile/include/mach/r8a7778.h  |    1 +
 arch/arm/mach-shmobile/setup-r8a7778.c         |    7 ++-
 8 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts
 create mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f2dc697..fd83b1a 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -162,6 +162,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
 dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
 	r8a7740-armadillo800eva.dtb \
 	r8a7778-bockw.dtb \
+	r8a7778-bockw-reference.dtb \
 	r8a7740-armadillo800eva-reference.dtb \
 	r8a7779-marzen-reference.dtb \
 	r8a7790-lager.dtb \
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
new file mode 100644
index 0000000..f5b8d77
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -0,0 +1,32 @@
+/*
+ * Reference Device Tree Source for the Bock-W board
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * based on r8a7779
+ *
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013 Simon Horman
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "r8a7778.dtsi"
+
+/ {
+	model = "bockw";
+	compatible = "renesas,bockw-reference", "renesas,r8a7778";
+
+	chosen {
+		bootargs = "console=ttySC0,115200 ignore_loglevel";
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x60000000 0x10000000>;
+	};
+};
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 90f449e..e5c2d35 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -127,6 +127,20 @@ config MACH_BOCKW
 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
 	select USE_OF
 
+config MACH_BOCKW_REFERENCE
+	bool "BOCK-W  - Reference Device Tree Implementation"
+	depends on ARCH_R8A7778
+	select ARCH_REQUIRE_GPIOLIB
+	select RENESAS_INTC_IRQPIN
+	select REGULATOR_FIXED_VOLTAGE if REGULATOR
+	select USE_OF
+	---help---
+	   Use reference implementation of BockW board support
+	   which makes use of device tree at the expense
+	   of not supporting a number of devices.
+
+	   This is intended to aid developers
+
 config MACH_MARZEN
 	bool "MARZEN board"
 	depends on ARCH_R8A7779
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index d813133..9c40be8 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o
 obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o
 obj-$(CONFIG_MACH_KOTA2)	+= board-kota2.o
 obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
+obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o
 obj-$(CONFIG_MACH_MARZEN_REFERENCE)	+= board-marzen-reference.o
 obj-$(CONFIG_MACH_LAGER)	+= board-lager.o
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index 16834d8..6f47b98 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -5,6 +5,7 @@ loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
+loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000
 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
new file mode 100644
index 0000000..24db8de
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -0,0 +1,62 @@
+/*
+ * Bock-W board support
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/of_platform.h>
+#include <linux/pinctrl/machine.h>
+#include <mach/common.h>
+#include <mach/r8a7778.h>
+#include <asm/mach/arch.h>
+
+/*
+ *	see board-bock.c for checking detail of dip-switch
+ */
+
+static const struct pinctrl_map bockw_pinctrl_map[] = {
+	/* SCIF0 */
+	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
+				  "scif0_data_a", "scif0"),
+	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
+				  "scif0_ctrl", "scif0"),
+};
+
+static void __init bockw_init(void)
+{
+	r8a7778_clock_init();
+
+	pinctrl_register_mappings(bockw_pinctrl_map,
+				  ARRAY_SIZE(bockw_pinctrl_map));
+	r8a7778_pinmux_init();
+	r8a7778_add_dt_devices();
+
+	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *bockw_boards_compat_dt[] __initdata = {
+	"renesas,bockw-reference",
+	NULL,
+};
+
+DT_MACHINE_START(BOCKW_DT, "bockw")
+	.init_early	= r8a7778_init_delay,
+	.init_irq	= r8a7778_init_irq_dt,
+	.init_machine	= bockw_init,
+	.init_time	= shmobile_timer_init,
+	.dt_compat	= bockw_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index 5d0e120..35c8bce 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -25,6 +25,7 @@
 
 extern void r8a7778_add_standard_devices(void);
 extern void r8a7778_add_standard_devices_dt(void);
+extern void r8a7778_add_dt_devices(void);
 extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
 extern void r8a7778_add_i2c_device(int id);
 extern void r8a7778_add_hspi_device(int id);
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index a3a2e37..08e9fb3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -333,7 +333,7 @@ void __init r8a7778_add_mmc_device(struct sh_mmcif_plat_data *info)
 		info, sizeof(*info));
 }
 
-void __init r8a7778_add_standard_devices(void)
+void __init r8a7778_add_dt_devices(void)
 {
 	int i;
 
@@ -365,6 +365,11 @@ void __init r8a7778_init_late(void)
 	platform_device_register_full(&ohci_info);
 }
 
+void __init r8a7778_add_standard_devices(void)
+{
+	r8a7778_add_dt_devices();
+}
+
 static struct renesas_intc_irqpin_config irqpin_platform_data __initdata = {
 	.irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
 	.sense_bitfield_width = 2,
-- 
1.7.9.5

Re: [PATCH v2] ARM: shmobile: bockw: add DT reference

[Magnus Damm]

Hi Morimoto-san,

On Wed, Jul 10, 2013 at 11:23 AM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> This patch adds a sample DT-based Bock-W "reference" implementation.
> The use of platform-specific C-code should be avoided
> with this configuration as much as possible.
>
> This patch adds new r8a7778_add_dt_devices() which was same stance
> of r8a7790_add_dt_devices()
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> v1 -> v2
>
>  - removed LAN support

Thanks for your efforts. It looks fine to me.

Acked-by: Magnus Damm <damm@opensource.se>

About r8a7778_add_standard_devices() and r8a7778_add_dt_devices(), do
you intend to add more device to r8a7778_add_standard_devices()?

If the answer is no then I think you should write an incremental patch
that simply replaces r8a7778_add_standard_devices() in board-bockw.c
with r8a7778_add_dt_devices(), and then you can remove
r8a7778_add_standard_devices() from setup-r8a7778.c and r8a7778.h.

Thanks,

/ magnus

Re: [PATCH v2] ARM: shmobile: bockw: add DT reference

[Kuninori Morimoto]

Hi Magnus

> > This patch adds a sample DT-based Bock-W "reference" implementation.
> > The use of platform-specific C-code should be avoided
> > with this configuration as much as possible.
> >
> > This patch adds new r8a7778_add_dt_devices() which was same stance
> > of r8a7790_add_dt_devices()
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > v1 -> v2
> >
> >  - removed LAN support
> 
> Thanks for your efforts. It looks fine to me.
> 
> Acked-by: Magnus Damm <damm@opensource.se>
> 
> About r8a7778_add_standard_devices() and r8a7778_add_dt_devices(), do
> you intend to add more device to r8a7778_add_standard_devices()?
> 
> If the answer is no then I think you should write an incremental patch
> that simply replaces r8a7778_add_standard_devices() in board-bockw.c
> with r8a7778_add_dt_devices(), and then you can remove
> r8a7778_add_standard_devices() from setup-r8a7778.c and r8a7778.h.

I guess we will add DMAEngine support in it ?
r8a73a4 is such style

Best regards
---
Kuninori Morimoto

Re: [PATCH v2] ARM: shmobile: bockw: add DT reference

[Magnus Damm]

Hi Morimoto-san,

On Wed, Jul 10, 2013 at 2:16 PM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
>
> Hi Magnus
>
>> > This patch adds a sample DT-based Bock-W "reference" implementation.
>> > The use of platform-specific C-code should be avoided
>> > with this configuration as much as possible.
>> >
>> > This patch adds new r8a7778_add_dt_devices() which was same stance
>> > of r8a7790_add_dt_devices()
>> >
>> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>> > ---
>> > v1 -> v2
>> >
>> >  - removed LAN support
>>
>> Thanks for your efforts. It looks fine to me.
>>
>> Acked-by: Magnus Damm <damm@opensource.se>
>>
>> About r8a7778_add_standard_devices() and r8a7778_add_dt_devices(), do
>> you intend to add more device to r8a7778_add_standard_devices()?
>>
>> If the answer is no then I think you should write an incremental patch
>> that simply replaces r8a7778_add_standard_devices() in board-bockw.c
>> with r8a7778_add_dt_devices(), and then you can remove
>> r8a7778_add_standard_devices() from setup-r8a7778.c and r8a7778.h.
>
> I guess we will add DMAEngine support in it ?
> r8a73a4 is such style

Yeah, maybe so. Also, I think other SoCs put SoC-specific devices
without board-specific configuration in this list. On r8a7778 you seem
to handle I2C and HSPI in a different way, but I am not sure why this
special style is needed.

Cheers,

/ magnus

Re: [PATCH v2] ARM: shmobile: bockw: add DT reference

[Kuninori Morimoto]

Hi Simon

> >> If the answer is no then I think you should write an incremental patch
> >> that simply replaces r8a7778_add_standard_devices() in board-bockw.c
> >> with r8a7778_add_dt_devices(), and then you can remove
> >> r8a7778_add_standard_devices() from setup-r8a7778.c and r8a7778.h.
> >
> > I guess we will add DMAEngine support in it ?
> > r8a73a4 is such style
> 
> Yeah, maybe so. Also, I think other SoCs put SoC-specific devices
> without board-specific configuration in this list. On r8a7778 you seem
> to handle I2C and HSPI in a different way, but I am not sure why this
> special style is needed.

I talked about these things with Magnus,
and now, I understand that I misunderstood on current r8a7778 code.

Please drop my current all patch set now.
I will re-send new/cleanup patches soon.


Best regards
---
Kuninori Morimoto

Re: [PATCH v2] ARM: shmobile: bockw: add DT reference

[Simon Horman]

On Wed, Jul 10, 2013 at 08:41:23PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > >> If the answer is no then I think you should write an incremental patch
> > >> that simply replaces r8a7778_add_standard_devices() in board-bockw.c
> > >> with r8a7778_add_dt_devices(), and then you can remove
> > >> r8a7778_add_standard_devices() from setup-r8a7778.c and r8a7778.h.
> > >
> > > I guess we will add DMAEngine support in it ?
> > > r8a73a4 is such style
> > 
> > Yeah, maybe so. Also, I think other SoCs put SoC-specific devices
> > without board-specific configuration in this list. On r8a7778 you seem
> > to handle I2C and HSPI in a different way, but I am not sure why this
> > special style is needed.
> 
> I talked about these things with Magnus,
> and now, I understand that I misunderstood on current r8a7778 code.
> 
> Please drop my current all patch set now.
> I will re-send new/cleanup patches soon.

Sure, I have marked the patch as "Changes Requested".