summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* ARM: add implementation for dma_alloc_writecombine for !CONFIG_MMULucas Stach2015-09-141-0/+5
| | | | | | | | This fixes build failures in builds without MMU support by providing a fallback implementation. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/socfpga'Sascha Hauer2015-09-017-805/+55
|\
| * ARM: socfpga: select OFTREE and OFDEVICELucas Stach2015-08-262-1/+2
| | | | | | | | | | | | | | | | | | SoCFPGA is completely multi-image enabled and probes the barebox from a built-in DT, so there is no point in building a barebox image that isn't able to probe from DT. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: socfpga: Configure console from device treeSascha Hauer2015-08-263-0/+9
| | | | | | | | | | | | | | Add the missing stdout-path properties for the socfpga boards and enable CONFIG_CONSOLE_ACTIVATE_NONE. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: dts: remove most of socfpga barebox-specific dt codeSteffen Trumtrar2015-08-195-809/+49
| | | | | | | | | | | | | | | | Instead of using internal devicetree files, use the official ones from /dts/src/arm. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/restart'Sascha Hauer2015-09-0159-253/+382
|\ \
| * | restart: replace reset_cpu with registered restart handlersSascha Hauer2015-08-2759-253/+382
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the reset_cpu() function which every SoC or board must provide with registered handlers. This makes it possible to have multiple reset functions for boards which have multiple ways to reset the machine. Also boards which have no way at all to reset the machine no longer have to provide a dummy reset_cpu() function. The problem this solves is that some machines have external PMICs or similar to reset the system which have to be preferred over the internal SoC reset, because the PMIC can reset not only the SoC but also the external devices. To pick the right way to reset a machine each handler has a priority. The default priority is 100 and all currently existing restart handlers are registered with this priority. of_get_restart_priority() allows to retrieve the priority from the device tree which makes it possible for boards to give certain restart handlers a higher priority in order to use this one instead of the default one. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/of_path'Sascha Hauer2015-09-0110-20/+20
|\ \
| * | ARM: dts: directly point to partitions in the barebox,environment bindingSascha Hauer2015-09-0110-20/+20
| | | | | | | | | | | | | | | | | | | | | We can now directly point to the partitions in the barebox,environment binding. Convert some boards over to it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/misc'Sascha Hauer2015-09-0110-45/+24
|\ \ \
| * | | ARM: pxa: zylonite: convert to generic default environmentRobert Jarzmik2015-08-1910-45/+24
| | |/ | |/| | | | | | | | | | | | | | | | | | | Convert zylonite board to the generic environment, and make consistent with lubbock and mainstone boards. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/imx'Sascha Hauer2015-09-017-147/+51
|\ \ \
| * | | ARM: pfla02: Add notice about the used environment partitionPhilipp Zabel2015-08-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Also, use the barebox partition on mmc2. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
| * | | ARM: pfla02: Add module revison detectionChristian Hemp2015-08-262-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pin SD4_DAT4 until SD4_DAT7 are used as revison control. The pins will be internally pulled up so we read a 1111 for revison 1. For revison two the first pin (bit) is pulled down (see schematic pfla-02 page 4 "SDIO, NAND-Flash". On Module rev 1 the pins are connected to the NAND but we have only 8bit NAND also the i.MX6 only can handle 8bit NAND flashs. Revisions: Rev 1: 0xF Rev 2: 0xE . . . Rev 15: 0x1 Rev 16: 0x0 Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: imx6: select OFTREELucas Stach2015-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.MX6 is fully DT enabled and the already selected COMMON_CLK_OF_PROVIDER needs OFTREE support to build properly. Fixes: arch/arm/mach-imx/clk-imx6.c: In function 'imx6_ccm_probe': arch/arm/mach-imx/clk-imx6.c:500:2: error: invalid use of undefined type 'struct clk_onecell_data' arch/arm/mach-imx/clk-imx6.c:502:2: error: implicit declaration of function 'of_clk_add_provider' Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: pbab01: align with and include mainline DTPhilipp Zabel2015-08-192-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align with the mainline device tree, include it, and remove all unchanged nodes and properties. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: pfla02: align with and include mainline DTPhilipp Zabel2015-08-193-133/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | Align with the mainline device tree, include it, and remove all unchanged nodes and properties. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/gpio'Sascha Hauer2015-09-0113-95/+36
|\ \ \
| * | | gpio: Drop asm-generic/gpio.hSascha Hauer2015-08-2010-62/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we no longer have custom gpio function prototypes we can drop the prototypes from asm-generic/gpio.h can add them to include/gpio.h instead. While at it add static inline dummy wrappers for !CONFIG_GENERIC_GPIO so that code using gpios can compile without gpio support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: boards: include gpio.h instead of mach/gpio.hSascha Hauer2015-08-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For getting the gpio functions include/gpio.h is the correct header file. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: PXA: use generic gpio prototypesSascha Hauer2015-08-073-32/+33
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | PXA is the only architecture that uses its own prototypes for the gpio functions because it uses static inline variants of these functions. For the sake of streamlining with other architectures move them to a C file and use the generic gpio prototypes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/fb-imx-ipu-v3'Sascha Hauer2015-09-011-0/+20
|\ \ \
| * | | implement dma_alloc_writecombineSascha Hauer2015-08-071-0/+20
| |/ / | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/arm-l2x0'Sascha Hauer2015-09-017-6/+86
|\ \ \
| * | | ARM: i.MX6: Enable l2 cacheSascha Hauer2015-08-082-0/+36
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: l2x0: Add some informational debug messagesSascha Hauer2015-08-081-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: l2x0: Flush cache before disabling itSascha Hauer2015-08-084-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise entries may still be in the cache and never reach memory. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: l2x0: Implement L310 supportSascha Hauer2015-08-081-2/+31
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: MMU: Fix order when flushing inner/outer cacheSascha Hauer2015-08-071-1/+1
| |/ / | | | | | | | | | | | | | | | | | | When flushing the cache L1 has to be flushed before L2, not the other way round. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | / ARM: do not ignore data aborts initiallySascha Hauer2015-09-011-2/+2
| |/ |/| | | | | | | | | | | arm_ignore_data_abort can be set to nonzero to ignore data aborts. The default should be not to ignore data aborts. Fix this. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: imx53: vincell: guard board initcallLucas Stach2015-08-281-0/+3
|/ | | | | | | Make sure that the initcall only executes on the expected board. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/vpl'Sascha Hauer2015-08-072-44/+89
|\
| * ARM: i.MX51 Efikasb: update device treeSascha Hauer2015-07-131-41/+87
| | | | | | | | | | | | | | Use the correct display pins (which are DISP2* and not DISP1*) and use the of_graph bindings to describe the video hardware. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: i.MX51 Efikasb: make more space for bareboxSascha Hauer2015-07-131-1/+1
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: i.MX51 Efikasb: Disable backlight earlierSascha Hauer2015-07-131-2/+1
| | | | | | | | | | | | | | | | Set the backlight enable gpio to disabled earlier during startup to avoid flicker when the pinmux is configured but not yet the enable gpio. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/vincell'Sascha Hauer2015-08-0711-360/+1226
|\ \
| * | ARM: vincell: move to DT probingSteffen Trumtrar2015-07-1310-360/+1208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enabled multi image support for the Garz&Fricke Vincell board. Also it adds the Vincell-LT as a second image with a separate device tree. Previously we used the same image on both the Vincell and the Vincell-LT image since the differences are not that significant for barebox. Still this was good for quite some confusion internally, so let's properly introduce a second image. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Add i.MX5 debug functionsSascha Hauer2015-07-131-0/+16
| |/ | | | | | | | | | | | | We recently introduced ungate_all_peripherals and SoC specific low level UART init functions. Add some more for i.MX5 SoCs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/video'Sascha Hauer2015-08-064-9/+4
|\ \
| * | video: stm: code buswidth in platform data as decimalSascha Hauer2015-07-064-9/+4
| |/ | | | | | | | | | | | | | | | | Instead of putting hardware specific bit masks in platform_data just use the decimal interface width and encode this in the driver. This makes it easier to create the platform_data and helps device tree based implementations. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/spd'Sascha Hauer2015-08-062-5/+2
|\ \
| * | common: move DDR_SPD to common/KconfigAlexander Smirnov2015-07-062-5/+2
| |/ | | | | | | | | | | | | | | This patch makes it possible to use ddr_spd-related routines in any arch not only in ppc. Signed-off-by: Alexander Smirnov <alllecs@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/ppc'Sascha Hauer2015-08-068-14/+150
|\ \
| * | PPC/PCM030: provide EEPROM support to read factory settingsJuergen Borleis2015-08-034-1/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | Above the 0x800 offset the manufacturer provides the board type, a serial number and the MAC as three simple strings. Extract these strings, provide their value as global variables and set the MAC into the ethernet unit. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | PPC/MPC5200: re-use the IMX I2C master driver for MPC5200Juergen Borleis2015-08-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This IP core is shared between many FSL SoCs. The MPC5200 provides this core as well. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | PPC/MPC52xx: unify header file name for clock APIJuergen Borleis2015-08-033-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | In preparation to re-use the i.MX I2C driver for the MPC5200 SoC use clock.h instead of clocks.h for the clock API. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | PPC/PCM030: enable USB/OHCI pin supportJuergen Borleis2015-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This change in the port config register enables the USB/OHCI support and makes USB work on the PCM030's regular development baseboard. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | PPC/PCM030: fix reference clockJuergen Borleis2015-08-032-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to enable and use USB/OHCI on the MPC5200 the USB PLL register must be set. It's not easy to find a correct value for this register, it seems it depends on the used external reference frequency and some other 'magic' things. There are some values out in the wild for the 33,333333 MHz and 33,333000 MHz reference frequency case, but they are not consistent over the boards. The value used here in this change for the USB PLL register is from the first days of support for this platform and works at least on the reference baseboard. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | PPC/PCM030: remove nowhere used definitionsJuergen Borleis2015-08-031-9/+0
| | | | | | | | | | | | | | | Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/misc'Sascha Hauer2015-08-0611-16/+103
|\ \ \