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

Commit 981ba657 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes 

Fixes for AT91 related to:
- move to sparse IRQ: some drivers were forgotten
- a DTS typo
- the delay for removal of old at91_mci driver

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91/feature-removal-schedule: delay at91_mci removal
  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
parents 31494932 51a6149b

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/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)

arch/arm/mach-at91/at91sam9261_devices.c

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

	}, {

		.flags	= IORESOURCE_MEM,

	}, {

		.flags  = IORESOURCE_IRQ,

	}

};
@@ -626,10 +628,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

	 */

	at91sam9261_rtt_device.num_resources = 2;

	at91sam9261_rtt_device.num_resources = 3;

	rtt_resources[1].start = AT91SAM9261_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)