From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 May 2022 17:28:12 +0000 (-0700)
Subject: Merge tag 'arm-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae862183285cbb2ef9032770d98ffa9becffe9d5;p=linux.git

Merge tag 'arm-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM DT updates from Arnd Bergmann:
 "There are 40 branches this time, adding a lot of new hardware support,
  and cleanups. Krzysztof Kozlowski continues his treewide cleanups.

  There are a number of new SoCs, all of them as part of existing
  families, and typically added along with a reference board:

   - Renesas RZ/G2UL (R9A07G043) is the single-core version of the
     RZ/G2L general-purpose MPU.

   - Renesas RZ/V2M (R9A09G011) is a smart camera SoC

   - Renesas R-Car V4H (R8A779G0) is an automotive chip with Cortex-A76
     cores and deep learning accerlation.

   - Broadcom BCM47622 is a new broadband SoC based on a quad Cortex-A7
     and dual Wifi-6.

   - Corstone1000 is a generic platform from Arm that is used for
     designing custom SoCs, the support for now is for the Fixed Virtual
     Platform emulation for it.

   - Mediatek MT8195 (Kompanio 1200) is a high-end consumer chip used in
     upcoming Chromebooks.

   - NXP i.MXRT1050 is a Cortex-M7 based microcontroller, the first
     MMU-less SoC to be added in a while

  New machines based on already supported SoCs this time are mainly for
  32-bit platforms and include:

   - Two wireless routers based on Broadcom bcm4708

   - 30 new boards based on NXP i.MX6, i.MX7 and i.MX8 families, mostly
     for the industrial embedded market, and on NXP LS1021A based IOT
     board.

   - Two ethernet switches based on Microchip LAN966

   - Eight Qualcomm Snapdragon based machines, including a smartwatch, a
     Chromebook board and some phones

   - Another phone based on the old ST-Ericsson Ux500 platform

   - Seven STM32MP1 based boards

   - Four single-board computers based on Rockchip RK3566/RK3568"

* tag 'arm-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (791 commits)
  ARM: dts: kswitch-d10: enable networking
  ARM: dts: lan966x: add switch node
  ARM: dts: lan966x: add serdes node
  ARM: dts: lan966x: add reset switch reset node
  ARM: dts: lan966x: add MIIM nodes
  ARM: dts: lan966x: add hwmon node
  ARM: dts: lan966x: add basic Kontron KSwitch D10 support
  ARM: dts: lan966x: add flexcom I2C nodes
  ARM: dts: lan966x: add flexcom SPI nodes
  ARM: dts: lan966x: add all flexcom usart nodes
  ARM: dts: lan966x: add missing uart DMA channel
  ARM: dts: lan966x: add sgpio node
  ARM: dts: lan966x: swap dma channels for crypto node
  ARM: dts: lan966x: rename pinctrl nodes
  ARM: dts: at91: sama7g5: remove interrupt-parent from gic node
  ARM: dts: at91: use generic node name for dataflash
  ARM: dts: turris-omnia: Add atsha204a node
  arm64: dts: mt8192: Follow binding order for SCP registers
  arm64: dts: mediatek: add mtk-snfi for mt7622
  arm64: dts: mediatek: mt8195-demo: enable uart1
  ...
---

ae862183285cbb2ef9032770d98ffa9becffe9d5
diff --cc arch/arm/boot/dts/imx6ull-colibri.dtsi
index 951a2a6c5a65,15ebabcacfc5..15621e03fa4d
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@@ -35,9 -67,9 +67,9 @@@
  		regulator-max-microvolt = <3300000>;
  	};
  
- 	reg_sd1_vmmc: regulator-sd1-vmmc {
+ 	reg_sd1_vqmmc: regulator-sd1-vqmmc {
  		compatible = "regulator-gpio";
 -		gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
 +		gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&pinctrl_snvs_reg_sd>;
  		regulator-always-on;
diff --cc arch/arm64/boot/dts/mediatek/mt7622.dtsi
index f232f8baf4e8,9768523fe4c3..dbcee8b4d8d8
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@@ -922,28 -936,9 +941,29 @@@
  		clock-names = "hsdma";
  		power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>;
  		#dma-cells = <1>;
+ 		dma-requests = <3>;
  	};
  
 +	pcie_mirror: pcie-mirror@10000400 {
 +		compatible = "mediatek,mt7622-pcie-mirror",
 +			     "syscon";
 +		reg = <0 0x10000400 0 0x10>;
 +	};
 +
 +	wed0: wed@1020a000 {
 +		compatible = "mediatek,mt7622-wed",
 +			     "syscon";
 +		reg = <0 0x1020a000 0 0x1000>;
 +		interrupts = <GIC_SPI 214 IRQ_TYPE_LEVEL_LOW>;
 +	};
 +
 +	wed1: wed@1020b000 {
 +		compatible = "mediatek,mt7622-wed",
 +			     "syscon";
 +		reg = <0 0x1020b000 0 0x1000>;
 +		interrupts = <GIC_SPI 215 IRQ_TYPE_LEVEL_LOW>;
 +	};
 +
  	eth: ethernet@1b100000 {
  		compatible = "mediatek,mt7622-eth",
  			     "mediatek,mt2701-eth",
diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
index e47c74e513af,4841d42c8c62..3df4920295ad
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
@@@ -33,9 -28,13 +28,13 @@@
  };
  
  &alc5682 {
 -	realtek,dmic-clk-driving-high = "true";
 +	realtek,dmic-clk-driving-high;
  };
  
+ &ap_tp_i2c {
+ 	status = "okay";
+ };
+ 
  &cpu6_alert0 {
  	temperature = <60000>;
  };