summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* dts: update to v4.14-rc1Sascha Hauer2017-10-06981-4030/+29785
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* memtest: fix list iteration in region setupSteffen Trumtrar2017-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | When memory regions start at 0, the current mem_test_request_regions function wrongly assumes that struct resource *r points at the correct region. It points to the first region however (which starts at 0). The comment states, that the code starts from the second entry. In include/linux/list.h the macro documentation however says: list_for_each_entry_from - iterate over list of given type from the current point The correct list iteration macro to use here is list_for_each_entry_continue, where the documentation says: Continue to iterate over list of given type, continuing after the current position. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: bootm_open_initrd_uimage(): propagate error if initrd verification failsMarc Kleine-Budde2017-09-201-0/+1
| | | | | | | | | | If the verification of an initrd inside of an uImage fails an error message is printed but the error is not propagated. Although this is not security relevant, as the verification is currently only a CRC32 check, the error should be returned. This patch fixes the problem. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next/state'Sascha Hauer2017-09-0810-341/+1258
|\
| * state: don't use uninitialized variableJuergen Borleis2017-09-061-1/+1
| | | | | | | | | | | | | | Printing 'ret' makes no sense. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * state: use the given backend storage type nameJuergen Borleis2017-09-062-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 119f92b27e131a0cb506fe8d8bffe8010fb14a3d already tried to fix it, but forgets the 'direct' usecase. The 'backend-storage-type' node is optional. Its default depends on the capability of the used backend memory, which means "circular" or NULL. The latter defaults to 'direct' in the routines. If it is NULL, the devicetree fixup routine skips exporting a 'backend-storage-type' node to the kernel's devicetree. But currently if the 'backend-storage-type' node is explicitly given as 'direct', it will be skipped silently and set to NULL instead. In this case the user of the 'barebox-state' tool then ends up with the warning: "No backend-storage-type found, using default" which is annoying, because it was given. Storing the given value will still use a NULL if the 'backend-storage-type' node isn't defined, but stores everything else if it is defined. Then the 'backend-storage-type' node is present in the kernel's devicetree as well. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * state command: extend help part IIJuergen Borleis2017-09-061-1/+2
| | | | | | | | | | | | | | | | | | Since commit 0c7436753c73e71ee512e5ed8029e7ccceedcd89 the 'state' command supports authentification and a related parameter. Honor this in the help text. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * state command: extend help part IJuergen Borleis2017-09-061-2/+3
| | | | | | | | | | | | | | | | | | | | The loading parameter and its help text was removed in commit 446f3d07dd59f1b15b83a31fa88fba919ce4f47d and the loading parameter was re-added in commit 3a5ddf3d0db006e9256c8e256e7dc7b4a3f89a14 but the help was forgotten. Re-add the help as well. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * state: provide an error message when an error occursJuergen Borleis2017-09-061-0/+1
| | | | | | | | | | | | | | | | A simple typo makes the state framework fail, but without an error message the developer is lost in the dark. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * docs: rework and extend the 'state' and 'bootchooser' documentationJuergen Borleis2017-09-063-317/+1204
| | | | | | | | | | | | | | | | Many links between sections and examples were added to give the developer the help to get it work. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * state: add debugging helpJuergen Borleis2017-09-062-1/+8
| | | | | | | | | | | | | | | | | | While working on the state documentation it turns out to be helpful to have more debug messages while a developer implements a 'state' variable set and tries to configure it correctly. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * docs: remove build warningJuergen Borleis2017-09-061-0/+1
| | | | | | | | | | | | | | | | | | This change removes: "devicetree/bindings/rtc/dallas,ds1307.rst: WARNING: document isn't included in any toctree" warning Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * bootchooser: allow an empty namespaceJuergen Borleis2017-09-061-6/+4
| | | | | | | | | | | | | | | | | | The bootchooser's documentation states the 'namespace' for the state storage backend is optional. This change makes it really optional to allow a flat state variable set definition for the 'bootchooser' as well. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * bootchooser: avoid a use after freeJuergen Borleis2017-09-061-1/+1
| | | | | | | | | | Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * state: keep backward compatibilityJuergen Borleis2017-09-062-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Previous 'state' variable set variants do not know and use metadata. The 'direct' storage backend's read function honors this, but not its counterpart the write function. This makes an update of the 'state' variable set impossible. This change makes backward compatibility explicit, else it complains in the read function as well. With some more debug output it helps the developer to do things right. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/omap'Sascha Hauer2017-09-0810-16/+99
|\ \
| * | arm: configs: AM335x: Enable mmc-extcsd commandDaniel Schultz2017-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | This tool is for setting up eMMC devices. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: dts: am335x: Add phycore emmc device treeDaniel Schultz2017-09-064-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | Add a new device tree for phyCORE SOMs with EMMC enabled and NAND disabled. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: dts: Enable NAND in DTS instead of DTSIDaniel Schultz2017-09-068-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with PCM-062, NAND isn't the main non-volatile memory for the AM335x. Because that, NAND has be disabled in the SOM dtsi file and will be enabled in a specific NAND SOM file. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | arm: dts: am335x: Add emmc node to phycore-somDaniel Schultz2017-09-061-0/+24
| |/ | | | | | | | | | | | | | | Add the EMMC node to the phycore-som device tree. It's by default disabled, because NAND is the primary boot device. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/net'Sascha Hauer2017-09-081-1/+6
|\ \
| * | Phy: Check NULL bus case and undetected phy via ofClément Leger2017-09-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From 5e87dc2c24051c2cd2985e513c5a825d51d9bb00 Mon Sep 17 00:00:00 2001 From: Clement Leger <clement.leger@kalray.eu> Date: Tue, 5 Sep 2017 10:37:23 +0200 Subject: [PATCH] Phy: Check NULL bus case and undetected phy via of phy_device_connect can be called with NULL miibus for automatic match with the phy described in the device tree. In the case where the phy was not detected for some unknown reason, the next calls will be done with a NULL bus. This will lead to undefined behavior and more probably crashes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | phy: don't crash if we have no parentOleksij Rempel2017-09-061-1/+1
| |/ | | | | | | | | | | | | | | current code will crash if DT has no PHY entry. With this patch we will test if parent exist, before testing the parent device node. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-next/mvebu'Sascha Hauer2017-09-082-0/+47
|\ \
| * | ARM: mvebu: armada-xp: configure PLL and PHY registerJan Luebbe2017-08-152-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | The PLL setup is needed to use the USB ports in Linux. This code is ported from mainline U-Boot arch/arm/mach-mvebu/cpu.c. Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
* | | Merge branch 'for-next/mtd'Sascha Hauer2017-09-083-13/+24
|\ \ \
| * | | mtd: nand: nand_mxs: Don't call get/set features on chips which do not ↵Sascha Hauer2017-09-061-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support it Older versions of the ONFI spec do not support get/set features, so do not call these commands when they are not available. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mtd: nand: Only call ONFI get/set features on supported chipsSascha Hauer2017-09-062-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of the ONFI spec do not support get/set features, so do not call these commands when they are not available. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mtd: nand-mxs: improve error messagesUwe Kleine-König2017-09-061-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | This commit adds the return value of the failing function to one message and makes the other unique. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-next/misc'Sascha Hauer2017-09-0814-46/+319
|\ \ \
| * | | gpio: gpio-generic: add dt supportAntony Pavlov2017-09-081-0/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | gpio: gpio-generic: fix bgpio_map()Antony Pavlov2017-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | serial: ns16550: provide big-endian supportOleksij Rempel2017-09-081-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we need it at least for QCA AR9344 Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | x86: asm: include asm-generic.hOleksij Rempel2017-09-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | make io[read,write]* defines available on x86 platform Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | asm-generic: partially sync io.h with linux kernelOleksij Rempel2017-09-084-31/+223
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | of: base: port of_device_is_big_endian from linuxOleksij Rempel2017-09-082-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |commit 37786c7fee40771d13901de129af7e084ed48b55 |Author: Kevin Cernekee <cernekee@gmail.com> |Date: Thu Apr 9 13:05:14 2015 -0700 | | of: Add helper function to check MMIO register endianness | | SoC peripherals can come in several different flavors: | | - little-endian: registers always need to be accessed in LE mode (so the | kernel should perform a swap if the CPU is running BE) | | - big-endian: registers always need to be accessed in BE mode (so the | kernel should perform a swap if the CPU is running LE) | | - native-endian: the bus will automatically swap accesses, so the kernel | should never swap | | Introduce a function that checks an OF device node to see whether it | contains a "big-endian" or "native-endian" property. For the former case, | always return true. For the latter case, return true iff the kernel was | built for BE (implying that the BE MMIO accessors do not perform a swap). | Otherwise return false, assuming LE registers. | | LE registers are assumed by default because most existing drivers (libahci, | serial8250, usb) always use readl/writel in the absence of instructions | to the contrary, so that will be our fallback. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | usb: gadget: autostart: properly release f_multi_optsOleksij Rempel2017-09-061-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same as for usb gadget autostarter. |commit 2b9bcff79a02f770fa730e2689ba35cc03c0da7d |Author: Sascha Hauer <s.hauer@pengutronix.de> |Date: Fri Jan 20 10:03:45 2017 +0100 | | usb: gadget: properly release f_multi_opts | | The usbgadget commands uses statically allocated f_multi_opts and passes | this to usb_multi_register(). These f_multi_opts are of course no | longer valid when we leave the usbgadget command. Luckily we do not use | the data after we left the usbgadget command, so this never has been a | problem. However, f_multi_opts has some allocated members which we can | not free anymore on gadget unregistration because we no longer have the | pointer to them. | | Fix this by adding a release function to struct f_multi_opts. This way | we can allocate all memory dynamically and properly free it when not | used anymore. | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | docs/DS1307: fix layoutJuergen Borleis2017-09-061-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | regsubst.pl: fix typo in help textUwe Kleine-König2017-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems I did too much assembler stuff ... Fixes: e7fed4338441 ("scripts: Provide script that helps using cpp defines in dcd tables") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | Merge branch 'for-next/misc'Lucas Stach2017-08-162-5/+4
| |\ \ \
| | * | | readline_simple: remove obsolete documentationGaël PORTAY2017-08-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The readline function does not return timed-out anymore since the commit: be5d13bcb readline_simple: drop unusable u-boot legacy stuff Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| | * | | readline_simple: return -1 if getc failsGaël PORTAY2017-08-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getc function may return an errno code if an error happens. This patch prevents readline from printing a non printable character and from looping to infinity and beyong. Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| | * | | loadxy: add missing ) to help textUwe Kleine-König2017-08-151-2/+2
| | | |/ | | |/| | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| * | | Merge branch 'for-next/mips'Lucas Stach2017-08-1620-163/+1340
| |\ \ \
| * \ \ \ Merge branch 'for-next/imx'Lucas Stach2017-08-164-85/+138
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'for-next/mips'Sascha Hauer2017-09-0820-163/+1340
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | MIPS: tplink-mr3020.dts: add partition tableOleksij Rempel2017-08-151-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need partition table for barebox update handler and for barebox environment Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| * | | | MIPS: tplink-mr3020_defconfig: enable more optionsOleksij Rempel2017-08-151-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| * | | | MIPS: tplink-mr3020: pbl: move hornet_mips24k_cp0_setup after flash addr testOleksij Rempel2017-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is needed to start zbarebox.bin from running barebox. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| * | | | MIPS: tplink-mr3020: pbl: move WMAC init after flash addr testOleksij Rempel2017-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if this function is called in the RAM, we won't be able to continue start sequence. It brakes boot over JTAG use case. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Cc: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>