Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f81a3a1f687a4a90025822dd54e51d7117a6cba7

Authored by Olof Johansson
2 parents 3729d4a41d 28e515878f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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

Showing 3 changed files Side-by-side Diff

arch/arm/configs/armadillo800eva_defconfig
Diff comments   View file @ f81a3a1
... ... @@ -33,7 +33,7 @@
33 33 CONFIG_FORCE_MAX_ZONEORDER=13
34 34 CONFIG_ZBOOT_ROM_TEXT=0x0
35 35 CONFIG_ZBOOT_ROM_BSS=0x0
36   -CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"
  36 +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"
37 37 CONFIG_CMDLINE_FORCE=y
38 38 CONFIG_KEXEC=y
39 39 CONFIG_VFP=y
arch/arm/mach-shmobile/board-armadillo800eva.c
Diff comments   View file @ f81a3a1
... ... @@ -902,8 +902,8 @@
902 902 &camera_device,
903 903 &ceu0_device,
904 904 &fsi_device,
905   - &fsi_hdmi_device,
906 905 &fsi_wm8978_device,
  906 + &fsi_hdmi_device,
907 907 };
908 908  
909 909 static void __init eva_clock_init(void)
arch/arm/mach-shmobile/board-mackerel.c
Diff comments   View file @ f81a3a1
... ... @@ -695,6 +695,7 @@
695 695 * - J30 "open"
696 696 * - modify usbhs1_get_id() USBHS_HOST -> USBHS_GADGET
697 697 * - add .get_vbus = usbhs_get_vbus in usbhs1_private
  698 + * - check usbhs0_device(pio)/usbhs1_device(irq) order in mackerel_devices.
698 699 */
699 700 #define IRQ8 evt2irq(0x0300)
700 701 #define USB_PHY_MODE (1 << 4)
701 702  
... ... @@ -1325,8 +1326,8 @@
1325 1326 &nor_flash_device,
1326 1327 &smc911x_device,
1327 1328 &lcdc_device,
1328   - &usbhs1_device,
1329 1329 &usbhs0_device,
  1330 + &usbhs1_device,
1330 1331 &leds_device,
1331 1332 &fsi_device,
1332 1333 &fsi_ak4643_device,