summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5/Kconfig
Commit message (Collapse)AuthorAgeFilesLines
* ARM i.MX: Merge i.MX5 support into mach-imxSascha Hauer2011-11-161-244/+0
| | | | | | | | | | This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx and adjusts the Makefile/Kconfig entries in a way that it's possible to compile i.MX5 together with i.MX3/6. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dirk Behme <dirk.behme@de.bosch.com>
* Merge branch 'imx/devel' into next/dtArnd Bergmann2011-11-011-16/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | The board changes in the imx/devel branch conflict with other changes in the device imx/dt branch. Conflicts: arch/arm/mach-mx5/board-mx53_loco.c arch/arm/mach-mx5/board-mx53_smd.c arch/arm/plat-mxc/include/mach/common.h arch/arm/plat-mxc/include/mach/memory.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * Merge branch 'imx/cleanup' into imx/develArnd Bergmann2011-10-071-2/+8
| |\ | | | | | | | | | | | | | | | | | | | | | This helps resolve the conflicts between the imx cleanups and the new code that has gone into the imx tree. Conflict resolution was originally done by Sascha Hauer. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| | * Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer2011-08-031-1/+26
| | |\ | | | | | | | | | | | | into imx-cleanup
| | | * ARM: mx5: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König2011-08-011-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | | * ARM: mx5: dynamically allocate mxc-ehci devicesUwe Kleine-König2011-08-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally make the usb related defines consistent with the other imx SoCs. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx50: Select IMX_HAVE_PLATFORM_FEC as done on other i.MX devicesFabio Estevam2011-07-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it is only the MX50_RDP board that selects IMX_HAVE_PLATFORM_FEC in its board Kconfig. Do like the other i.MX processors, which select IMX_HAVE_PLATFORM_FEC based on the processor type. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | |
| | \ \
| *-. \ \ Merge branches 'features/assorted', 'features/imx-cpurev', ↵Sascha Hauer2011-08-261-14/+5
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features-for-arnd
| | | * | ARM i.MX: allow to compile together all i.MX5 based SoCsSascha Hauer2011-08-241-14/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | imx: efika: Enable pata.Arnaud Patard (Rtp)2011-08-231-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Enable pata support on efika mx/sb platforms. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | arm/mx5: add device tree support for imx51 babbageShawn Guo2011-10-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | It adds device tree support for imx51 babbage board. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | arm/mx5: add device tree support for imx53 boardsShawn Guo2011-10-181-0/+12
|/ / | | | | | | | | | | | | | | | | It adds device tree support for imx53 boards. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: mach-mx5/mx53_ard: Add gpio_keys supportDaiane Angolini2011-07-071-0/+1
| | | | | | | | | | Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM:mach-mx5/mx53_ard: Add I2C2 and I2C3 supportAndre Silva2011-07-071-0/+1
| | | | | | | | | | Signed-off-by: Andre Silva <andre.silva@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM:mach-mx5/mx53_ard: Add Watchdog timer supportAndre Silva2011-07-071-0/+1
| | | | | | | | | | Signed-off-by: Andre Silva <andre.silva@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM:mach-mx5/mx53_ard: Add ESDHC supportAndre Silva2011-07-071-0/+1
| | | | | | | | | | Signed-off-by: Andre Silva <andre.silva@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: mach-mx5/mx53_ard: Add support for i.MX53 ARD boardAndre Silva2011-07-071-0/+8
| | | | | | | | | | | | | | Signed-off-by: Andre Silva <andre.silva@freescale.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: mx5/mx53_evk: Add support for LEDFabio Estevam2011-07-071-0/+1
| | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: mx5/mx53_loco: Add support for LEDFabio Estevam2011-07-071-0/+1
| | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: mx5: convert to new leds-gpio registration helperUwe Kleine-König2011-07-071-0/+4
|/ | | | | | | | This gets rid of per machine struct platform_device definitions and allows to move the platform data and led definition to .init.rodata. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxc: don't allow to compile together i.MX51 and i.MX53Uwe Kleine-König2011-05-191-18/+33
| | | | | | | | | The two SoCs have different PHYS_OFFSETs so it's not (yet) possible to compile a single (working) kernel for these. LAKML-Reference: 1302464943-20721-4-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxc: don't use the symbols in the CPU family choice to select othersUwe Kleine-König2011-05-191-0/+6
| | | | | | | | | | | | | The symbols in this choice should only be used to select between the available machines that can be built into a single kernel. As these sets (will) differ e.g. depending on ARM_PATCH_PHYS_VIRT and AUTO_ZRELADDR letting them select other symbols makes the logic more complex and needs to duplicate some things. So let the machines select the corresponding symbols (indirectly via SOC_XYZ). LAKML-Reference: 1302464943-20721-2-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/mx53_smd: Add esdhc supportFabio Estevam2011-05-191-0/+1
| | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> LAKML-Reference: 1301921449-32194-1-git-send-email-fabio.estevam@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx53_loco: Add GPIO Keypad supportFrank Li2011-03-231-0/+1
| | | | | Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx5x: clean up ARCH_MX5XRichard Zhao2011-03-071-1/+2
| | | | | | | | | Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc using ARCH_MX5X. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx53_smd: Add I2C supportFabio Estevam2011-03-071-0/+1
| | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx53_loco: add esdhc device supportRichard Zhu2011-03-071-0/+1
| | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx53_loco: add i2c device supportRichard Zhao2011-02-181-0/+1
| | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mach-mx5: Add watchdog support for MX53 based boardsFabio Estevam2011-02-181-0/+3
| | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx51: add support for efika smartbookArnaud Patard (Rtp)2011-02-181-0/+7
| | | | | Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* efikamx: add usb h1 supportArnaud Patard (Rtp)2011-02-181-0/+1
| | | | | | | Now that usb has been fixed, we can enable usb h1 on efikamx Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Introduce EFIKA_COMMONArnaud Patard (Rtp)2011-02-181-2/+6
| | | | | | | | | The Genesi EFIKA MX and EFIKA Smartbook are sharing a lot of things so it makes sense to create a common file for both devices and a specific file for each. No functionnal change except dropping uart 1 & 2. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/mx51_3ds: Add watchdog supportDaiane Angolini2011-01-241-0/+1
| | | | | Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm: mx50_rdp: add fec supportRichard Zhao2011-01-191-0/+1
| | | | | Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX53 enable LOCO board bootupYong Shen2011-01-131-0/+8
| | | | | | | | | 1. Add Kconfig and Makefile entries 2. Add board definition 3. enable uart and fec for LOCO board Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX53 enable SMD board bootupYong Shen2011-01-131-0/+7
| | | | | | | | | 1. Add Kconfig and Makefile entries 2. Add board definition 3. enable uart and fec for SMD board Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5: dynamically allocate imx-keypad devicesFabio Estevam2011-01-121-0/+2
| | | | | | | | | | | | | | | Add support for dynamical allocation of imx-keypad on mx5 platform. After moving to dynamically registration of the keypad, the keypad clock name needs to change accordingly. The reason is that the original mx5 keypad platform_device id was 0, now we use id=-1 as per arch/arm/plat-mxc/devices/platform-imx-keypad.c. Tested keypad successfully on a MX51_3DS board. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX53 enable spi on EVK boardYong Shen2011-01-111-0/+1
| | | | | | | | | 1. some macro definitions fix 2. add platform data for spi device 3. register spi clocks Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX53 enable sdhc support on EVK boardYong Shen2011-01-071-0/+1
| | | | | | | | 1. changes some register address to fit macro definition 2. add platform data and clock for sdhc Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX53 enable i2c on EVK boardYong Shen2011-01-071-0/+1
| | | | | | | add i2c platform data and clock Signed-off-by: Yong Shen <yong.shen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM i.MX53: Make MX53 EVK bootableYong Shen2011-01-041-0/+18
| | | | | | | | | | 1. Add entries to Kconfig 2. Add machine definition 3. Add Uart platform data, pad setting and base address 4. Adjust GPIO irq number Signed-off-by: Yong Shen <yong.shen@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm: mx50: add mx50 reference design board supportRichard Zhao2011-01-031-0/+12
| | | | | | | Add basic function and uart device support. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm: mx50: add core functions support except clockRichard Zhao2011-01-031-1/+12
| | | | | | | | Add core definitions and memory map, gpio, irq, iomux, uart device support. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/mx51_babbage: Add watchdog supportFabio Estevam2010-12-071-0/+1
| | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5: introduce SOC_IMX51Fabio Estevam2010-12-031-1/+10
| | | | | | | | Introduce SOC_IMX51 to keep consistency with the other i.MX devices Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx5: Fix efikamx buildArnaud Patard (Rtp)2010-12-031-2/+2
| | | | | | | | | | Commit 124bf94a "ARM: imx: fix name for functions adding sdhci-esdhc-imx devices" changed some devices and Kconfig entry and didn't change every places it should have. It's breaking efikamx build. I've fixed 3ds Kconfig entry as I believe it's broken there too. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx51_babbage: Add SPI flash supportFabio Estevam2010-11-241-0/+1
| | | | | | | | | | MX51 Babbage has an AT45DB321 SPI Flash connected to eCSPI1. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* mx51_3ds: Add esdhc supportFabio Estevam2010-11-241-0/+1
| | | | | | | | Add support for esdhc on mx51_3ds board. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* efikamx: add spi nor supportArnaud Patard (Rtp)2010-11-241-0/+1
| | | | | | | On efikamx, uboot is stored on a nor spi flash. Add support for it Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* efikamx: add mmc supportArnaud Patard (Rtp)2010-11-241-0/+1
| | | | | | | | The efika mx is using a esdhc host for mmc support. Now that the sdhci has support for it, enable it. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>