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

Merge tag 'soc-drivers-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull more SoC driver updates from Arnd Bergmann:
"This is the promised follow-up to the soc drivers branch, adding minor
updates to omap and freescale drivers.

Most notably, Ioana Ciornei takes over maintenance of the DPAA bus
driver used in some NXP (originally Freescale) chips"

* tag 'soc-drivers-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
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()
Input: tsc2007 - accept standard properties

+9 -63
+3 -3
MAINTAINERS
··· 19723 19723 F: include/linux/qnx6_fs.h 19724 19724 19725 19725 QORIQ DPAA2 FSL-MC BUS DRIVER 19726 - M: Stuart Yoder <stuyoder@gmail.com> 19727 - M: Laurentiu Tudor <laurentiu.tudor@nxp.com> 19726 + M: Ioana Ciornei <ioana.ciornei@nxp.com> 19727 + L: linuxppc-dev@lists.ozlabs.org 19728 19728 L: linux-kernel@vger.kernel.org 19729 19729 S: Maintained 19730 19730 F: Documentation/ABI/stable/sysfs-bus-fsl-mc 19731 - F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt 19731 + F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.yaml 19732 19732 F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst 19733 19733 F: drivers/bus/fsl-mc/ 19734 19734 F: include/uapi/linux/fsl_mc.h
-22
drivers/bus/fsl-mc/dpmcp.c
··· 75 75 /* send command to mc*/ 76 76 return mc_send_command(mc_io, &cmd); 77 77 } 78 - 79 - /** 80 - * dpmcp_reset() - Reset the DPMCP, returns the object to initial state. 81 - * @mc_io: Pointer to MC portal's I/O object 82 - * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' 83 - * @token: Token of DPMCP object 84 - * 85 - * Return: '0' on Success; Error code otherwise. 86 - */ 87 - int dpmcp_reset(struct fsl_mc_io *mc_io, 88 - u32 cmd_flags, 89 - u16 token) 90 - { 91 - struct fsl_mc_command cmd = { 0 }; 92 - 93 - /* prepare command */ 94 - cmd.header = mc_encode_cmd_header(DPMCP_CMDID_RESET, 95 - cmd_flags, token); 96 - 97 - /* send command to mc*/ 98 - return mc_send_command(mc_io, &cmd); 99 - }
-5
drivers/bus/fsl-mc/fsl-mc-allocator.c
··· 656 656 { 657 657 return fsl_mc_driver_register(&fsl_mc_allocator_driver); 658 658 } 659 - 660 - void fsl_mc_allocator_driver_exit(void) 661 - { 662 - fsl_mc_driver_unregister(&fsl_mc_allocator_driver); 663 - }
-6
drivers/bus/fsl-mc/fsl-mc-private.h
··· 66 66 u32 cmd_flags, 67 67 u16 token); 68 68 69 - int dpmcp_reset(struct fsl_mc_io *mc_io, 70 - u32 cmd_flags, 71 - u16 token); 72 - 73 69 /* 74 70 * Data Path Resource Container (DPRC) API 75 71 */ ··· 626 630 bool alloc_interrupts); 627 631 628 632 int __init fsl_mc_allocator_driver_init(void); 629 - 630 - void fsl_mc_allocator_driver_exit(void); 631 633 632 634 void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); 633 635
-20
drivers/bus/fsl-mc/mc-io.c
··· 263 263 dpmcp_dev->consumer_link = NULL; 264 264 } 265 265 EXPORT_SYMBOL_GPL(fsl_mc_portal_free); 266 - 267 - /** 268 - * fsl_mc_portal_reset - Resets the dpmcp object for a given fsl_mc_io object 269 - * 270 - * @mc_io: Pointer to the fsl_mc_io object that wraps the MC portal to free 271 - */ 272 - int fsl_mc_portal_reset(struct fsl_mc_io *mc_io) 273 - { 274 - int error; 275 - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; 276 - 277 - error = dpmcp_reset(mc_io, 0, dpmcp_dev->mc_handle); 278 - if (error < 0) { 279 - dev_err(&dpmcp_dev->dev, "dpmcp_reset() failed: %d\n", error); 280 - return error; 281 - } 282 - 283 - return 0; 284 - } 285 - EXPORT_SYMBOL_GPL(fsl_mc_portal_reset);
+2
drivers/input/touchscreen/tsc2007.h
··· 19 19 #ifndef _TSC2007_H 20 20 #define _TSC2007_H 21 21 22 + #include <linux/input/touchscreen.h> 22 23 struct gpio_desc; 23 24 24 25 #define TSC2007_MEASURE_TEMP0 (0x0 << 4) ··· 64 63 65 64 struct i2c_client *client; 66 65 66 + struct touchscreen_properties prop; 67 67 u16 model; 68 68 u16 x_plate_ohms; 69 69 u16 max_rt;
+2 -3
drivers/input/touchscreen/tsc2007_core.c
··· 142 142 rt = ts->max_rt - rt; 143 143 144 144 input_report_key(input, BTN_TOUCH, 1); 145 - input_report_abs(input, ABS_X, tc.x); 146 - input_report_abs(input, ABS_Y, tc.y); 145 + touchscreen_report_pos(input, &ts->prop, tc.x, tc.y, false); 147 146 input_report_abs(input, ABS_PRESSURE, rt); 148 147 149 148 input_sync(input); ··· 338 339 input_set_drvdata(input_dev, ts); 339 340 340 341 input_set_capability(input_dev, EV_KEY, BTN_TOUCH); 341 - 342 342 input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, ts->fuzzx, 0); 343 343 input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, ts->fuzzy, 0); 344 + touchscreen_parse_properties(input_dev, false, &ts->prop); 344 345 input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT, 345 346 ts->fuzzz, 0); 346 347
+2 -2
drivers/soc/fsl/qe/qe_ic.c
··· 344 344 if (irq == 0) 345 345 return 0; 346 346 347 - return irq_linear_revmap(qe_ic->irqhost, irq); 347 + return irq_find_mapping(qe_ic->irqhost, irq); 348 348 } 349 349 350 350 /* Return an interrupt vector or 0 if no interrupt is pending. */ ··· 360 360 if (irq == 0) 361 361 return 0; 362 362 363 - return irq_linear_revmap(qe_ic->irqhost, irq); 363 + return irq_find_mapping(qe_ic->irqhost, irq); 364 364 } 365 365 366 366 static void qe_ic_cascade_low(struct irq_desc *desc)
-2
include/linux/fsl/mc.h
··· 417 417 418 418 void fsl_mc_portal_free(struct fsl_mc_io *mc_io); 419 419 420 - int fsl_mc_portal_reset(struct fsl_mc_io *mc_io); 421 - 422 420 int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, 423 421 enum fsl_mc_pool_type pool_type, 424 422 struct fsl_mc_device **new_mc_adev);