summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/tegra'Sascha Hauer2013-06-026-0/+483
|\
| * tegra20: add generic board and Colibri T20 on IrisLucas Stach2013-05-154-0/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | The Tegra arch will be fully based on device tree and most boards shouldn't need anything more than the generic drivers and arch code. This adds generic tegra20 board support, but since we currently have no way to combine an image with a devicetree other than compiling it into the single image we also add Colibri T20 on Iris support here and add a defconfig for it. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * tegra: paz00: import pinconfig from LinuxLucas Stach2013-05-121-0/+216
| | | | | | | | | | Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * tegra20: add pinctrl driverLucas Stach2013-05-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This adds a pinctrl driver for the Tegra 20 line of SoCs. It only supports the three basic pinconfiguration settings function mux, tristate control and pullup/down control. The driver understands the same devicetree bindings as the Linux one, unimplemented pinconfiguration options will be ignored. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/omap'Sascha Hauer2013-06-027-6/+90
|\ \
| * | pcm049: clean upJan Weitzel2013-05-301-5/+5
| | | | | | | | | | | | | | | | | | Remove magic numbers Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | pcm049: add 1GB RAM supportTeresa Gámez2013-05-303-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | Add config to select RAM assembly. The difference is if one or two chip selects are used. This can't be checkt at runtime. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: am33xx: add pinmux config for RMII2Jan Luebbe2013-05-232-0/+26
| | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: am33xx: add pinmux and clock config for UART2Jan Luebbe2013-05-234-0/+23
| | | | | | | | | | | | | | | Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/of'Sascha Hauer2013-06-021-0/+4
|\ \ \
| * | | bootm: print Kernel commandline in verbose modeSascha Hauer2013-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without devicetree support we print the Kernel commandline in verbose mode. Do the same with devicetree boot aswell. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | bootm: make sure to print fixed oftreeSascha Hauer2013-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when doing bootm -v -v we dumped the original tree to the console. Make sure to print the fixed tree instead so that the fixups can be examined. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/mxs'Sascha Hauer2013-06-022-1/+59
|\ \ \ \
| * | | | ARM: cfa10036: Add more board ID for boot time detectionBrian Lilly2013-05-241-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As new breakout boards are being developped, we need to add their IDs in the device detection code, otherwise they will be treated as regular CFA-10036. Signed-off-by: Brian Lilly <brian@crystalfontz.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | MXS/i.MX23: add boot source detectionJuergen Beisert2013-05-231-1/+43
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The boot source for the i.MX23 is configured via a few GPIOs, which are later be used for different purposes (like LCD data for example). The SoC internal ROM reads these GPIOs and uses the selected boot source. For various reasons the boot source is also of interest when Barebox is running. This detection approach reads again the GPIOs. It switches temporarily the pins to act as GPIOs and input, reads their settings, and switches back to their previous functions. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/mci'Sascha Hauer2013-06-022-2/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: include/driver.h
| * | | | twl6030: Set WR_S for VMMCJan Weitzel2013-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After Reset VMMC goes to default VSEL. This is not a clean power cycle for some SD cards. Set flag WR_S for VMMC to avoid going to default VSEL. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: OMAP MCI: Move TWL6030 power initialization into OMAP directoryAlexander Shiyan2013-05-301-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | Added sd driver for bcm2835 (Raspberry PI)wilhelm2013-05-301-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Replaced defines according to sdhci.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/marvell'Sascha Hauer2013-06-0244-0/+1173
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Makefile
| * | | | arm: mvebu: introduce common lowlevel and early initSebastian Hesselbarth2013-05-2127-322/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At early stage after boot, all MVEBU SoCs are similar enough to have a common lowlevel and barebox entry. We also remap the internal register base address to 0xf100000 as it gives some 512M more of contiguous address space. As we cannot determine real memory size that early, we start with a default memory size of 64M and probe correct size later in SoC init. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: mvebu: add more visible SoC separators to KconfigSebastian Hesselbarth2013-05-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just add more visible separators between each subconfig of the supported Marvell EBU SoCs. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: mvebu: remove useless lines in kwbimage.cfg for CuBoxThomas Petazzoni2013-05-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to the improvements brought into the kwbimage tool, it is no longer necessary to have dummy DEST_ADDR and EXEC_ADDR lines in the kwbimage.cfg file if those values are passed on the command line to the kwbimage tool, which is what the Barebox build process does. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: mvebu: add basic support for Globalscale Guruplug boardThomas Petazzoni2013-05-178-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Globalscale Guruplug board is a small NAS-type plug platform that uses a Marvell Kirkwood SoC. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: mvebu: initial support for Marvell Kirkwood SoCsThomas Petazzoni2013-05-175-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marvell Kirkwood SoCs are based on a ARMv5 compatible core designed by Marvell, and a large number of peripherals with Marvell Dove, Marvell Armada 370 and Marvell Armada XP SoCs. The Marvell Kirkwood are used in a large number of consumer-grade NAS devices, for example. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: mvebu: add Feroceon CPU typeThomas Petazzoni2013-05-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Kirkwood Marvell SoC uses a Marvell-specific implementation of an ARMv5TE compatible ARM core, the Feroceon. This patch introduces a Kconfig option that allows to select this CPU type. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: mach-mvebu: rename Armada 370/XP core codeSebastian Hesselbarth2013-05-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are more than Armada 370/XP in Marvell MVEBU SoC familiy. To avoid irritation with source file nameing, we rename setup source file for Armada 370/XP from core.c to armada-370-xp.c. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: add basic support for SolidRun CuBoxSebastian Hesselbarth2013-05-158-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SolidRun CuBox is a small cubic platform based on the Marvell Dove SoC. There is nothing more than a console, yet. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: initial support for Marvell Dove SoCsSebastian Hesselbarth2013-05-156-2/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds minimal support for the Marvell Dove SoC (88AP510) as first SoC of the Marvell Orion family. Orion SoCs have a different timer, therefore current mach-mvebu and Armada 370/XP Kconfig and Makefiles are slightly modified and a new clocksource drivers is added. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: add basic support for the Armada XP GP platformThomas Petazzoni2013-05-138-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Armada XP GP platform is an evaluation platform designed by Marvell, that uses the MV78460 quad-core SoC from the Armada XP family. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: add basic support for the Armada 370 Mirabox platformThomas Petazzoni2013-05-138-4/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mirabox is a platform manufactured by Globalscale, and based on the Marvell Armada 370 SoC. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: add basic support for Armada XP OpenBlocks AX3 platformThomas Petazzoni2013-05-138-6/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenBlocks AX3 platform is manufactured by PlatHome and uses the MV78260 dual-core SoC from the Armada XP family. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: integrate kwbimage in the image generationThomas Petazzoni2013-05-131-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a ARCH_MVEBU platform is selected, generate barebox.kwb and barebox.kwbuart images from barebox.bin, using kwbimage. barebox.kwb is generated by executing kwbimage on the board kwbimage.cfg file, and is therefore designed to be booted from the default boot media of the board, as defined by kwbimage.cfg (typically a NAND flash or SPI flash). barebox.kwbuart is generated by executing kwbimage on the board kwbimage.cfg file, but by overriding the boot media to be UART. This image is suitable for usage with the kwbtool and is generally useful for recovery purposes. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Squashed this fixup: arm: ensure the build doesn't fail when kwbimage lacks the binary blob mach-mvebu images for Armada 370 and Armada XP SoC require a DDR3 training code which should be extracted from existing bootable images for the relevant board. When such binary blob has not been extracted, the build of the .kwb and .kwbuart images will fail. This is annoying as it makes the build of all Armada 370/XP defconfig fail, which can be a problem for automated builds. This proposal makes the failure of kwbimage not a fatal failure for the build process, and shows a warning. The user therefore sees: ==================================================================== KWB barebox.kwb Didn't find the file 'plathome-openblocks-ax3-binary.0' in '/home/thomas/projets/barebox' which is mandatory to generate the image This file generally contains the DDR3 training code, and should be extracted from an existing bootable image for your board. See 'kwbimage -x' to extract it from an existing image. Could not create image WARNING: Couldn't create KWB image due to previous errors. KWBUART barebox.kwbuart Didn't find the file 'plathome-openblocks-ax3-binary.0' in '/home/thomas/projets/barebox' which is mandatory to generate the image This file generally contains the DDR3 training code, and should be extracted from an existing bootable image for your board. See 'kwbimage -x' to extract it from an existing image. Could not create image WARNING Couldn't create KWB image due to previous errors. ==================================================================== The only drawback is that barebox-flash-image, which normally points to barebox.kwb, becomes a stale symbolic link. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | arm: initial support for Marvell Armada 370/XP SoCsThomas Petazzoni2013-05-137-0/+254
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds minimal support for the Armada 370 and Armada XP SoCs from Marvell. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-next/imx-oftree'Sascha Hauer2013-06-0223-387/+4500
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/boards/freescale-mx51-pdk/board.c
| * | | | ARM: i.MX6 sabresd: Switch to devicetree probingSascha Hauer2013-05-314-126/+150
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX6 sabrelite: switch to devicetree probingSascha Hauer2013-05-315-140/+220
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX6: Add usdhc aliasesSascha Hauer2013-05-311-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX6: add imx31 compatible entry for GPTSascha Hauer2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX6: Add devicetree filesSascha Hauer2013-05-313-0/+2235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diretly taken from Linux 3.10-rc3 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX6: skip devices register when devicetree is presentSascha Hauer2013-05-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have a devicetree, do not register the platform devices. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX6: Fix CCM compatible nodeSascha Hauer2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51: Add aliases for MMC controllersSascha Hauer2013-05-272-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get persistent names for the MMC controllers add aliases to them Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51 babbage: switch to devicetreeSascha Hauer2013-05-233-95/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches the babbage board to probe from devicetree for all for all devices we currently support probing from devicetree. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51 babbage: Add phy reset gpio to dtsSascha Hauer2013-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs to be configured to properly reset the phy. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51 babbage: provide MAC adress in devicetreeSascha Hauer2013-05-231-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51 babbage: Add spi-cs-high property to pmicSascha Hauer2013-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mc13892 driver knows that it needs spi-cs-high, so the mc13892 will work. The dataflash also connected to this bus though can only be probed when the mc13892 is inactive. Due to driver probe differences we can only make sure the mc13892 is inactive when we put the information into the devicetree. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51: skip devices register when devicetree is presentSascha Hauer2013-05-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have a devicetree, do not register the platform devices. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51: Fixup fec pads in dtsSascha Hauer2013-05-231-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Kernel dts relies on reset default pad settings for the FEC. Add correct pad settings. Also, add missing MX51_PAD_NANDF_D11__FEC_RX_DV. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | | ARM: i.MX51: Add IIM devicetree nodeSascha Hauer2013-05-231-0/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>