Unverified Commit 0fd70327 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'vexpress-updates-6.6' of... 

Merge tag 'vexpress-updates-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/drivers

Arm Vexpress updates for v6.6

Couple of minor updates: Code simplification in the vexpress config bus
driver with the use of devm_platform_ioremap_resource() and simplification
of Arm Vexpress platform and related drivers entries in MAINTAINERS file.

* tag 'vexpress-updates-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  MAINTAINERS: Simplify entries for Arm Vexpress platform and related drivers
  bus: vexpress-config: Convert to devm_platform_ioremap_resource()

Link: https://lore.kernel.org/r/20230804123214.3258032-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bf08f323 ebd4f610

MAINTAINERS

+4 −5
Original line number Diff line number Diff line
@@ -2931,14 +2931,13 @@ M: Sudeep Holla <sudeep.holla@arm.com> 
M:	Lorenzo Pieralisi <lpieralisi@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	*/*/*/vexpress*

F:	*/*/vexpress*

F:	arch/arm/boot/dts/arm/vexpress*

N:	mps2

N:	vexpress

F:	arch/arm/mach-versatile/

F:	arch/arm64/boot/dts/arm/

F:	drivers/clk/versatile/clk-vexpress-osc.c

F:	drivers/clocksource/timer-versatile.c

N:	mps2

X:	drivers/cpufreq/vexpress-spc-cpufreq.c

X:	Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml









ARM/VFP SUPPORT









M:	Russell King <linux@armlinux.org.uk>
































drivers/bus/vexpress-config.c



+1
−3






























Original line number
Diff line number
Diff line







@@ -350,7 +350,6 @@ static struct vexpress_config_bridge_ops vexpress_syscfg_bridge_ops = {







static int vexpress_syscfg_probe(struct platform_device *pdev)









{









	struct vexpress_syscfg *syscfg;









	struct resource *res;









	struct vexpress_config_bridge *bridge;









	struct device_node *node;









	int master;








@@ -362,8 +361,7 @@ static int vexpress_syscfg_probe(struct platform_device *pdev)







	syscfg->dev = &pdev->dev;









	INIT_LIST_HEAD(&syscfg->funcs);



















	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);









	syscfg->base = devm_ioremap_resource(&pdev->dev, res);









	syscfg->base = devm_platform_ioremap_resource(pdev, 0);









	if (IS_ERR(syscfg->base))









		return PTR_ERR(syscfg->base);