From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 9 Jun 2023 13:01:45 +0000 (+0200)
Subject: Merge tag 'zynqmp-soc-for-v6.5' of https://github.com/Xilinx/linux-xlnx into soc... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b79dec951a5ed81cdd6de88e619c1a8e3f88200f;p=linux.git

Merge tag 'zynqmp-soc-for-v6.5' of https://github.com/Xilinx/linux-xlnx into soc/drivers

arm64: ZynqMP SoC changes for v6.5

soc-power
- Use of_property_present() instead of of_find_property()

soc-event
- Avoid use after free eve_data in event manager code

firmware:
- Extend zynqmp_pm_fpga_load() interface

MAINTAINERS:
- Clean xilinx records

* tag 'zynqmp-soc-for-v6.5' of https://github.com/Xilinx/linux-xlnx:
  MAINTAINERS: Switch to @amd.com emails
  MAINTAINERS: Remove Hyun and Anurag from maintainer list
  firmware: xilinx: Update the zynqmp_pm_fpga_load() API
  driver: soc: xilinx: use _safe loop iterator to avoid a use after free
  soc: xilinx: Use of_property_present() for testing DT property presence

Link: https://lore.kernel.org/r/411aee78-e7e8-5966-cbe8-40ff45e27ba2@monstr.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

b79dec951a5ed81cdd6de88e619c1a8e3f88200f
diff --cc MAINTAINERS
index 27ef116247481,4b2ef60a4d01d..8e9aac279a4d7
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -23131,31 -23127,19 +23130,31 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/net/can/xilinx,can.yaml
  F:	drivers/net/can/xilinx_can.c
  
 +XILINX EVENT MANAGEMENT DRIVER
 +M:	Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
 +S:	Maintained
 +F:	drivers/soc/xilinx/xlnx_event_manager.c
 +F:	include/linux/firmware/xlnx-event-manager.h
 +
  XILINX GPIO DRIVER
- M:	Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
- R:	Srinivas Neeli <srinivas.neeli@xilinx.com>
+ M:	Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
+ R:	Srinivas Neeli <srinivas.neeli@amd.com>
  R:	Michal Simek <michal.simek@amd.com>
  S:	Maintained
 -F:	Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
  F:	Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
 +F:	Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
  F:	drivers/gpio/gpio-xilinx.c
  F:	drivers/gpio/gpio-zynq.c
  
 +XILINX PWM DRIVER
 +M:	Sean Anderson <sean.anderson@seco.com>
 +S:	Maintained
 +F:	drivers/pwm/pwm-xilinx.c
 +F:	include/clocksource/timer-xilinx.h
 +
  XILINX SD-FEC IP CORES
- M:	Derek Kiernan <derek.kiernan@xilinx.com>
- M:	Dragan Cvetic <dragan.cvetic@xilinx.com>
+ M:	Derek Kiernan <derek.kiernan@amd.com>
+ M:	Dragan Cvetic <dragan.cvetic@amd.com>
  S:	Maintained
  F:	Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt
  F:	Documentation/misc-devices/xilinx_sdfec.rst