Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'soc-fixes-6.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC fixes from Arnd Bergmann:
"Shawn Guo is moving on from maintaining the NXP i.MX platform and
hands over to Frank Li. Shawn has maintained the platform for 15 years
after initially upstreaming support for i.MX6 and i.MX23/28, and his
work has helped make this the most important industrial embedded Linux
platform. Roughly one out of five devicetree files in mainline kernels
are for the wider i.MX platform. Many thanks to Shawn for the taking
care of the platform all these years!

There are also two additional updates for the MAINTAINERS file, and a
fix for error handling in the qualcomm smem driver"

* tag 'soc-fixes-6.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
MAINTAINERS: Change Sudeep Holla's email address
MAINTAINERS: Add myself as maintainer of hisi_soc_hha
soc: qcom: smem: fix qcom_smem_is_available and check if __smem is valid
MAINTAINERS: Replace Shawn with Frank as i.MX platform maintainer

+28 -21
+2 -1
.mailmap
··· 786 786 Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org> 787 787 Subhash Jadavani <subhashj@codeaurora.org> 788 788 Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org> 789 - Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com> 789 + Sudeep Holla <sudeep.holla@kernel.org> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com> 790 + Sudeep Holla <sudeep.holla@kernel.org> <sudeep.holla@arm.com> 790 791 Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org> 791 792 Sumit Semwal <sumit.semwal@ti.com> 792 793 Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
+23 -18
MAINTAINERS
··· 335 335 ACPI FOR ARM64 (ACPI/arm64) 336 336 M: Lorenzo Pieralisi <lpieralisi@kernel.org> 337 337 M: Hanjun Guo <guohanjun@huawei.com> 338 - M: Sudeep Holla <sudeep.holla@arm.com> 338 + M: Sudeep Holla <sudeep.holla@kernel.org> 339 339 L: linux-acpi@vger.kernel.org 340 340 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 341 341 S: Maintained ··· 351 351 F: include/linux/acpi_rimt.h 352 352 353 353 ACPI PCC(Platform Communication Channel) MAILBOX DRIVER 354 - M: Sudeep Holla <sudeep.holla@arm.com> 354 + M: Sudeep Holla <sudeep.holla@kernel.org> 355 355 L: linux-acpi@vger.kernel.org 356 356 S: Supported 357 357 F: drivers/mailbox/pcc.c ··· 2747 2747 F: arch/arm/mach-footbridge/ 2748 2748 2749 2749 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE 2750 - M: Shawn Guo <shawnguo@kernel.org> 2750 + M: Frank Li <Frank.Li@nxp.com> 2751 2751 M: Sascha Hauer <s.hauer@pengutronix.de> 2752 2752 R: Pengutronix Kernel Team <kernel@pengutronix.de> 2753 2753 R: Fabio Estevam <festevam@gmail.com> 2754 2754 L: imx@lists.linux.dev 2755 2755 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2756 2756 S: Maintained 2757 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git 2757 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git 2758 2758 F: Documentation/devicetree/bindings/firmware/fsl* 2759 2759 F: Documentation/devicetree/bindings/firmware/nxp* 2760 2760 F: arch/arm/boot/dts/nxp/imx/ ··· 2769 2769 N: \bmxc[^\d] 2770 2770 2771 2771 ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE 2772 - M: Shawn Guo <shawnguo@kernel.org> 2772 + M: Frank Li <Frank.Li@nxp.com> 2773 2773 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2774 2774 S: Maintained 2775 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git 2775 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git 2776 2776 F: arch/arm/boot/dts/nxp/ls/ 2777 2777 F: arch/arm64/boot/dts/freescale/fsl-* 2778 2778 F: arch/arm64/boot/dts/freescale/qoriq-* 2779 2779 2780 2780 ARM/FREESCALE VYBRID ARM ARCHITECTURE 2781 - M: Shawn Guo <shawnguo@kernel.org> 2781 + M: Frank Li <Frank.Li@nxp.com> 2782 2782 M: Sascha Hauer <s.hauer@pengutronix.de> 2783 2783 R: Pengutronix Kernel Team <kernel@pengutronix.de> 2784 2784 R: Stefan Agner <stefan@agner.ch> 2785 2785 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2786 2786 S: Maintained 2787 - T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git 2787 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git 2788 2788 F: arch/arm/boot/dts/nxp/vf/ 2789 2789 F: arch/arm/mach-imx/*vf610* 2790 2790 ··· 3681 3681 3682 3682 ARM/VERSATILE EXPRESS PLATFORM 3683 3683 M: Liviu Dudau <liviu.dudau@arm.com> 3684 - M: Sudeep Holla <sudeep.holla@arm.com> 3684 + M: Sudeep Holla <sudeep.holla@kernel.org> 3685 3685 M: Lorenzo Pieralisi <lpieralisi@kernel.org> 3686 3686 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 3687 3687 S: Maintained ··· 6513 6513 6514 6514 CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE 6515 6515 M: Viresh Kumar <viresh.kumar@linaro.org> 6516 - M: Sudeep Holla <sudeep.holla@arm.com> 6516 + M: Sudeep Holla <sudeep.holla@kernel.org> 6517 6517 L: linux-pm@vger.kernel.org 6518 6518 S: Maintained 6519 6519 W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php ··· 6609 6609 6610 6610 CPUIDLE DRIVER - ARM PSCI 6611 6611 M: Lorenzo Pieralisi <lpieralisi@kernel.org> 6612 - M: Sudeep Holla <sudeep.holla@arm.com> 6612 + M: Sudeep Holla <sudeep.holla@kernel.org> 6613 6613 M: Ulf Hansson <ulf.hansson@linaro.org> 6614 6614 L: linux-pm@vger.kernel.org 6615 6615 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) ··· 9815 9815 F: tools/firewire/ 9816 9816 9817 9817 FIRMWARE FRAMEWORK FOR ARMV8-A 9818 - M: Sudeep Holla <sudeep.holla@arm.com> 9818 + M: Sudeep Holla <sudeep.holla@kernel.org> 9819 9819 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 9820 9820 S: Maintained 9821 9821 F: drivers/firmware/arm_ffa/ ··· 10513 10513 F: scripts/gendwarfksyms/ 10514 10514 10515 10515 GENERIC ARCHITECTURE TOPOLOGY 10516 - M: Sudeep Holla <sudeep.holla@arm.com> 10516 + M: Sudeep Holla <sudeep.holla@kernel.org> 10517 10517 L: linux-kernel@vger.kernel.org 10518 10518 S: Maintained 10519 10519 F: drivers/base/arch_topology.c ··· 11374 11374 F: Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs 11375 11375 F: drivers/soc/hisilicon/kunpeng_hccs.c 11376 11376 F: drivers/soc/hisilicon/kunpeng_hccs.h 11377 + 11378 + HISILICON SOC HHA DRIVER 11379 + M: Yushan Wang <wangyushan12@huawei.com> 11380 + S: Maintained 11381 + F: drivers/cache/hisi_soc_hha.c 11377 11382 11378 11383 HISILICON LPC BUS DRIVER 11379 11384 M: Jay Fang <f.fangjian@huawei.com> ··· 15105 15100 F: include/linux/mailbox/arm_mhuv2_message.h 15106 15101 15107 15102 MAILBOX ARM MHUv3 15108 - M: Sudeep Holla <sudeep.holla@arm.com> 15103 + M: Sudeep Holla <sudeep.holla@kernel.org> 15109 15104 M: Cristian Marussi <cristian.marussi@arm.com> 15110 15105 L: linux-kernel@vger.kernel.org 15111 15106 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) ··· 20582 20577 PIN CONTROLLER - FREESCALE 20583 20578 M: Dong Aisheng <aisheng.dong@nxp.com> 20584 20579 M: Fabio Estevam <festevam@gmail.com> 20585 - M: Shawn Guo <shawnguo@kernel.org> 20580 + M: Frank Li <Frank.Li@nxp.com> 20586 20581 M: Jacky Bai <ping.bai@nxp.com> 20587 20582 R: Pengutronix Kernel Team <kernel@pengutronix.de> 20588 20583 R: NXP S32 Linux Team <s32@nxp.com> ··· 23635 23630 SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC) 23636 23631 M: Mark Rutland <mark.rutland@arm.com> 23637 23632 M: Lorenzo Pieralisi <lpieralisi@kernel.org> 23638 - M: Sudeep Holla <sudeep.holla@arm.com> 23633 + M: Sudeep Holla <sudeep.holla@kernel.org> 23639 23634 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 23640 23635 S: Maintained 23641 23636 F: drivers/firmware/smccc/ ··· 25399 25394 F: drivers/mfd/syscon.c 25400 25395 25401 25396 SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers 25402 - M: Sudeep Holla <sudeep.holla@arm.com> 25397 + M: Sudeep Holla <sudeep.holla@kernel.org> 25403 25398 R: Cristian Marussi <cristian.marussi@arm.com> 25404 25399 L: arm-scmi@vger.kernel.org 25405 25400 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) ··· 26551 26546 26552 26547 TRUSTED SERVICES TEE DRIVER 26553 26548 M: Balint Dobszay <balint.dobszay@arm.com> 26554 - M: Sudeep Holla <sudeep.holla@arm.com> 26549 + M: Sudeep Holla <sudeep.holla@kernel.org> 26555 26550 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 26556 26551 L: trusted-services@lists.trustedfirmware.org 26557 26552 S: Maintained
+3 -2
drivers/soc/qcom/smem.c
··· 396 396 */ 397 397 bool qcom_smem_is_available(void) 398 398 { 399 - return !!__smem; 399 + return !IS_ERR(__smem); 400 400 } 401 401 EXPORT_SYMBOL_GPL(qcom_smem_is_available); 402 402 ··· 1247 1247 { 1248 1248 platform_device_unregister(__smem->socinfo); 1249 1249 1250 - __smem = NULL; 1250 + /* Set to -EPROBE_DEFER to signal unprobed state */ 1251 + __smem = ERR_PTR(-EPROBE_DEFER); 1251 1252 } 1252 1253 1253 1254 static const struct of_device_id qcom_smem_of_match[] = {