Merge tag 'arm-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2022 17:28:12 +0000 (10:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2022 17:28:12 +0000 (10:28 -0700)
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
  ...

20 files changed:
1  2 
Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
Documentation/devicetree/bindings/power/renesas,rcar-sysc.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
arch/arm/boot/dts/imx6ul-phytec-segin-peb-av-02.dtsi
arch/arm/boot/dts/imx6ull-colibri.dtsi
arch/arm/boot/dts/logicpd-som-lv.dtsi
arch/arm/boot/dts/qcom-ipq8064.dtsi
arch/arm/boot/dts/sama7g5.dtsi
arch/arm64/boot/dts/amlogic/meson-s4.dtsi
arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi
arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi
arch/arm64/boot/dts/freescale/imx8mn.dtsi
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
arch/arm64/boot/dts/mediatek/mt7622.dtsi
arch/arm64/boot/dts/qcom/msm8996.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
arch/arm64/boot/dts/qcom/sm8250.dtsi
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts

index f5a531738d935a23c3800ecac9278e77b97bc053,0000000000000000000000000000000000000000..76199a67d6282b4dc5e7ce7a26388280aa04d66e
mode 100644,000000..100644
--- /dev/null
@@@ -1,137 -1,0 +1,138 @@@
 +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 +# Copyright (c) 2020, Silicon Laboratories, Inc.
 +%YAML 1.2
 +---
 +
 +$id: http://devicetree.org/schemas/net/wireless/silabs,wfx.yaml#
 +$schema: http://devicetree.org/meta-schemas/core.yaml#
 +
 +title: Silicon Labs WFxxx devicetree bindings
 +
 +maintainers:
 +  - Jérôme Pouiller <jerome.pouiller@silabs.com>
 +
 +description: >
 +  Support for the Wifi chip WFxxx from Silicon Labs. Currently, the only device
 +  from the WFxxx series is the WF200 described here:
 +     https://www.silabs.com/documents/public/data-sheets/wf200-datasheet.pdf
 +
 +  The WF200 can be connected via SPI or via SDIO.
 +
 +  For SDIO:
 +
 +    Declaring the WFxxx chip in device tree is mandatory (usually, the VID/PID is
 +    sufficient for the SDIO devices).
 +
 +    It is recommended to declare a mmc-pwrseq on SDIO host above WFx. Without
 +    it, you may encounter issues during reboot. The mmc-pwrseq should be
 +    compatible with mmc-pwrseq-simple. Please consult
 +    Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.yaml for more
 +    information.
 +
 +  For SPI:
 +
 +    In add of the properties below, please consult
 +    Documentation/devicetree/bindings/spi/spi-controller.yaml for optional SPI
 +    related properties.
 +
 +properties:
 +  compatible:
 +    items:
 +      - enum:
++          - prt,prtt1c-wfm200 # Protonic PRTT1C Board
 +          - silabs,brd4001a # WGM160P Evaluation Board
 +          - silabs,brd8022a # WF200 Evaluation Board
 +          - silabs,brd8023a # WFM200 Evaluation Board
 +      - const: silabs,wf200 # Chip alone without antenna
 +
 +  reg:
 +    description:
 +      When used on SDIO bus, <reg> must be set to 1. When used on SPI bus, it is
 +      the chip select address of the device as defined in the SPI devices
 +      bindings.
 +    maxItems: 1
 +
 +  spi-max-frequency: true
 +
 +  interrupts:
 +    description: The interrupt line. Should be IRQ_TYPE_EDGE_RISING. When SPI is
 +      used, this property is required. When SDIO is used, the "in-band"
 +      interrupt provided by the SDIO bus is used unless an interrupt is defined
 +      in the Device Tree.
 +    maxItems: 1
 +
 +  reset-gpios:
 +    description: (SPI only) Phandle of gpio that will be used to reset chip
 +      during probe. Without this property, you may encounter issues with warm
 +      boot.
 +
 +      For SDIO, the reset gpio should declared using a mmc-pwrseq.
 +    maxItems: 1
 +
 +  wakeup-gpios:
 +    description: Phandle of gpio that will be used to wake-up chip. Without this
 +      property, driver will disable most of power saving features.
 +    maxItems: 1
 +
 +  silabs,antenna-config-file:
 +    $ref: /schemas/types.yaml#/definitions/string
 +    description: Use an alternative file for antenna configuration (aka
 +      "Platform Data Set" in Silabs jargon). Default depends of "compatible"
 +      string. For "silabs,wf200", the default is 'wf200.pds'.
 +
 +  local-mac-address: true
 +
 +  mac-address: true
 +
 +additionalProperties: false
 +
 +required:
 +  - compatible
 +  - reg
 +
 +examples:
 +  - |
 +    #include <dt-bindings/gpio/gpio.h>
 +    #include <dt-bindings/interrupt-controller/irq.h>
 +
 +    spi {
 +        #address-cells = <1>;
 +        #size-cells = <0>;
 +
 +        wifi@0 {
 +            compatible = "silabs,brd8022a", "silabs,wf200";
 +            pinctrl-names = "default";
 +            pinctrl-0 = <&wfx_irq &wfx_gpios>;
 +            reg = <0>;
 +            interrupts-extended = <&gpio 16 IRQ_TYPE_EDGE_RISING>;
 +            wakeup-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 +            reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 +            spi-max-frequency = <42000000>;
 +        };
 +    };
 +
 +  - |
 +    #include <dt-bindings/gpio/gpio.h>
 +    #include <dt-bindings/interrupt-controller/irq.h>
 +
 +    wfx_pwrseq: wfx_pwrseq {
 +        compatible = "mmc-pwrseq-simple";
 +        pinctrl-names = "default";
 +        pinctrl-0 = <&wfx_reset>;
 +        reset-gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 +    };
 +
 +    mmc {
 +        mmc-pwrseq = <&wfx_pwrseq>;
 +        #address-cells = <1>;
 +        #size-cells = <0>;
 +
 +        wifi@1 {
 +            compatible = "silabs,brd8022a", "silabs,wf200";
 +            pinctrl-names = "default";
 +            pinctrl-0 = <&wfx_wakeup>;
 +            reg = <1>;
 +            wakeup-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 +        };
 +    };
 +...
index 951a2a6c5a65783db36e66124ea1f7dd0d71c48a,15ebabcacfc50f5c9ed8fc4a2dcaac66f381ac5e..15621e03fa4d46f6f269744d78cb691ffcc216e3
@@@ -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;
Simple merge
Simple merge
Simple merge
index f232f8baf4e8d215ffaf7b3f2a1bf3eebd47117a,9768523fe4c30209a5a7f59dfdb98a0182fd0bc1..dbcee8b4d8d8f8f9a2f7b5453b3774568a9a0643
                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",
Simple merge
index e47c74e513afddec831849f8dd6cddf099631c39,4841d42c8c620ead8a4d07d5916d4dce6cc17bd3..3df4920295ad777ded60d583968802c46817c756
  };
  
  &alc5682 {
 -      realtek,dmic-clk-driving-high = "true";
 +      realtek,dmic-clk-driving-high;
  };
  
+ &ap_tp_i2c {
+       status = "okay";
+ };
  &cpu6_alert0 {
        temperature = <60000>;
  };
Simple merge