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

Commit eeea3ac9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC bug fixes from Olof Johansson:
 "Mostly Renesas and Atmel bugfixes this time, targeting boot and build
  problems.  A couple of patches for gemini and kirkwood as well.  On a
  whole nothing very controversial."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: gemini: fix the gemini build
  ARM: shmobile: armadillo800eva: enable rw rootfs mount
  ARM: Kirkwood: Fix 'SZ_1M' undeclared here for db88f6281-bp-setup.c
  ARM: shmobile: mackerel: fixup usb module order
  ARM: shmobile: armadillo800eva: fixup: sound card detection order
  ARM: shmobile: marzen: fixup smsc911x id for regulator
  ARM: at91/feature-removal-schedule: delay at91_mci removal
  ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
  ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions
  ARM: at91/dts: remove partial parameter in at91sam9g25ek.dts
  ARM: at91/clock: fix PLLA overclock warning
  ARM: at91: fix rtc-at91sam9 irq issue due to sparse irq support
  ARM: at91: fix system timer irq issue due to sparse irq support
  ARM: shmobile: sh73a0: fixup RELOC_BASE of intca_irq_pins_desc
parents c7c6bf1e e829c667

Documentation/feature-removal-schedule.txt

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ Why: KVM tracepoints provide mostly equivalent information in a much more 
----------------------------



What:	at91-mci driver ("CONFIG_MMC_AT91")

When:	3.7

When:	3.8

Why:	There are two mci drivers: at91-mci and atmel-mci. The PDC support

	was added to atmel-mci as a first step to support more chips.

	Then at91-mci was kept only for old IP versions (on at91rm9200 and

arch/arm/boot/dts/at91sam9g25ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
	compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";



	chosen {

		bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";

		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";

	};



	ahb {

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-at91/at91rm9200_time.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void __init at91rm9200_timer_init(void) 
	at91_st_read(AT91_ST_SR);



	/* Make IRQs happen for the system timer */

	setup_irq(AT91_ID_SYS, &at91rm9200_timer_irq);

	setup_irq(NR_IRQS_LEGACY + AT91_ID_SYS, &at91rm9200_timer_irq);



	/* The 32KiHz "Slow Clock" (tick every 30517.58 nanoseconds) is used

	 * directly for the clocksource and all clockevents, after adjusting

arch/arm/mach-at91/at91sam9260_devices.c

+5 −1
Original line number Diff line number Diff line
@@ -726,6 +726,8 @@ static struct resource rtt_resources[] = { 
		.flags	= IORESOURCE_MEM,

	}, {

		.flags	= IORESOURCE_MEM,

	}, {

		.flags  = IORESOURCE_IRQ,

	},

};
@@ -744,10 +746,12 @@ static void __init at91_add_device_rtt_rtc(void) 
	 * The second resource is needed:

	 * GPBR will serve as the storage for RTC time offset

	 */

	at91sam9260_rtt_device.num_resources = 2;

	at91sam9260_rtt_device.num_resources = 3;

	rtt_resources[1].start = AT91SAM9260_BASE_GPBR +

				 4 * CONFIG_RTC_DRV_AT91SAM9_GPBR;

	rtt_resources[1].end = rtt_resources[1].start + 3;

	rtt_resources[2].start = NR_IRQS_LEGACY + AT91_ID_SYS;

	rtt_resources[2].end = NR_IRQS_LEGACY + AT91_ID_SYS;

}

#else

static void __init at91_add_device_rtt_rtc(void)