Commit 18713e8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "There have not been a lot of fixes for for the soc tree in 6.4, but
  these have been sitting here for too long.

  For the devicetree side, there is one minor warning fix for vexpress,
  the rest all all for the the NXP i.MX platforms: SoC specific bugfixes
  for the iMX8 clocks and its USB-3.0 gadget device, as well as board
  specific fixes for regulators and the phy on some of the i.MX boards.

  The microchip risc-v and arm32 maintainers now also add a shared
  maintainer file entry for the arm64 parts.

  The remaining fixes are all for firmware drivers, addressing mistakes
  in the optee, scmi and ff-a firmware driver implementation, mostly in
  the error handling code, incorrect use of the alloc_workqueue()
  interface in SCMI, and compatibility with corner cases of the firmware
  implementation"

* tag 'arm-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: update arm64 Microchip entries
  arm64: dts: imx8: fix USB 3.0 Gadget Failure in QM & QXPB0 at super speed
  dt-binding: cdns,usb3: Fix cdns,on-chip-buff-size type
  arm64: dts: colibri-imx8x: delete adc1 and dsp
  arm64: dts: colibri-imx8x: fix iris pinctrl configuration
  arm64: dts: colibri-imx8x: move pinctrl property from SoM to eval board
  arm64: dts: colibri-imx8x: fix eval board pin configuration
  arm64: dts: imx8mp: Fix video clock parents
  ARM: dts: imx6qdl-mba6: Add missing pvcie-supply regulator
  ARM: dts: imx6ull-dhcor: Set and limit the mode for PMIC buck 1, 2 and 3
  arm64: dts: imx8mn-var-som: fix PHY detection bug by adding deassert delay
  arm64: dts: imx8mn: Fix video clock parents
  firmware: arm_ffa: Set reserved/MBZ fields to zero in the memory descriptors
  firmware: arm_ffa: Fix FFA device names for logical partitions
  firmware: arm_ffa: Fix usage of partition info get count flag
  firmware: arm_ffa: Check if ffa_driver remove is present before executing
  arm64: dts: arm: add missing cache properties
  ARM: dts: vexpress: add missing cache properties
  firmware: arm_scmi: Fix incorrect alloc_workqueue() invocation
  optee: fix uninited async notif value
parents 96f15fc6 abf5422e

Documentation/devicetree/bindings/usb/cdns,usb3.yaml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ properties: 
    description:

      size of memory intended as internal memory for endpoints

      buffers expressed in KB

    $ref: /schemas/types.yaml#/definitions/uint32

    $ref: /schemas/types.yaml#/definitions/uint16



  cdns,phyrst-a-enable:

    description: Enable resetting of PHY if Rx fail is detected

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -2429,6 +2429,15 @@ X: drivers/net/wireless/atmel/ 
N:	at91

N:	atmel









ARM/MICROCHIP (ARM64) SoC support









M:	Conor Dooley <conor@kernel.org>









M:	Nicolas Ferre <nicolas.ferre@microchip.com>









M:	Claudiu Beznea <claudiu.beznea@microchip.com>









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









S:	Supported









T:	git https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git









F:	arch/arm64/boot/dts/microchip/

















ARM/Microchip Sparx5 SoC support









M:	Lars Povlsen <lars.povlsen@microchip.com>









M:	Steen Hegelund <Steen.Hegelund@microchip.com>








@@ -2436,8 +2445,7 @@ M:	Daniel Machon <daniel.machon@microchip.com>







M:	UNGLinuxDriver@microchip.com









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









S:	Supported









T:	git git://github.com/microchip-ung/linux-upstream.git









F:	arch/arm64/boot/dts/microchip/









F:	arch/arm64/boot/dts/microchip/sparx*









F:	drivers/net/ethernet/microchip/vcap/









F:	drivers/pinctrl/pinctrl-microchip-sgpio.c









N:	sparx5
































arch/arm/boot/dts/imx6qdl-mba6.dtsi



+1
−0






























Original line number
Diff line number
Diff line







@@ -209,6 +209,7 @@ &pcie {







	pinctrl-names = "default";









	pinctrl-0 = <&pinctrl_pcie>;









	reset-gpio = <&gpio6 7 GPIO_ACTIVE_LOW>;









	vpcie-supply = <&reg_pcie>;









	status = "okay";









};










































arch/arm/boot/dts/imx6ull-dhcor-som.dtsi



+7
−0






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@







#include <dt-bindings/input/input.h>









#include <dt-bindings/leds/common.h>









#include <dt-bindings/pwm/pwm.h>









#include <dt-bindings/regulator/dlg,da9063-regulator.h>









#include "imx6ull.dtsi"



















/ {








@@ -84,16 +85,20 @@ onkey {

















		regulators {









			vdd_soc_in_1v4: buck1 {









				regulator-allowed-modes = <DA9063_BUCK_MODE_SLEEP>; /* PFM */









				regulator-always-on;









				regulator-boot-on;









				regulator-initial-mode = <DA9063_BUCK_MODE_SLEEP>;









				regulator-max-microvolt = <1400000>;









				regulator-min-microvolt = <1400000>;









				regulator-name = "vdd_soc_in_1v4";









			};



















			vcc_3v3: buck2 {









				regulator-allowed-modes = <DA9063_BUCK_MODE_SYNC>; /* PWM */









				regulator-always-on;









				regulator-boot-on;









				regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>;









				regulator-max-microvolt = <3300000>;









				regulator-min-microvolt = <3300000>;









				regulator-name = "vcc_3v3";








@@ -106,8 +111,10 @@ vcc_3v3: buck2 {







			 * the voltage is set to 1.5V.









			 */









			vcc_ddr_1v35: buck3 {









				regulator-allowed-modes = <DA9063_BUCK_MODE_SYNC>; /* PWM */









				regulator-always-on;









				regulator-boot-on;









				regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>;









				regulator-max-microvolt = <1500000>;









				regulator-min-microvolt = <1500000>;









				regulator-name = "vcc_ddr_1v35";
































arch/arm/boot/dts/vexpress-v2p-ca5s.dts



+1
−0






























Original line number
Diff line number
Diff line







@@ -132,6 +132,7 @@ L2: cache-controller@2c0f0000 {







		reg = <0x2c0f0000 0x1000>;









		interrupts = <0 84 4>;









		cache-level = <2>;









		cache-unified;









	};



















	pmu {