aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2018-12-14gpio: Pass a flag to gpiochip_request_own_desc()Linus Walleij2-2/+2
Before things go out of hand, make it possible to pass flags when requesting "own" descriptors from a gpio_chip. This is necessary if the chip wants to request a GPIO with active low semantics, for example. Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Roger Quadros <rogerq@ti.com> Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2018-12-13ARM: dts: omap4-droid4: Configure wlcore wakeirqTony Lindgren1-3/+7
With wlcore supporting optional wakeirqs, we can configure it for droid 4. This makes ssh connection usable with the SoC entering deeper idle states. Let's configure a wakeirq both for the wlcore GPIO and the SDIO dat1 pin in case wlcore starts supporting SDIO dat1 interrupt at some point. And let's also add the missing keep-power-in-suspend while at it. Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-13ARM: dts: Configure wlcore wakeirq for pandaboardTony Lindgren1-2/+4
With wlcore supporting optional wakeirqs, we can configure it for pandaboard. This makes ssh connection usable with the SoC entering deeper idle states. Note that pandaboard already has a wakeirq configured for SDIO dat1 pin although that is not currently used by wlcore. Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-13ARM: dts: Add wlcore wakeirq for omap3-evmTony Lindgren2-3/+14
With wlcore supporting optional wakeirqs, let's configure it for omap3-evm and update the related pin muxing as some pins are left unmuxed. Let's configure a wakeirq both for the wlcore GPIO and the SDIO dat1 pin in case wlcore starts supporting SDIO dat1 interrupt at some point. Note that for off-mode, the wlcore reset GPIO will have a glitch meaning wlcore will reset. The only way to workaround for this currently is to configure the reset pin with SAFE_MODE + PULL. Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-13ARM: dts: exynos: Specify I2S assigned clocks in proper nodeSylwester Nawrocki2-10/+8
The assigned parent clocks should be normally specified in the consumer device's DT node, this ensures respective driver always sees correct clock settings when required. This patch fixes regression in audio subsystem on Odroid XU3/XU4 boards that appeared after commits: commit 647d04f8e07a ("ASoC: samsung: i2s: Ensure the RCLK rate is properly determined") commit 995e73e55f46 ("ASoC: samsung: i2s: Fix rclk_srcrate handling") commit 48279c53fd1d ("ASoC: samsung: i2s: Prevent external abort on exynos5433 I2S1 access") Without this patch the driver gets wrong clock as the I2S function clock (op_clk) in probe() and effectively the clock which is finally assigned from DT is not being enabled/disabled in the runtime resume/suspend ops. Without the above listed commits the EXYNOS_I2S_BUS clock was always set as parent of CLK_I2S_RCLK_SRC regardless of DT settings so there was no issue with not enabled EXYNOS_SCLK_I2S. Cc: <stable@vger.kernel.org> # 4.17.x Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2018-12-13ARM: dts: exynos: Add missing CPUs in cooling maps for Odroid X2Markus Reichl1-2/+4
While updating cooling maps, the exynos4412-prime.dtsi was left untouched. This is not a problem with Odroid U3 because it uses its own map with fan (which was updated). However the cooling maps of Odroid X2 rely only on exynos4412-prime.dtsi. Signed-off-by: Markus Reichl <m.reichl@fivetechno.de> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2018-12-13dma-mapping: bypass indirect calls for dma-directChristoph Hellwig2-12/+4
Avoid expensive indirect calls in the fast path DMA mapping operations by directly calling the dma_direct_* ops if we are using the directly mapped DMA operations. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Tested-by: Jesper Dangaard Brouer <brouer@redhat.com> Tested-by: Tony Luck <tony.luck@intel.com>
2018-12-13dma-mapping: always build the direct mapping codeChristoph Hellwig1-1/+0
All architectures except for sparc64 use the dma-direct code in some form, and even for sparc64 we had the discussion of a direct mapping mode a while ago. In preparation for directly calling the direct mapping code don't bother having it optionally but always build the code in. This is a minor hardship for some powerpc and arm configs that don't pull it in yet (although they should in a relase ot two), and sparc64 which currently doesn't need it at all, but it will reduce the ifdef mess we'd otherwise need significantly. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Tested-by: Jesper Dangaard Brouer <brouer@redhat.com> Tested-by: Tony Luck <tony.luck@intel.com>
2018-12-13Merge branch 'yaml-bindings-for-v4.21' into dt/nextRob Herring7-8/+12
2018-12-13ARM: dts: Cosmetic fix for omap5 USB node namesTony Lindgren1-3/+3
These should be now using offset from the module base and not the full physical address. Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-13regulator: dts: enable soft-start and ramp delay for the OLinuXino Lime2Olliver Schinagl1-0/+2
The OLinuXino Lime2 has a big capacitor on its LDO3 output. It is actually too large, causing the PMIC to shutdown when toggling the LDO3. By enabling soft-start and ramp delay we increase the time for the capacitor to charge lowering the current drain on the power regulator. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Signed-off-by: Priit Laes <plaes@plaes.org> Signed-off-by: Mark Brown <broonie@kernel.org>
2018-12-12ARM: dts: Fix wrong address for omap5 sata phyTony Lindgren1-13/+13
Looks like I missed converting the omap5 sata phy addresses to use offset from the module base instead of full physical address. While at it, we can also more it to be a direct child of the interconnect target module, it is not really a child of the ocp2scp control device. Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-12Merge tag 'omap-for-v4.21/driver-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/driversOlof Johansson1-6/+17
Few more omap driver fixes and improvments for v4.21 merge window This series of changes improves the TI module flag handling to allow booting with older dts files until the module flags have been moved to the interconnect target module level. And there's a of_node_name_eq() clean-up patch from Rob Herring for the GPMC driver. * tag 'omap-for-v4.21/driver-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: memory: omap-gpmc: Use of_node_name_eq for node name comparisons bus: ti-sysc: Check for no-reset and no-idle flags at the child level ARM: OMAP2+: Check also the first dts child for hwmod flags Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'omap-for-v4.20/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixesOlof Johansson4-3/+7
Few device fixes for omaps Here's a collection of minor fixes for annoying usability issues people have noticed using various devices. There are two regression fixes: - A regression fix for omap5 usb3 dual role mode - A regression fix to ams-delta audio being muted permanently And two one-liners: - Fix polarity for am335x-pdu001 SD card detection - Fix non-working omap4-sdp Ethernet startup for rebind It would be nice to get these merged during the -rc cycle if possible. Naturally these can all wait for the merge window too if we start running out of time. * tag 'omap-for-v4.20/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Fix OMAP4430 SDP Ethernet startup ARM: dts: am335x-pdu001: Fix polarity of card detection input ARM: OMAP1: ams-delta: Fix audio permanently muted ARM: dts: omap5: Fix dual-role mode on Super-Speed port Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12ARM: omap2: avoid section mismatch warningArnd Bergmann1-1/+1
WARNING: vmlinux.o(.text+0x27530): Section mismatch in reference from the function am43xx_suspend_init() to the function .init.text:am43xx_map_scu() The function am43xx_suspend_init() references the function __init am43xx_map_scu(). This is often because am43xx_suspend_init lacks a __init annotation or the annotation of am43xx_map_scu is wrong. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Reviewed-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/socOlof Johansson1-0/+2
soc: Amlogic updates for v4.21 - ARM: meson: Kconfig: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER - misc MAINTAINERS updates * tag 'amlogic-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER MAINTAINERS: add drivers/soc/amlogic/ to amlogic list MAINTAINERS: Remove myself from the list Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'gemini-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dtOlof Johansson9-76/+161
Gemini DTS updates for v4.21: - Fix the erroneous partition table on D-Link DIR-685 - Multiplex flash usage with other usage using pin control handling (merged to the MTD tree) - Use the RedBoot partition parser on SQ201 - Add the USB blocks (DT bindings merged in the last merge window) - Bump the debounce times a bit to avoid bouncing * tag 'gemini-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: dts: Bump Gemini platforms to use 100ms debounce ARM: dts: Add the FOTG210 USB host to Gemini boards ARM: dts: Fix up SQ201 flash access ARM: dts: Enable Gemini flash access ARM: dts: Fix up the D-Link DIR-685 MTD partition info Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'sunxi-h3-h5-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dtOlof Johansson5-8/+198
Allwinner H3/H5 changes for 4.21 Our usual pull request with the changes shared between the H3 and H5 SoCs. The major changes for this release are: - Addition of the video engine for the H5 - H3 Camera support - New board: Emlid Neutis N5, Mapleboard MP130 * tag 'sunxi-h3-h5-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: h5: Add Video Engine node ARM/arm64: dts: allwinner: Move H3/H5 syscon label over to soc-specific nodes arm64: dts: allwinner: h5: Add system-control node with SRAM C1 ARM: dts: sun8i: h3: Fix the system-control register range ARM: dts: sun8i: Add the H3/H5 CSI controller ARM: dts: sun8i-h3: Add dts for the Mapleboard MP130 arm64: dts: allwinner: new board - Emlid Neutis N5 dt-bindings: vendor-prefix: new vendor - Emlid ARM: dts: sun8i-h3: add sy8106a to orange pi plus Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'omap-for-v4.21/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/socOlof Johansson12-132/+76
Changes for omap1 variants for v4.21 merge window In this set of changes Aaro Koskinen revives Palm Tungsten E for the MMC and USB making it usable again. And Janusz Krzysztofik follows up on the clean-up of ams-delta GPIO handling. The other changes are clean-up for DEFINE_SHOW_ATTRIBUTE by Yangtao Li. * tag 'omap-for-v4.21/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: fix USB configuration for device-only setups ARM: OMAP1: add MMC configuration for Palm Tungsten E ARM: OMAP1: devices: configure omap1_spi100k only on OMAP7xx ARM: OMAP1/2: fix SoC name printing ARM: OMAP1: ams-delta: Move AMS_DELTA_LATCH2_NGPIO to the board file ARM: OMAP1: ams-delta: Drop unused symbols from the board header ARM: OMAP1: ams-delta: Drop board specific global GPIO numbers ARM: OMAP: PM: Change to use DEFINE_SHOW_ATTRIBUTE macro ARM: OMAP1: clock: Change to use DEFINE_SHOW_ATTRIBUTE macro ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device ARM: OMAP1: ams-delta: make board header file local to mach-omap1 Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12ARM: tegra: avoid section mismatch warningArnd Bergmann1-2/+2
WARNING: vmlinux.o(.text+0x39ecc): Section mismatch in reference from the function tegra114_gic_cpu_pm_registration() to the (unknown reference) .init.rodata:(unknown) The function tegra114_gic_cpu_pm_registration() references the (unknown reference) __initconst (unknown). This is often because tegra114_gic_cpu_pm_registration lacks a __initconst annotation or the annotation of (unknown) is wrong. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12ARM: ks8695: fix section mismatch warningArnd Bergmann1-1/+1
WARNING: vmlinux.o(.text+0x13250): Section mismatch in reference from the function acs5k_i2c_init() to the (unknown reference) .init.data:(unknown) The function acs5k_i2c_init() references the (unknown reference) __initdata (unknown). This is often because acs5k_i2c_init lacks a __initdata annotation or the annotation of (unknown) is wrong. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12ARM: pxa: avoid section mismatch warningArnd Bergmann3-3/+3
WARNING: vmlinux.o(.text+0x19f90): Section mismatch in reference from the function littleton_init_lcd() to the function .init.text:pxa_set_fb_info() The function littleton_init_lcd() references the function __init pxa_set_fb_info(). This is often because littleton_init_lcd lacks a __init annotation or the annotation of pxa_set_fb_info is wrong. WARNING: vmlinux.o(.text+0xf824): Section mismatch in reference from the function zeus_register_ohci() to the function .init.text:pxa_set_ohci_info() The function zeus_register_ohci() references the function __init pxa_set_ohci_info(). This is often because zeus_register_ohci lacks a __init annotation or the annotation of pxa_set_ohci_info is wrong. WARNING: vmlinux.o(.text+0xf95c): Section mismatch in reference from the function cm_x300_init_u2d() to the function .init.text:pxa3xx_set_u2d_info() The function cm_x300_init_u2d() references the function __init pxa3xx_set_u2d_info(). This is often because cm_x300_init_u2d lacks a __init annotation or the annotation of pxa3xx_set_u2d_info is wrong. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12ARM: mmp: fix pxa168_device_usb_phy use on aspeniteArnd Bergmann2-0/+5
This one ended up in the wrong header file, causing a build failure on at least one platform: arch/arm/mach-mmp/aspenite.c: In function 'common_init': arch/arm/mach-mmp/aspenite.c:260:28: error: 'pxa168_device_usb_phy' undeclared (first use in this function); did you mean 'pxa168_device_ssp5'? We can just include both the pxa168.h and pxa910.h headers to make that work, which gets us to the next failure: arch/arm/mach-mmp/aspenite.o: In function `common_init': aspenite.c:(.init.text+0x1c0): undefined reference to `pxa168_device_usb_phy' This is solved by using the matching ifdef check around the USB device registration, enabling them only when either USB host or gadget mode are enabled. Fixes: a225daf72ee7 ("ARM: mmp: add a pxa-usb-phy device") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12ARM: mmp: fix timer_init callsArnd Bergmann5-6/+6
The change to passing the timer frequency as a function argument was a good idea, but caused a build failure for one user that was missed in the update: arch/arm/mach-mmp/time.c: In function 'mmp_dt_init_timer': arch/arm/mach-mmp/time.c:242:2: error: implicit declaration of function 'timer_init'; did you mean 'hrtimer_init'? [-Werror=implicit-function-declaration] Change that as well to fix the build error, and rename the function to put it into a proper namespace and make it clearer what is actually going on. I saw that the high 6500000 HZ frequency was previously only set with CONFIG_MMP2, but is now also used with MMP (pxa910), so I'm changing that back here. Please make sure that the frequencies are all correct now. Fixes: f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'imx-soc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/socOlof Johansson8-14/+89
i.MX SoC changes for 4.21: - An improvement on i.MX debugging options that only defines DEBUG_IMX_UART_PORT if needed, so that the option will not be present in the kernel config when DEBUG_LL is disabled. - Adds the necessary platform support for i.MX7ULP SoC and configures power mode to Partial Stop mode 3 with system/bus clock enabled. Otherwise the default STOP mode will gate off system/bus clock when WFI gets executed on i.MX7ULP. - A fix from Arnd on SOC_IMX7ULP option dependency. * tag 'imx-soc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: fix dependencies on imx7ulp ARM: imx: add initial support for imx7ulp ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'samsung-soc-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/socOlof Johansson6-54/+29
Samsung mach/soc changes for v4.21 Just cleanups of: legacy way of setting external wakeup interrupts, old power management debugging functions and duplicated secondary startup initialization. * tag 'samsung-soc-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: exynos: Remove secondary startup initialization from smp_prepare_cpus ARM: samsung: Limit SAMSUNG_PM_DEBUG config option to non-Exynos platforms ARM: exynos: Remove no longer needed s3c_pm_check_*() calls ARM: exynos: Remove legacy setting of external wakeup interrupts ARM: s5pv210: Remove legacy setting of external wakeup interrupts Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'sunxi-core-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/socOlof Johansson2-1/+27
Allwinner core changes for 4.21 A few patches to enable a new Allwinner SoC based on an armv5 CPU. * tag 'sunxi-core-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: dt-bindings: watchdog: Add Allwinner ARMv5 F1C100s wdt ARM: sunxi: add Allwinner ARMv5 SoCs dt-bindings: arm: Add new Allwinner ARMv5 F1C100s SoC ARM: Check ARCH_MULTI_V7 to differentiate ARMv5/v7 Allwinner SoCs Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'davinci-for-v4.21/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/socOlof Johansson6-1/+157
DaVinci SoC updates for v4.21 ----------------------------- This set of patches moves DaVinci one step closer to not relying on at24 platform data by relying on nvmem cell lookups instead. Once other dependencies are merged, for v4.22, plan is to merge another series of patches removing at24 platform data. * tag 'davinci-for-v4.21/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: da850-evm: remove unnecessary include ARM: davinci: dm850-evm: use cell nvmem lookup for mac address ARM: davinci: mityomapl138: use cell nvmem lookup for mac address ARM: davinci: da830-evm: use cell nvmem lookup for mac address ARM: davinci: dm646x-evm: use cell nvmem lookup for mac address ARM: davinci: dm644x-evm: use cell nvmem lookup for mac address ARM: davinci: dm365-evm: use cell nvmem lookup for mac address Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'renesas-soc-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/socOlof Johansson5-506/+0
Renesas ARM Based SoC Updates for v4.21 * pm-rmobile driver - Move to drivers/soc/renesas/ - Clean up struct rmobile_pm_domain * Renesas SoC Kconfig Symbols - Move symbols for ARM and SoCs to drivers/soc/renesas/ - Hide ARCH_RZN1 to improve consistency * SH-Mobile AG5 (sh73a0) SoC: Remove obsolete inclusion of <asm/smp_twd.h> * Restrict TWD and SCU to Renesas ARM based SoCs where they are present * Enable GPIOLIB on Renesas arm64 based SoCs to allow GPIO driver selection * tag 'renesas-soc-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/ ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/ arm64: renesas: Move SoC Kconfig symbols to drivers/soc/renesas/ ARM: shmobile: Hide ARCH_RZN1 to improve consistency ARM: shmobile: sh73a0: Remove obsolete inclusion of <asm/smp_twd.h> ARM: shmobile: Restrict TWD support to SoCs that have it ARM: shmobile: Restrict SCU support to SoCs that have it arm64: renesas: Enable GPIOLIB to allow GPIO driver selection Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'imx-defconfig-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfigOlof Johansson1-1/+9
i.MX defconfig update for 4.21: - Enable build of i.MX7ULP SoC support. - Enable Goodix touchscreen driver which is needed by ConnectCore 6UL SBC Pro (ccimx6ulsbcpro) board support. - Enable USB_ANNOUNCE_NEW_DEVICES to help USB issue debugging and BT_BNEP to support network over bluetooth. - Remove explicit ARM_UNWIND disabling as it's selected by ARM EABI support. - Enable DA9063 PMIC for emtrion i.MX6 boards support. - Enable driver support for Pixel Pipeline (PXP) and DCP crypto block which are found on i.MX6 and i.MX7 SoCs. * tag 'imx-defconfig-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: add imx7ulp support ARM: imx_v6_v7_defconfig: Select TOUCHSCREEN_GOODIX ARM: imx_v6_v7_defconfig: Enable USB_ANNOUNCE_NEW_DEVICES ARM: imx_v6_v7_defconfig: Enable BT_BNEP ARM: imx_v6_v7_defconfig: Remove explicit ARM_UNWIND disable ARM: imx_v6_v7_defconfig: Enable DA9063 PMIC support ARM: imx_v6_v7_defconfig: Select the PXP driver ARM: imx_v6_v7_defconfig: Enable CRYPTO_DEV_MXS_DCP Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'samsung-defconfig-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfigOlof Johansson2-0/+6
Samsung defconfig changes for v4.21 Enable drivers in exynos and multi_v7 defconfigs for MAX8952, MAX8998 (Samsung UniversalC210 board) and TC358764 (Arndale board). * tag 'samsung-defconfig-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: multi_v7_defconfig: Add TOSHIBA TC358764 bridge driver ARM: multi_v7_defconfig: Add MAX8952 regulator driver ARM: exynos_defconfig: Add TOSHIBA TC358764 bridge driver ARM: exynos_defconfig: Add MAX8952 regulator driver ARM: exynos_defconfig: Add MAX8998 RTC and charger drivers Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'renesas-arm-defconfig-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfigOlof Johansson1-0/+1
Renesas ARM Based SoC Defconfig Updates for v4.21 * Enable SII902X in shmobile defconfig * tag 'renesas-arm-defconfig-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: defconfig: Enable SII902X Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12ARM: smp: add support for per-task stack canariesArd Biesheuvel7-3/+50
On ARM, we currently only change the value of the stack canary when switching tasks if the kernel was built for UP. On SMP kernels, this is impossible since the stack canary value is obtained via a global symbol reference, which means a) all running tasks on all CPUs must use the same value b) we can only modify the value when no kernel stack frames are live on any CPU, which is effectively never. So instead, use a GCC plugin to add a RTL pass that replaces each reference to the address of the __stack_chk_guard symbol with an expression that produces the address of the 'stack_canary' field that is added to struct thread_info. This way, each task will use its own randomized value. Cc: Russell King <linux@armlinux.org.uk> Cc: Kees Cook <keescook@chromium.org> Cc: Emese Revfy <re.emese@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Laura Abbott <labbott@redhat.com> Cc: kernel-hardening@lists.openwall.com Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Kees Cook <keescook@chromium.org>
2018-12-12Merge tag 'v4.21-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dtOlof Johansson8-22/+885
RV1108 improvements (uart-dma, clocks, interrupt numbers, gmac support timer and emmc pins) from its first real-world user. RK3188 improvements (OPPv2, cpu node updates) to prepare for a new devicetree, the BQ Edison 2 Quad-Core. VPU device node for rk3288, right now only the jpeg encoder part will be in the kernel but hopefully other codecs will follow. * tag 'v4.21-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: Add internal timer support for rv1108 ARM: dts: rockchip: add BQ Edison 2 QC devicetree ARM: dts: rockchip: add VPU device node for RK3288 ARM: dts: rockchip: update cpu supplies on rk3188 ARM: dts: rockchip: add phandles to secondary cpu cores ARM: dts: rockchip: add cpu-core resets for rk3188 ARM: dts: rockchip: convert rk3188 to opp-v2 ARM: dts: rockchip: add #sound-dai-cells to Cortex-A9 i2s ARM: dts: rockchip: Add UART DMA support for rv1108 ARM: dts: rockchip: Assign the proper GPIO clocks for rv1108 ARM: dts: rockchip: Fix the PMU interrupt number for rv1108 ARM: dts: rockchip: Pass the 'arm,cpu-registers-not-fw-configured' property on rv1108 ARM: dts: rockchip: Pass the 'clock-latency' property on rv1108 ARM: dts: rockchip: Add rv1108 GMAC support ARM: dts: rockchip: add rv1108 eMMC pin settings Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'at91-4.21-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into next/dtOlof Johansson25-2541/+295
AT91 DT for 4.21 - Switch most platforms to the new clock binding - Small improvement for Axentia nattis * tag 'at91-4.21-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: at91: nattis: initialize the BLON pin as output-low early ARM: dts: at91: at91sam9rl: switch to new clock bindings ARM: dts: at91: at91sam9x5: switch to new clock bindings ARM: dts: at91: at91sam9263: switch to new clock bindings ARM: dts: at91: at91sam9261: switch to new clock bindings ARM: dts: at91: at91sam9260: switch to new clock bindings ARM: dts: at91: sama5d2: switch to new clock binding ARM: dts: at91: sama5d4: switch to new clock bindings ARM: dts: at91: sama5d2: use the divided clock for SMC Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'amlogic-dt-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dtOlof Johansson3-18/+208
ARM: dts: Amlogic updates for v4.21, round 2 Highlights - add CPU OPP tables - timers: add global timer and TWD * tag 'amlogic-dt-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: dts: meson: meson8b: add the CPU OPP tables ARM: dts: meson: meson8: add the CPU OPP table ARM: dts: meson8b: add the Cortex-A5 global timer ARM: dts: meson8b: add the ARM TWD timer ARM: dts: meson8: add the Cortex-A9 global timer ARM: dts: meson8: add the ARM TWD timer ARM: dts: meson: group the Cortex-A5 / Cortex-A9 peripherals dt-bindings: clock: meson8b: export the CPU post dividers Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'uniphier-dt-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dtOlof Johansson4-2/+48
UniPhier ARM SoC DT updates for v4.21 - Add bindings for all SoCs/boards of UniPhier platform - Move binding docs to socionext directory - Add all CPUs in cooling maps - Add MIO DMAC nodes * tag 'uniphier-dt-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier: ARM: dts: uniphier: add MIO DMAC nodes arm64: dts: uniphier: Add all CPUs in cooling maps ARM: dts: uniphier: Add all CPUs in cooling maps dt-bindings: uniphier: move cache-uniphier.txt to vendor directory dt-bindings: uniphier: add bindings for UniPhier SoC family Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'imx7ulp-dt-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dtOlof Johansson3-0/+425
i.MX7ULP device tree for 4.21: - It includes the initial device tree for i.MX7ULP SoC and EVK board support. * tag 'imx7ulp-dt-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx: add imx7ulp evk support ARM: dts: imx: add common imx7ulp dtsi support dt-bindings: fsl: add imx7ulp pm related components bindings dt-bindings: fsl: add compatible for imx7ulp evk clk: imx: add imx7ulp clk driver clk: imx: implement new clk_hw based APIs clk: imx: make mux parent strings const dt-bindings: clock: add imx7ulp clock binding doc clk: imx: add imx7ulp composite clk support clk: imx: add pfdv2 support clk: imx: add pllv4 support clk: fractional-divider: add CLK_FRAC_DIVIDER_ZERO_BASED flag support clk: imx: add gatable clock divider support Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'imx7d-pico-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dtOlof Johansson7-194/+486
i.MX7D PICO boards update for 4.21: - It contains a series from Otavio Salvador that improves i.MX7D PICO SoM, and then adds Hobbit baseboard support on top of the improvement. * tag 'imx7d-pico-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx7d-pico: Add the imx7d-pico-hobbit variant ARM: dts: imx7d-pico-pi: Extend peripherals support ARM: dts: imx7d-pico: Extend peripherals support ARM: dts: imx7d-pico: Improve WiFi regulator name ARM: dts: imx7d-pico: Pass the Ethernet PHY reset GPIO ARM: dts: imx7d-pico: Pass the USBOTG1_PWR pinctrl ARM: dts: imx7d-pico-pi: Move SoM related part to imx7d-pico.dtsi ARM: dts: imx7d-pico: Switch to SPDX identifier ARM: dts: imx7d-pico: Do not harcode the memory size ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock ARM: imx: update the cpu power up timing setting on i.mx6sx ARM: dts: imx7d-pico: Describe the Wifi clock ARM: dts: imx51-zii-rdu1: Remove EEPROM node Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'imx-dt-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dtOlof Johansson210-829/+4055
i.MX device tree update for 4.21: - New boards support: emtrion emCON-MX6, imx6ul-pico-pi, imx7d-sdb-reva and vf610 based Liebherr's BK4 device, ZII SCU4 AIB board. - Add flexcan support for i.MX6UL SoC, turn on stop mode wakeup feature for flexcan, and enable devices on a few i.MX6 NXP boards. - Enable AUO G101EVN010 lcd panel and Goodix touch support for imx6ul-ccimx6ulsbcpro board. - Enable sensors support for imx6qdl-sabresd board: egalax touch, light, magnetometer and accelerometer sensor. - Switch more boards to use SPDX identifier. - Fix memory node duplication in i.MX device tree sources. - Correct GIC PPI interrupts mask for i.MX6UL and i.MX7 SoCs. - Drop 'snps,dw-pcie' compatible from LS1021A PCIe device to avoid incorrect device matching. - Add the gpu nodes for the adreno 200 GPU on iMX51 and iMX53, which are now supported by the freedreno driver. - Add DCP device support for i.MX6ULL, which requires explicit clock enabling. - Add '#thermal-sensor-cells' for thermal device and '#cooling-cells' for cooling devices. - Add missing clock information for EPIT on i.MX25 SoC. - Add PWM and qdma devices for LS1021A SoC. - Update cooling maps of LS1021A SoC to include all devices affected by individual trip points. - Random device addition and cleanup on various boards. * tag 'imx-dt-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (82 commits) ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1 ARM: dts: imx6ul: Remove extra space between node name and brace ARM: dts: imx6qdl-sabresd: Use GPIO_ACTIVE_HIGH for regulators ARM: dts: imx6ul: add flexcan support ARM: dts: imx5: add gpu nodes ARM: dts: imx6qdl-sabresd: add accelerometer sensor support ARM: dts: imx6qdl-sabresd: add magnetometer sensor support ARM: dts: imx6qdl-sabresd: add light sensor support ARM: dts: imx6qdl-sabresd: Move regulators outside of "simple-bus" ARM: dts: imx6qdl: Fix memory node duplication ARM: dts: imx6dl-mamoj: Add a memory node ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication ARM: dts: vf610-zii-scu4-aib: Add HI8435 support ARM: dts: imx6qdl-sabresd: add egalax touch screen support on i2c2 bus ARM: dts: imx7s: Add flexcan stop mode wakeup support ARM: dts: imx6ul: Add flexcan stop mode wakeup support ARM: dts: imx6qdl: Add flexcan stop mode wakeup support ARM: dts: imx6sx: Add flexcan stop mode wakeup support ARM: dts: imx6ul-pico: Add the imx6ul-pico-pi variant ARM: dts: imx6ul-pico-hobbit: Extend peripherals support ... Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'samsung-dt-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dtOlof Johansson20-143/+221
Samsung DTS ARM changes for v4.21 1. Add missing properties and nodes for PMIC clocks in multiple DTS files. 2. Add UHS-I bus speed support to Odroid XU3/XU4/HC SD card and bump the maximum clock frequency to 200 MHz for SD and eMMC. 3. Update cooling maps to include all CPU devices in multiple DTS files. 4. Enable quirks for Exynos3250 DWC. 5. Add JPEG CODEC node to S5Pv210. 6. Add opp-suspend to devfreq OPPs on Exynos4 boards to fix resuming from suspend to RAM. 7. Remove eDP from Arndale board as it does not work and breaks also DSI. * tag 'samsung-dt-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: remove display-port node from Arndale ARM: dts: exynos: Add opp-suspend to DMC and leftbus devfreq OPPs on Exynos4 ARM: dts: s5pv210: Add s5p-jpeg codec node. ARM: dts: exynos: Use Samsung SoC specific compatible for DWC2 module ARM: dts: exynos: Add all CPUs in cooling maps ARM: dts: exynos: Clarify comment explaining purpose of Odroid XU3 DTSI ARM: dts: exynos: Add pin configuration for SD write protect on Odroid XU3/XU4/HC1 ARM: dts: exynos: Update maximum frequency for eMMC to 200MHz on Odroid XU3/XU4 ARM: dts: exynos: Update maximum frequency for SD card to 200MHz on Odroid XU3/XU4/HC1 ARM: dts: exynos: Fix LDO13 min values on Odroid XU3/XU4/HC1 ARM: dts: exynos: Add UHS-I bus speed support to Odroid XU3/XU4/HC1 ARM: dts: exynos: Add missing clocks to RTC node for Arndale board ARM: dts: exynos: Add compatible for s5m8767 clocks node on Itop Core ARM: dts: exynos: Add compatible for s2mps11 clocks node on Exynos542x Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-12Merge tag 'sunxi-dt-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dtOlof Johansson98-1917/+1022
Allwinner DT changes for 4.21 This is a quite big pull request this time, with a huge number of changes (and patches) due to us fixing the vast majority of the DTC warnings our DT had. We also have a bunch of other good, more meaningful, changes: - Support for the new Allwinner T3 (rebranded R40) and f1c100s (armv5) SoCs - AXP803 PMIC AC Power supply support - Rework of the oscillators tree - Two new boards: the t3-cqa3t-bv3 and Lichee Pi Nano Plus a few enhancements here and there. * tag 'sunxi-dt-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (84 commits) ARM: dts: sunxi: Fix PMU compatible strings ARM: dts: sun8i: r40: Add RTC device node ARM: dts: sunxi: h3/h5: Fix up RTC device node and clock references ARM: dts: sun8i: a23/a33: Fix up RTC device node ARM: dts: sun8i: r40: Add clock accuracy for external oscillators ARM: dts: sunxi: h3/h5: Add clock accuracy for external oscillators ARM: dts: sun8i: a33: Drop audio codec oversampling rate to 128 fs ARM: dts: sun8i: h3: Remove unnecessary reserved memory node ARM: dts: sun8i: a33: Remove unnecessary reserved memory node ARM: dts: suniv: Add device tree for Lichee Pi Nano ARM: dts: suniv: add initial DTSI file for F1C100s ARM: dts: axp81x: add AC power supply subnode ARM: dts: sun8i: v3s: Remove skeleton and memory to avoid warnings ARM: dts: sun8i: v3s: Provide default muxing for relevant controllers ARM: dts: sun8i: v3s: Change pinctrl nodes to avoid warning ARM: dts: sun8i: v3s: Change LRADC node names to avoid warnings ARM: dts: sun8i: h3: Remove leading zeros from unit-addresses ARM: dts: sun8i: BPI-M2M: Remove i2c nodes ARM: dts: sun8i: a23/a33: Provide default muxing for relevant controllers ARM: dts: sunxi: reference: Move the muxing back to the common DTSI ... Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-11Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21Mark Brown38-155/+369
2018-12-11ARM: dts: rockchip: Add internal timer support for rv1108Otavio Salvador1-0/+8
Add support for the internal timer peripheral on RV1108. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
2018-12-11ARM: dts: am335x-chiliboard: Add stdout-path propertyMarcin Niestroj1-0/+4
Add stdout-path property in /chosen node so that earlycon can be used by just adding earlycon in bootargs. Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-11Merge branch 'omap1-usb-fix' into omap-for-v4.21/omap1Tony Lindgren2-2/+2
2018-12-11ARM: OMAP1: fix USB configuration for device-only setupsAaro Koskinen2-2/+2
Currently we do USB configuration only if the host mode (CONFIG_USB) is enabled. But it should be done also in the case of device-only setups, so change the condition to CONFIG_USB_SUPPORT. This allows to use omap_udc on Palm Tungsten E. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-11ARM: OMAP1: add MMC configuration for Palm Tungsten EAaro Koskinen1-0/+29
Add initial MMC configuration for Palm Tungsten E to allow using a proper rootfs on the device. This still assumes the bootloader enabling the MMC, and that the card is always present and writeable. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Tony Lindgren <tony@atomide.com>
2018-12-11Merge tag 'tegra-for-4.21-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dtOlof Johansson2-0/+14
ARM: tegra: Device tree changes for v4.21-rc1 These changes add the external memory controller on Tegra20 as well as the VIC on Tegra124. * tag 'tegra-for-4.21-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Add VIC on Tegra124 ARM: dts: tegra20: Add clock entry to External Memory Controller ARM: dts: tegra20: Add interrupt entry to External Memory Controller Signed-off-by: Olof Johansson <olof@lixom.net>
2018-12-11Merge tag 'renesas-arm-dt2-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dtOlof Johansson8-11/+1875
Second Round of Renesas ARM Based SoC DT Updates for v4.21 * RZ/G1N (r8a7744) SoC - Describe in DT: SYS-DMAC, GPIO, Ethernet AVB, SMP, [H]SCIF{A|B}, I2C, USB 2.0 and 3.0 hosts, USB-DMAC, HSUSB, RWDT, Audio, CAN, IRQC, thermal, CMT, VIN, VSP, IPMMU, PMU, TPU, QSPI MSIOF, and PCIE - iWave G20D-Q7 board - Initial support - Enable eMMC, SDHI and SPIO NOR support - Add camera daughterboard * RZ/G1M (r8a7743) SoC - Remove legacy "renesas,rcar-thermal" compatibility * tag 'renesas-arm-dt2-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (34 commits) ARM: dts: r8a7744-iwg20m: Add SPI NOR support ARM: dts: iwg20d-q7-common: Move cmt/rwdt node out of RZ/G1M SOM ARM: dts: r8a7744: Add PCIe Controller device node ARM: dts: r8a7744: Add xhci support ARM: dts: r8a7744: Add MSIOF[012] support ARM: dts: r8a7744: Add QSPI support ARM: dts: r8a7744-iwg20d-q7-dbcm-ca: Add device tree for camera DB ARM: dts: r8a7744: Add TPU support ARM: dts: r8a7744: Add PWM SoC support ARM: dts: r8a7744: Add IPMMU DT nodes ARM: dts: r8a7744: Add VSP support ARM: dts: r8a7744: add VIN dt support ARM: dts: r8a7744: Add CMT SoC specific support ARM: dts: r8a7744: Add thermal device to DT ARM: dts: r8a7744: Add IRQC support ARM: dts: r8a7744: Add CAN support ARM: dts: r8a7744: Add audio support ARM: dts: r8a7744: Add RWDT node ARM: dts: r8a7744: Add USB-DMAC and HSUSB device nodes ARM: dts: r8a7744: USB 2.0 host support ... Signed-off-by: Olof Johansson <olof@lixom.net>