summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/resource-err-ptr'Sascha Hauer2014-10-0218-14/+41
|\
| * resource: Let dev_request_mem_region return an error pointerSascha Hauer2014-09-1618-14/+41
| | | | | | | | | | | | For all users fix or add the error check. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/phycore-imx6'Sascha Hauer2014-10-0230-260/+340
|\ \
| * | ARM:phyFLEX-iMX6 New Ram Timings for Q/DLMaik Otto2014-09-177-130/+146
| | | | | | | | | | | | | | | | | | Signed-off-by: Maik Otto <m.otto@phytec.de> Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM:phyFLEX-iMX6: Remove mmd_write_reg from boardChristian Hemp2014-09-171-9/+1
| | | | | | | | | | | | | | | | | | | | | Remove mmd_write_reg function from board file and use phy_write_mmd_indirect. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM:phyFLEX-iMX6: Remove eth phy reset form boardChristian Hemp2014-09-171-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ethernet phy reset from board file. The reset is now made by the fec driver since commit: |commit 5c1846b625247f4b99eb429dcd5b0854699a4298 |Author: Rostislav Lisovy <lisovy@gmail.com> |Date: Wed Nov 20 22:22:25 2013 +0100 | | ARM: i.mx53: Parse Reset GPIO pin in FEC driver from Devicetree | | Signed-off-by: Rostislav Lisovy <lisovy@gmail.com> | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM:phyFLEX-iMX6: Add bootsource detectionChristian Hemp2014-09-151-0/+15
| | | | | | | | | | | | | | | Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | dts:imx6:pfla02: Add env node for SPI-NOR and NANDChristian Hemp2014-09-154-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add environment node for NAND and SPI-NOR Move the environment property to the module file. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | dts:imx6:pfla02:Move spi partitions imx6qdl-phytec-pfla02Christian Hemp2014-09-153-30/+14
| | | | | | | | | | | | | | | | | | | | | Move the spi partition definition to imx6qdl-phytec-pfla02.dtsi Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | dts:imx6:pfla02: move mac read to moduleChristian Hemp2014-09-152-4/+4
| | | | | | | | | | | | | | | | | | | | | Move mac read to module. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | dts:imx6:pfla02: Remove memory nodeChristian Hemp2014-09-153-12/+0
| | | | | | | | | | | | | | | Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM:imx6:pfla02: Remove redundant codeChristian Hemp2014-09-151-27/+19
| | | | | | | | | | | | | | | | | | | | | Move redundant code to a common function. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM:imx6:phyflex: Add defaultenvChristian Hemp2014-09-156-0/+39
| | | | | | | | | | | | | | | | | | | | | Add defaultenv_append_directory to phyFLEX-i.MX6. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM:imx6:phycard: Switch env to defaultenv_append_directoryChristian Hemp2014-09-158-13/+33
| | | | | | | | | | | | | | | Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | dts:imx6q:pcaaxl3: Add oftree partition to nandChristian Hemp2014-09-151-3/+8
| | | | | | | | | | | | | | | | | | | | | Add oftree partiton to nand. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | dts:imx6:pfla02: Add nand partitionsChristian Hemp2014-09-151-0/+27
| |/ | | | | | | | | Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/omap'Sascha Hauer2014-10-022-61/+100
|\ \
| * | ARM: phyCORE-AM335x: Update partition tableTeresa Gámez2014-09-091-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | Added device tree partition and made rootfs partition variable size depending on nand flash size. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: phyCORE-AM335x: Add support for 2x512MB RAMTeresa Gámez2014-09-091-0/+25
| | | | | | | | | | | | | | | | | | | | | Added settings for 1GB RAM option. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: phyCORE-AM335x: Fixup RAM setting namingTeresa Gámez2014-09-091-15/+15
| | | | | | | | | | | | | | | | | | | | | Naming is confusing and wrong. Fixed it up. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: phyCORE-AM335x: Update RAM TimingsTeresa Gámez2014-09-091-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | Increased the RAM frequency to 400MHz. Recalculation of the RAM timing values was needed. Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: phyCORE-AM335x: Updated SPI NOR dts entriesTeresa Gámez2014-09-091-7/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Updated the SPI NOR flash entries. NOR flash got detected but did not work. - Updated muxing - Fixed frequency - Fixed CS - Removed first compatible entry (the flashes used is changing frequently) Signed-off-by: Teresa Gámez <t.gamez@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/musb'Sascha Hauer2014-10-026-21/+50
|\ \
| * | ARM: am335x_defconfig: Enable USB supportSascha Hauer2014-09-261-0/+13
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: dts: Update am335x-bone-common.dtsiSascha Hauer2014-09-261-19/+19
| | | | | | | | | | | | | | | | | | | | | Update from current upstream dtsi. This enables the USB control module. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: AM33xx: Enable USB and USB phy clocksRolf Evers-Fischer2014-09-264-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | These are necessary for USB support. To make sure they are actually enabled when a USB capable barebox is started call the clock enable function during startup also for the full barebox, not only the MLO. Signed-off-by: Rolf Evers-Fischer <rolf.evers.fischer@delphi.com>
* | | Merge branch 'for-next/misc'Sascha Hauer2014-10-025-9/+2
|\ \ \
| * | | pinctrl: fix Kconfig dependenciesSascha Hauer2014-09-153-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove OFDEVICE dependency from PINCTRL. It won't do much then, so add a comment to Kconfig when PINCTRL is selected without OFDEVICE - Let Architectures only select PINCTRL instead of the particular driver. Change the drivers to 'default y if $SOC' to make sure the drivers are still compiled if the corresponding SoC is selected This fixes Kconfig warnings like: warning: (PINCTRL_ARMADA_370 && PINCTRL_ARMADA_XP && PINCTRL_DOVE && PINCTRL_KIRKWOOD) selects PINCTRL which has unmet direct dependencies (OFDEVICE) Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
| * | | ARM: remove nonexisting env directories from defconfigsSascha Hauer2014-09-122-2/+0
| | |/ | |/| | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/marvell'Sascha Hauer2014-10-0211-152/+169
|\ \ \
| * | | ARM: defconfig: remove board specific mvebu defconfigsSascha Hauer2014-10-025-135/+0
| | | | | | | | | | | | | | | | | | | | | | | | The boards are now covered by mvebu_defconfig Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: Add mvebu_defconfigSascha Hauer2014-10-021-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a mvebu_defconfig which enables all mvebu based boards. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
| * | | ARM: mvebu: Allow multiple SoCsSascha Hauer2014-09-235-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the correct SoC specific memory fixup function is called we can allow to select multiple SoCs in Kconfig. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
| * | | ARM: mvebu: Check for correct SoC in of_fixup callbackSascha Hauer2014-09-193-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only run the fixup when we are actually on the corresponding SoC. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
| * | | ARM: mvebu: Simplify memory init orderSascha Hauer2014-09-195-37/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initialisation of the memory nodes on mvebu is a bit compilcated: pure_initcall(mvebu_memory_fixup_register) of_register_fixup(mvebu_memory_of_fixup, NULL) core_initcall(kirkwood_init_soc) mvebu_set_memory() core_initcall(of_arm_init) of_fix_tree() mvebu_memory_of_fixup() First a mvebu common of_fixup function is registered, then the SoC calls mvebu_set_memory which stores the memory base and size in global variables. Afterwards the of_fixup is executed which fixes the memory nodes according to the global variables. Instead register a SoC specific fixup which directly calls mvebu_set_memory with the memory base and size as arguments: pure_initcall(kirkwood_register_soc_fixup); of_register_fixup(kirkwood_init_soc, NULL); core_initcall(of_arm_init) of_fix_tree() kirkwood_init_soc() mvebu_set_memory(phys_base, phys_size); Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: mvebu: Add machine compatible to mbus rangesSebastian Hesselbarth2014-09-193-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-SoC support for MVEBU will add mbus ranges for all compiled SoCs. To protect the mbus node of the SoC barebox is executed on from others ranges, pass machine's compatible to mvebu_mbus_add_range and check before applying the fixup. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: mvebu: Add common reset_cpu functionSascha Hauer2014-09-195-28/+46
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | mvebu has a reset_cpu function per SoC this does not work when multiple SoCs are selected, so add a common reset_cpu function which calls into the SoC specific ones. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
* | | Merge branch 'for-next/imx'Sascha Hauer2014-10-0225-1/+984
|\ \ \
| * | | imx35-regs: add UART2 to CCM definesEric Bénard2014-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX6: add support for Karo TX6X familySteffen Trumtrar2014-09-1910-0/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Karo TX6X family consists of different i.MX6Q/DL based System-on-Modules. Add support for the TX6u 801x modules, that have an i.MX6DL SoC. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm: mach-imx: add more ddr register definesSteffen Trumtrar2014-09-192-0/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm: imx6: add Gateworks Ventana boardLucas Stach2014-09-1715-1/+425
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now only the Quad 1GB variant is supported. Tested: - starting barebox over USB - writing barebox to NAND with barebox_update - starting Linux kernel over TFTP Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/firmware'Sascha Hauer2014-10-023-0/+9
|\ \ \
| * | | Firmware: socfpga: Add SoCFPGA FPGA program supportSascha Hauer2014-09-093-0/+9
| |/ / | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/at91'Sascha Hauer2014-10-0228-37/+1595
|\ \ \
| * | | ARM: at91: add sama5d4ek board supportBo Shen2014-09-248-0/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Atmel sama5d4ek board support, which include following features: - NAND flash support - SPI flash support - MMC card support (MCI1) - LCD display support (with QT1070) - Ethernet support Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: at91: add sama5d4 soc support #2Bo Shen2014-09-243-0/+933
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: at91: add sama5d4 soc support #1Bo Shen2014-09-248-21/+142
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: at91: clock: use cpu_has_pcr for pcr1 checkingBo Shen2014-09-221-7/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: atmel: sama5d3 is a family member of sama5Bo Shen2014-09-223-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the sama5d3 is a family member of sama5, so only check sama5 family. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 10:24:02 +0000