Skip to content

Commit a608167

Browse files
torvaldstorvalds
committed
Merge tag 'soc-arm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC code updates from Arnd Bergmann: "These are mostly minor updates, including a number of kerneldoc fixes from Randy Dunlap across multiple platforms. OMAP gets a few bugfixes, and the MAINTAINERS file gets updated for AMD Zynq and NXP S32G" * tag 'soc-arm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (23 commits) ARM: s32c: update MAINTAINERS entry ARM: AM33xx: PRM: Implement REBOOT_COLD ARM: AM33xx: PRM: Remove redundand defines ARM: omap1: remove duplicated 'select ARCH_OMAP' ARM: s3c64xx: make bus_type const ARM: imx: Remove usage of the deprecated ida_simple_xx() API ARM: OMAP2+: fix kernel-doc warnings ARM: OMAP2+: fix kernel-doc warnings ARM: OMAP2+: fix a kernel-doc warning ARM: OMAP2+: PRM: fix kernel-doc warnings ARM: OMAP2+: prm44xx: fix a kernel-doc warning ARM: OMAP2+: pmic-cpcap: fix kernel-doc warnings ARM: OMAP2+: hwmod: fix kernel-doc warnings ARM: OMAP2+: hwmod: remove misuse of kernel-doc ARM: OMAP2+: CMINST: use matching function name in kernel-doc ARM: OMAP2+: cm33xx: use matching function name in kernel-doc ARM: OMAP2+: clock: fix a function name in kernel-doc ARM: OMAP2+: clockdomain: fix kernel-doc warnings ARM: OMAP2+: am33xx-restart: fix function name in kernel-doc soc: xilinx: update maintainer of event manager driver ...
2 parents 2184dbc + 98dcb87 commit a608167

25 files changed

+83
-63
lines changed

‎MAINTAINERS

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2549,13 +2549,14 @@ F: drivers/*/*/*wpcm*
25492549
F: drivers/*/*wpcm*
25502550

25512551
ARM/NXP S32G ARCHITECTURE
2552-
M: Chester Lin <[email protected]>
2553-
R: Andreas Färber <[email protected]>
2552+
R: Chester Lin <[email protected]>
25542553
R: Matthias Brugger <[email protected]>
2555-
R: NXP S32 Linux Team <[email protected]>
2554+
R: Ghennadi Procopciuc <[email protected]>
2555+
L: NXP S32 Linux Team <[email protected]>
25562556
L: [email protected] (moderated for non-subscribers)
25572557
S: Maintained
25582558
F: arch/arm64/boot/dts/freescale/s32g*.dts*
2559+
F: drivers/pinctrl/nxp/
25592560

25602561
ARM/Orion SoC/Technologic Systems TS-78xx platform support
25612562
M: Alexander Clouter <[email protected]>
@@ -17290,9 +17291,12 @@ M: Shawn Guo <[email protected]>
1729017291
M: Jacky Bai <[email protected]>
1729117292
R: Pengutronix Kernel Team <[email protected]>
1729217293
L: [email protected]
17294+
L: NXP S32 Linux Team <[email protected]>
1729317295
S: Maintained
1729417296
F: Documentation/devicetree/bindings/pinctrl/fsl,*
17297+
F: Documentation/devicetree/bindings/pinctrl/nxp,s32*
1729517298
F: drivers/pinctrl/freescale/
17299+
F: drivers/pinctrl/nxp/
1729617300

1729717301
PIN CONTROLLER - INTEL
1729817302
M: Mika Westerberg <[email protected]>
@@ -17346,14 +17350,6 @@ S: Supported
1734617350
F: drivers/gpio/gpio-sama5d2-piobu.c
1734717351
F: drivers/pinctrl/pinctrl-at91*
1734817352

17349-
PIN CONTROLLER - NXP S32
17350-
M: Chester Lin <[email protected]>
17351-
R: NXP S32 Linux Team <[email protected]>
17352-
L: [email protected]
17353-
S: Maintained
17354-
F: Documentation/devicetree/bindings/pinctrl/nxp,s32*
17355-
F: drivers/pinctrl/nxp/
17356-
1735717353
PIN CONTROLLER - QUALCOMM
1735817354
M: Bjorn Andersson <[email protected]>
1735917355
L: [email protected]
@@ -24159,7 +24155,7 @@ F: Documentation/devicetree/bindings/net/can/xilinx,can.yaml
2415924155
F: drivers/net/can/xilinx_can.c
2416024156

2416124157
XILINX EVENT MANAGEMENT DRIVER
24162-
M: Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
24158+
M: Michal Simek <michal.simek@amd.com>
2416324159
S: Maintained
2416424160
F: drivers/soc/xilinx/xlnx_event_manager.c
2416524161
F: include/linux/firmware/xlnx-event-manager.h

‎arch/arm/mach-imx/mmdc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc,
452452
.active_events = 0,
453453
};
454454

455-
pmu_mmdc->id = ida_simple_get(&mmdc_ida, 0, 0, GFP_KERNEL);
455+
pmu_mmdc->id = ida_alloc(&mmdc_ida, GFP_KERNEL);
456456

457457
return pmu_mmdc->id;
458458
}
@@ -461,7 +461,7 @@ static void imx_mmdc_remove(struct platform_device *pdev)
461461
{
462462
struct mmdc_pmu *pmu_mmdc = platform_get_drvdata(pdev);
463463

464-
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
464+
ida_free(&mmdc_ida, pmu_mmdc->id);
465465
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
466466
perf_pmu_unregister(&pmu_mmdc->pmu);
467467
iounmap(pmu_mmdc->mmdc_base);
@@ -529,7 +529,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
529529
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
530530
hrtimer_cancel(&pmu_mmdc->hrtimer);
531531
pmu_release_id:
532-
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
532+
ida_free(&mmdc_ida, pmu_mmdc->id);
533533
pmu_free:
534534
kfree(pmu_mmdc);
535535
return ret;

‎arch/arm/mach-omap1/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ menuconfig ARCH_OMAP1
44
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5
55
depends on CPU_LITTLE_ENDIAN
66
depends on ATAGS
7-
select ARCH_OMAP
87
select ARCH_HAS_HOLES_MEMORYMODEL
98
select ARCH_OMAP
109
select CLKSRC_MMIO

‎arch/arm/mach-omap2/am33xx-restart.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "prm.h"
1010

1111
/**
12-
* am3xx_restart - trigger a software restart of the SoC
12+
* am33xx_restart - trigger a software restart of the SoC
1313
* @mode: the "reboot mode", see arch/arm/kernel/{setup,process}.c
1414
* @cmd: passed from the userspace program rebooting the system (if provided)
1515
*
@@ -18,7 +18,8 @@
1818
*/
1919
void am33xx_restart(enum reboot_mode mode, const char *cmd)
2020
{
21-
/* TODO: Handle mode and cmd if necessary */
21+
/* TODO: Handle cmd if necessary */
22+
prm_reboot_mode = mode;
2223

2324
omap_prm_reset_system();
2425
}

