[PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order

[PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order

[Kuninori Morimoto]

Since armadillo800eva has 2 sound cards,
and had reversed deferred probe order issue,
it was purposely registered in reverse order.

But it was solved by
1d29cfa57471a5e4b8a7c2a7433eeba170d3ad92
(driver core: fixup reversed deferred probe order)

armadillo800eva board is expecting that
FSI-WM8978 is the 1st, and FSI-HDMI is the 2nd sound card.
This patch fixes it up

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index cf10f92..ecd8136 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -901,8 +901,8 @@ static struct platform_device *eva_devices[] __initdata = {
 	&camera_device,
 	&ceu0_device,
 	&fsi_device,
-	&fsi_hdmi_device,
 	&fsi_wm8978_device,
+	&fsi_hdmi_device,
 };
 
 static void __init eva_clock_init(void)
-- 
1.7.5.4

Re: [PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order

[Simon Horman]

On Wed, Aug 08, 2012 at 11:03:07PM -0700, Kuninori Morimoto wrote:
> Since armadillo800eva has 2 sound cards,
> and had reversed deferred probe order issue,
> it was purposely registered in reverse order.
> 
> But it was solved by
> 1d29cfa57471a5e4b8a7c2a7433eeba170d3ad92
> (driver core: fixup reversed deferred probe order)
> 
> armadillo800eva board is expecting that
> FSI-WM8978 is the 1st, and FSI-HDMI is the 2nd sound card.
> This patch fixes it up
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks, I have queued this up and will push it to the armadillo800eva
branch of my renesas tree once my outstanding pull request is either
accepted or rejected.

Re: [PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order

[Simon Horman]

On Mon, Aug 27, 2012 at 05:48:18PM +0900, Simon Horman wrote:
> On Wed, Aug 08, 2012 at 11:03:07PM -0700, Kuninori Morimoto wrote:
> > Since armadillo800eva has 2 sound cards,
> > and had reversed deferred probe order issue,
> > it was purposely registered in reverse order.
> > 
> > But it was solved by
> > 1d29cfa57471a5e4b8a7c2a7433eeba170d3ad92
> > (driver core: fixup reversed deferred probe order)
> > 
> > armadillo800eva board is expecting that
> > FSI-WM8978 is the 1st, and FSI-HDMI is the 2nd sound card.
> > This patch fixes it up
> > 
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Thanks, I have queued this up and will push it to the armadillo800eva
> branch of my renesas tree once my outstanding pull request is either
> accepted or rejected.

On further consideration I have moved this patch to the
fixes branch.

I will endeavour to get it included in 3.6.

[PATCH] ARM: shmobile: armadillo800eva: enable rw rootfs mount

[Kuninori Morimoto]

armadillo800eva default boot loader is "hermit",
and it's tag->u.core.flags has flag when kernel boots.
Because of this, ${LINUX}/arch/arm/kernel/setup.c :: parse_tag_core()
didn't remove MS_RDONLY flag from root_mountflags.
Thus, the rootfs is mounted as "readonly".
This patch adds "rw" kernel parameter,
and enable read/write mounts for rootfs

Cc: Masahiro Nakai <nakai@atmark-techno.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/configs/armadillo800eva_defconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 7d87184..90610c7 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -33,7 +33,7 @@ CONFIG_AEABI=y
 CONFIG_FORCE_MAX_ZONEORDER\x13
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96"
+CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize@96,wsize@96 rw"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
 CONFIG_VFP=y
-- 
1.7.9.5

Re: [PATCH] ARM: shmobile: armadillo800eva: enable rw rootfs mount

[Simon Horman]

On Sun, Sep 02, 2012 at 11:06:52PM -0700, Kuninori Morimoto wrote:
> armadillo800eva default boot loader is "hermit",
> and it's tag->u.core.flags has flag when kernel boots.
> Because of this, ${LINUX}/arch/arm/kernel/setup.c :: parse_tag_core()
> didn't remove MS_RDONLY flag from root_mountflags.
> Thus, the rootfs is mounted as "readonly".
> This patch adds "rw" kernel parameter,
> and enable read/write mounts for rootfs

Thanks, applied to the fixes branch of my reneas tree.
I will endeavour to get this included in 3.6.

FWIW, I believe that I have run into this problem.

[PATCH] ARM: shmobile: armadillo800eva: Add support RTC

[Nobuhiro Iwamatsu]

The armadillo800eva has S35390A which is RTC. This is controlled
using I2C of GPIO.
This commit supports RTC of armadillo800eva.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c |   25 ++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index cf10f92..81dfb88 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -37,6 +37,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/i2c-gpio.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a7740.h>
@@ -876,6 +877,21 @@ static struct platform_device fsi_hdmi_device = {
 	},
 };
 
+/* RTC: RTC connects i2c-gpio. */
+static struct i2c_gpio_platform_data i2c_gpio_data = {
+	.sda_pin	= GPIO_PORT208,
+	.scl_pin	= GPIO_PORT91,
+	.udelay		= 5, /* 100 kHz */
+};
+
+static struct platform_device i2c_gpio_device = {
+	.name = "i2c-gpio",
+	.id = 2,
+	.dev = {
+		.platform_data = &i2c_gpio_data,
+	},
+};
+
 /* I2C */
 static struct i2c_board_info i2c0_devices[] = {
 	{
@@ -887,6 +903,13 @@ static struct i2c_board_info i2c0_devices[] = {
 	},
 };
 
+static struct i2c_board_info i2c2_devices[] = {
+	{
+		I2C_BOARD_INFO("s35390a", 0x30),
+		.type = "s35390a",
+	},
+};
+
 /*
  * board devices
  */
@@ -903,6 +926,7 @@ static struct platform_device *eva_devices[] __initdata = {
 	&fsi_device,
 	&fsi_hdmi_device,
 	&fsi_wm8978_device,
+	&i2c_gpio_device,
 };
 
 static void __init eva_clock_init(void)
@@ -1173,6 +1197,7 @@ static void __init eva_init(void)
 #endif
 
 	i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
+	i2c_register_board_info(2, i2c2_devices, ARRAY_SIZE(i2c2_devices));
 
 	r8a7740_add_standard_devices();
 
-- 
1.7.10.4

Re: [PATCH] ARM: shmobile: armadillo800eva: Add support RTC

[Simon Horman]

On Thu, Sep 13, 2012 at 12:10:41PM +0900, Nobuhiro Iwamatsu wrote:
> The armadillo800eva has S35390A which is RTC. This is controlled
> using I2C of GPIO.
> This commit supports RTC of armadillo800eva.
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

Hi Iwamatsu-san,

could you please either update this patch or provide a follow-up
patch to update the defconfig so the S35390A is enabled?

"make savedefconfig" may be useful for this.

Re: [PATCH] ARM: shmobile: armadillo800eva: Add support RTC

[Nobuhiro Iwamatsu]

Hi,

On Thu, Sep 13, 2012 at 1:06 PM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Sep 13, 2012 at 12:10:41PM +0900, Nobuhiro Iwamatsu wrote:
>> The armadillo800eva has S35390A which is RTC. This is controlled
>> using I2C of GPIO.
>> This commit supports RTC of armadillo800eva.
>>
>> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
>
> Hi Iwamatsu-san,
>
> could you please either update this patch or provide a follow-up
> patch to update the defconfig so the S35390A is enabled?
>
> "make savedefconfig" may be useful for this.

OK, I will resend with updated defconfig.

-- 
Nobuhiro Iwamatsu

[PATCH] ARM: shmobile: armadillo800eva: __io abuse cleanup

[Kuninori Morimoto]

a2a47ca36642e3995e982957bc42678cf11ca6ac
(ARM: __io abuse cleanup) cleanuped __io() -> IOMEM(),
but armadillo800eva was a outside of a target,
since "merge window" timing issue.
This patch cleanup it, and enabled CONFIG_CACHE_L2X0

Cc: Masahiro Nakai <nakai@atmark-techno.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/configs/armadillo800eva_defconfig     |    2 +-
 arch/arm/mach-shmobile/board-armadillo800eva.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index f78d259..a18593d 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -20,7 +20,7 @@ CONFIG_MACH_ARMADILLO800EVA=y
 # CONFIG_SH_TIMER_TMU is not set
 CONFIG_ARM_THUMB=y
 CONFIG_CPU_BPREDICT_DISABLE=y
-# CONFIG_CACHE_L2X0 is not set
+CONFIG_CACHE_L2X0=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_458693=y
 CONFIG_ARM_ERRATA_460075=y
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2912eab..3cc8b1c 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1196,7 +1196,7 @@ static void __init eva_init(void)
 
 #ifdef CONFIG_CACHE_L2X0
 	/* Early BRESP enable, Shared attribute override enable, 32K*8way */
-	l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
+	l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
 #endif
 
 	i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
-- 
1.7.9.5

[PATCH] ARM: shmobile: armadillo800eva: enable restart

[Kuninori Morimoto]

Cc: Masahiro Nakai <nakai@atmark-techno.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 3cc8b1c..499e6e3 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1229,6 +1229,13 @@ static void __init eva_add_early_devices(void)
 	shmobile_timer.init = eva_earlytimer_init;
 }
 
+#define RESCNT2 IOMEM(0xe6188020)
+static void eva_restart(char mode, const char *cmd)
+{
+	/* Do soft power on reset */
+	writel((1 << 31), RESCNT2);
+}
+
 static const char *eva_boards_compat_dt[] __initdata = {
 	"renesas,armadillo800eva",
 	NULL,
@@ -1243,4 +1250,5 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva")
 	.init_late	= shmobile_init_late,
 	.timer		= &shmobile_timer,
 	.dt_compat	= eva_boards_compat_dt,
+	.restart	= eva_restart,
 MACHINE_END
-- 
1.7.9.5

Re: [PATCH] ARM: shmobile: armadillo800eva: enable restart

[Simon Horman]

On Thu, Oct 11, 2012 at 06:39:36PM -0700, Kuninori Morimoto wrote:
> Cc: Masahiro Nakai <nakai@atmark-techno.com>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks applied to the boards branch of my renesas tree.

> ---
>  arch/arm/mach-shmobile/board-armadillo800eva.c |    8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index 3cc8b1c..499e6e3 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1229,6 +1229,13 @@ static void __init eva_add_early_devices(void)
>  	shmobile_timer.init = eva_earlytimer_init;
>  }
>  
> +#define RESCNT2 IOMEM(0xe6188020)
> +static void eva_restart(char mode, const char *cmd)
> +{
> +	/* Do soft power on reset */
> +	writel((1 << 31), RESCNT2);
> +}
> +
>  static const char *eva_boards_compat_dt[] __initdata = {
>  	"renesas,armadillo800eva",
>  	NULL,
> @@ -1243,4 +1250,5 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva")
>  	.init_late	= shmobile_init_late,
>  	.timer		= &shmobile_timer,
>  	.dt_compat	= eva_boards_compat_dt,
> +	.restart	= eva_restart,
>  MACHINE_END
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] ARM: shmobile: armadillo800eva: __io abuse cleanup

[Simon Horman]

On Thu, Oct 11, 2012 at 06:24:46PM -0700, Kuninori Morimoto wrote:
> a2a47ca36642e3995e982957bc42678cf11ca6ac
> (ARM: __io abuse cleanup) cleanuped __io() -> IOMEM(),
> but armadillo800eva was a outside of a target,
> since "merge window" timing issue.
> This patch cleanup it, and enabled CONFIG_CACHE_L2X0

Hi Morimoto-san,

could you please split this into two patches?
One for the IOMEM annotation. And one for the defconfig change.

The reason being that the changes do not appear to be dependent on each other
even though they both relate to L2X0.

Also, could you indicate if either of the changes are fixes
and thus appropriate for 3.7?

Thanks

> Cc: Masahiro Nakai <nakai@atmark-techno.com>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  arch/arm/configs/armadillo800eva_defconfig     |    2 +-
>  arch/arm/mach-shmobile/board-armadillo800eva.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
> index f78d259..a18593d 100644
> --- a/arch/arm/configs/armadillo800eva_defconfig
> +++ b/arch/arm/configs/armadillo800eva_defconfig
> @@ -20,7 +20,7 @@ CONFIG_MACH_ARMADILLO800EVA=y
>  # CONFIG_SH_TIMER_TMU is not set
>  CONFIG_ARM_THUMB=y
>  CONFIG_CPU_BPREDICT_DISABLE=y
> -# CONFIG_CACHE_L2X0 is not set
> +CONFIG_CACHE_L2X0=y
>  CONFIG_ARM_ERRATA_430973=y
>  CONFIG_ARM_ERRATA_458693=y
>  CONFIG_ARM_ERRATA_460075=y
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index 2912eab..3cc8b1c 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1196,7 +1196,7 @@ static void __init eva_init(void)
>  
>  #ifdef CONFIG_CACHE_L2X0
>  	/* Early BRESP enable, Shared attribute override enable, 32K*8way */
> -	l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
> +	l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
>  #endif
>  
>  	i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
> -- 
> 1.7.9.5
> 

[PATCH] ARM: shmobile: armadillo800eva: set clock rates before timer init

[Hideki EIRAKU]

Previously clock rates were set after initialization of timer.
Therefore the timer used the default extal1 clock rate (25MHz)
instead of the correct rate for this board (24MHz).

Signed-off-by: Hideki EIRAKU <hdk@igel.co.jp>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 5353adf..1e79cfb 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1175,8 +1175,6 @@ static void __init eva_init(void)
 	platform_add_devices(eva_devices,
 			     ARRAY_SIZE(eva_devices));
 
-	eva_clock_init();
-
 	rmobile_add_device_to_domain("A4LC", &lcdc0_device);
 	rmobile_add_device_to_domain("A4LC", &hdmi_lcdc_device);
 	if (usb)
@@ -1187,6 +1185,9 @@ static void __init eva_earlytimer_init(void)
 {
 	r8a7740_clock_init(MD_CK0 | MD_CK2);
 	shmobile_earlytimer_init();
+
+	/* the rate of extal1 clock must be set before late_time_init */
+	eva_clock_init();
 }
 
 static void __init eva_add_early_devices(void)
-- 
1.8.0

Re: [PATCH] ARM: shmobile: armadillo800eva: set clock rates before timer init

[Kuninori Morimoto]

> Previously clock rates were set after initialization of timer.
> Therefore the timer used the default extal1 clock rate (25MHz)
> instead of the correct rate for this board (24MHz).
> 
> Signed-off-by: Hideki EIRAKU <hdk@igel.co.jp>
> ---
>  arch/arm/mach-shmobile/board-armadillo800eva.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Best regards
---
Kuninori Morimoto

Re: [PATCH] ARM: shmobile: armadillo800eva: set clock rates before timer init

[Simon Horman]

On Fri, Jan 18, 2013 at 02:02:05PM +0900, Hideki EIRAKU wrote:
> Previously clock rates were set after initialization of timer.
> Therefore the timer used the default extal1 clock rate (25MHz)
> instead of the correct rate for this board (24MHz).
> 
> Signed-off-by: Hideki EIRAKU <hdk@igel.co.jp>

Thanks, I have applied this to the boards2 branch
and will merge it into the next branch.

[PATCH] arm: shmobile: armadillo800eva: Fix maximum number of SCIF

[Nobuhiro Iwamatsu]

The r8a77740 has 9ch SCIF. It is not 8ch.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
 arch/arm/configs/armadillo800eva_defconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 0f2d80d..fae939d 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -86,7 +86,7 @@ CONFIG_TOUCHSCREEN_ST1232=y
 # CONFIG_SERIO is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=8
+CONFIG_SERIAL_SH_SCI_NR_UARTS=9
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
-- 
1.7.10.4

Re: [PATCH] arm: shmobile: armadillo800eva: Fix maximum number of SCIF

[Simon Horman]

On Mon, Apr 15, 2013 at 01:44:52PM +0900, Nobuhiro Iwamatsu wrote:
> The r8a77740 has 9ch SCIF. It is not 8ch.

Thanks, queued up for v3.11 in the defconfig-armadillo800eva branch.
I plan to push that branch later today.

[PATCH] ARM: shmobile: armadillo800eva: add DMA support to MMCIF

[Guennadi Liakhovetski]

Add DMA slave IDs to MMCIF Tx and Rx channels.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
---

depends on "ARM: shmobile: r8a7740: add MMCIF DMA definitions"
http://www.spinics.net/lists/linux-sh/msg20295.html

 arch/arm/mach-shmobile/board-armadillo800eva.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index ce1c37f..41ff7d65 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -778,6 +778,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
 	.caps		= MMC_CAP_4_BIT_DATA |
 			  MMC_CAP_8_BIT_DATA |
 			  MMC_CAP_NONREMOVABLE,
+	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,
+	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,
 };
 
 static struct resource sh_mmcif_resources[] = {
-- 
1.7.2.5

Re: [PATCH] ARM: shmobile: armadillo800eva: add DMA support to MMCIF

[Simon Horman]

On Tue, Jul 02, 2013 at 05:24:58PM +0200, Guennadi Liakhovetski wrote:
> Add DMA slave IDs to MMCIF Tx and Rx channels.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> ---
> 
> depends on "ARM: shmobile: r8a7740: add MMCIF DMA definitions"
> http://www.spinics.net/lists/linux-sh/msg20295.html
> 
>  arch/arm/mach-shmobile/board-armadillo800eva.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index ce1c37f..41ff7d65 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -778,6 +778,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
>  	.caps		= MMC_CAP_4_BIT_DATA |
>  			  MMC_CAP_8_BIT_DATA |
>  			  MMC_CAP_NONREMOVABLE,
> +	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,
> +	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,
>  };
>  
>  static struct resource sh_mmcif_resources[] = {

Thanks, I will queue this up for v3.12 in the boards branch.

[PATCH] ARM: shmobile: armadillo800eva: tidyup ST1232 pin settings

[Kuninori Morimoto]

89ae7b5bbd3e65bc6ab7a577ca5ec18569589c8c
(ARM: shmobile: armadillo800eva: Register pinctrl mapping for INTC)
adds gpio request for 166pin, but it will be requested from
st1232 driver itself via st1232_pdata :: reset_gpio.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
>> Simon, Hiep-san, Laurent

Could you please check this patch ?

 arch/arm/mach-shmobile/board-armadillo800eva.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2412fca..4cfcbbe 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1205,9 +1205,6 @@ static void __init eva_init(void)
 	/* LCDC0 */
 	gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
 
-	/* Touchscreen */
-	gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
-
 	/* GETHER */
 	gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */
 
-- 
1.7.9.5

Re: [PATCH] ARM: shmobile: armadillo800eva: tidyup ST1232 pin settings

[Laurent Pinchart]

Hi Morimoto-san,

On Wednesday 24 July 2013 17:16:12 Kuninori Morimoto wrote:
> 89ae7b5bbd3e65bc6ab7a577ca5ec18569589c8c
> (ARM: shmobile: armadillo800eva: Register pinctrl mapping for INTC)
> adds gpio request for 166pin, but it will be requested from
> st1232 driver itself via st1232_pdata :: reset_gpio.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> 
> >> Simon, Hiep-san, Laurent
> 
> Could you please check this patch ?
> 
>  arch/arm/mach-shmobile/board-armadillo800eva.c |    3 ---
>  1 file changed, 3 deletions(-)

Oops, I've submitted an identical patch that I had in my tree before seeing 
yours. That probably means the code is correct, and it implies my Acked-by :-)

> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c
> b/arch/arm/mach-shmobile/board-armadillo800eva.c index 2412fca..4cfcbbe
> 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1205,9 +1205,6 @@ static void __init eva_init(void)
>  	/* LCDC0 */
>  	gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
> 
> -	/* Touchscreen */
> -	gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
> -
>  	/* GETHER */
>  	gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */

-- 
Regards,

Laurent Pinchart

[PATCH] ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code

[Kuninori Morimoto]

89ae7b5bbd3e65bc6ab7a577ca5ec18569589c8c
(ARM: shmobile: armadillo800eva: Register pinctrl mapping for INTC)
mistakenly requests GPIO 166 in board code,
most probably due to a wrong merge conflict resolution.
As the GPIO is passed to the st1232 driver through platform
data and requested by the driver,
there's no need to request it in board code. Fix it.

Tested by: Cao Minh Hiep <cm-hiep@jinso.co.jp>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
>> Simon

This patch is v2 of
[ARM: shmobile: armadillo800eva: tidyup ST1232 pin settings]

v1 -> v2

 - exchange Subject and log
 - Hiep's Tested-by, and Laurent's Acked-by were added

 arch/arm/mach-shmobile/board-armadillo800eva.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2412fca..4cfcbbe 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1205,9 +1205,6 @@ static void __init eva_init(void)
 	/* LCDC0 */
 	gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
 
-	/* Touchscreen */
-	gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
-
 	/* GETHER */
 	gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */
 
-- 
1.7.9.5

[PATCH] ARM: shmobile: armadillo800eva: Enable backlight control in defconfig

[Laurent Pinchart]

The backlight is controlled by a PWM signal generated by the TPU.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/configs/armadillo800eva_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 5abf1a2..9287a62 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -105,6 +105,7 @@ CONFIG_FB=y
 CONFIG_FB_SH_MOBILE_LCDC=y
 CONFIG_FB_SH_MOBILE_HDMI=y
 CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_LOGO=y
@@ -130,6 +131,8 @@ CONFIG_DMADEVICES=y
 CONFIG_SH_DMAE=y
 CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
+CONFIG_PWM=y
+CONFIG_PWM_RENESAS_TPU=y
 # CONFIG_DNOTIFY is not set
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
-- 
Regards,

Laurent Pinchart

Re: [PATCH] ARM: shmobile: armadillo800eva: Enable backlight control in defconfig

[Simon Horman]

On Wed, Dec 18, 2013 at 03:03:23PM +0100, Laurent Pinchart wrote:
> The backlight is controlled by a PWM signal generated by the TPU.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm/configs/armadillo800eva_defconfig | 3 +++
>  1 file changed, 3 insertions(+)

Thanks, I have queued this up.

> 
> diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
> index 5abf1a2..9287a62 100644
> --- a/arch/arm/configs/armadillo800eva_defconfig
> +++ b/arch/arm/configs/armadillo800eva_defconfig
> @@ -105,6 +105,7 @@ CONFIG_FB=y
>  CONFIG_FB_SH_MOBILE_LCDC=y
>  CONFIG_FB_SH_MOBILE_HDMI=y
>  CONFIG_LCD_CLASS_DEVICE=y
> +CONFIG_BACKLIGHT_PWM=y
>  CONFIG_FRAMEBUFFER_CONSOLE=y
>  CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
>  CONFIG_LOGO=y
> @@ -130,6 +131,8 @@ CONFIG_DMADEVICES=y
>  CONFIG_SH_DMAE=y
>  CONFIG_UIO=y
>  CONFIG_UIO_PDRV_GENIRQ=y
> +CONFIG_PWM=y
> +CONFIG_PWM_RENESAS_TPU=y
>  # CONFIG_DNOTIFY is not set
>  CONFIG_MSDOS_FS=y
>  CONFIG_VFAT_FS=y
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[PATCH] ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
exchanged sound flags, but armadillo800eva flags needs IB_NF.
The recorded sound will be noise without this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2858f38..486063d 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -992,6 +992,7 @@ static struct asoc_simple_card_info fsi_wm8978_info = {
 	.platform	= "sh_fsi2",
 	.daifmt		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM,
 	.cpu_dai = {
+		.fmt	= SND_SOC_DAIFMT_IB_NF,
 		.name	= "fsia-dai",
 	},
 	.codec_dai = {
-- 
1.7.9.5

Re: [PATCH] ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags

[Simon Horman]

On Sun, Apr 13, 2014 at 05:59:47PM -0700, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> c7a507eea1db1430476289f525f9c853d5d485e8
> (ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
> exchanged sound flags, but armadillo800eva flags needs IB_NF.
> The recorded sound will be noise without this patch.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks, I will queue this up as a fix for v3.15.

> ---
>  arch/arm/mach-shmobile/board-armadillo800eva.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index 2858f38..486063d 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -992,6 +992,7 @@ static struct asoc_simple_card_info fsi_wm8978_info = {
>  	.platform	= "sh_fsi2",
>  	.daifmt		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM,
>  	.cpu_dai = {
> +		.fmt	= SND_SOC_DAIFMT_IB_NF,
>  		.name	= "fsia-dai",
>  	},
>  	.codec_dai = {
> -- 
> 1.7.9.5
> 

[PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

[Kuninori Morimoto]

c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
fixuped FSI driver's behavior
which didn't match to ALSA flags.

But, it didn't care about armadillo800eva HDMI sound flags.
This patch fixed it.

Reported-by: Bui Duc Phuc(Fukuda) <bd-phuc@jinso.co.jp>
Reported-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
>> Simon

This patch is needed on latest linus/master tree

 arch/arm/mach-shmobile/board-armadillo800eva.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 92d24a4..deb3b38 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1051,7 +1051,7 @@ static struct asoc_simple_card_info fsi2_hdmi_info = {
 	.platform	= "sh_fsi2",
 	.cpu_dai = {
 		.name	= "fsib-dai",
-		.fmt	= SND_SOC_DAIFMT_CBM_CFM,
+		.fmt	= SND_SOC_DAIFMT_CBS_CFS,
 	},
 	.codec_dai = {
 		.name = "sh_mobile_hdmi-hifi",
-- 
1.7.9.5

Re: [PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

[Simon Horman]

On Tue, May 27, 2014 at 07:57:16PM -0700, Kuninori Morimoto wrote:
> c7a507eea1db1430476289f525f9c853d5d485e8
> (ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
> fixuped FSI driver's behavior
> which didn't match to ALSA flags.
> 
> But, it didn't care about armadillo800eva HDMI sound flags.
> This patch fixed it.
> 
> Reported-by: Bui Duc Phuc(Fukuda) <bd-phuc@jinso.co.jp>
> Reported-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> >> Simon
> 
> This patch is needed on latest linus/master tree

Thanks I have queued this up as a fix for v3.16.
Even though it is a fix I think it is too late for it to be included in v3.15.
Instead I will ask for it to be added to stable (LTSI) for v3.15.
And likewise for v3.14 where the problem first appeared (I think).

>  arch/arm/mach-shmobile/board-armadillo800eva.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index 92d24a4..deb3b38 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1051,7 +1051,7 @@ static struct asoc_simple_card_info fsi2_hdmi_info = {
>  	.platform	= "sh_fsi2",
>  	.cpu_dai = {
>  		.name	= "fsib-dai",
> -		.fmt	= SND_SOC_DAIFMT_CBM_CFM,
> +		.fmt	= SND_SOC_DAIFMT_CBS_CFS,
>  	},
>  	.codec_dai = {
>  		.name = "sh_mobile_hdmi-hifi",
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

[Kuninori Morimoto]

Hi Simon

> > c7a507eea1db1430476289f525f9c853d5d485e8
> > (ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
> > fixuped FSI driver's behavior
> > which didn't match to ALSA flags.
> > 
> > But, it didn't care about armadillo800eva HDMI sound flags.
> > This patch fixed it.
> > 
> > Reported-by: Bui Duc Phuc(Fukuda) <bd-phuc@jinso.co.jp>
> > Reported-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > >> Simon
> > 
> > This patch is needed on latest linus/master tree
> 
> Thanks I have queued this up as a fix for v3.16.
> Even though it is a fix I think it is too late for it to be included in v3.15.
> Instead I will ask for it to be added to stable (LTSI) for v3.15.
> And likewise for v3.14 where the problem first appeared (I think).

Thank you

But, don't use this patch to v3.14.
v3.14 doesn't have this problem.
First appeared version is v3.15 (not released yet)

Best regards
---
Kuninori Morimoto

Re: [PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

[Simon Horman]

On Tue, May 27, 2014 at 09:23:24PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > c7a507eea1db1430476289f525f9c853d5d485e8
> > > (ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
> > > fixuped FSI driver's behavior
> > > which didn't match to ALSA flags.
> > > 
> > > But, it didn't care about armadillo800eva HDMI sound flags.
> > > This patch fixed it.
> > > 
> > > Reported-by: Bui Duc Phuc(Fukuda) <bd-phuc@jinso.co.jp>
> > > Reported-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
> > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > ---
> > > >> Simon
> > > 
> > > This patch is needed on latest linus/master tree
> > 
> > Thanks I have queued this up as a fix for v3.16.
> > Even though it is a fix I think it is too late for it to be included in v3.15.
> > Instead I will ask for it to be added to stable (LTSI) for v3.15.
> > And likewise for v3.14 where the problem first appeared (I think).
> 
> Thank you
> 
> But, don't use this patch to v3.14.
> v3.14 doesn't have this problem.
> First appeared version is v3.15 (not released yet)

Thanks, got it.

Re: [PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

[Geert Uytterhoeven]

Hi Simon,

On Wed, May 28, 2014 at 6:06 AM, Simon Horman <horms@verge.net.au> wrote:
> Instead I will ask for it to be added to stable (LTSI) for v3.15.

According to lists.linuxfoundation.org/pipermail/ltsi-dev/2014-May/003196.html,
the next LTSI kernel will be v3.14?

Good choice, as \pi has an infinite number of digits ;-)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH] ARM: shmobile: armadillo800eva: Sort includes

[Simon Horman]

Sorted includes seems to be the done thing these days.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c | 40 +++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index fc73246..ad27665 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -22,43 +22,43 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/kernel.h>
-#include <linux/input.h>
-#include <linux/platform_data/st1232_pdata.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
-#include <linux/regulator/driver.h>
+#include <linux/i2c-gpio.h>
+#include <linux/input.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mfd/tmio.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/pinctrl/machine.h>
+#include <linux/platform_data/st1232_pdata.h>
+#include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
+#include <linux/reboot.h>
+#include <linux/regulator/driver.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/gpio-regulator.h>
 #include <linux/regulator/machine.h>
 #include <linux/sh_eth.h>
-#include <linux/videodev2.h>
 #include <linux/usb/renesas_usbhs.h>
-#include <linux/mfd/tmio.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sh_mmcif.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
-#include <linux/i2c-gpio.h>
-#include <linux/reboot.h>
+#include <linux/videodev2.h>
 
-#include <media/mt9t112.h>
-#include <media/sh_mobile_ceu.h>
-#include <media/soc_camera.h>
-#include <asm/page.h>
+#include <asm/hardware/cache-l2x0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/hardware/cache-l2x0.h>
-#include <video/sh_mobile_lcdc.h>
-#include <video/sh_mobile_hdmi.h>
+#include <asm/page.h>
+#include <media/mt9t112.h>
+#include <media/sh_mobile_ceu.h>
+#include <media/soc_camera.h>
 #include <sound/sh_fsi.h>
 #include <sound/simple_card.h>
+#include <video/sh_mobile_hdmi.h>
+#include <video/sh_mobile_lcdc.h>
 
 #include "common.h"
 #include "irqs.h"
-- 
2.0.1

Re: [PATCH] ARM: shmobile: armadillo800eva: Sort includes

[Simon Horman]

On Mon, Aug 11, 2014 at 11:38:59AM +0900, Simon Horman wrote:
> Sorted includes seems to be the done thing these days.
> 
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

I have queued up this patch.

> ---
>  arch/arm/mach-shmobile/board-armadillo800eva.c | 40 +++++++++++++-------------
>  1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
> index fc73246..ad27665 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -22,43 +22,43 @@
>  #include <linux/clk.h>
>  #include <linux/delay.h>
>  #include <linux/err.h>
> -#include <linux/kernel.h>
> -#include <linux/input.h>
> -#include <linux/platform_data/st1232_pdata.h>
> -#include <linux/irq.h>
> -#include <linux/platform_device.h>
>  #include <linux/gpio.h>
>  #include <linux/gpio_keys.h>
> -#include <linux/regulator/driver.h>
> +#include <linux/i2c-gpio.h>
> +#include <linux/input.h>
> +#include <linux/irq.h>
> +#include <linux/kernel.h>
> +#include <linux/mfd/tmio.h>
> +#include <linux/mmc/host.h>
> +#include <linux/mmc/sh_mmcif.h>
> +#include <linux/mmc/sh_mobile_sdhi.h>
>  #include <linux/pinctrl/machine.h>
> +#include <linux/platform_data/st1232_pdata.h>
> +#include <linux/platform_device.h>
>  #include <linux/pwm.h>
>  #include <linux/pwm_backlight.h>
> +#include <linux/reboot.h>
> +#include <linux/regulator/driver.h>
>  #include <linux/regulator/fixed.h>
>  #include <linux/regulator/gpio-regulator.h>
>  #include <linux/regulator/machine.h>
>  #include <linux/sh_eth.h>
> -#include <linux/videodev2.h>
>  #include <linux/usb/renesas_usbhs.h>
> -#include <linux/mfd/tmio.h>
> -#include <linux/mmc/host.h>
> -#include <linux/mmc/sh_mmcif.h>
> -#include <linux/mmc/sh_mobile_sdhi.h>
> -#include <linux/i2c-gpio.h>
> -#include <linux/reboot.h>
> +#include <linux/videodev2.h>
>  
> -#include <media/mt9t112.h>
> -#include <media/sh_mobile_ceu.h>
> -#include <media/soc_camera.h>
> -#include <asm/page.h>
> +#include <asm/hardware/cache-l2x0.h>
>  #include <asm/mach-types.h>
>  #include <asm/mach/arch.h>
>  #include <asm/mach/map.h>
>  #include <asm/mach/time.h>
> -#include <asm/hardware/cache-l2x0.h>
> -#include <video/sh_mobile_lcdc.h>
> -#include <video/sh_mobile_hdmi.h>
> +#include <asm/page.h>
> +#include <media/mt9t112.h>
> +#include <media/sh_mobile_ceu.h>
> +#include <media/soc_camera.h>
>  #include <sound/sh_fsi.h>
>  #include <sound/simple_card.h>
> +#include <video/sh_mobile_hdmi.h>
> +#include <video/sh_mobile_lcdc.h>
>  
>  #include "common.h"
>  #include "irqs.h"
> -- 
> 2.0.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

Re: [PATCH] ARM: shmobile: armadillo800eva: Sort includes

[Simon Horman]

On Fri, Aug 22, 2014 at 10:47:04AM +0900, Simon Horman wrote:
> On Mon, Aug 11, 2014 at 11:38:59AM +0900, Simon Horman wrote:
> > Sorted includes seems to be the done thing these days.
> > 
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> I have queued up this patch.

I have deferred this patch until v3.19.

> 
> > ---
> >  arch/arm/mach-shmobile/board-armadillo800eva.c | 40 +++++++++++++-------------
> >  1 file changed, 20 insertions(+), 20 deletions(-)

Re: [PATCH] ARM: shmobile: armadillo800eva: Sort includes

[Simon Horman]

On Tue, Sep 02, 2014 at 10:16:59AM +0900, Simon Horman wrote:
> On Fri, Aug 22, 2014 at 10:47:04AM +0900, Simon Horman wrote:
> > On Mon, Aug 11, 2014 at 11:38:59AM +0900, Simon Horman wrote:
> > > Sorted includes seems to be the done thing these days.
> > > 
> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> > 
> > I have queued up this patch.
> 
> I have deferred this patch until v3.19.

I have queued this up for v3.19.
I will push it to a branch that will be included in linux-next
once v3.18-rc1 has been released.

[GIT PULL] Renesas ARM Based SoC Fixes for v3.16

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these Renesas ARM based SoC fixes for v3.16.

This corrects a bug that will be introduced in v3.15.
The bug causes audio playback to fail on the Armadillo800 EVA board.

I am posting this as a fix for v3.16 rather than v3.15 as I believe
it is too late in the v3.15 cycle for a change of this nature.
As such I would also like this change considered for v3.15 -stable.


The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

  Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes-for-v3.16

for you to fetch changes up to 730359857f5f0e1fac9881c63d389d73adb5f416:

  ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting (2014-05-28 12:57:07 +0900)

----------------------------------------------------------------
Renesas ARM Based SoC Fixes for v3.16

This corrects a bug that will be introduced in v3.15.
The bug causes audio playback to fail on the Armadillo800 EVA board.

----------------------------------------------------------------
Kuninori Morimoto (1):
      ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

 arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting

[Simon Horman]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
fixuped FSI driver's behavior
which didn't match to ALSA flags.

But, it didn't care about armadillo800eva HDMI sound flags.
This patch fixed it.

Reported-by: Bui Duc Phuc(Fukuda) <bd-phuc@jinso.co.jp>
Reported-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2858f38..40895cc 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1016,7 +1016,7 @@ static struct asoc_simple_card_info fsi2_hdmi_info = {
 	.platform	= "sh_fsi2",
 	.cpu_dai = {
 		.name	= "fsib-dai",
-		.fmt	= SND_SOC_DAIFMT_CBM_CFM,
+		.fmt	= SND_SOC_DAIFMT_CBS_CFS,
 	},
 	.codec_dai = {
 		.name = "sh_mobile_hdmi-hifi",
-- 
1.8.5.2