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

Commit 23f3f061 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

From Sascha Hauer:

ARM i.MX: Two fixes for i.MX
- armadillo5x0 board broken since v3.5 (stable material)
- i.MX25 Architecture broken since v3.6-rc1

* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM i.MX25: Make timer irq work again
  ARM: imx: armadillo5x0: Fix illegal register access
parents 652f5b5e 42a3f891

arch/arm/mach-imx/clk-imx25.c

+1 −1
Original line number Diff line number Diff line
@@ -241,6 +241,6 @@ int __init mx25_clocks_init(void) 
	clk_register_clkdev(clk[sdma_ahb], "ahb", "imx35-sdma");

	clk_register_clkdev(clk[iim_ipg], "iim", NULL);



	mxc_timer_init(MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54);

	mxc_timer_init(MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), MX25_INT_GPT1);

	return 0;

}

arch/arm/mach-imx/mach-armadillo5x0.c

+2 −1
Original line number Diff line number Diff line
@@ -526,7 +526,8 @@ static void __init armadillo5x0_init(void) 
	imx31_add_mxc_nand(&armadillo5x0_nand_board_info);



	/* set NAND page size to 2k if not configured via boot mode pins */

	__raw_writel(__raw_readl(MXC_CCM_RCSR) | (1 << 30), MXC_CCM_RCSR);

	__raw_writel(__raw_readl(mx3_ccm_base + MXC_CCM_RCSR) |

					(1 << 30), mx3_ccm_base + MXC_CCM_RCSR);



	/* RTC */

	/* Get RTC IRQ and register the chip */

arch/arm/plat-mxc/include/mach/mx25.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ 
#define MX25_INT_UART1		(NR_IRQS_LEGACY + 45)

#define MX25_INT_GPIO2		(NR_IRQS_LEGACY + 51)

#define MX25_INT_GPIO1		(NR_IRQS_LEGACY + 52)

#define MX25_INT_GPT1		(NR_IRQS_LEGACY + 54)

#define MX25_INT_FEC		(NR_IRQS_LEGACY + 57)



#define MX25_DMA_REQ_SSI2_RX1	22