summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-27Merge tag 'tegra-for-4.17-soc-2' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers Pull "soc/tegra: Changes for v4.17-rc1" from Thierry Reding: This contains more Tegra194 support as well as an implementation for the MBIST workaround needed to avoid some memory-related issues on Tegra210. * tag 'tegra-for-4.17-soc-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux: soc/tegra: pmc: Use the new reset APIs to manage reset controllers soc/tegra: pmc: Pass PMC to tegra_powergate_power_up() soc/tegra: pmc: MBIST work around for Tegra210 soc/tegra: pmc: Add Tegra194 compatibility string soc/tegra: Add Tegra194 SoC configuration option
2018-03-27gpio: Add Spreadtrum PMIC EIC driver supportBaolin Wang
The Spreadtrum PMIC EIC controller contains only one bank of debounce EIC, and this bank contains 16 EICs. Each EIC can only be used as input mode, as well as supporting the debounce and the capability to trigger interrupts when detecting input signals. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27gpio: Add Spreadtrum EIC driver supportBaolin Wang
The Spreadtrum digital-chip EIC controller has 4 sub-modules: debounce EIC, latch EIC, async EIC and sync EIC, and each sub-module can has multiple banks and each bank contains 8 EICs. Each EIC can only be used as input mode, and has the capability to trigger interrupts when detecting input signals. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27dt-bindings: gpio: Add Spreadtrum EIC controller documentationBaolin Wang
This patch adds the device tree bindings for the Spreadtrum EIC controller. The EIC can be seen as a special type of GPIO, which can only be used as input mode. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Reviewed-by: Rob Herring <robh@kernel.org> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27Merge tag 'tegra-for-4.17-firmware' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers Pull "firmware: Changes for v4.17-rc1" from Thierry Reding: These changes are rather small, with just a fix for a return value check and some preparatory work for Tegra194 BPMP support. * tag 'tegra-for-4.17-firmware' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux: firmware: tegra: adjust tested variable firmware: tegra: Simplify channel management
2018-03-27Merge tag 'omap-for-v4.17/soc-pt2-signed' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "Two omap5 specific aux control module patches for v4.17" from Tony Lindgren: On omap5 there is an aux control module that we are not handling currently for clocks, so let's add support for it. * tag 'omap-for-v4.17/soc-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP5: control: add support for control module wkup pad config ARM: omap2+: control: add support for auxiliary control module instances
2018-03-27Merge tag 'samsung-soc-4.17-2' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc Pull "Samsung mach/soc changes for v4.17, part two" from Krzysztof Kozłowski: 1. Fix coupled CPU idle freeze on Exynos4210. 2. Simplify hot-path in coupled CPU idle. * tag 'samsung-soc-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: EXYNOS: Simplify code in coupled CPU idle hot path ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210
2018-03-27Merge tag 'renesas-soc-for-v4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM Based SoC Updates for v4.17" from Simon Horman: 01d675f159e0 ARM: shmobile: rcar-gen2: Add watchdog support 58adf1ba0d22 ARM: shmobile: Add watchdog support * SoC - Identify R-Car V3H (r8a77980) and M3N (r8a77965) - Enable R-Car Gen2 regulator quirk for Stout board with H3 (r8a7790) SoC Marek Vaust says "Regulator setup is suboptimal on H2 Stout too. The Stout newly has two DA9210 regulators, so the quirk is extended to handle another DA9210 at i2c address 0x70." - Add watchdog support This is the SoC portion of the following solution. It is not yet enabled in DT as it is not functional without clock dependencies in place. Fabrizio Castro says "this series has been around for some time as RFC, and it has collected useful comments from the community along the way. The solution proposed by this patch set works for most R-Car Gen2 and RZ/G1 devices, but not all of them. We now know that for some R-Car Gen2 early revisions there is no proper software fix. Anyway, no product has been built around early revisions, but development boards mounting early revisions (basically prototypes) are still out there. As a result, this series isn't enabling the internal watchdog on R-Car Gen2 boards, developers may enable it in board specific device trees if needed. This series has been tested by me on the iwg20d, iwg22d, Lager, Alt, and Koelsch boards. The problem =========== To deal with SMP on R-Car Gen2 and RZ/G1, we install a reset vector to ICRAM1 and we program the [S]BAR registers so that when we turn ON the non-boot CPUs they are redirected to the reset vector installed by Linux in ICRAM1, and eventually they continue the execution to RAM, where the SMP bring-up code will take care of the rest. The content of the [S]BAR registers survives a watchdog triggered reset, and as such after the watchdog fires the boot core will try and execute the SMP bring-up code instead of jumping to the bootrom code. The fix ======= The main strategy for the solution is to let the reset vector decide if it needs to jump to shmobile_boot_fn or to the bootrom code. In a watchdog triggered reset scenario, since the [S]BAR registers keep their values, the boot CPU will jump into the newly designed reset vector, the assembly routine will eventually test WOVF (a bit in register RWTCSRA that indicates if the watchdog counter has overflown, the value of this bit gets retained in this scenario), and jump to the bootrom code which will in turn load up the bootloader, etc. When bringing up SMP or using CPU hotplug, the reset vector will jump to shmobile_boot_fn instead." * R-Car Rst - Add support for R-Car V3H (r8a77980) and V3H (r8a77980) * R-Car SYSC - Mark rcar_sysc_matches[] __initconst Geert Uytterhoeven says "This frees another 1764 bytes (arm32/shmobile_defconfig) or 1000 bytes (arm64/renesas_defconfig) of memory after kernel init." - Fix power area parents Sergei Shtylyov says "According to the figure 9.2(b) of the R-Car Series, 3rd Generation User’s Manual: Hardware Rev. 0.80 the A2IRn and A2SCn power areas in R8A77970 have the A3IR area as a parent, thus the SYSC driver has those parents wrong.." - Add support for R-Car V3H (r8a77980) and V3H (r8a77980) * tag 'renesas-soc-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: rcar-gen2: Add watchdog support ARM: shmobile: Add watchdog support ARM: shmobile: rcar-gen2: Fix error check in regulator quirk soc: renesas: rcar-rst: Add support for R-Car M3-N ARM: shmobile: stout: enable R-Car Gen2 regulator quirk soc: renesas: rcar-sysc: Add R-Car M3-N support soc: renesas: Identify R-Car M3-N soc: renesas: rcar-sysc: add R8A77980 support dt-bindings: power: add R8A77980 SYSC power domain definitions soc: renesas: r8a77970-sysc: fix power area parents soc: renesas: rcar-rst: Enable watchdog as reset trigger for Gen2 soc: renesas: rcar-rst: add R8A77980 support soc: renesas: identify R-Car V3H soc: renesas: rcar-sysc: Mark rcar_sysc_matches[] __initconst
2018-03-27arm: dts: kirkwood*.dts: use SPDX-License-Identifier for board using GPL-2.0+Gregory CLEMENT
Follow the recent trend for the license description Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27arm: dts: kirkwood*.dts: use SPDX-License-Identifier for boards using ↵Gregory CLEMENT
GPL-2.0+/MIT Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27gpio: ath79: Fix potential NULL dereference in ath79_gpio_probe()Wei Yongjun
platform_get_resource() may return NULL, add proper check to avoid potential NULL dereferencing. This is detected by Coccinelle semantic patch. @@ expression pdev, res, n, t, e, e1, e2; @@ res = platform_get_resource(pdev, t, n); + if (!res) + return -EINVAL; ... when != res == NULL e = devm_ioremap(e1, res->start, e2); Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> [albeu@free.fr: Fixed patch to apply on current tree] Signed-off-by: Alban Bedel <albeu@free.fr> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27arm: dts: kirkwood*.dts: use SPDX-License-Identifier for boards using GPL-2.0Gregory CLEMENT
Follow the recent trend for the license description Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27Merge tag 'sunxi-core-for-4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc Pull "Allwinner core changes for 4.17" from Maxime Ripard: Here is our bunch of changes for mach-sunxi for this release cycle. This is basically only about bringing the SMP support to the A80, which has a bug in hardware and cannot use PSCI like the other SoCs we have. * tag 'sunxi-core-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: sunxi: mc-smp: Split out SoC-specific device node lookup sequence ARM: sunxi: mc-smp: Use DT enable-method for sun9i A80 SMP ARM: sunxi: mc-smp: Fix "lookback" typo ARM: sun9i: smp: Support cpu0 hotplug dt-bindings: ARM: sunxi: Document A80 SoC secure SRAM usage by SMP hotplug ARM: sun9i: smp: Support CPU/cluster power down and hotplugging for cpu1~7 ARM: sun9i: Support SMP bring-up on A80
2018-03-27ARM: multi_v7_defconfig: add NXP FlexCAN IP supportStefan Agner
Enable FlexCAN support as module by default. FlexCAN can be found on various NXP designs such as the i.MX and Vybrid SoC family. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27ARM: multi_v7_defconfig: enable thermal driver for i.MX devicesStefan Agner
Enable the i.MX thermal driver required for i.MX SoC family. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27ARM: multi_v7_defconfig: add RN5T618 PMIC family supportStefan Agner
This allows to successfully boot Colibri iMX7 which is using the Ricoh RN5T567 PMIC. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27ARM: multi_v7_defconfig: add NXP graphics driversStefan Agner
Enable drivers to support NXP graphics IPs such as: - Etnaviv (e.g. i.MX6) - DCU (e.g. Vybrid LS1021A) - mxsfb (e.g. i.MX6UL/ULL/7) Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27ARM: multi_v7_defconfig: add GPMI NAND controller supportStefan Agner
Add GPMI NAND controller support as required by some NXP i.MX6/7 based boards. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27ARM: multi_v7_defconfig: add OCOTP driver for NXP SoCsStefan Agner
Enable on-chip OTP NVMEM support for NXP i.MX and VF610 SoCs. Since OTP values might be required by drivers required during boot, make sure the driver is built-in (e.g. i.MX thermal driver). Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27Merge branch 'gpio-reserved-ranges' into develLinus Walleij
2018-03-27pinctrl: qcom: Don't allow protected pins to be requestedStephen Boyd
Some qcom platforms make some GPIOs or pins unavailable for use by non-secure operating systems, and thus reading or writing the registers for those pins will cause access control issues and reset the device. With a DT/ACPI property to describe the set of pins that are available for use, parse the available pins and set the irq valid bits for gpiolib to know what to consider 'valid'. This should avoid any issues with gpiolib. Furthermore, implement the pinmux_ops::request function so that pinmux can also make sure to not use pins that are unavailable. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Tested-by: Timur Tabi <timur@codeaurora.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27ARM: multi_v7_defconfig: configure I2C driver built-inStefan Agner
PMIC often require the I2C bus, and the PMIC regulators might be necessary to power on eMMC/SD-card or other supplies required for successful boot. Make sure I2C driver for i.MX devices is built-in. Signed-off-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27gpiolib: Support 'gpio-reserved-ranges' propertyStephen Boyd
Some qcom platforms make some GPIOs or pins unavailable for use by non-secure operating systems, and thus reading or writing the registers for those pins will cause access control issues. Add support for a DT property to describe the set of GPIOs that are available for use so that higher level OSes are able to know what pins to avoid reading/writing. Non-DT platforms can add support by directly updating the chip->valid_mask. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Tested-by: Timur Tabi <timur@codeaurora.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27gpiolib: Change bitmap allocation to kmalloc_arrayStephen Boyd
We don't need to clear out these bits when we set them immediately after. Use kmalloc_array() to skip clearing the bits. Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Tested-by: Timur Tabi <timur@codeaurora.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27gpiolib: Extract mask allocation into subroutineStephen Boyd
We're going to use similar code to allocate and set all the bits in a mask for valid gpios to use. Extract the code from the irqchip version so it can be reused. Signed-off-by: Stephen Boyd <swboyd@chromium.org> Tested-by: Timur Tabi <timur@codeaurora.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27dt-bindings: gpio: Add a gpio-reserved-ranges propertyStephen Boyd
Some qcom platforms make some GPIOs or pins unavailable for use by non-secure operating systems, and thus reading or writing the registers for those pins will cause access control issues. Introduce a DT property to describe the set of GPIOs that are available for use so that higher level OSes are able to know what pins to avoid reading/writing. Cc: Grant Likely <grant.likely@secretlab.ca> Cc: <devicetree@vger.kernel.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Rob Herring <robh@kernel.org> Tested-by: Timur Tabi <timur@codeaurora.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27arm64: defconfig: add CONFIG_UNIPHIER_THERMAL and CONFIG_SNI_AVEKunihiko Hayashi
Enable the thermal monitor driver and the AVE ethernet driver implemented on UniPhier SoCs. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27Merge tag 'stratix10_defconfig_for_v4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/soc Pull "ARM64: stratix10: defconfig updates for 4.17" from Dinh Nguyen: -enables STMMAC_ETH controller that is present on Stratix10 * tag 'stratix10_defconfig_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: defconfig: enable stmmac ethernet to defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27Merge tag 'omap-for-v4.17/defconfig-pt2-signed' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "Second set of defconfig changes for omap variants for v4.17" from Tony Lindgren: This series enables more devices working on droid4 to make it easier for people and distros to use out of the box. * tag 'omap-for-v4.17/defconfig-pt2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: multi_v7_defconfig: Enable CPCAP related options mostly as loadable modules ARM: omap2plus_defconfig: Add UINPUT ARM: omap2plus_defconfig: Enable MDM6600 USB PHY ARM: omap2plus_defconfig: Add AUDIO_GRAPH_CARD ARM: omap2plus_defconfig: Enable PWM_VIBRA
2018-03-27Merge tag 'qcom-arm64-defconfig-for-4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc Pull "Qualcomm ARM64 Based defconfig Updates for v4.17" from Andy Gross: * Enable cpufreq governors, QCOM TSENS, and QCOM APCS driver * tag 'qcom-arm64-defconfig-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux: arm64: defconfig: enable more cpufreq governors arm64: defconfig: enable thermal sensor on QCOM platforms arm64: defconfig: Enable the APCS IPC driver on Qualcomm platforms Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27Merge tag 'armsoc-versatile-drm-defconfig' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc Pull "defconfig changes for Versatile DRM" from Linus Walleij: This augments the RealView and Versatile defconfig to use the PL111 DRM driver rather than the old fbdev driver. * tag 'armsoc-versatile-drm-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: defconfig: Configure Versatile boards to use PL111 DRM ARM: defconfig: Update Versatile defconfig ARM: defconfig: Switch RealView boards to use P111 DRM ARM: defconfig: Update RealView defconfig
2018-03-27Merge tag 'amlogic-defconfig' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/soc Pull "Amlogic defconfig fixes for v4.17" from Kevin Hilman * tag 'amlogic-defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm64: defconfig: enable MESON EFUSE
2018-03-27arm: dts: armada-385-turris-omnia: use SPDX-License-IdentifierGregory CLEMENT
Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Cc: Uwe Kleine-König <uwe@kleine-koenig.org> Acked-by: Uwe Kleine-König <uwe@kleine-koenig.org> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27arm: dts: armada-385-db-ap: use SPDX-License-IdentifierGregory CLEMENT
Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Cc: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27arm: dts: armada-388-rd: use SPDX-License-IdentifierGregory CLEMENT
Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Cc: Gregory CLEMENT <gregory.clement@bootlin.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27arm: dts: armada-xp-db-xc3-24g4xg: use SPDX-License-IdentifierGregory CLEMENT
Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> Acked-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27arm: dts: armada-xp-db-dxbc2: use SPDX-License-IdentifierGregory CLEMENT
Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> Acked-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27arm: dts: armada-370-db: use SPDX-License-IdentifierGregory CLEMENT
Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27arm: dts: armada-*.dts: use SPDX-License-Identifier for most of the Armada ↵Gregory CLEMENT
based board Follow the recent trend for the license description, and also fix the wrongly stated X11 to MIT. As already pointed on the DT ML, the X11 license text [1] is explicitly for the X Consortium and has a couple of extra clauses. The MIT license text [2] is actually what the current DT files claim. [1] https://spdx.org/licenses/X11.html [2] https://spdx.org/licenses/MIT.html Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
2018-03-27ALSA: pcm: potential uninitialized return valuesDan Carpenter
Smatch complains that "tmp" can be uninitialized if we do a zero size write. Fixes: 02a5d6925cd3 ("ALSA: pcm: Avoid potential races between OSS ioctls and read/write") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2018-03-27gpio: mockup: fix a potential crash when creating debugfs entriesBartosz Golaszewski
If we failed to create the top debugfs directory, we must not try to create the child nodes. We currently only check if gpio_mockup_dbg_dir is not NULL, but it can also contain an errno if debugfs is disabled in build options. Use IS_ERR_OR_NULL() instead. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27gpio: pca953x: add compatibility for pcal6524 and pcal9555aH. Nikolaus Schaller
The Pyra-Handheld originally used the tca6424 but recently we have replaced it by the pin and package compatible pcal6524. So let's add this to the bindings and the driver. And while we are at it, the pcal9555a does not have a compatible entry either but is already supported by the device id table. Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> Reviewed-by: Rob Herring <robh@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27gpio: dwapb: Add support for a bus clockPhil Edworthy
Enable an optional bus clock provided by DT. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27gpio: Remove VLA from xra1403 driverLaura Abbott
The new challenge is to remove VLAs from the kernel (see https://lkml.org/lkml/2018/3/7/621) This patch replaces a VLA with an appropriate call to kmalloc_array. Signed-off-by: Laura Abbott <labbott@redhat.com> Reviewed-by: Nandor Han <nandor.han@ge.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27gpio: Remove VLA from MAX3191X driverLaura Abbott
The new challenge is to remove VLAs from the kernel (see https://lkml.org/lkml/2018/3/7/621) This patch replaces several a VLA with an appropriate call to kmalloc_array. Signed-off-by: Laura Abbott <labbott@redhat.com> Reviewed-and-tested-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27Merge tag 'omap-for-v4.17/defconfig-signed' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "Defconfig updates for omap variants for v4.17 merge window" from Tony Lindgren: We need to enable MMC_SDHCI option in both omap2plus_defconfig and multi_v7_defconfig so systems are able to mount root when the dts files get updated for sdhci. Then let's update omap2plus_defconfig so we can patch it easier. And as Arnd noticed earlier, just running make savedefconfig will accidentally drop few Kconfig options. This is happening because some options are no longer available as loadable modules like LIRC. Or new dependencies have been added such as SND_OSSEMUL for selecting SOUND_OSS_CORE. So we first move the unchanged options around to their make savedefconfig suggested place, then update the options to prevent make savedefconfig dropping some options accidentally, and then finally drop the unused options. And after that we enable options DRM_OMAP and 8250_OMAP. These both have been around for years now. And we do have 8250_OMAP warn about console being redirected with SERIAL_8250_OMAP_TTYO_FIXUP option that is enabled by default. Some users may need to update their inittab to use ttyS* instead of ttyO* though. If this turns out to be a problem, we may want to introduce a separate compatible for 8250-omap. But I think we're good to go with the SERIAL_8250_OMAP_TTYO_FIXUP warning now. Let's not update multi_v7_defconfig yet though and first see how 8250_OMAP change plays out. We also enable few new options for PM on am335x and am437x, and CEC in omap2plus_defconfig. Naturally similar options can be later on added to multi_v7_defconfig, but in this series we only enable OTG, MUSB and the related PHYs in multi_v7_defconfig to make it more usable for distros. * tag 'omap-for-v4.17/defconfig-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: multi_v7_defconfig: Enable USB gadget configfs as loadable module ARM: multi_v7_defconfig: Enable various USB PHYs found on omap variants ARM: multi_v7_defconfig: Enable OTG and MUSB as loadable modules ARM: omap2plus_defconfig: Enable 8250_OMAP ARM: omap2plus_defconfig: Switch to use omapdrm by default ARM: omap2plus_defconfig: Enable CEC ARM: omap2plus_defconfig: Enable am335x and am437x PM options ARM: omap2plus_defconfig: Drop unneeded options ARM: omap2plus_defconfig: Add SND_OSSEMUL ARM: omap2plus_defconfig: Update LIRC options ARM: omap2plus_defconfig: Select MFD_TI_LMU ARM: omap2plus_defconfig: Add SERIAL_DEV for bluetooth ARM: omap2plus_defconfig: Update for moved options ARM: omap2plus_defconfig: Enable CONFIG_MMC_SDHCI_OMAP ARM: multi_v7_defconfig: Enable CONFIG_MMC_SDHCI_OMAP Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-03-27pinctrl: uniphier: add UART hardware flow control pin-mux settingsKunihiko Hayashi
UniPhier SoCs have the following pins for hardware flow control of UART: XRTS, XCTS and for modem control of UART: XDTR, XDSR, XDCD, XRI The port number with the flow control is SoC-dependent. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-03-27Merge tag 'renesas-defconfig-for-v4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM Based SoC Defconfig Updates for v4.17" from Simon Horman: Updates to shmobile defconfig: * Redresh defconfig to ease future maintenence overhead * Disable CONFIG_EMBEDDED Geert Uytterhoeven says "CONFIG_EXPERT exposes too many config options that do not matter for development. E.g. it prohibits using the default values for the various SH_SCI options. However, CONFIG_EMBEDDED selects CONFIG_EXPERT, so it cannot be disabled. Hence disable CONFIG_EMBEDDED, and compensate for the loss of CONFIG_DEBUG_KERNEL by enabling the latter. Actual impact, all harmless: - CONFIG_NAMESPACES=y (plus a few related CONFIG_*_NS options), - CONFIG_SYSCTL_SYSCALL=n, - CONFIG_SERIAL_SH_SCI_NR_UARTS changed from 20 to 18, - Some HID support became enabled, - CONFIG_DEBUG_MEMORY_INIT=y," * Enable RZA1 pin controller This allows the Genmai board with RZ/A1 (r7s72100) SoC to once again boot using the shmobile defconfig. * tag 'renesas-defconfig-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: defconfig: Disable CONFIG_EMBEDDED ARM: shmobile: defconfig: Refresh ARM: shmobile: Enable RZA1 pin controller
2018-03-27Merge tag 'renesas-arm64-defconfig-for-v4.17' of ↵Arnd Bergmann
ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc Pull "Renesas ARM64 Based SoC Defconfig Updates for v4.17" from Simon Horman: Enable the following to allow them to be more widely exercised: * Newly added R8A77965 and R8A77980 SoCs * PWM and USB as used on R-Car Gen3 SoCs * tag 'renesas-arm64-defconfig-for-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: arm64: defconfig: enable R8A77965 SoC arm64: defconfig: Enable PWM and USB for R-Car arm64: defconfig: enable R8A77980 SoC
2018-03-27iommu/arm-smmu-v3: Support 52-bit virtual addressRobin Murphy
Stage 1 input addresses are effectively 64-bit in SMMUv3 anyway, so really all that's involved is letting io-pgtable know the appropriate upper bound for T0SZ. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>