summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-imx6q.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-091-0/+34
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: 7198/1: arm/imx6: add restart support for imx6qShawn Guo2012-01-051-1/+34
| | | | | | | | | | | | | | | | | | The restart support was missed from the initial imx6q submission. The mxc_restart() does not work for imx6q. Instead, this patch adds the restart for imx6q. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: restart: mxc: use new restart hookRussell King2012-01-051-0/+1
| | | | | | | | | | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | arm/imx6q: Rename Sabreauto to Armadillo2Dirk Behme2011-12-141-1/+1
| | | | | | | | | | | | | | | | The Sabreauto board was renamed to Armadillo2 recently. To avoid confusion, rename Sabreauto to Armadillo2/arm2. Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | arm/imx6q-sabrelite: add enet phy ksz9021rn fixupRichard Zhao2011-12-141-0/+21
| | | | | | | | | | | | | | The default phy RGMII pad settings can not work, tune pad skew. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | arm/imx6: add imx6q sabrelite board supportRichard Zhao2011-12-141-0/+1
|/ | | | | | | | | - Add basic board dts file - Add board compatible string to mach-imx6q. - Update fsl DT board doc. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* Merge branch 'imx/fix-irqdomain' of ↵Arnd Bergmann2011-12-061-4/+5
|\ | | | | | | git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
| * arm/imx: fix irq_base for gpioShawn Guo2011-12-011-3/+2
| | | | | | | | | | | | | | | | | | | | When gpio core dynamically allocate gpio number for a port, it starts from the end of the total range, 0 ~ ARCH_NR_GPIOS. That said, the earlier a port gets probed, the bigger gpio number it gets assigned. To match this, the irq_base for gpio should be assigned from 'MXC_GPIO_IRQ_START + ARCH_NR_GPIOS' decreasingly. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
| * arm/imx: fix return type of callback passed to of_irq_init()Shawn Guo2011-12-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | The of_irq_init() expects the callback passed by .data of of_device_id return 'int' instead of 'void'. This patch fixes it to have irq_init_cb() return the correct value, and in turn have the secondary interrupt controller (gpio in this case) initialized properly and also eliminate the error message 'of_irq_init: children remain, but no parents' which was overlooked before. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* | ARM: imx6q: move clock register map to machine_desc.map_ioRichard Zhao2011-11-171-0/+1
|/ | | | | | | | map_io is the only place to call iotable_init. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> [shawn.guo: rename imx_clock_map_io() to imx6q_clock_map_io()] Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
* arm/imx6q: add device tree machine supportShawn Guo2011-10-311-0/+84
It adds generic device tree based machine support for imx6q. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>