From: Linus Torvalds Date: Thu, 29 Jun 2023 22:22:19 +0000 (-0700) Subject: Merge tag 'soc-drivers-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e4c8d01865118ab148f77bdb54ec9c0c181d90a3;p=linux.git Merge tag 'soc-drivers-6.5' of git://git./linux/kernel/git/soc/soc Pull ARM SoC driver updates from Arnd Bergmann: "Nothing surprising in the SoC specific drivers, with the usual updates: - Added or improved SoC driver support for Tegra234, Exynos4121, RK3588, as well as multiple Mediatek and Qualcomm chips - SCMI firmware gains support for multiple SMC/HVC transport and version 3.2 of the protocol - Cleanups amd minor changes for the reset controller, memory controller, firmware and sram drivers - Minor changes to amd/xilinx, samsung, tegra, nxp, ti, qualcomm, amlogic and renesas SoC specific drivers" * tag 'soc-drivers-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (118 commits) dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding MAINTAINERS: add PHY-related files to Amlogic SoC file list drivers: meson: secure-pwrc: always enable DMA domain tee: optee: Use kmemdup() to replace kmalloc + memcpy soc: qcom: geni-se: Do not bother about enable/disable of interrupts in secondary sequencer dt-bindings: sram: qcom,imem: document qdu1000 soc: qcom: icc-bwmon: Fix MSM8998 count unit dt-bindings: soc: qcom,rpmh-rsc: Require power-domains soc: qcom: socinfo: Add Soc ID for IPQ5300 dt-bindings: arm: qcom,ids: add SoC ID for IPQ5300 soc: qcom: Fix a IS_ERR() vs NULL bug in probe soc: qcom: socinfo: Add support for new fields in revision 19 soc: qcom: socinfo: Add support for new fields in revision 18 dt-bindings: firmware: scm: Add compatible for SDX75 soc: qcom: mdt_loader: Fix split image detection dt-bindings: memory-controllers: drop unneeded quotes soc: rockchip: dtpm: use C99 array init syntax firmware: tegra: bpmp: Add support for DRAM MRQ GSCs soc/tegra: pmc: Use devm_clk_notifier_register() soc/tegra: pmc: Simplify debugfs initialization ... --- e4c8d01865118ab148f77bdb54ec9c0c181d90a3 diff --cc MAINTAINERS index e712fa257161e,21b954e872a6d..4f807f1bc1132 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1906,7 -1910,8 +1906,8 @@@ L: linux-arm-kernel@lists.infradead.or L: linux-amlogic@lists.infradead.org S: Maintained W: http://linux-meson.com/ + F: Documentation/devicetree/bindings/phy/amlogic* -F: arch/arm/boot/dts/meson* +F: arch/arm/boot/dts/amlogic/ F: arch/arm/mach-meson/ F: arch/arm64/boot/dts/amlogic/ F: drivers/mmc/host/meson* @@@ -23267,9 -23120,8 +23268,9 @@@ F: Documentation/devicetree/bindings/ii F: drivers/iio/adc/xilinx-ams.c XILINX AXI ETHERNET DRIVER - M: Radhey Shyam Pandey + M: Radhey Shyam Pandey S: Maintained +F: Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml F: drivers/net/ethernet/xilinx/xilinx_axienet* XILINX CAN DRIVER diff --cc drivers/reset/Kconfig index d9ac540c00ab5,010f7b2c527cf..ccd59ddd76100 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@@ -142,17 -142,7 +142,14 @@@ config RESET_NPC help This enables the reset controller driver for Nuvoton NPCM BMC SoCs. + +config RESET_NUVOTON_MA35D1 + bool "Nuvoton MA35D1 Reset Driver" + depends on ARCH_MA35 || COMPILE_TEST + default ARCH_MA35 + help + This enables the reset controller driver for Nuvoton MA35D1 SoC. - config RESET_OXNAS - bool - config RESET_PISTACHIO bool "Pistachio Reset Driver" depends on MIPS || COMPILE_TEST diff --cc drivers/reset/Makefile index 411b45ba0da70,acb6f824837d3..8270da8a4baa6 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@@ -21,8 -21,6 +21,7 @@@ obj-$(CONFIG_RESET_MCHP_SPARX5) += rese obj-$(CONFIG_RESET_MESON) += reset-meson.o obj-$(CONFIG_RESET_MESON_AUDIO_ARB) += reset-meson-audio-arb.o obj-$(CONFIG_RESET_NPCM) += reset-npcm.o +obj-$(CONFIG_RESET_NUVOTON_MA35D1) += reset-ma35d1.o - obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o obj-$(CONFIG_RESET_PISTACHIO) += reset-pistachio.o obj-$(CONFIG_RESET_POLARFIRE_SOC) += reset-mpfs.o obj-$(CONFIG_RESET_QCOM_AOSS) += reset-qcom-aoss.o