Skip to content

Commit a149804

Browse files
torvaldstorvalds
committed
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
2 parents 5fd0a1d + c3cb272 commit a149804

3 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎.mailmap‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,8 @@ Subash Abhinov Kasiviswanathan <[email protected]> <subashab@codeaurora.
786786
Subbaraman Narayanamurthy <[email protected]> <[email protected]>
787787
Subhash Jadavani <[email protected]>
788788
Sudarshan Rajagopalan <[email protected]> <[email protected]>
789-
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
789+
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
790+
Sudeep Holla <[email protected]> <[email protected]>
790791
Sumit Garg <[email protected]> <[email protected]>
791792
Sumit Semwal <[email protected]>
792793
Surabhi Vishnoi <[email protected]> <[email protected]>

‎MAINTAINERS‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ F: tools/power/acpi/
335335
ACPI FOR ARM64 (ACPI/arm64)
336336
M: Lorenzo Pieralisi <[email protected]>
337337
M: Hanjun Guo <[email protected]>
338-
M: Sudeep Holla <sudeep.holla@arm.com>
338+
M: Sudeep Holla <sudeep.holla@kernel.org>
339339
L: [email protected]
340340
L: [email protected] (moderated for non-subscribers)
341341
S: Maintained
@@ -351,7 +351,7 @@ F: drivers/acpi/riscv/
351351
F: include/linux/acpi_rimt.h
352352

353353
ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
354-
M: Sudeep Holla <sudeep.holla@arm.com>
354+
M: Sudeep Holla <sudeep.holla@kernel.org>
355355
L: [email protected]
356356
S: Supported
357357
F: drivers/mailbox/pcc.c
@@ -2747,14 +2747,14 @@ F: arch/arm/include/asm/hardware/dec21285.h
27472747
F: arch/arm/mach-footbridge/
27482748

27492749
ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
2750-
M: Shawn Guo <[email protected]>
2750+
M: Frank Li <[email protected]>
27512751
M: Sascha Hauer <[email protected]>
27522752
R: Pengutronix Kernel Team <[email protected]>
27532753
R: Fabio Estevam <[email protected]>
27542754
L: [email protected]
27552755
L: [email protected] (moderated for non-subscribers)
27562756
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
27582758
F: Documentation/devicetree/bindings/firmware/fsl*
27592759
F: Documentation/devicetree/bindings/firmware/nxp*
27602760
F: arch/arm/boot/dts/nxp/imx/
@@ -2769,22 +2769,22 @@ N: mxs
27692769
N: \bmxc[^\d]
27702770

27712771
ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE
2772-
M: Shawn Guo <[email protected]>
2772+
M: Frank Li <[email protected]>
27732773
L: [email protected] (moderated for non-subscribers)
27742774
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
27762776
F: arch/arm/boot/dts/nxp/ls/
27772777
F: arch/arm64/boot/dts/freescale/fsl-*
27782778
F: arch/arm64/boot/dts/freescale/qoriq-*
27792779

