* [PATCH 1/3] ARM: shmobile: armadillo800eva: fixup: sound card detection order
2012-09-05 1:34 [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2 Simon Horman
@ 2012-09-05 1:34 ` Simon Horman
2012-09-05 1:34 ` [PATCH 2/3] ARM: shmobile: mackerel: fixup usb module order Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-05 1:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
Signed-off-by: Simon Horman <horms@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 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.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] ARM: shmobile: mackerel: fixup usb module order
2012-09-05 1:34 [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2 Simon Horman
2012-09-05 1:34 ` [PATCH 1/3] ARM: shmobile: armadillo800eva: fixup: sound card detection order Simon Horman
@ 2012-09-05 1:34 ` Simon Horman
2012-09-05 1:34 ` [PATCH 3/3] ARM: shmobile: armadillo800eva: enable rw rootfs mount Simon Horman
2012-09-05 4:44 ` [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2 Olof Johansson
3 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-05 1:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
renesas_usbhs driver can play role as both Host and Gadget.
In case of Gadget, it requires not only renesas_usbhs
but also usb gadget module (like g_ether).
So, renesas_usbhs driver calls usb_add_gadget_udc() on probe time.
Because of this behavior,
Host port plays also Gadget role if kernel has both Host/Gadget support.
In mackerel case, from 0ada2da51800a4914887a9bcf22d563be80e50be
(ARM: mach-shmobile: mackerel: use renesas_usbhs instead of r8a66597_hcd)
usb0 plays Gadget role, and usb1 plays Host role,
and current mackerel board probes as usb1 -> usb0.
Thus, 1st installed usb gadget module (like g_ether) will be
assigned to usb1 (= usb Host port), and 2nd module to usb0 (= usb Gadget port).
It is very confusable for user.
This patch fixup usb modes probing order as usb0 -> usb1.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/board-mackerel.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 7ea2b31..c129542 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -695,6 +695,7 @@ static struct platform_device usbhs0_device = {
* - J30 "open"
* - modify usbhs1_get_id() USBHS_HOST -> USBHS_GADGET
* - add .get_vbus = usbhs_get_vbus in usbhs1_private
+ * - check usbhs0_device(pio)/usbhs1_device(irq) order in mackerel_devices.
*/
#define IRQ8 evt2irq(0x0300)
#define USB_PHY_MODE (1 << 4)
@@ -1325,8 +1326,8 @@ static struct platform_device *mackerel_devices[] __initdata = {
&nor_flash_device,
&smc911x_device,
&lcdc_device,
- &usbhs1_device,
&usbhs0_device,
+ &usbhs1_device,
&leds_device,
&fsi_device,
&fsi_ak4643_device,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] ARM: shmobile: armadillo800eva: enable rw rootfs mount
2012-09-05 1:34 [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2 Simon Horman
2012-09-05 1:34 ` [PATCH 1/3] ARM: shmobile: armadillo800eva: fixup: sound card detection order Simon Horman
2012-09-05 1:34 ` [PATCH 2/3] ARM: shmobile: mackerel: fixup usb module order Simon Horman
@ 2012-09-05 1:34 ` Simon Horman
2012-09-05 4:44 ` [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2 Olof Johansson
3 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-05 1:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
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=13
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=4096,wsize=4096"
+CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw"
CONFIG_CMDLINE_FORCE=y
CONFIG_KEXEC=y
CONFIG_VFP=y
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2
2012-09-05 1:34 [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2 Simon Horman
` (2 preceding siblings ...)
2012-09-05 1:34 ` [PATCH 3/3] ARM: shmobile: armadillo800eva: enable rw rootfs mount Simon Horman
@ 2012-09-05 4:44 ` Olof Johansson
2012-09-05 4:53 ` Simon Horman
3 siblings, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2012-09-05 4:44 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 05, 2012 at 10:34:50AM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> please consider the following fixes for the Armadillo800 EVA and
> Mackerel boards from Morimoto-san.
>
> * "ARM: shmobile: armadillo800eva: fixup: sound card detection order"
> is a regression fix.
> * "ARM: shmobile: mackerel: fixup usb module order"
> is a regression fix.
> * "ARM: shmobile: armadillo800eva: enable rw rootfs mount"
> is a boot-loader compatibility fix.
>
> All of the changes are aimed at improving the end-user experience.
>
> Notes:
>
> * This pull request is based on my previous
> "[GIT PULL] Renesas ARM-based SoC fix for v3.6" pull request
> which was recently pulled by Olof. Please let me know
> if you would like me to handle this a different way.
That's exactly the way to do it. In this case it meant I have two pulls after
each other from the same tree, and I suppose I could replace the older one with
the newer one but that means rebasing so I just pulled it in. Either way, you
just need to send a delta pull request like you did, the rest would be up to
us.
>
> ----------------------------------------------------------------
> The following changes since commit 497dcf6fc355f0734faf851662b6957386715d24:
>
> ARM: shmobile: marzen: fixup smsc911x id for regulator (2012-08-30 14:10:08 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git fixes
Pulled, thanks!
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2
2012-09-05 4:44 ` [GIT PULL] Renesas ARM-based SoC fix for v3.6 #2 Olof Johansson
@ 2012-09-05 4:53 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-05 4:53 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 04, 2012 at 09:44:41PM -0700, Olof Johansson wrote:
> On Wed, Sep 05, 2012 at 10:34:50AM +0900, Simon Horman wrote:
> > Hi Olof, Hi Arnd,
> >
> > please consider the following fixes for the Armadillo800 EVA and
> > Mackerel boards from Morimoto-san.
> >
> > * "ARM: shmobile: armadillo800eva: fixup: sound card detection order"
> > is a regression fix.
> > * "ARM: shmobile: mackerel: fixup usb module order"
> > is a regression fix.
> > * "ARM: shmobile: armadillo800eva: enable rw rootfs mount"
> > is a boot-loader compatibility fix.
> >
> > All of the changes are aimed at improving the end-user experience.
> >
> > Notes:
> >
> > * This pull request is based on my previous
> > "[GIT PULL] Renesas ARM-based SoC fix for v3.6" pull request
> > which was recently pulled by Olof. Please let me know
> > if you would like me to handle this a different way.
>
> That's exactly the way to do it. In this case it meant I have two pulls
> after each other from the same tree, and I suppose I could replace the
> older one with the newer one but that means rebasing so I just pulled it
> in. Either way, you just need to send a delta pull request like you did,
> the rest would be up to us.
Thanks, its good to know what to do.
^ permalink raw reply [flat|nested] 6+ messages in thread