Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f81a3a1f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes 

Two regression fixes and one boot-loader compatibility fix from Simon Horman.

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: armadillo800eva: enable rw rootfs mount
  ARM: shmobile: mackerel: fixup usb module order
  ARM: shmobile: armadillo800eva: fixup: sound card detection order
parents 3729d4a4 28e51587

arch/arm/configs/armadillo800eva_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-shmobile/board-armadillo800eva.c

+1 −1
Original line number Diff line number Diff line
@@ -902,8 +902,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)

arch/arm/mach-shmobile/board-mackerel.c

+2 −1
Original line number Diff line number Diff line
@@ -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,