Unverified Commit 45c88e9e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc_fsl-6.15-1' of https://github.com/chleroy/linux into soc/drivers-2 

FSL SOC Changes for 6.15:

- irqdomain cleanups from Jiry

- Add Ioana as Maintainer of fsl-mc bus and remove Laurentiu and Stuart

- Remove deadcode from fsl-mc bus

* tag 'soc_fsl-6.15-1' of https://github.com/chleroy/linux:
  bus: fsl-mc: Remove deadcode
  MAINTAINERS: add the linuppc-dev list to the fsl-mc bus entry
  MAINTAINERS: fix nonexistent dtbinding file name
  MAINTAINERS: add myself as maintainer for the fsl-mc bus
  irqdomain: soc: Switch to irq_find_mapping()
parents 0ad2507d c25951eb

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -19333,12 +19333,12 @@ F: fs/qnx6/ 
F:	include/linux/qnx6_fs.h









QORIQ DPAA2 FSL-MC BUS DRIVER









M:	Stuart Yoder <stuyoder@gmail.com>









M:	Laurentiu Tudor <laurentiu.tudor@nxp.com>









M:	Ioana Ciornei <ioana.ciornei@nxp.com>









L:	linuxppc-dev@lists.ozlabs.org









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/ABI/stable/sysfs-bus-fsl-mc









F:	Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt









F:	Documentation/devicetree/bindings/misc/fsl,qoriq-mc.yaml









F:	Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst









F:	drivers/bus/fsl-mc/









F:	include/uapi/linux/fsl_mc.h

























drivers/bus/fsl-mc/dpmcp.c



+0
−22






























Original line number
Diff line number
Diff line







@@ -75,25 +75,3 @@ int dpmcp_close(struct fsl_mc_io *mc_io,







	/* send command to mc*/









	return mc_send_command(mc_io, &cmd);









}


















/**









 * dpmcp_reset() - Reset the DPMCP, returns the object to initial state.









 * @mc_io:	Pointer to MC portal's I/O object









 * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'









 * @token:	Token of DPMCP object









 *









 * Return:	'0' on Success; Error code otherwise.









 */









int dpmcp_reset(struct fsl_mc_io *mc_io,









		u32 cmd_flags,









		u16 token)









{









	struct fsl_mc_command cmd = { 0 };



















	/* prepare command */









	cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET,









					  cmd_flags, token);



















	/* send command to mc*/









	return mc_send_command(mc_io, &cmd);









}
























drivers/bus/fsl-mc/fsl-mc-allocator.c



+0
−5






























Original line number
Diff line number
Diff line







@@ -656,8 +656,3 @@ int __init fsl_mc_allocator_driver_init(void)







{









	return fsl_mc_driver_register(&fsl_mc_allocator_driver);









}


















void fsl_mc_allocator_driver_exit(void)









{









	fsl_mc_driver_unregister(&fsl_mc_allocator_driver);









}
























drivers/bus/fsl-mc/fsl-mc-private.h



+0
−6






























Original line number
Diff line number
Diff line







@@ -66,10 +66,6 @@ int dpmcp_close(struct fsl_mc_io *mc_io,







		u32 cmd_flags,









		u16 token);



















int dpmcp_reset(struct fsl_mc_io *mc_io,









		u32 cmd_flags,









		u16 token);



















/*









 * Data Path Resource Container (DPRC) API









 */








@@ -631,8 +627,6 @@ int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,

















int __init fsl_mc_allocator_driver_init(void);



















void fsl_mc_allocator_driver_exit(void);



















void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev);



















void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev);
































drivers/bus/fsl-mc/mc-io.c



+0
−20






























Original line number
Diff line number
Diff line







@@ -263,23 +263,3 @@ void fsl_mc_portal_free(struct fsl_mc_io *mc_io)







	dpmcp_dev->consumer_link = NULL;









}









EXPORT_SYMBOL_GPL(fsl_mc_portal_free);


















/**









 * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object









 *









 * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free









 */









int fsl_mc_portal_reset(struct fsl_mc_io *mc_io)









{









	int error;









	struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;



















	error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle);









	if (error < 0) {









		dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error);









		return error;









	}



















	return 0;









}









EXPORT_SYMBOL_GPL(fsl_mc_portal_reset);