summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2021-08-16Merge tag 'tegra-for-5.15-arm-dt' of ↵Arnd Bergmann12-62/+218
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt ARM: tegra: Device tree changes for v5.15-rc1 The majority of this is temperature sensor additions for various devices and fixes to the trigger type of the thermal interrupts. Other than that there are various minor fixes across the board. * tag 'tegra-for-5.15-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: tamonten: Fix UART pad setting ARM: tegra: nexus7: Improve thermal zones ARM: tegra: acer-a500: Improve thermal zones ARM: tegra: acer-a500: Use verbose variant of atmel,wakeup-method value ARM: tegra: acer-a500: Add power supplies to accelerometer ARM: tegra: acer-a500: Remove bogus USB VBUS regulators ARM: tegra: jetson-tk1: Correct interrupt trigger type of temperature sensor ARM: tegra: dalmore: Correct interrupt trigger type of temperature sensor ARM: tegra: cardhu: Correct interrupt trigger type of temperature sensor ARM: tegra: apalis: Correct interrupt trigger type of temperature sensor ARM: tegra: nyan: Correct interrupt trigger type of temperature sensor ARM: tegra: acer-a500: Add interrupt to temperature sensor node ARM: tegra: nexus7: Add interrupt to temperature sensor node ARM: tegra: paz00: Add interrupt to temperature sensor node ARM: tegra: ouya: Add interrupt to temperature sensor node ARM: tegra: Add SoC thermal sensor to Tegra30 device-trees Link: https://lore.kernel.org/r/20210813162157.2820913-4-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-16Merge tag 'renesas-arm-dt-for-v5.15-tag2' of ↵Arnd Bergmann2-0/+16
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt Renesas ARM DT updates for v5.15 (take two) - Pin control, ADC, and CANFD support for the RZ/G2L SoC, - Add interrupt-names properties to the Renesas RZ/A and RZ/G2L I2C Bus Interface. * tag 'renesas-arm-dt-for-v5.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: dt-bindings: i2c: renesas,riic: Make interrupt-names required arm64: dts: renesas: r9a07g044: Add I2C interrupt-names ARM: dts: rza: Add I2C interrupt-names dt-bindings: i2c: renesas,riic: Add interrupt-names arm64: dts: renesas: r9a07g044: Add CANFD node arm64: dts: renesas: r9a07g044: Add ADC node arm64: dts: renesas: r9a07g044: Add pinctrl node dt-bindings: clock: r9a07g044-cpg: Add entry for P0_DIV2 core clock Link: https://lore.kernel.org/r/cover.1628849623.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-16tracing: Refactor TRACE_IRQFLAGS_SUPPORT in KconfigMasahiro Yamada1-4/+1
Make architectures select TRACE_IRQFLAGS_SUPPORT instead of having many defines. Link: https://lkml.kernel.org/r/20210731052233.4703-2-masahiroy@kernel.org Acked-by: Heiko Carstens <hca@linux.ibm.com> Acked-by: Vineet Gupta <vgupta@synopsys.com>   #arch/arc Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
2021-08-16ARM: dts: aspeed: cloudripper: Add comments for "mdio1"Tao Ren1-0/+5
Add some comments to explain the purpose of "mdio1" controller: it's connected to the MDC/MDIO interface of the on-board management switch. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Link: https://lore.kernel.org/r/20210813061900.24539-1-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-16ARM: dts: aspeed: minipack: Update flash partition tableTao Ren1-4/+4
Update firmware flash "data0" partition size from 4MB to 8MB for larger persistent storage on minipack BMC. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Link: https://lore.kernel.org/r/20210720002704.7390-1-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-14ARM: dts: imx6qp-prtwd3: configure ENET_REF clock to 125MHzOleksij Rempel1-0/+2
By default ENET_REF is configured to 50MHz, which is usable for the RMII link. In case RGMII is used, we need 125MHz clock. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2021-08-14ARM: dts: vf610-zii-dev-rev-b: Remove #address-cells and #size-cells ↵Aswath Govindraju1-2/+0
property from at93c46d dt node Remove #address-cells and #size-cells property from at93c46d device tree node as it does not have child nodes. Fixes: 1556063fde42 ("ARM: dts: vf610-zii-dev: Add ZII development board.") Signed-off-by: Aswath Govindraju <a-govindraju@ti.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2021-08-14ARM: imx_v6_v7_defconfig: enable driver of the LTC3676 PMICPascal Zimmermann1-0/+1
The LTC3676 is a PMIC which is used on some i.MX6 based boards (like the DHCOM i.MX6 Quad SoM), it was first used on the GW Ventana board, enable LTC3676 driver in imx_v6_v7_defconfig. Signed-off-by: Pascal Zimmermann <pzimmermann@dh-electronics.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@denx.de> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Marek Vasut <marex@denx.de> Cc: kernel@dh-electronics.com To: linux-arm-kernel@lists.infradead.org Reviewed-by: Marek Vasut <marex@denx.de> Tested-by: Marek Vasut <marex@denx.de> # On DH iMX6Q DHCOM PDK2 Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2021-08-14ARM: dts: add SKOV imx6q and imx6dl based boardsSam Ravnborg8-0/+946
Add SKOV imx6q/dl LT2, LT6 and mi1010ait-1cp1 boards. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Søren Andersen <san@skov.dk> Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
2021-08-13ARM: tegra: tamonten: Fix UART pad settingAndreas Obergschwandtner1-7/+7
This patch fixes the tristate and pullup configuration for UART 1 to 3 on the Tamonten SOM. Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netJakub Kicinski13-31/+58
Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h 9e26680733d5 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp") 9e518f25802c ("bnxt_en: 1PPS functions to configure TSIO pins") 099fdeda659d ("bnxt_en: Event handler for PPS events") kernel/bpf/helpers.c include/linux/bpf-cgroup.h a2baf4e8bb0f ("bpf: Fix potentially incorrect results with bpf_get_local_storage()") c7603cfa04e7 ("bpf: Add ambient BPF runtime context stored in current") drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c 5957cc557dc5 ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray") 2d0b41a37679 ("net/mlx5: Refcount mlx5_irq with integer") MAINTAINERS 7b637cd52f02 ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo") 7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-08-13ARM: ixp4xx: Delete the Freecom FSG-3 boardfilesLinus Walleij4-395/+0
This board is replaced with the corresponding device tree. Acked-by: Marc Zyngier <maz@kernel.org> Tested-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete GTWX5715 board filesLinus Walleij4-259/+0
This board is replaced with the corresponding device tree. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete Coyote and IXDPG425 boardfilesLinus Walleij5-282/+0
These boards are replaced with the corresponding device trees. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete Intel reference design boardfilesLinus Walleij4-453/+0
These boards are replaced with the corresponding device trees. Cc: Deepak Saxena <dsaxena@plexity.net> Cc: Vladimir Barinov <vladimir.barinov@cogentembedded.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete Avila boardfilesLinus Walleij4-307/+0
This board is replaced with the corresponding device tree. There is also the "loft" board which is just a Kconfi entry and which reuses the same boardfile. If there is interest in the Loft variant and someone is willing to test I can create a special DT superset for this board, which only differs in PCI set-up. Cc: Michael-Luke Jones <mlj28@cam.ac.uk> Cc: Deepak Saxena <dsaxena@plexity.net> Cc: Tom Billman <kernel@giantshoulderinc.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete the Arcom Vulcan boardfilesLinus Walleij4-362/+0
This board is replaced with the corresponding device tree. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete Gateway WG302v2 boardfilesLinus Walleij4-184/+0
This board is replaced with the corresponding device tree. Cc: Imre Kaloz <kaloz@openwrt.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete Omicron boardfilesLinus Walleij4-396/+0
These boards are reported obsoleted by the manufacturer and no known community users exist. Cc: Richard Cochran <richardcochran@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete the D-Link DSM-G600 boardfilesLinus Walleij4-392/+0
This board is replaced with the corresponding device tree. Cc: Michael-Luke Jones <mlj28@cam.ac.uk> Cc: Rod Whitby <rod@whitby.id.au> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Michael Westerhof <mwester@dls.net> Cc: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete NAS100D boardfilesLinus Walleij4-437/+0
The NAS100D is now completely migrated to use device tree exclusively so delete the boardfiles. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: ixp4xx: Delete NSLU2 boardfilesLinus Walleij4-421/+0
The NSLU2 is now completely migrated to use device tree exclusively so delete the boardfiles. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2021-08-13ARM: tegra: nexus7: Improve thermal zonesDmitry Osipenko1-4/+52
Use skin temperature for maintaining temperature that is suitable specifically for Nexus 7. Add CPU thermal zone that protects silicon. All these changes don't make a significant difference, but it is a more correct definition of thermal zones. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: acer-a500: Improve thermal zonesDmitry Osipenko1-9/+46
Use skin temperature for maintaining temperature that is suitable specifically for A500. Add CPU thermal zone that protects silicon. All these changes don't make a significant difference, but it is a more correct definition of thermal zones. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: acer-a500: Use verbose variant of atmel,wakeup-method valueDmitry Osipenko1-1/+2
The verbose variant of the atmel,wakeup-method value was lost when patch that added the property was merged because it conflicted with other patch, re-add it for consistency. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: acer-a500: Add power supplies to accelerometerDmitry Osipenko1-0/+3
Add power supplies to accelerometer node, for completeness. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: acer-a500: Remove bogus USB VBUS regulatorsDmitry Osipenko1-24/+1
The configuration of USB VBUS regulators was borrowed from downstream kernel, which is incorrect because the corresponding GPIOs are connected to PROX_EN (A501 3G model) and LED_EN pins in accordance to the board schematics. USB works fine with both GPIOs being disabled, so remove the bogus USB VBUS regulators. The USB VBUS of USB3 is supplied from the fixed 5v system regulator and device-mode USB1 doesn't have VBUS switches. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: jetson-tk1: Correct interrupt trigger type of temperature sensorDmitry Osipenko1-1/+1
The LM90 temperature sensor should use edge-triggered interrupt because LM90 hardware doesn't deassert interrupt line until temperature is back to normal state, which results in interrupt storm. Correct the interrupt trigger type. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: dalmore: Correct interrupt trigger type of temperature sensorDmitry Osipenko1-1/+1
The LM90 temperature sensor should use edge-triggered interrupt because LM90 hardware doesn't deassert interrupt line until temperature is back to normal state, which results in interrupt storm. Correct the interrupt trigger type. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: cardhu: Correct interrupt trigger type of temperature sensorDmitry Osipenko1-1/+1
The LM90 temperature sensor should use edge-triggered interrupt because LM90 hardware doesn't deassert interrupt line until temperature is back to normal state, which results in interrupt storm. Correct the interrupt trigger type. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: apalis: Correct interrupt trigger type of temperature sensorDmitry Osipenko2-2/+2
The LM90 temperature sensor should use edge-triggered interrupt because LM90 hardware doesn't deassert interrupt line until temperature is back to normal state, which results in interrupt storm. Correct the interrupt trigger type. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: nyan: Correct interrupt trigger type of temperature sensorDmitry Osipenko1-1/+1
The LM90 temperature sensor should use edge-triggered interrupt because LM90 hardware doesn't deassert interrupt line until temperature is back to normal state, which results in interrupt storm. Correct the interrupt trigger type. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: acer-a500: Add interrupt to temperature sensor nodeDmitry Osipenko1-0/+4
The TEMP_ALERT pin of LM90 temperature sensor is connected to Tegra SoC. Add interrupt property to the temperature sensor for completeness. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: nexus7: Add interrupt to temperature sensor nodeDmitry Osipenko1-0/+4
The TEMP_ALERT pin of LM90 temperature sensor is connected to Tegra SoC. Add interrupt property to the temperature sensor for completeness. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: paz00: Add interrupt to temperature sensor nodeDmitry Osipenko1-0/+4
The TEMP_ALERT pin of LM90 temperature sensor is connected to Tegra SoC. Add interrupt property to the temperature sensor for completeness. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: ouya: Add interrupt to temperature sensor nodeDmitry Osipenko1-7/+6
The TEMP_ALERT pin of LM90 temperature sensor is connected to Tegra SoC. Add interrupt property to the temperature sensor and enable it in pinmux, for completeness. Tested-by: Matt Merhar <mattmerhar@protonmail.com> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: tegra: Add SoC thermal sensor to Tegra30 device-treesDmitry Osipenko1-4/+83
Add the on-chip SoC thermal sensor to Tegra30 device-trees. Now CPU temperature reporting and thermal throttling is available on all Tegra30 devices universally. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
2021-08-13ARM: dts: aspeed: Add Facebook Fuji (AST2600) BMCTao Ren2-0/+1252
Add initial version of device tree for Facebook Fuji (AST2600) BMC. Fuji is Facebook's next generation switch platform with an AST2600 BMC integrated for health monitoring purpose. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Signed-off-by: Joel Stanley <joel@jms.id.au> Link: https://lore.kernel.org/r/20210805222818.8391-7-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-13ARM: dts: aspeed: Add Facebook Elbert (AST2600) BMCTao Ren2-0/+186
Add initial version of device tree for Facebook Elbert (AST2600) BMC. Elbert is Facebook's next generation switch platform with an AST2600 BMC integrated for health monitoring purpose. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Signed-off-by: Joel Stanley <joel@jms.id.au> Link: https://lore.kernel.org/r/20210805222818.8391-6-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-13ARM: dts: aspeed: Add Facebook Cloudripper (AST2600) BMCTao Ren2-0/+540
Add initial version of device tree for Facebook Cloudripper (AST2600) BMC. Cloudripper is Facebook's next generation switch platform with an AST2600 BMC integrated for health monitoring purpose. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Signed-off-by: Joel Stanley <joel@jms.id.au> Link: https://lore.kernel.org/r/20210805222818.8391-5-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-13ARM: dts: aspeed: Common dtsi for Facebook AST2600 Network BMCsTao Ren1-0/+169
This common descirption is included by all Facebook AST2600 Network BMC platforms to minimize duplicated device entries across Facebook Network BMC device trees. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Signed-off-by: Joel Stanley <joel@jms.id.au> Link: https://lore.kernel.org/r/20210805222818.8391-4-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-13ARM: dts: aspeed: wedge400: Use common flash layoutTao Ren1-47/+1
Simplify wedge400 flash layout by using the common layout defined in "facebook-bmc-flash-layout-128.dtsi". Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Signed-off-by: Joel Stanley <joel@jms.id.au> Link: https://lore.kernel.org/r/20210805222818.8391-3-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-13ARM: dts: Add Facebook BMC 128MB flash layoutTao Ren1-0/+60
This is the layout used by Facebook BMC systems. It describes the fixed flash layout of a 128MB mtd device. Signed-off-by: Tao Ren <rentao.bupt@gmail.com> Signed-off-by: Joel Stanley <joel@jms.id.au> Link: https://lore.kernel.org/r/20210805222818.8391-2-rentao.bupt@gmail.com Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-08-13ARM: ixp4xx: fix building both pci driversArnd Bergmann1-24/+24
When both the old and the new PCI drivers are enabled in the same kernel, there are a couple of namespace conflicts that cause a build failure: drivers/pci/controller/pci-ixp4xx.c:38: error: "IXP4XX_PCI_CSR" redefined [-Werror] 38 | #define IXP4XX_PCI_CSR 0x1c | In file included from arch/arm/mach-ixp4xx/include/mach/hardware.h:23, from arch/arm/mach-ixp4xx/include/mach/io.h:15, from arch/arm/include/asm/io.h:198, from include/linux/io.h:13, from drivers/pci/controller/pci-ixp4xx.c:20: arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h:221: note: this is the location of the previous definition 221 | #define IXP4XX_PCI_CSR(x) ((volatile u32 *)(IXP4XX_PCI_CFG_BASE_VIRT+(x))) | drivers/pci/controller/pci-ixp4xx.c:148:12: error: 'ixp4xx_pci_read' redeclared as different kind of symbol 148 | static int ixp4xx_pci_read(struct ixp4xx_pci *p, u32 addr, u32 cmd, u32 *data) | ^~~~~~~~~~~~~~~ Rename both the ixp4xx_pci_read/ixp4xx_pci_write functions and the IXP4XX_PCI_CSR macro. In each case, I went with the version that has fewer callers to keep the change small. Fixes: f7821b493458 ("PCI: ixp4xx: Add a new driver for IXP4xx") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: soc@kernel.org Link: https://lore.kernel.org/r/20210721151546.2325937-1-arnd@kernel.org' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-13ARM: configs: Update the nhk8815_defconfigLinus Walleij1-5/+3
The platform lost the framebuffer due to a commit solving a circular dependency in v5.14-rc1, so add it back in by explicitly selecting the framebuffer. Also fix up some Kconfig options that got dropped or moved around while we're at it. Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Cc: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20210807225518.3607126-1-linus.walleij@linaro.org' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-13Merge tag 'amlogic-arm-configs-for-v5.15' of ↵Arnd Bergmann1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/defconfig Amlogic ARM configs change for v5.15: - Enable CONFIG_MMC_MESON_MX_SDHC controller used on meson8/8b * tag 'amlogic-arm-configs-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: ARM: multi_v7_defconfig: Enable CONFIG_MMC_MESON_MX_SDHC Link: https://lore.kernel.org/r/8e2b5139-86e6-0da3-75c4-d8df66448d51@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-13Merge tag 'at91-defconfig-5.15' of ↵Arnd Bergmann2-0/+211
git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig AT91 defconfig for 5.15: - add defconfig entries for new SoC: SAMA7G5 - dedicated sama7_defconfig which avoids having to carry older drivers and dependencies from the sama5 family: CACHE_L2X0, CAN_AT91, TOUCHSCREEN_ADC, AT91SAM9X_WATCHDOG, VIDEO_ATMEL_ISI, SND_ATMEL_SOC_I2S, MMC_ATMELMCI, AT_HDMAC, AT91_ADC, REGULATOR_ACT* Addition of new drivers that are not part of any sama5 SoC: SND_MCHP_SOC_I2S_MCC, SND_MCHP_SOC_SPDIFTX|RX, MICROCHIP_PIT64B plus upcoming MIPI pipeline, audio sample rate converter, ... It also maintains both sama5 and sama7 defconfig tailored for their respective families and easy to identify. - addition to the generic multi_v7_defconfig * tag 'at91-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: multi_v7_defconfig: add sama7g5 SoC ARM: configs: at91: add defconfig for sama7 family of SoCs Link: https://lore.kernel.org/r/20210809134521.10155-1-nicolas.ferre@microchip.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-12Merge tag 'omap-for-v5.15/dt-am3-signed' of ↵Arnd Bergmann32-209/+194
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt Changes for am3 cpsw and SanCloud for v5.15 A series of changes to update am3 to use cpsw switch driver and few updates to earlier SanCloud changes. The plan was to send the cpsw switch driver changes earlier but looks like I never tagged the mail thread in my inbox to apply for v5.15. * tag 'omap-for-v5.15/dt-am3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-sancloud-bbe: Drop usb wifi comment ARM: dts: am335x-sancloud-bbe: Fix missing pinctrl refs ARM: dts: am335x-bone: switch to new cpsw switch drv ARM: dts: am33xx: update ethernet aliases ARM: dts: am335x-sl50: switch to new cpsw switch drv ARM: dts: am335x-shc: switch to new cpsw switch drv ARM: dts: am335x-phycore: switch to new cpsw switch drv ARM: dts: am335x-pepper: switch to new cpsw switch drv ARM: dts: am335x-pdu001: switch to new cpsw switch drv ARM: dts: am335x-osd3358-sm-red: switch to new cpsw switch drv ARM: dts: am335x-myirtech: switch to new cpsw switch drv ARM: dts: am335x-moxa-uc: switch to new cpsw switch drv ARM: dts: am335x-lxm: switch to new cpsw switch drv ARM: dts: am335x-igep0033: switch to new cpsw switch drv ARM: dts: am335x-cm-t335: switch to new cpsw switch drv ARM: dts: am335x-chiliboard: switch to new cpsw switch drv ARM: dts: am335x-nano: switch to new cpsw switch drv ARM: dts: am335x-baltos: switch to new cpsw switch drv Link: https://lore.kernel.org/r/pull-1628751694-126144@atomide.com-3 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-12Merge tag 'samsung-dt-5.15' of ↵Arnd Bergmann7-6/+146
git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt Samsung DTS ARM changes for v5.15 Add CPU topology to all Exynos DTSI files. * tag 'samsung-dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: add CPU topology to Exynos5422 ARM: dts: exynos: add CPU topology to Exynos5420 ARM: dts: exynos: add CPU topology to Exynos5260 ARM: dts: exynos: add CPU topology to Exynos5250 ARM: dts: exynos: add CPU topology to Exynos4412 ARM: dts: exynos: add CPU topology to Exynos4210 ARM: dts: exynos: add CPU topology to Exynos3250 Link: https://lore.kernel.org/r/20210811085128.30103-1-krzysztof.kozlowski@canonical.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2021-08-12Merge tag 'amlogic-arm-dt-for-v5.15' of ↵Arnd Bergmann6-5/+194
git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt Amlogic ARM DT changes for v5.15: - meson8: use a default higher default GPU clock to solve probe failure - meson: add AIU audio controller and codec for ec100 - meson8b: fix pwm regulator supply property name * tag 'amlogic-arm-dt-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: ARM: dts: meson8b: ec100: Fix the pwm regulator supply properties ARM: dts: meson8b: mxq: Fix the pwm regulator supply properties ARM: dts: meson8b: odroidc1: Fix the pwm regulator supply properties ARM: dts: meson8b: ec100: wire up the RT5640 audio codec ARM: dts: meson: Add the AIU audio controller ARM: dts: meson8: Use a higher default GPU clock frequency Link: https://lore.kernel.org/r/87519792-c9e7-76a6-5db5-0e955286b564@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>