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

Commit 66583ec7 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Nicolas Ferre, first fixes series for 3.12:
- removal of void IRQF_DISABLED flag in timer drivers
- two little fixes in DT for at91sam9x5 family

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

:
  ARM: at91: remove IRQF_DISABLED
  ARM: at91: at91sam9x5: set default mmc[01] pinctrl-names
  ARM: at91: serial: fix wrong pinctrl_usart2_rts

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 55a9e7c8 9ceb389d

arch/arm/boot/dts/at91sam9x5.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -190,12 +190,12 @@ 
							 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PA8 periph A */

					};



					pinctrl_uart2_rts: uart2_rts-0 {

					pinctrl_usart2_rts: usart2_rts-0 {

						atmel,pins =

							<AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PB0 periph B */

					};



					pinctrl_uart2_cts: uart2_cts-0 {

					pinctrl_usart2_cts: usart2_cts-0 {

						atmel,pins =

							<AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PB1 periph B */

					};
@@ -556,6 +556,7 @@ 
				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;

				dma-names = "rxtx";

				pinctrl-names = "default";

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";
@@ -567,6 +568,7 @@ 
				interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;

				dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;

				dma-names = "rxtx";

				pinctrl-names = "default";

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";

arch/arm/mach-at91/at91rm9200_time.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id) 


static struct irqaction at91rm9200_timer_irq = {

	.name		= "at91_tick",

	.flags		= IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= at91rm9200_timer_interrupt,

	.irq		= NR_IRQS_LEGACY + AT91_ID_SYS,

};

arch/arm/mach-at91/at91sam926x_time.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id) 


static struct irqaction at91sam926x_pit_irq = {

	.name		= "at91_tick",

	.flags		= IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.flags		= IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= at91sam926x_pit_interrupt,

	.irq		= NR_IRQS_LEGACY + AT91_ID_SYS,

};

arch/arm/mach-at91/at91x40_time.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static irqreturn_t at91x40_timer_interrupt(int irq, void *dev_id) 


static struct irqaction at91x40_timer_irq = {

	.name		= "at91_tick",

	.flags		= IRQF_DISABLED | IRQF_TIMER,

	.flags		= IRQF_TIMER,

	.handler	= at91x40_timer_interrupt

};