summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-next/state'Sascha Hauer2018-05-091-0/+1
|\
| * ARM: dts: AM335x: Add keep-previous-content propertyDaniel Schultz2018-04-161-0/+1
| | | | | | | | | | | | | | | | | | Some of our customers may have data in the EEPROM region, which we newly have assigned as state partition. This property should prevent them of data loses. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/socfpga'Sascha Hauer2018-05-094-12/+7
|\ \
| * | ARM: socfpga_defconfig: enable Altera firmware stuffAntony Pavlov2018-04-121-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: socfpga: mach/pll_config.h: add guard macroAntony Pavlov2018-04-121-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: socfpga: boards: pll_config.h: remove duplicate macrosAntony Pavlov2018-04-122-12/+0
| | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | net: make SoCFPGA-specific designware driver work againAntony Pavlov2018-04-121-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | If MFD_SYSCON is disabled in .config then socfpga_designware_eth probe fails with this message: socfpga_designware_eth ff702000.ethernet: Could not get sysmgr-syscon node Thanks to Steffen for hint! Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mfd-dialog'Sascha Hauer2018-05-092-0/+16
|\ \
| * | ARM: i.MX: pfla02: set priority of da9063 watchdogEnrico Scholz2018-04-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To win against the internal imx6 or other external watchdogs, increase priority (default: 100) of the da9063 watchdog. Ditto for the restart handler and reset source priority. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Tested-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Christian Hemp <c.hemp@phytec.de>
| * | ARM: i.MX: phycore-som: added and enabled DA9062 PMICEnrico Scholz2018-04-121-0/+10
| |/ | | | | | | | | | | Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Tested-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Christian Hemp <c.hemp@phytec.de>
* | Merge branch 'for-next/imx-reset-reason'Sascha Hauer2018-05-0911-15/+236
|\ \
| * | ARM: i.MX51: Record reset reason as a part of startupAndrey Smirnov2018-05-081-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX53: Record reset reason as a part of startupAndrey Smirnov2018-05-081-0/+4
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Introduce IMX_SRC_SRSRAndrey Smirnov2018-05-083-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Offset for SRSR register in SRC IP block for i.MX51, i.MX53, i.MX6 and VFxxx is exactly the same so define a single constant for that and replace all of the SoC specific definitions. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Make imx6_reset_reasons globalAndrey Smirnov2018-05-083-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Both i.MX51 and i.MX53 have exactly the same reset source mapping, so rename imx6_reset_reasons to imx_reset_reasons and make it a globally visible constant so it could be shared. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Fix incorrect IMX_SRC_SRSR_CSU_RESETAndrey Smirnov2018-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | IMX_SRC_SRSR_CSU_RESET is bit 2, not 1. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX51: Replace expicit casts with IOMEMAndrey Smirnov2018-05-081-8/+8
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX7: Remove unnecessary local variableAndrey Smirnov2018-05-081-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks this code was based on analogous code for i.MX6, but there that variable was being used as a part of following switch statement. Since this is not the case for i.MX7, just replace the variable with direct function call. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: VFxxx: Record reset reason as a part of startupAndrey Smirnov2018-05-082-0/+21
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: VFxxx: Detect cpu variant on startAndrey Smirnov2018-05-084-1/+50
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: VFxxx: Add code to detect cpu variantAndrey Smirnov2018-05-082-0/+54
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Print "revision unknown" if that is the caseAndrey Smirnov2018-05-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Printing "revision 16.16" if i.MX SoC's revision is unknown is a bit confusing so modify the code to actually say "revision unknown" in such a case. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Log detected reset reasonAndrey Smirnov2018-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Log detected reset reason as well as raw value of SRSR for better clarity. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX7: Record reset reason as a part of startupAndrey Smirnov2018-04-262-0/+15
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX6: Record reset reason as a part of startupAndrey Smirnov2018-04-262-1/+14
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: i.MX: Add infrastructure to record SoC reset reasonAndrey Smirnov2018-04-262-0/+58
| | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/imx-bootsource'Sascha Hauer2018-05-097-119/+328
|\ \ \
| * | | ARM: i.MX: boot: Coalesce copy-pasted codeAndrey Smirnov2018-04-251-49/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the instances of imx*_boot_save_loc() do exactly the same thing with the only difference being SoC-specific imx*_get_boot_source call. Convert the code into a generic function taking function pointer to perform SoC specific bits. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX6: boot: Return BOOTSOURCE_SPI_NOR, not BOOTSOURCE_SPIAndrey Smirnov2018-04-176-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use BOOTSOURCE_SPI to denote, among other things, QSPI on i.MX7 and VFxxx, whereas on i.MX6 it is used to mean SPI-NOR. To make functions like imx_xload() work consistently across various i.MX platforms use already existent BOOTSOURCE_SPI_NOR constant to mean booting from SPI-NOR on i.MX6 as well. Replace all in-tree code that relying on the old value as well. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: VFxxx: Implement code to detect bootsourceAndrey Smirnov2018-04-172-0/+103
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX7: boot: Move magic numbers into utility functionsAndrey Smirnov2018-04-171-2/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX6: boot: Move magic numbers into utility functionsAndrey Smirnov2018-04-171-14/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move magic numbers and algorithm for determining Serial ROM bootsource and boot instance into utility functions. Add a comment on the logic behing the latter while at it. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX53: boot: Move magic numbers info utility functionsAndrey Smirnov2018-04-171-6/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: boot: Check for NAND boot only if necessary on i.MX53, 6Andrey Smirnov2018-04-171-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to check if the boot source is NAND in cases when we already know for a fact that we booted from something else. To avoid that, move the NAND check to be done inside of default branch of the preceeding switch statement. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: boot: Share code to detect NAND as a boot sourceAndrey Smirnov2018-04-171-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Share code to detect NAND as a boot source between i.MX53 and i.MX6 which behave the same in that aspect. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: boot: Move magic values into small functionsAndrey Smirnov2018-04-171-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move code to extract appropiate BOOT_CFG bits to decode bootsource on i.MX53, 6, and 7 into small functions for clarity and to allow sharing the code between i.MX53 and i.MX6. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: boot: Remove unnecessary returnsAndrey Smirnov2018-04-171-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX7: boot: Fix SPI-NOR/QSPI boot source mixupAndrey Smirnov2018-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per "Table 6-33. Boot device selection" from "i.MX 7Dual Applications Processor Reference Manual, Rev. 1, 01/2018" QSPI is encoded with 0b0100 and Serial ROM with 0b0110. Fix the original code to use correct values. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX7: boot: Remove incorrect NAND bootsource detectionAndrey Smirnov2018-04-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.MX7 differs from i.MX6 and i.MX53 and bit 7 in SBMR is not used to signify boot from NAND. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX7: boot: Add code to handle SD/MMC manufacture modeAndrey Smirnov2018-04-171-0/+40
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: Account for unprogrammed fuses on i.MX6 and i.MX7Andrey Smirnov2018-04-171-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On both i.MX6 and i.MX7 (also true for VFxxx) there's an additional path that leads mask ROM to switch into serial bootloader mode. Add code to support it. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: Simplify serial bootsource detection for i.MX6 and 7Andrey Smirnov2018-04-171-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The algorithm to detect serial mode can be shared between i.M6 and i.MX7 as wall as simplified a bit by replacing swich goto/break/return termination logic with more trivial if statements. This commit also sets the stage for additional improvements in the commits that follow. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: Add a function to extract BMOD valueAndrey Smirnov2018-04-171-11/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The location of BMDO field in SBMR/SBMR2 registers is consistent across all i.MX SoCs starting from i.MX53. Add simple helper function imx53_get_bmod and use it to avoid code duplication. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/imx'Sascha Hauer2018-05-0946-282/+1202
|\ \ \
| * | | arm: imx6: don't reset PFDs that are used by periph_clkMarc Ohlf2018-05-021-23/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if PLL2 PFD0 or PLL2 PFD2 is selected as clock source in register CCM CBCMR->pre_periph_clk_sel or CCM CBCMR->pre_periph2_clk. Don't reset the used PFDs to avoid system hang. ported from https://github.com/Freescale/u-boot-fslc/ commit/9293d7fd502ce29302fadb8b4ccb9231ec0bcc66 Signed-off-by: Marc Ohlf <ohlf@mkt-sys.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: imx_v7_defconfig: Select various missing v7 boards by defaultAndrey Smirnov2018-04-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the following boards: - ZII RDU2 (all variants) - ZII Vybrid Dev Board (and its derivatives) - Freescale/NXP i.MX7D SabreSD - NXP i.MX6ULL EVK - element 14 WaRP7 to be selected by default by imx_v7_defconfig. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX6: Make cpu_is_mx6xy() greppableSascha Hauer2018-04-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grepping for cpu_is_mx6 will not find the definitions of this function because it is hidden behind a macro. Add a comment containing all functions defined here to make it greppable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: imx_v7_defconfig: enable da9063Sascha Hauer2018-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The da9063 is used on some Phytec boards. Enable it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: i.MX: phytec-som-imx6: Change kernel boot image to zImageStefan Riedmueller2018-04-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use zImage instead of linuximage as kernel boot image name for mmc and emmc. Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de> Signed-off-by: Christian Hemp <c.hemp@phytec.de>
| * | | ARM: dts: phycore-imx6: Use generic jedec spi nor compatibleStefan Riedmueller2018-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the generic jedec-spi-nor compatible for the SPI NOR node to make it generic. Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de> Signed-off-by: Christian Hemp <c.hemp@phytec.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 05:33:04 +0000