27802780
ARM/FREESCALE VYBRID ARM ARCHITECTURE
2781-
M: Shawn Guo <[email protected]>
2781+
M: Frank Li <[email protected]>
27822782
M: Sascha Hauer <[email protected]>
27832783
R: Pengutronix Kernel Team <[email protected]>
27842784
R: Stefan Agner <[email protected]>
27852785
L: [email protected] (moderated for non-subscribers)
27862786
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
27882788
F: arch/arm/boot/dts/nxp/vf/
27892789
F: arch/arm/mach-imx/*vf610*
27902790

@@ -3681,7 +3681,7 @@ N: uniphier
36813681

36823682
ARM/VERSATILE EXPRESS PLATFORM
36833683
M: Liviu Dudau <[email protected]>
3684-
M: Sudeep Holla <sudeep.holla@arm.com>
3684+
M: Sudeep Holla <sudeep.holla@kernel.org>
36853685
M: Lorenzo Pieralisi <[email protected]>
36863686
L: [email protected] (moderated for non-subscribers)
36873687
S: Maintained
@@ -6513,7 +6513,7 @@ F: drivers/i2c/busses/i2c-cp2615.c
65136513

65146514
CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
65156515
M: Viresh Kumar <[email protected]>
6516-
M: Sudeep Holla <sudeep.holla@arm.com>
6516+
M: Sudeep Holla <sudeep.holla@kernel.org>
65176517
L: [email protected]
65186518
S: Maintained
65196519
W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php
@@ -6609,7 +6609,7 @@ F: include/linux/platform_data/cpuidle-exynos.h
66096609

66106610
CPUIDLE DRIVER - ARM PSCI
66116611
M: Lorenzo Pieralisi <[email protected]>
6612-
M: Sudeep Holla <sudeep.holla@arm.com>
6612+
M: Sudeep Holla <sudeep.holla@kernel.org>
66136613
M: Ulf Hansson <[email protected]>
66146614
L: [email protected]
66156615
L: [email protected] (moderated for non-subscribers)
@@ -9815,7 +9815,7 @@ F: include/uapi/linux/firewire*.h
98159815
F: tools/firewire/
98169816

98179817
FIRMWARE FRAMEWORK FOR ARMV8-A
9818-
M: Sudeep Holla <sudeep.holla@arm.com>
9818+
M: Sudeep Holla <sudeep.holla@kernel.org>
98199819
L: [email protected] (moderated for non-subscribers)
98209820
S: Maintained
98219821
F: drivers/firmware/arm_ffa/
@@ -10513,7 +10513,7 @@ S: Maintained
1051310513
F: scripts/gendwarfksyms/
1051410514

1051510515
GENERIC ARCHITECTURE TOPOLOGY
10516-
M: Sudeep Holla <sudeep.holla@arm.com>
10516+
M: Sudeep Holla <sudeep.holla@kernel.org>
1051710517
L: [email protected]
1051810518
S: Maintained
1051910519
F: drivers/base/arch_topology.c
@@ -11375,6 +11375,11 @@ F: Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs
1137511375
F: drivers/soc/hisilicon/kunpeng_hccs.c
1137611376
F: drivers/soc/hisilicon/kunpeng_hccs.h
1137711377

11378+
HISILICON SOC HHA DRIVER
11379+
M: Yushan Wang <[email protected]>
11380+
S: Maintained
11381+
F: drivers/cache/hisi_soc_hha.c
11382+
1137811383
HISILICON LPC BUS DRIVER
1137911384
M: Jay Fang <[email protected]>
1138011385
S: Maintained
@@ -15100,7 +15105,7 @@ F: drivers/mailbox/arm_mhuv2.c
1510015105
F: include/linux/mailbox/arm_mhuv2_message.h
1510115106

1510215107
MAILBOX ARM MHUv3
15103-
M: Sudeep Holla <sudeep.holla@arm.com>
15108+
M: Sudeep Holla <sudeep.holla@kernel.org>
1510415109
M: Cristian Marussi <[email protected]>
1510515110
L: [email protected]
1510615111
L: [email protected] (moderated for non-subscribers)
@@ -20577,7 +20582,7 @@ F: drivers/pinctrl/pinctrl-amd.c
2057720582
PIN CONTROLLER - FREESCALE
2057820583
M: Dong Aisheng <[email protected]>
2057920584
M: Fabio Estevam <[email protected]>
20580-
M: Shawn Guo <[email protected]>
20585+
M: Frank Li <[email protected]>
2058120586
M: Jacky Bai <[email protected]>
2058220587
R: Pengutronix Kernel Team <[email protected]>
2058320588
R: NXP S32 Linux Team <[email protected]>
@@ -23630,7 +23635,7 @@ F: include/uapi/linux/sed*
2363023635
SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)
2363123636
M: Mark Rutland <[email protected]>
2363223637
M: Lorenzo Pieralisi <[email protected]>
23633-
M: Sudeep Holla <sudeep.holla@arm.com>
23638+
M: Sudeep Holla <sudeep.holla@kernel.org>
2363423639
L: [email protected] (moderated for non-subscribers)
2363523640
S: Maintained
2363623641
F: drivers/firmware/smccc/
@@ -25394,7 +25399,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
2539425399
F: drivers/mfd/syscon.c
2539525400

2539625401
SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
25397-
M: Sudeep Holla <sudeep.holla@arm.com>
25402+
M: Sudeep Holla <sudeep.holla@kernel.org>
2539825403
R: Cristian Marussi <[email protected]>
2539925404
L: [email protected]
2540025405
L: [email protected] (moderated for non-subscribers)
@@ -26546,7 +26551,7 @@ F: samples/tsm-mr/
2654626551

2654726552
TRUSTED SERVICES TEE DRIVER
2654826553
M: Balint Dobszay <[email protected]>
26549-
M: Sudeep Holla <sudeep.holla@arm.com>
26554+
M: Sudeep Holla <sudeep.holla@kernel.org>
2655026555
L: [email protected] (moderated for non-subscribers)
2655126556
L: [email protected]
2655226557
S: Maintained

‎drivers/soc/qcom/smem.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ EXPORT_SYMBOL_GPL(qcom_smem_bust_hwspin_lock_by_host);
396396
*/
397397
bool qcom_smem_is_available(void)
398398
{
399-
return !!__smem;
399+
return !IS_ERR(__smem);
400400
}
401401
EXPORT_SYMBOL_GPL(qcom_smem_is_available);
402402

@@ -1247,7 +1247,8 @@ static void qcom_smem_remove(struct platform_device *pdev)
12471247
{
12481248
platform_device_unregister(__smem->socinfo);
12491249

1250-
__smem = NULL;
1250+
/* Set to -EPROBE_DEFER to signal unprobed state */
1251+
__smem = ERR_PTR(-EPROBE_DEFER);
12511252
}
12521253

12531254
static const struct of_device_id qcom_smem_of_match[] = {

0 commit comments

Comments
 (0)