‎arch/arm/mach-omap2/board-generic.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,12 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
246246
.init_time = omap_init_time_of,
247247
.dt_compat = am33xx_boards_compat,
248248
.restart = am33xx_restart,
249+
/*
250+
* Historically am33xx supported only REBOOT_WARM even though default
251+
* reboot_mode was REBOOT_COLD. Reflect legacy de-facto behaviour in
252+
* SYSFS.
253+
*/
254+
.reboot_mode = REBOOT_WARM,
249255
MACHINE_END
250256
#endif
251257

‎arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static int omap2_select_table_rate(struct clk_hw *hw, unsigned long rate,
162162
}
163163

164164
/**
165-
* omap2xxx_clkt_vps_check_bootloader_rate - determine which of the rate
165+
* omap2xxx_clkt_vps_check_bootloader_rates - determine which of the rate
166166
* table sets matches the current CORE DPLL hardware rate
167167
*
168168
* Check the MPU rate set by bootloader. Sets the 'curr_prcm_set'

‎arch/arm/mach-omap2/clockdomain.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ void clkdm_allow_idle(struct clockdomain *clkdm)
990990
}
991991

992992
/**
993-
* clkdm_deny_idle - disable hwsup idle transitions for clkdm
993+
* clkdm_deny_idle_nolock - disable hwsup idle transitions for clkdm
994994
* @clkdm: struct clockdomain *
995995
*
996996
* Prevent the hardware from automatically switching the clockdomain
@@ -1110,7 +1110,7 @@ void clkdm_del_autodeps(struct clockdomain *clkdm)
11101110
/**
11111111
* clkdm_clk_enable - add an enabled downstream clock to this clkdm
11121112
* @clkdm: struct clockdomain *
1113-
* @clk: struct clk * of the enabled downstream clock
1113+
* @unused: struct clk * of the enabled downstream clock
11141114
*
11151115
* Increment the usecount of the clockdomain @clkdm and ensure that it
11161116
* is awake before @clk is enabled. Intended to be called by

‎arch/arm/mach-omap2/cm33xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ static int am33xx_clkdm_save_context(struct clockdomain *clkdm)
357357
}
358358

359359
/**
360-
* am33xx_restore_save_context - Restore the clockdomain transition context
360+
* am33xx_clkdm_restore_context - Restore the clockdomain transition context
361361
* @clkdm: The clockdomain pointer whose context needs to be restored
362362
*
363363
* Restore the clockdomain transition context.

‎arch/arm/mach-omap2/cminst44xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ static void omap4_cminst_clkdm_disable_hwsup(u8 part, u16 inst, u16 cdoffs)
237237
}
238238

239239
/**
240-
* omap4_cminst_clkdm_force_sleep - try to take a clockdomain out of idle
240+
* omap4_cminst_clkdm_force_wakeup - try to take a clockdomain out of idle
241241
* @part: PRCM partition ID that the clockdomain registers exist in
242242
* @inst: CM instance register offset (*_INST macro)
243243
* @cdoffs: Clockdomain register offset (*_CDOFFS macro)

‎arch/arm/mach-omap2/omap-secure.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static void __init omap_optee_init_check(void)
4747
}
4848

4949
/**
50-
* omap_sec_dispatcher: Routine to dispatch low power secure
50+
* omap_secure_dispatcher - Routine to dispatch low power secure
5151
* service routines
5252
* @idx: The HAL API index
5353
* @flag: The flag indicating criticality of operation
@@ -183,7 +183,7 @@ static u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
183183
/**
184184
* rx51_secure_update_aux_cr: Routine to modify the contents of Auxiliary Control Register
185185
* @set_bits: bits to set in ACR
186-
* @clr_bits: bits to clear in ACR
186+
* @clear_bits: bits to clear in ACR
187187
*
188188
* Return the non-zero error value on failure.
189189
*/

0 commit comments

Comments
 (0)