Commit a6adef89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "Most of the changes are devicetree fixes for NXP, Mediatek, Rockchips
  Arm machines as well as Microchip RISC-V, and most of these address
  build-time warnings for spec violations and other minor issues. One of
  the Mediatek warnings was enabled by default and prevented a clean
  build.

  The ones that address serious runtime issues are all on the i.MX
  platform:

   - a boot time panic on imx8qm

   - USB hanging under load on imx8

   - regressions on the imx93 ethernet phy

  Code fixes include a minor error handling for the i.MX PMU driver, and
  a number of firmware driver fixes:

   - OP-TEE fix for supplicant based device enumeration, and a new sysfs
     attribute to needed to fix a race against userspace

   - Arm SCMI fix for possible truncation/overflow in the frequency
     computations

   - Multiple FF-A fixes for the newly added notification support"

* tag 'soc-fixes-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (55 commits)
  MAINTAINERS: change the S32G2 maintainer's email address.
  arm64: dts: rockchip: Fix eMMC Data Strobe PD on rk3588
  ARM: dts: imx28-xea: Pass the 'model' property
  ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt
  MAINTAINERS: reinstate freescale ARM64 DT directory in i.MX entry
  arm64: dts: imx8-apalis: set wifi regulator to always-on
  ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init
  arm64: dts: imx8ulp: update gpio node name to align with register address
  arm64: dts: imx93: update gpio node name to align with register address
  arm64: dts: imx93: correct mediamix power
  arm64: dts: imx8qm: Add imx8qm's own pm to avoid panic during startup
  arm64: dts: freescale: imx8-ss-dma: Fix #pwm-cells
  arm64: dts: freescale: imx8-ss-lsio: Fix #pwm-cells
  dt-bindings: pwm: imx-pwm: Unify #pwm-cells for all compatibles
  ARM: dts: imx6ul-pico: Describe the Ethernet PHY clock
  arm64: dts: imx8mp: imx8mq: Add parkmode-disable-ss-quirk on DWC3
  arm64: dts: rockchip: Fix PCI node addresses on rk3399-gru
  arm64: dts: rockchip: drop interrupt-names property from rk3588s dfi
  firmware: arm_scmi: Fix possible frequency truncation when using level indexing mode
  firmware: arm_scmi: Fix frequency truncation by promoting multiplier type
  ...
parents 17894c2a fd1e5745

Documentation/ABI/testing/sysfs-bus-optee-devices

+9 −0
Original line number Diff line number Diff line
@@ -6,3 +6,12 @@ Description: 
		OP-TEE bus provides reference to registered drivers under this directory. The <uuid>

		matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers

		are free to create needed API under optee-ta-<uuid> directory.



What:		/sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant

Date:		November 2023

KernelVersion:	6.7

Contact:	op-tee@lists.trustedfirmware.org

Description:

		Allows to distinguish whether an OP-TEE based TA/device requires user-space

		tee-supplicant to function properly or not. This attribute will be present for

		devices which depend on tee-supplicant to be running.

Documentation/devicetree/bindings/pwm/imx-pwm.yaml

+4 −6
Original line number Diff line number Diff line
@@ -14,12 +14,10 @@ allOf: 


properties:

  "#pwm-cells":

    description: |

      Should be 2 for i.MX1 and 3 for i.MX27 and newer SoCs. See pwm.yaml

      in this directory for a description of the cells format.

    enum:

      - 2

      - 3

    description:

      The only third cell flag supported by this binding is

      PWM_POLARITY_INVERTED. fsl,imx1-pwm does not support this flags.

    const: 3



  compatible:

    oneOf:

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ allOf: 
              - rockchip,rk3399-grf

              - rockchip,rk3399-pmugrf

              - rockchip,rk3568-pmugrf

              - rockchip,rk3588-pmugrf

              - rockchip,rv1108-grf

              - rockchip,rv1108-pmugrf

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -2143,6 +2143,7 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

F:	arch/arm/boot/dts/nxp/imx/

F:	arch/arm/boot/dts/nxp/mxs/

F:	arch/arm64/boot/dts/freescale/

X:	arch/arm64/boot/dts/freescale/fsl-*

X:	arch/arm64/boot/dts/freescale/qoriq-*

X:	drivers/media/i2c/
@@ -2523,7 +2524,7 @@ F: drivers/*/*/*wpcm* 
F:	drivers/*/*wpcm*









ARM/NXP S32G ARCHITECTURE









M:	Chester Lin <clin@suse.com>









M:	Chester Lin <chester62515@gmail.com>









R:	Andreas Färber <afaerber@suse.de>









R:	Matthias Brugger <mbrugger@suse.com>









R:	NXP S32 Linux Team <s32@nxp.com>
































arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts



+1
−3






























Original line number
Diff line number
Diff line







@@ -36,9 +36,7 @@ &led_pwr {







	gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;









};



















&leds {









	/delete-node/ led_act;









};









/delete-node/ &led_act;



















&pm {









	/delete-property/ system-power-controller;