summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2019-09-04vmalloc: lift the arm flag for coherent mappings to common codeChristoph Hellwig
The arm architecture had a VM_ARM_DMA_CONSISTENT flag to mark DMA coherent remapping for a while. Lift this flag to common code so that we can use it generically. We also check it in the only place VM_USERMAP is directly check so that we can entirely replace that flag as well (although I'm not even sure why we'd want to allow remapping DMA appings, but I'd rather not change behavior). Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-09-04dma-mapping: provide a better default ->get_required_maskChristoph Hellwig
Most dma_map_ops instances are IOMMUs that work perfectly fine in 32-bits of IOVA space, and the generic direct mapping code already provides its own routines that is intelligent based on the amount of memory actually present. Wire up the dma-direct routine for the ARM direct mapping code as well, and otherwise default to the constant 32-bit mask. This way we only need to override it for the occasional odd IOMMU that requires 64-bit IOVA support, or IOMMU drivers that are more efficient if they can fall back to the direct mapping. Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-09-04dma-mapping: remove CONFIG_ARCH_NO_COHERENT_DMA_MMAPChristoph Hellwig
CONFIG_ARCH_NO_COHERENT_DMA_MMAP is now functionally identical to !CONFIG_MMU, so remove the separate symbol. The only difference is that arm did not set it for !CONFIG_MMU, but arm uses a separate dma mapping implementation including its own mmap method, which is handled by moving the CONFIG_MMU check in dma_can_mmap so that is only applies to the dma-direct case, just as the other ifdefs for it. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # m68k
2019-09-04parisc: don't set ARCH_NO_COHERENT_DMA_MMAPChristoph Hellwig
parisc is the only architecture that sets ARCH_NO_COHERENT_DMA_MMAP when an MMU is enabled. AFAIK this is because parisc CPUs use VIVT caches, which means exporting normally cachable memory to userspace is relatively dangrous due to cache aliasing. But normally cachable memory is only allocated by dma_alloc_coherent on parisc when using the sba_iommu or ccio_iommu drivers, so just remove the .mmap implementation for them so that we don't have to set ARCH_NO_COHERENT_DMA_MMAP, which I plan to get rid of. Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-09-04arm-nommu: call dma_mmap_from_dev_coherent directlyChristoph Hellwig
There is no need to go through dma_common_mmap for the arm-nommu dma mmap implementation as the only possible memory not handled above could be that from the per-device coherent pool. Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-09-04dma-mapping: explicitly wire up ->mmap and ->get_sgtableChristoph Hellwig
While the default ->mmap and ->get_sgtable implementations work for the majority of our dma_map_ops impementations they are inherently safe for others that don't use the page allocator or CMA and/or use their own way of remapping not covered by the common code. So remove the defaults if these methods are not wired up, but instead wire up the default implementations for all safe instances. Fixes: e1c7e324539a ("dma-mapping: always provide the dma_map_ops based implementation") Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-09-04dma-mapping: move the dma_get_sgtable API comments from arm to common codeChristoph Hellwig
The comments are spot on and should be near the central API, not just near a single implementation. Signed-off-by: Christoph Hellwig <hch@lst.de>
2019-09-04kbuild,arc: add CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 for ARCMasahiro Yamada
arch/arc/Makefile overrides -O2 with -O3. This is the only user of ARCH_CFLAGS. There is no user of ARCH_CPPFLAGS or ARCH_AFLAGS. My plan is to remove ARCH_{CPP,A,C}FLAGS after refactoring the ARC Makefile. Currently, ARC has no way to enable -Wmaybe-uninitialized because both -O3 and -Os disable it. Enabling it will be useful for compile-testing. This commit allows allmodconfig (, which defaults to -O2) to enable it. Add CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y to all the defconfig files in arch/arc/configs/ in order to keep the current config settings. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Vineet Gupta <vgupta@synopsys.com>
2019-09-03Merge tag 'amlogic-dt64-2.1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt arm64: dts: Amlogic updates for v5.4 (round 2) - new board: Khadas VIM3L (SM1/S905D3 SoC) - support power domains on G12[AB] and SM1 SoCs - DT binding fixups based on YAML schema - add a bunch of remote control keymap - enable DVFS on SM1/SEI610 board * tag 'amlogic-dt64-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (44 commits) arm64: dts: meson-sm1-sei610: add stdout-path property back arm64: dts: meson-sm1-sei610: enable DVFS arm64: dts: khadas-vim3: add support for the SM1 based VIM3L dt-bindings: arm: amlogic: add Amlogic SM1 based Khadas VIM3L bindings arm64: dts: khadas-vim3: move common nodes into meson-khadas-vim3.dtsi arm64: dts: meson: g12a: add reset to tdm formatters arm64: dts: meson: g12a: audio clock controller provides resets arm64: dts: meson-sm1-sei610: enable DVFS arm64: dts: meson-gxm-khadas-vim2: use rc-khadas keymap arm64: dts: meson-gxl-s905w-tx3-mini: add rc-tx3mini keymap arm64: dts: meson-gxl-s905x-khadas-vim: use rc-khadas keymap arm64: dts: meson-gxbb-wetek-play2: add rc-wetek-play2 keymap arm64: dts: meson-gxbb-wetek-hub: add rc-wetek-hub keymap arm64: dts: meson-g12a-x96-max: add rc-x96max keymap arm64: dts: meson-g12b-odroid-n2: add rc-odroid keymap arm64: dts: meson-sm1-sei610: add USB support arm64: dts: meson-sm1-sei610: add HDMI display support arm64: dts: meson-g12: add Everything-Else power domain controller arm64: dts: meson: fix boards regulators states format arm64: dts: meson-gxbb-p201: fix snps, reset-delays-us format ... Link: https://patchwork.kernel.org/patch/11122331/ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'renesas-arm-soc-for-v5.4-tag1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc Renesas ARM SoC updates for v5.4 - Low-level debugging support for RZ/A2M. * tag 'renesas-arm-soc-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: debug-ll: Add support for r7s9210 Link: https://lore.kernel.org/r/20190823123643.18799-3-geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'zynq-soc-for-v5.4' of https://github.com/Xilinx/linux-xlnx into ↵Arnd Bergmann
arm/soc ARM: Xilinx Zynq SoC patches for v5.4 - Add support for SMP in thumb mode - Fix SMP trampoline code when FORTIFY_SOURCE is enabled * tag 'zynq-soc-for-v5.4' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up ARM: zynq: Support smp in thumb mode Link: https://lore.kernel.org/r/8e00ba70-9403-4bf7-2870-a94758e37346@monstr.eu Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03ARM: scoop: Use the right includeLinus Walleij
This is a GPIO driver so it should include <linux/gpio/driver.h> not <linux/gpio.h> Link: https://lore.kernel.org/r/20190820103429.7028-1-linus.walleij@linaro.org Cc: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03x86/amd_nb: Add PCI device IDs for family 17h, model 70hMarcel Bocu
The AMD Ryzen gen 3 processors came with a different PCI IDs for the function 3 & 4 which are used to access the SMN interface. The root PCI address however remained at the same address as the model 30h. Adding the F3/F4 PCI IDs respectively to the misc and link ids appear to be sufficient for k10temp, so let's add them and follow up on the patch if other functions need more tweaking. Vicki Pfau sent an identical patch after I checked that no-one had written this patch. I would have been happy about dropping my patch but unlike for his patch series, I had already Cc:ed the x86 people and they already reviewed the changes. Since Vicki has not answered to any email after his initial series, let's assume she is on vacation and let's avoid duplication of reviews from the maintainers and merge my series. To acknowledge Vicki's anteriority, I added her S-o-b to the patch. v2, suggested by Guenter Roeck and Brian Woods: - rename from 71h to 70h Signed-off-by: Vicki Pfau <vi@endrift.com> Signed-off-by: Marcel Bocu <marcel.p.bocu@gmail.com> Tested-by: Marcel Bocu <marcel.p.bocu@gmail.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Brian Woods <brian.woods@amd.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> # pci_ids.h Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: x86@kernel.org Cc: "Woods, Brian" <Brian.Woods@amd.com> Cc: Clemens Ladisch <clemens@ladisch.de> Cc: Jean Delvare <jdelvare@suse.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: linux-hwmon@vger.kernel.org Link: https://lore.kernel.org/r/20190722174510.2179-1-marcel.p.bocu@gmail.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2019-09-03Merge tag 'imx-defconfig-5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig i.MX defconfig update for 5.4: - Enable pinctrl and clock driver support for i.MX8MN SoC. - Enable SDMA support for i.MX8MQ and i.MX8MM SoC, including FW_LOADER_USER_HELPER and FW_LOADER_USER_HELPER_FALLBACK to support SDMA firmware loading via udev. - Enable module build of i.MX8 DDR PMU driver and ETNAVIV GPU driver. - Enable module build of OV5645 camera driver in imx_v6_v7_defconfig. * tag 'imx-defconfig-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: defconfig: CONFIG_DRM_ETNAVIV=m ARM: imx_v6_v7_defconfig: Select the OV5645 camera driver arm64: defconfig: Build imx8 ddr pmu as module arm64: defconfig: Select CONFIG_CLK_IMX8MN by default arm64: defconfig: Select CONFIG_PINCTRL_IMX8MN by default arm64: defconfig: Enable SDMA on i.mx8mq/8mm Link: https://lore.kernel.org/r/20190825153237.28829-7-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'aspeed-5.4-defconfig' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/defconfig ASPEED defconfig updates for 5.4 - Enable the new AST2600 in multi_v7 and the aspeed_g5 configs. - Regenerate defconfigs to drop old options - Clean up network options * tag 'aspeed-5.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: ARM: configs: aspeed_g5: Enable AST2600 ARM: configs: multi_v7: Add ASPEED G6 ARM: configs: aspeed: Refresh defconfigs ARM: configs: aspeed: Enable commonly used network functionality Link: https://lore.kernel.org/r/CACPK8XdyWzghA0QPDzA_MK5FYwhT5afqDJHNdhc8mfD2uk8MfQ@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'sunxi-config64-for-5.4-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig Allwinner arm64 defconfig changes for 5.4 Two patches to enable the IR receiver and the SPDIF transceiver found on the Allwinner SoCs. * tag 'sunxi-config64-for-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: defconfig: Enable Sun4i SPDIF module arm64: defconfig: Enable IR SUNXI option Link: https://lore.kernel.org/r/24f215ca-f3a8-4497-bf98-9ba1808b37be.lettre@localhost Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'arm64_defconfig_watchdog_for_v5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/defconfig arm64 defconfig for v5.4 - Add CONFIG_DW_WATCHDOG to support the Designware watchdog driver * tag 'arm64_defconfig_watchdog_for_v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: defconfig: Enable the DesignWare watchdog Link: https://lore.kernel.org/r/20190819141659.26414-2-dinguyen@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'hisi-arm64-defconfig-for-5.4' of ↵Arnd Bergmann
git://github.com/hisilicon/linux-hisi into arm/defconfig ARM64: hisilicon: defconfig updates for v5.4 - Enable ACPI_APEI_PCIEAER for the hisilicon D06 board to support PCIe AER error report * tag 'hisi-arm64-defconfig-for-5.4' of git://github.com/hisilicon/linux-hisi: arm64: defconfig: Enable CONFIG_ACPI_APEI_PCIEAER Link: https://lore.kernel.org/r/5D562573.5030604@hisilicon.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'ux500-dts-v5.4-3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt More Ux500 device tree updates for the v5.4 kernel: - Drop TV-OUT muxgroup from the HREF pin control - Fix up BU21013 touchpad from Dmitry - Split of AB8500 config in its own DTSI - Drop the unused USB regulator config - Add proper thermal zone for the CPU * tag 'ux500-dts-v5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: dts: ux500: Update thermal zone ARM: dts: ux500: Remove ab8500_ldo_usb regulator from device tree ARM: dts: ux500: Move ab8500 nodes to ste-ab8500.dtsi ARM: ux500: improve BU21013 touchpad bindings ARM: dts: ux500: Drop TV-out muxgroup on HREFs Link: https://lore.kernel.org/r/CACRpkdZ9Xvx+rg-hFVgG61_i2CdQSs+nZq5FXkkK2-3Ce9ooWg@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03mips: compat: vdso: Use legacy syscalls as fallbackVincenzo Frascino
The generic VDSO implementation uses the Y2038 safe clock_gettime64() and clock_getres_time64() syscalls as fallback for 32bit VDSO. This breaks seccomp setups because these syscalls might be not (yet) allowed. Implement the 32bit variants which use the legacy syscalls and select the variant in the core library. The 64bit time variants are not removed because they are required for the time64 based vdso accessors. Cc: Paul Burton <paul.burton@mips.com> Fixes: 00b26474c2f1 ("lib/vdso: Provide generic VDSO implementation") Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-arch@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@vger.kernel.org Cc: linux-kselftest@vger.kernel.org Cc: catalin.marinas@arm.com Cc: will@kernel.org Cc: tglx@linutronix.de Cc: salyzyn@android.com Cc: 0x7f454c46@gmail.com Cc: luto@kernel.org
2019-09-03Merge tag 'mvebu-dt64-5.4-1' of git://git.infradead.org/linux-mvebu into arm/dtArnd Bergmann
mvebu dt64 for 5.4 (part 1) - Add mailbox support on Armada 37xx - Add cpu clock node needed for CPU freq on Armada 7K/8K - Enhance CP110 COMPHY support used by PCIe, USB3 and SATA * tag 'mvebu-dt64-5.4-1' of git://git.infradead.org/linux-mvebu: arm64: dts: marvell: Add cpu clock node on Armada 7K/8K arm64: dts: marvell: Convert 7k/8k usb-phy properties to phy-supply arm64: dts: marvell: Add 7k/8k PHYs in PCIe nodes arm64: dts: marvell: Add 7k/8k PHYs in USB3 nodes arm64: dts: marvell: Add 7k/8k per-port PHYs in SATA nodes arm64: dts: marvell: Add CP110 COMPHY clocks arm64: dts: marvell: armada-37xx: add mailbox node Link: https://lore.kernel.org/r/875zmhzjml.fsf@FE-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'mvebu-dt-5.4-1' of git://git.infradead.org/linux-mvebu into arm/dtArnd Bergmann
mvebu dt for 5.4 (part 1) - Disable the kirkwood RTC that doesn't work on the ts219 board * tag 'mvebu-dt-5.4-1' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: ts219: disable the SoC's RTC Link: https://lore.kernel.org/r/878srdzjpj.fsf@FE-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'at91-5.4-dt' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt AT91 DT for 5.4 - style cleanup for at91sam9x5 based boards - avoid colliding node and property names * tag 'at91-5.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: at91: at91sam9x5dm.dtsi: Style cleanup ARM: dts: at91: at91sam9x5_lcd.dtsi: Style cleanup ARM: dts: at91: at91sam9xx5ek: Style cleanup ARM: dts: at91: at91sam9g15: Style cleanup ARM: dts: at91: kizboxmini: Style cleanup ARM: dts: at91: cosino: Style cleanup ARM: dts: at91: ariettag25: style cleanup ARM: dts: at91: ariag25: Style cleanup ARM: dts: at91: Add label for sam9x5's internal RTC dt-bindings: add vendor prefix "acme" for "Acme Systems srl" ARM: dts: at91: Avoid colliding 'display' node and property names Link: https://lore.kernel.org/r/20190825202642.GA18853@piout.net Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'imx-dt64-5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt i.MX arm64 device tree update for 5.4: - New board support: i.MX8MQ Nitrogen8m, Hummingboard Pulse, PICO-PI-IMX8M, i.MX8QXP AI_ML, and LS1046A FRWY board. - Add gpio-ranges for GPIO devices on i.MX8MQ and i.MX8MM. - Update OPP table according to latest data sheet and add opp-suspend to OPP table for i.MX8MQ and i.MX8MM. - Add IDEL states for i.MX8MM SoC. - Correct I2C clock divider for Layerscape SoCs. - Add series alias and LPUART baud clock for i.MX8QXP SoC. - Add MIPI D-PHY device for i.MX8MQ and enable it on imx8mq-librem5 board. - Enable USB1 and Type-C support for i.MX8MM EVK board. - Add Thermal Monitor Unit support for LS1028A SoC. - Misc small update and correction on Layerscape and i.MX8 support. * tag 'imx-dt64-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (41 commits) arm64: dts: imx8mq: Add mux controller to iomuxc_gpr arm64: dts: fsl: add support for Hummingboard Pulse arm64: dts: ls1088a: update gpio compatible arm64: dts: imx: Add i.mx8mq nitrogen8m basic dts support arm64: dts: ls1088a-qds: Add the spi-flash nodes under the DSPI controller arm64: dts: ls1088a: Add the DSPI controller node arm64: dts: imx8mm: Enable cpu-idle driver arm64: dts: ls1028a: Add esdhc node in dts arm64: dts: ls1028a: Add properties node for Display output pixel clock arm64: dts: lx2160a: Fix incorrect I2C clock divider arm64: dts: ls1028a: Fix incorrect I2C clock divider arm64: dts: ls1012a: Fix incorrect I2C clock divider arm64: dts: ls1088a: Fix incorrect I2C clock divider arm64: dts: ls1028a: fix gpio nodes arm64: dts: ls1028a: Add Thermal Monitor Unit node arm64: dts: imx8mq-evk: Unbypass audio_pll1 arm64: dts: imx8mm: Add opp-suspend property to OPP table arm64: dts: imx8mq: Add opp-suspend property to OPP table arm64: dts: ls1088a: Revise gpio registers to little-endian arm64: dts: add the console node for DPAA2 platforms ... Link: https://lore.kernel.org/r/20190825153237.28829-6-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'imx-dt-5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt i.MX arm32 device tree changes for 5.4: - New board support: ZII i.MX7 RMU2, Kontron i.MX6UL N6310, and PHYTEC phyBOARD-Segin based on i.MX6ULL. - A series from Andrey Smirnov to update vf610-zii boards on I2C pinmux, switch watchdog, GPIO expander IRQ. - Move GIC node into soc node for i.MX6 SoCs. - Add OV5645 camera support for imx6qdl-wandboard board. - Drop unneeded snvs_pwrkey node for imx7d-zii-rpu2 and imx7-colibri. - Use simple-mfd instead of simple-bus for i.MX6 ANATOP. - Move the native-mode property inside the display-timings node for various i.MX25 and i.MX27 boards. - Add EDMA devices for i.MX7ULP SoC. - A series from Stefan Riedmueller to update imx6ul-phytec-segin board on various devices. - Use OF graph to describe the display for opos6uldev board. - Misc random updates on i.MX7/6 boards. * tag 'imx-dt-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (53 commits) ARM: dts: vf610-zii-scu4-aib: Configure IRQ line for GPIO expander ARM: dts: imx6ul-kontron-n6310: Add Kontron i.MX6UL N6310 SoM and boards ARM: dts: vf610-zii-cfu1: Slow I2C0 down to 100 kHz ARM: dts: pbab01: correct rtc vendor ARM: vf610-zii-cfu1: Add node for switch watchdog ARM: dts: imx6: drop gpmi-nand address and size cells ARM: dts: imx6: replace simple-bus by simple-mfd for anatop ARM: dts: imx6qdl-colibri: add phy to fec ARM: dts: imx7-colibri: add recovery for I2C for iMX7 ARM: dts: imx7-colibri: Add sleep pinctrl to ethernet ARM: dts: imx7-colibri: prepare module device tree for FlexCAN ARM: dts: imx7-colibri: disable HS400 ARM: dts: imx7-colibri: make sure module supplies are always on ARM: dts: imx7d: cl-som-imx7: add compatible for phy ARM: dts: imx7d: cl-som-imx7: make ethernet work again ARM: dts: imx6ul: Add csi node ARM: dts: imx25: mbimxsd25: native-mode is part of display-timings ARM: dts: apf27dev: native-mode is part of display-timings ARM: dts: edb7211: native-mode is part of display-timings ARM: dts: imx27-phytec-phycore-rdk: native-mode is part of display-timings ... Link: https://lore.kernel.org/r/20190825153237.28829-5-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'imx-dt-clkdep-5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt i.MX device tree update with new clocks: - A series from Anson Huang to add i.MX8MN SoC and DDR4 EVK board device tree support. - Add DSP device tree support for i.MX8QXP SoC. * tag 'imx-dt-clkdep-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8qxp: Add DSP DT node arm64: dts: imx8mn: Add cpu-freq support arm64: dts: imx8mn-ddr4-evk: Add rohm,bd71847 PMIC support arm64: dts: imx8mn-ddr4-evk: Add i2c1 support arm64: dts: freescale: Add i.MX8MN DDR4 EVK board support arm64: dts: imx8mn: Add gpio-ranges property arm64: dts: freescale: Add i.MX8MN dtsi support clk: imx8: Add DSP related clocks clk: imx: Add support for i.MX8MN clock driver clk: imx: Add API for clk unregister when driver probe fail clk: imx8mm: Make 1416X/1443X PLL macro definitions common for usage dt-bindings: imx: Add clock binding doc for i.MX8MN Link: https://lore.kernel.org/r/20190825153237.28829-4-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'gpio-v5.4-updates-for-linus' of ↵Linus Walleij
git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel gpio: updates for v5.4 - use a helper variable for &pdev->dev in gpio-em - tweak the ifdefs in GPIO headers - fix function links in HTML docs - remove an unneeded error message from ixp4xx - use the optional clk_get in gpio-mxc instead of checking the return value - a couple improvements in pca953x - allow to build gpio-lpc32xx on non-lpc32xx targets
2019-09-03Merge tag 'aspeed-5.4-devicetree' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt ASPEED device tree updates for 5.4 New machines: - Facebook Wedge100, Wedge40 and Minipack - Lenovo Hr855xg2 - Wistron Mihawk There's a few other updates, notably some changes to to use the newly added SDHCI driver. * tag 'aspeed-5.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: ARM: dts: aspeed: swift: Add eMMC device ARM: dts: aspeed: Enable first MMC slot on AST2500 EVB ARM: dts: aspeed: Describe SD controllers ARM: dts: aspeed: Add Mihawk BMC platform ARM: dts: aspeed: fp5280g2: Fix power supply address ARM: dts: aspeed: tiogapass: Add Riser card ARM: dts: aspeed: tiogapass: Move battery sensor ARM: dts: aspeed: Add Facebook Wedge100 BMC ARM: dts: aspeed: Add Facebook Wedge40 BMC ARM: dts: aspeed: swift: Fix FSI GPIOs ARM: dts: aspeed: Add SGPM pinmux ARM: dts: aspeed: tiogapass: Add VR devices ARM: dts: aspeed: Add Lenovo Hr855xg2 BMC ARM: dts: aspeed: Add Facebook Minipack BMC Link: https://lore.kernel.org/r/CACPK8XfKHpNYXNE_VRaLeGUQa7-hkmUS0nsPfaeSLE4sckKFHg@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'omap-for-v5.4/dt-take2-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt dts changes for omap variants for v5.4 Remove regulator-boot-off properties that we never had in the mainline kernel so they won't do anything. We add stdout-path for gta04, and make am335x-boneblue use am335x-osd335x-common.dtsi file. * tag 'omap-for-v5.4/dt-take2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-boneblue: Use of am335x-osd335x-common.dtsi ARM: dts: gta04: define chosen/stdout-path ARM: dts: omap3-n950-n9: Remove regulator-boot-off property ARM: dts: am335x-cm-t335: Remove regulator-boot-off property Link: https://lore.kernel.org/r/pull-1566599057-142651@atomide.com-2 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'v5.3-next-dts64' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt mt8183: - fix pwrap interrupt number - add i2c notes dt-bindings: - add compatible for mt6779 - add mt6779 uart and sysirq compatible * tag 'v5.3-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: dt-bindings: irq: mtk, sysirq: add support for mt6779 dt-bindings: mtk-uart: add mt6779 uart bindings dt-bindings: mediatek: add support for mt6779 reference board arm64: dts: mt8183: add I2C nodes arm64: dts: mt8183: fix pwrap gic number Link: https://lore.kernel.org/r/def8fb77-fce4-097d-7ae2-8c4670bc09c1@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'v5.3-next-dts32' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt add support for the mt7629 reference board * tag 'v5.3-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: arm: dts: mediatek: add basic support for MT7629 SoC Link: https://lore.kernel.org/r/e236f659-2851-21b8-1873-314cd72ed6be@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'sunxi-dt-for-5.4-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt Allwinner DT changes for 5.4 Our usual pile of patches for the next release, which include mostly: - More fixes thanks to the DT validation using the YAML bindings - IR receiver support on the H6 - SPDIF support on the H6 - I2C Support on the H6 - CSI support on the A20 - RTC support on the H6 - New Boards: Lichee Zero Plus, Tanix TX6, A64-Olinuxino-eMMC * tag 'sunxi-dt-for-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (40 commits) arm64: dts: allwinner: orange-pi-3: Enable WiFi ARM: dts: sunxi: Add missing watchdog clocks ARM: dts: sunxi: Add missing watchdog interrupts arm64: dts: allwinner: h6: Add support for RTC and fix the clock tree ARM: dts: sun7i: Add CSI0 controller arm64: dts: allwinner: a64: Add A64 OlinuXino board (with eMMC) dt-bindings: arm: sunxi: Add compatible for A64 OlinuXino with eMMC ARM: dts: v3s: Change the timers compatible ARM: dts: h3: Change the timers compatible ARM: dts: a83t: Change the timers compatible ARM: dts: a23/a33: Change the timers compatible ARM: dts: sun6i: Add missing timers interrupts ARM: dts: sun5i: Add missing timers interrupts ARM: dts: sun4i: Add missing timers interrupts dt-bindings: mfd: Convert Allwinner GPADC bindings to a schema arm64: dts: allwinner: h6: Introduce Tanix TX6 board dt-bindings: arm: sunxi: Add compatible for Tanix TX6 board arm64: allwinner: h6: add I2C nodes dt-bindings: i2c: mv64xxx: Add compatible for the H6 i2c node. ARM: dts: sunxi: Add mdio bus sub-node to GMAC ... Link: https://lore.kernel.org/r/d97e6252-9dd7-4cf5-a3cf-56f78b0ca455.lettre@localhost Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03arm64: bpf: optimize modulo operationJerin Jacob
Optimize modulo operation instruction generation by using single MSUB instruction vs MUL followed by SUB instruction scheme. Signed-off-by: Jerin Jacob <jerinj@marvell.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2019-09-03Merge tag 'renesas-arm64-dt-for-v5.4-tag2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt Renesas ARM64 DT updates for v5.4 (take two) - Sort nodes in various SoC and board DTSes, - HDMI sound for HiHope RZ/G2M and R-Car M3-N Salvator-X(S) boards, - Limit EtherAVB to 100Mbps on the Ebisu and Draak boards, - Small fixes and improvements. * tag 'renesas-arm64-dt-for-v5.4-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: (21 commits) arm64: dts: renesas: Update 'vsps' properties for readability arm64: dts: renesas: r8a77965-salvator-x(s): Enable HDMI sound arm64: dts: renesas: r8a774c0: Fix register range of display node arm64: dts: renesas: r8a77970: Sort nodes arm64: dts: renesas: r8a7796: Sort nodes arm64: dts: renesas: r8a774c0: Sort nodes arm64: dts: renesas: r8a774c0: cat874: Sort nodes arm64: dts: renesas: r8a774a1: Sort nodes arm64: dts: renesas: r8a77980: Fix IPMMU-VC0 base address arm64: dts: renesas: ebisu, draak: Limit EtherAVB to 100Mbps arm64: dts: renesas: hihope-common: Add HDMI audio support arm64: dts: renesas: r8a774c0: cat874: Add definition for 12V regulator arm64: dts: renesas: r8a774c0: Point LVDS0 to its companion LVDS1 arm64: dts: renesas: r8a77995: Sort nodes arm64: dts: renesas: r8a77995: draak: Sort nodes arm64: dts: renesas: r8a77990: Sort nodes arm64: dts: renesas: r8a77990: ebisu: Sort nodes arm64: dts: renesas: r8a77980: v3hsk: Sort nodes arm64: dts: renesas: r8a77980: condor: Sort nodes arm64: dts: renesas: r8a77970: v3msk: Sort nodes ... Link: https://lore.kernel.org/r/20190823123643.18799-4-geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'renesas-arm-dt-for-v5.4-tag1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt Renesas ARM DT updates for v5.4 - Fix HSCIF PM Domain on R-Car H1, - PMU support for RZ/G1C. * tag 'renesas-arm-dt-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: dts: r8a77470: Add PMU device node ARM: dts: r8a7779: Use SYSC "always-on" PM Domain for HSCIF Link: https://lore.kernel.org/r/20190823123643.18799-2-geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03bpf: s390: add JIT support for bpf line infoYauheni Kaliuta
This adds support for generating bpf line info for JITed programs like commit 6f20c71d8505 ("bpf: powerpc64: add JIT support for bpf line info") does for powerpc, but it should pass the array starting from 1. This fixes test_btf. Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> Acked-by: Ilya Leoshkevich <iii@linux.ibm.com> Tested-by: Ilya Leoshkevich <iii@linux.ibm.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
2019-09-03hypfs: don't bother with d_delete()Al Viro
If that's not the last reference, d_delete() will do d_drop(). If it is, dput() immediately after it will unhash the sucker anyway, since ->d_delete() the method is always_delete_dentry(). IOW, there's no point trying to turn it into a negative hashed dentry - it won't stick around anyway. Just d_drop() it and be done with that. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2019-09-03MIPS: Drop Loongson _CACHE_* definitionsPaul Burton
_CACHE_CACHABLE_NONCOHERENT is defined as 3<<_CACHE_SHIFT by default, so there's no need to define it as such specifically for Loongson. _CACHE_CACHABLE_COHERENT is not used anywhere in the kernel, so there's no need to define it at all. Finally the comment found alongside these definitions seems incorrect - it suggests that we're defining _CACHE_CACHABLE_NONCOHERENT such that it actually provides coherence, but the opposite seems to be true & instead the unused _CACHE_CACHABLE_COHERENT is defined as the typically incoherent value. Delete the whole thing, which will have no effect on the compiled code anyway. Signed-off-by: Paul Burton <paul.burton@mips.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Cc: Huacai Chen <chenhc@lemote.com> Cc: linux-mips@vger.kernel.org
2019-09-03MIPS: tlbex: Remove cpu_has_local_ebasePaul Burton
The cpu_has_local_ebase macro is, confusingly, not used to indicate whether the EBase register is local to a CPU or not. Instead it indicates whether we want to generate the TLB refill exception vector each time a CPU is brought online. Doing this makes little sense on any system, since we always use the same value for EBase & thus we cannot have different TLB refill exception handlers per CPU. Regenerating the code is not only pointless but also can be actively harmful, as commit 8759934e2b6b ("MIPS: Build uasm-generated code only once to avoid CPU Hotplug problem") described. That commit introduced cpu_has_local_ebase to disable the handler regeneration for Loongson machines, but this is by no means a Loongson-specific problem. Remove cpu_has_local_ebase & simply generate the TLB refill handler once during boot, just like the rest of the TLB exception handlers. Signed-off-by: Paul Burton <paul.burton@mips.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Cc: linux-mips@vger.kernel.org
2019-09-03MIPS: tlbex: Simplify r3k checkPaul Burton
We already know whether a CPU has r3k style exceptions, including TLB exceptions, by checking cpu_has_3kex. Remove the list of CPU types in build_tlb_refill_handler() & check cpu_has_3kex instead. Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-mips@vger.kernel.org
2019-09-03MIPS: Select R3k-style TLB in KconfigPaul Burton
Currently areas where we need to determine whether the TLB is R3k-style need to check for either of CONFIG_CPU_R3000 || CONFIG_CPU_TX39XX. Introduce a new CONFIG_CPU_R3K_TLB & select it from both of the above, allowing us to simplify checks for R3k-style TLBs by only checking for this new Kconfig option. Signed-off-by: Paul Burton <paul.burton@mips.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Cc: linux-mips@vger.kernel.org
2019-09-03Merge tag 'amlogic-dt64' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt arm64: dts: Amlogic updates for v5.4 Highlights - new SoCs (G12B family): S922X, A311D - new SoCs (SM1 family): S905X3 - new board: SEI Robotics SEI610 (SM1/S905X3) - new board: Khadas VIM3 (G12B/A311D) - DVFS/CPUfreq support on G12[AB] family * tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (40 commits) arm64: dts: add support for SM1 based SEI Robotics SEI610 dt-bindings: arm: amlogic: add SEI Robotics SEI610 bindings dt-bindings: arm: amlogic: add SM1 bindings arm64: dts: meson-g12b-odroid-n2: enable DVFS arm64: dts: meson-g12b-khadas-vim3: add initial device-tree dt-bindings: arm: amlogic: fix x96-max/sei510 section in amlogic.yaml arm64: dts: amlogic: g12 CPU timers stop in suspend arm64: dts: meson-g12b: support a311d and s922x cpu operating points dt-bindings: arm: amlogic: add support for the Khadas VIM3 dt-bindings: arm: amlogic: add bindings for the Amlogic G12B based A311D SoC dt-bindings: arm: amlogic: add bindings for G12B based S922X SoC arm64: dts: meson: add video decoder entries arm64: dts: meson-gx: add video decoder entry dt-bindings: media: amlogic,vdec: add default compatible arm64: dts: meson: add ethernet fifo sizes arm64: dts: meson-g12b: add cpus OPP tables arm64: dts: meson-g12a: enable DVFS on G12A boards arm64: dts: meson-g12a: add cpus OPP table arm64: dts: meson-g12-common: add pwm_a on GPIOE_2 pinmux arm64: dts: move common G12A & G12B modes to meson-g12-common.dtsi ... Link: https://lore.kernel.org/r/7hr25fbi4v.fsf@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'amlogic-dt' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt ARM: dts: Amlogic updates for v5.4 Highlights - odroid-c1: use MAC address from efuse - add VDD_EE regulator to several boards * tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM: dts: meson8b: odroidc1: use the MAC address stored in the eFuse ARM: dts: meson8b: mxq: add the VDDEE regulator ARM: dts: meson8b: odroidc1: add the VDDEE regulator ARM: dts: meson8b: ec100: add the VDDEE regulator ARM: dts: meson8b: add the PWM_D output pin ARM: dts: meson8b: add ethernet fifo sizes Link: https://lore.kernel.org/r/7hzhk3bi96.fsf@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'socfpga_dts_updates_for_v5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt SoCFPGA DTS updates for v5.4 - Add reset properties for various peripherals - QSPI OCP and DMA on Arria10 - DMA on Agilex/Stratix10 - Update NAND controller bindings to match driver update - Add NAND controller to Stratix10 - VINING FPGA board fixups - Update button mapping - Adjust GMAC1 clock and TXD skew settings - Add missing reset-names for dma controller * tag 'socfpga_dts_updates_for_v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: dts: socfpga: add missing reset-names for dma ARM: dts: socfpga: Adjust GMAC1 clock and TXD lines skew on VINING FPGA ARM: dts: socfpga: Fix up button mapping on VINING FPGA arm64: dts: stratix10: Add NAND device node ARM: dts: socfpga: update to new Denali NAND binding arm64: dts: agilex/stratix10: Add reset properties for DMA ARM: dts: socfpga: add reset properties for DMA ARM: dts: socfpga: add the QSPI OCP reset property on arria10 Link: https://lore.kernel.org/r/20190819141659.26414-1-dinguyen@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'v5.4-rockchip-dts64-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt PWM-Fan and nor-flash for the RockPro64, a better display mode for the Kevin Chromebook and a new board the Leez P710 SBC. * tag 'v5.4-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add dts for Leez RK3399 P710 SBC arm64: dts: rockchip: enable internal SPI flash for RockPro64. arm64: dts: rockchip: Add PWM fan for RockPro64 arm64: dts: rockchip: Specify override mode for kevin panel Link: https://lore.kernel.org/r/20190819141659.26414-1-dinguyen@kernel.org Link: https://lore.kernel.org/r/2362486.gYoCZEsBuK@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'v5.4-rockchip-dts32-1' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt A lot more love for Veyron devices with cleanups in the display and wifi areas and also a 100ms speedup as a delay isn't needed anymore. New boards are Tiger and Fievel from the Veyron family and the Mecer Xtreme Mini S6, which I think is the first consumer-grade rk3229-based device in the kernel. * tag 'v5.4-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: add device tree for Mecer Xtreme Mini S6 Revert "ARM: dts: rockchip: add startup delay to rk3288-veyron panel-regulators" ARM: dts: rockchip: Add pin names for rk3288-veyron fievel ARM: dts: rockchip: A few fixes for veyron-{fievel,tiger} ARM: dts: rockchip: Cleanup style around assignment operator ARM: dts: rockchip: add veyron-tiger board ARM: dts: rockchip: add veyron-fievel board dt-bindings: ARM: dts: rockchip: Add bindings for rk3288-veyron-{fievel,tiger} ARM: dts: rockchip: consolidate veyron panel and backlight settings ARM: dts: rockchip: move rk3288-veryon display settings into a separate file ARM: dts: rockchip: Limit WiFi TX power on rk3288-veyron-jerry ARM: dts: rockchip: Specify rk3288-veyron-minnie's display timings ARM: dts: rockchip: Specify rk3288-veyron-chromebook's display timings Link: https://lore.kernel.org/r/1611583.rKl1eQBRh8@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'samsung-dt-5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt Samsung DTS ARM changes for v5.4 1. Add AHCI to Exynos5250, 2. Add camera and GPU power domains to Exynos5422, 3. Minor cleanup. * tag 'samsung-dt-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Add CAM power domain to Exynos5422/5800 ARM: dts: exynos: Add G3D power domain to Exynos542x ARM: dts: exynos: Move MSC power domain to the right (sorted) place ARM: dts: exynos: Add port map to Exynos5250 AHCI node ARM: dts: exynos: Use space after '=' in exynos4412-itop-scp-core Link: https://lore.kernel.org/r/20190816163042.6604-2-krzk@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'omap-for-v5.4/soc-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc SoC changes for omap variants for v5.4 The first change moves platform-specific asm-offsets.h to arch/arm/mach-omap2 to fix iessu with parallel build with CONFIG_IKHEADERS, and the second change removes a useless kfree. Note that the first change causes a trivial merge conflict with the iommu changes for arch/arm/mach-omap2/Makefile. * tag 'omap-for-v5.4/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Delete an unnecessary kfree() call in omap_hsmmc_pdata_init() ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2 Link: https://lore.kernel.org/r/pull-1567016893-318461@atomide.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'at91-5.4-soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc AT91 SoC for 5.4 - MAINTAINERS updates - a generated headers parallel build fix * tag 'at91-5.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: mailmap: map old company name to new one @microchip.com MAINTAINERS: at91: remove the TC entry MAINTAINERS: at91: Collect all pinctrl/gpio drivers in same entry ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 Link: https://lore.kernel.org/r/20190825203222.GA22800@piout.net Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2019-09-03Merge tag 'imx-soc-5.4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc i.MX SoC changes for 5.4: - Drop AR8031 PHY TX delay adjusting from i.MX7D machine code, as it's superfluous due to the recent changes to Atheros AT803X driver. - Select TIMER_IMX_SYS_CTR for arm64 ARCH_MXC platform, since the system counter is needed as broadcast timer for cpuidle support. * tag 'imx-soc-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: stop adjusting ar8031 phy tx delay arm64: Enable TIMER_IMX_SYS_CTR for ARCH_MXC platforms Link: https://lore.kernel.org/r/20190825153237.28829-2-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
generated by cgit (git 2.34.1) at 2025-09-30 18:40:49 +0000