summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* blspec: fix return value of entry_is_of_compatible()Ulrich Ölmann2016-09-281-1/+1
| | | | | | | | | The function returns a boolean and not an integer. Hence the former explicit/implicit cast of an ERR_PTR to a boolean has led to a return value of true although a bootspec entry with a faulty devicetree is not compatible. Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* blspec: fix erroneus free in entry_is_of_compatible()Ulrich Ölmann2016-09-271-0/+1
| | | | | | | | | Whenever of_unflatten_dtb() encountered an error it already released the memory before returning the error code. Make this apparent by setting the pointer to NULL to avoid an erroneus free. Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* nv: Fix variable removal in nvvar_save()Sascha Hauer2016-09-221-0/+1
| | | | | | | | | When nv variables are removed during runtime then they are present again when saved with nvvar_save(). This is because nvvar_save() does not delete variables that exist on the saved environment. Delete /nv on the saved environment before saving the new variables. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Documentation: imd: fix sphinx warningAntony Pavlov2016-09-211-2/+6
| | | | | | | | | | The patch fixes this sphinx warnings: barebox/Documentation/user/imd.rst:27: WARNING: Could not lex literal_block as "c". Highlighting skipped. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* commands: exit on invalid optionEnrico Jorns2016-09-1617-6/+30
| | | | | | | | | | Barebox commands should not perform any action and return 0 if an invalid parameter was given. This might cause undetected unintended behvaior when calling commands with wrong options, either manually or from a script. Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx6: reset PLL2's PFD2 on i.MX6DUwe Kleine-König2016-09-151-6/+6
| | | | | | | | | | | | | | | | | | | The check for is_imx6q was introduced initially in f1f6d76370b3 ("ARM: i.MX6: correct work flow of PFDs from uboot-sources") to differentiate between i.MX6DL+i.MX6SL and i.MX6Q. The i.MX6D must be handled like the latter, so drop the check. i.MX6DL+i.MX6SL can be ignored here since since a66596282413 ("imx6: lowlevel_init: Fix workaround for new i.MX6s chips") the PFD handling is only done for i.MX6DQ. Update the comment to be not only logically correct but also helpful. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: i.MX6: Enable parent propagation for clk_gate2Sascha Hauer2016-09-141-0/+3
| | | | | | | | | | | | | | | | Enable parent rate propagation for clk_gate2 to allow the clock consumers to adjust their rates. One effect of this is that the i.MX6 NAND controller now can adjust its rate. It already called a clk_set_rate(rate, 96000000), but this had no effect, so the clock stayed at reset default 24MHz resulting in a rather slow timing. This became a problem when commit "1daa3bc mtd: nand_mxs: Setup timing" introduced EDO timing mode for faster NAND chips. EDO mode can only work properly for cycle times < 30ns (at least that's specified in the ONFI spec). 1daa3bc resulted in sporadic NAND read errors on some boards. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Sam Ravnborg <sam@ravnborg.org>
* ARM: karo-tx6: Include correct device treeSascha Hauer2016-09-141-1/+1
| | | | | | | As a i.MX6dl board dts imx6dl-tx6u.dts should include imx6dl.dtsi, not the i.MX6q variant. This fixes various pinctrl problems. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/dts'Sascha Hauer2016-09-130-0/+0
|\
| * dts: update to v4.7Sascha Hauer2016-09-137-23/+32
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * dts: update to v4.7-rc6Sascha Hauer2016-09-131-0/+31
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/video'Sascha Hauer2016-09-1313-180/+1492
|\ \
| * | video/edid: Fix edid_to_display_timings error pathPhilipp Zabel2016-09-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edid_to_display_timings is called in drivers/video/imx-ipu-v3/imx-hdmi.c, drivers/video/simple-panel.c, and drivers/video/edid.c with the struct display_timings *timings parameter pointing to an embedded struct display_timings inside a struct fb_info. The timings pointer is not to be freed in the error path. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | video: tc358767: add eDP video encoder driverAndrey Gusakov2016-08-253-0/+1322
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Toshiba TC358767 eDP bridge, connected via DPI. Signed-off-by: Andrey Gusakov <andrey.gusakov@cogentembedded.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | video: add VPL ioctl to get bus formatPhilipp Zabel2016-08-252-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The i.MX specific DI_MODE VPL ioctl already allows to query the encoder input bus format. This patch also allows non-i.MX specific encoder drivers to report their input bus format. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | video: switch to media bus formatsPhilipp Zabel2016-08-258-179/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V4L2 pixel formats are supposed to describe video frames in memory. To describe the pixel format on the hardware bus between display interface and encoders, use media bus formats, which are more expressive. This allows to get rid of the custom GBR24 and LVDS666 fourccs. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/socfpga'Sascha Hauer2016-09-137-84/+246
|\ \ \
| * | | socfpga: Add support for V1 images to socfpga_mkimageTrent Piepho2016-08-181-34/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Altera's SocFPGA Arria10 SoC uses a new image format, different from the one used on CycloneV. The formats are similar, with the header matching up to the point where the version field is 1 instead of 0. At that point the header fields diverge. The CRC and checksum use is the same between the two. This patch extends socfpga_mkimage to support generating the new format with a version command line option. The default will be V0 for CycloneV. The new format is, IMHO, not as good as the previous one. It requires the start location be after the header, while the V0 format would allow the start location to be before or after. Barebox boot images are designed to start from offset 0, which is before the header. To avoid modifying the common barebox start code specifically for Arria10, I instead add a trampoline instruction after the V1 header to jump to the real start location, wherever it might be. Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | clk: socfpga: add divider registers to the main pll outputsEnrico Jorns2016-08-181-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is based on kernel patch 0691bb1b5a1865b3bbc9b7ce6e26eff546abb1cf by Dinh Nguyen <dinguyen@altera.com>. The C0(mpu_clk), C1(main_clk), and C2(dbg_base_clk) outputs from the main PLL go through a pre-divider before coming into the system. These registers were hidden for the CycloneV platform, but are now used for the ArriaV platform. This patch updates the clock driver to read the div-reg property for the socfpga-periph-clk clocks. Note: The registers used for the div-reg property are not documented but set by the preloader. Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: socfpga: socrates: register bbu handlersSteffen Trumtrar2016-08-181-0/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: socfpga: socrates: add qspi partitionsSteffen Trumtrar2016-08-181-0/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: socfpga: socrates: set alias for ethernet0Steffen Trumtrar2016-08-181-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | socfpga: remove dt entries that are upstreamSteffen Trumtrar2016-08-181-34/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: socfpga: xload: support more qspi partitionsUlrich Ölmann2016-08-181-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | filetype: add new filetype for SoCFPGA xload imageSteffen Trumtrar2016-08-182-0/+5
| |/ / | | | | | | | | | | | | Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/rockchip'Sascha Hauer2016-09-1334-43/+2554
|\ \ \
| * | | doc: Add RK3288 DocumentationWadim Egorov2016-09-012-0/+81
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | configs: Add RK3288 defconfigWadim Egorov2016-09-011-0/+104
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: Add phyCORE-RK3288 SOM supportWadim Egorov2016-09-0112-0/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phyCORE-RK3288 aka PCM-059 is a SoM (System on Module) containing a RK3288 SoC. The module can be connected to different carrier boards. Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mci: dw_mmc: Add RK3288 compatible stringWadim Egorov2016-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDHC used in the RK2928 and RK3288 are compatible with each other. Add a compatible string for RK3288's SDHC. Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | clk: Add RK3288 clock driverWadim Egorov2016-08-262-1/+839
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clk driver for RK3288 SoC. This driver comes from the Linux kernel. Based on kernel v4.4 Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: rockchip: Add early debug support for RK3288Wadim Egorov2016-08-262-33/+46
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | clocksource: Add rk3288 timer driverWadim Egorov2016-08-265-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver comes from the u-boot (v2016.01). Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: rockchip: Add basic RK3288 supportWadim Egorov2016-08-2611-9/+1121
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RK3288 SoC is a low power, high performance processor for mobile phones, personal mobile internet devices and other digital multimedia applications. It has an integrated quad-core cortex-A17 with separate NEON coprocessor. Prepare mach-rockchip infrastructure for Rockchip RK3288 support. Let's seperate the RK3188 and RK3288 SoCs. Later we will have two different configs. Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/misc'Sascha Hauer2016-09-1311-20/+21
|\ \ \
| * | | mci: mmci: Fix read FIFO handlingMichael Olbrich2016-09-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Linux kernel and the qemu code, the MMCIFIFOCNT contains the remaining number of words to read, excluding those that are already in the FIFO. So the current number of bytes in the FIFO is host_remain - (readl(base + MMCIFIFOCNT) << 2). Also writing to MMCIDATACTRL will reset the read counter. As a result, MCI_DATABLOCKEND is never set and read_bytes() waits forever. With this change, SD-Card support on qemu vexpress works correctly. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Fix small typo in common/KconfigSam Van Den Berge2016-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix small typo frendly -> friendly Signed-off-by: Sam Van Den Berge <sam.van.den.berge@telenet.be> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | commands: saveenv: exit on invalid optionEnrico Jorns2016-09-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Saveenv should not perform any actions if an invalid parameter was given. Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm: Add both .lds files to CLEAN_FILES unconditionallyAndrey Smirnov2016-08-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'clean' target is listed on 'no-dot-config-targets' list in main Makefile so that conditional statement would yeild the same result every time. Given how CLEAN_FILES are rm'ed with -f there should be no harm in specifying them both unconditionally. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Call boot_board from boot, not from init.grodriguez2016-08-242-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that any board-specific code that must be run at boot time will be run both when autobooting and when manually running the 'boot' command from the console. Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Kconfig: defaultenv-2 select CMD_TESTAlexander Kurz2016-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CMD_TEST is required for scripts in defaultenv-2, e.g. automount. Signed-off-by: Alexander Kurz <akurz@blala.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | commands/Kconfig: fix typo in CMD_OF_FIXUP_STATUS helpChristian Hemp2016-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The command is of_fixup_status and not of_fixup_node. Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | clarify strim function descriptionAleksey Kuleshov2016-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aleksey Kuleshov <rndfax@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | net: phy: of_phy_register_fixed_link(): drop redundant initializationAntony Pavlov2016-08-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phy_device_create() function makes all necessary phydev initialization so we can drop phydev->pause and phydev->link initialization in the of_phy_register_fixed_link() function. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mfd mc13xxx: add MC13892_REVISION_2_4Alexander Kurz2016-08-182-6/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | An MC13892CJ having REV[4:0]=0x14 can be found in the kindle-d01100. Add the revision to the list to support this device. Signed-off-by: Alexander Kurz <akurz@blala.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/mips'Sascha Hauer2016-09-131-67/+1
|\ \ \
| * | | MIPS: dts: reuse TP-LINK MR3020 dts file from linuxAntony Pavlov2016-08-181-67/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment barebox tplink-mr3020.dts file has almost the same content as linux ar9331_tl_mr3020.dts file so we can reuse linux dts-file and drop duplicated lines from barebox dts-file. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/menu'Sascha Hauer2016-09-135-20/+109
|\ \ \
| * | | rework menu so that it can support multiline titlesAleksey Kuleshov2016-09-055-19/+108
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aleksey Kuleshov <rndfax@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | properly remove menu entryAleksey Kuleshov2016-08-181-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aleksey Kuleshov <rndfax@yandex.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>