Merge tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jan 2022 07:52:17 +0000 (09:52 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jan 2022 07:52:17 +0000 (09:52 +0200)
Pull devicetree fixes and cleanups from Rob Herring:

 - Fix a regression when probing a child device reusing the parent
   device's DT node pointer

 - Refactor of_parse_phandle*() variants to static inlines

 - Drop Enric Balletbo i Serra as a maintainer

 - Fix DT schemas with arrays incorrectly encoded as a matrix

 - Drop unneeded pinctrl properties from schemas

 - Add SPI peripheral schema to SPI based displays

 - Clean-up several schema examples

 - Clean-up trivial-devices.yaml comments

 - Add missing, in use vendor prefixes: Wingtech, Thundercomm, Huawei,
   F(x)tec, 8devices

* tag 'devicetree-fixes-for-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: google,cros-ec: drop Enric Balletbo i Serra from maintainers
  dt-bindings: display: bridge: drop Enric Balletbo i Serra from maintainers
  of: Check 'of_node_reused' flag on of_match_device()
  of: property: define of_property_read_u{8,16,32,64}_array() unconditionally
  of: base: make small of_parse_phandle() variants static inline
  dt-bindings: mfd: cirrus,madera: Fix 'interrupts' in example
  dt-bindings: Fix array schemas encoded as matrices
  dt-bindings: Drop unnecessary pinctrl properties
  dt-bindings: rtc: st,stm32-rtc: Make each example a separate entry
  dt-bindings: mmc: arm,pl18x: Make each example a separate entry
  dt-bindings: display: Add SPI peripheral schema to SPI based displays
  scripts/dtc: dtx_diff: remove broken example from help text
  dt-bindings: trivial-devices: fix double spaces in comments
  dt-bindings: trivial-devices: fix swapped comments
  dt-bindings: vendor-prefixes: add Wingtech
  dt-bindings: vendor-prefixes: add Thundercomm
  dt-bindings: vendor-prefixes: add Huawei
  dt-bindings: vendor-prefixes: add F(x)tec
  dt-bindings: vendor-prefixes: add 8devices
  dt-bindings: power: reset: gpio-restart: Correct default priority

1  2 
Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
Documentation/devicetree/bindings/mmc/arm,pl18x.yaml
Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.yaml
Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml
Documentation/devicetree/bindings/trivial-devices.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml

index 0faa4da6c7c8725882b000c03cda6abaf329059e,58a1a9405228ff67783e72c9870443b12b9b961d..d1f53bd449f7b2764d71acb84c53db2297d0dd24
@@@ -8,7 -8,6 +8,6 @@@ title: ChromeOS Embedded Controlle
  
  maintainers:
    - Benson Leung <bleung@chromium.org>
-   - Enric Balletbo i Serra <enric.balletbo@collabora.com>
    - Guenter Roeck <groeck@chromium.org>
  
  description:
@@@ -59,7 -58,7 +58,7 @@@ properties
        whether this nvram is present or not.
      type: boolean
  
 -  mtk,rpmsg-name:
 +  mediatek,rpmsg-name:
      description:
        Must be defined if the cros-ec is a rpmsg device for a Mediatek
        ARM Cortex M4 Co-processor. Contains the name pf the rpmsg
index a4f74bec68a3edc0d759bb5e8e4b20d8ff4a240a,2a64cffbe6ad948e520c16b9c0e39459a1a60c14..1e69a5a42439b5d3414e80daf9df186f9f1bf454
@@@ -53,12 -53,6 +53,12 @@@ properties
          items:
            - const: arm,pl18x
            - const: arm,primecell
 +      - description: Entry for STMicroelectronics variant of PL18x.
 +          This dedicated compatible is used by bootloaders.
 +        items:
 +          - const: st,stm32-sdmmc2
 +          - const: arm,pl18x
 +          - const: arm,primecell
  
    clocks:
      description: One or two clocks, the "apb_pclk" and the "MCLK"
      minItems: 1
      maxItems: 2
  
 +  dmas:
 +    maxItems: 2
 +
 +  dma-names:
 +    oneOf:
 +      - items:
 +          - const: tx
 +          - const: rx
 +      - items:
 +          - const: rx
 +          - const: tx
 +
    power-domains: true
  
    resets:
@@@ -185,6 -167,9 +185,9 @@@ examples
        clock-names = "mclk", "apb_pclk";
      };
  
+   - |
+     #include <dt-bindings/interrupt-controller/irq.h>
      mmc@80126000 {
        compatible = "arm,pl18x", "arm,primecell";
        reg = <0x80126000 0x1000>;
        vqmmc-supply = <&vmmci>;
      };
  
+   - |
      mmc@101f6000 {
        compatible = "arm,pl18x", "arm,primecell";
        reg = <0x101f6000 0x1000>;
        clocks = <&sdiclk>, <&pclksdi>;
        clock-names = "mclk", "apb_pclk";
-       interrupt-parent = <&vica>;
        interrupts = <22>;
        max-frequency = <400000>;
        bus-width = <4>;
        vmmc-supply = <&vmmc_regulator>;
      };
  
+   - |
      mmc@52007000 {
        compatible = "arm,pl18x", "arm,primecell";
        arm,primecell-periphid = <0x10153180>;
        reg = <0x52007000 0x1000>;
        interrupts = <49>;
 -      interrupt-names = "cmd_irq";
        clocks = <&rcc 0>;
        clock-names = "apb_pclk";
        resets = <&rcc 1>;
index 80020539c3bbeaf55a5ab9f30ddbfe8c126a5e1d,6ff829a7d6e51b2eae5015603d247609968fc3d8..5cd512b7d5ba31882d4fc5369f19384913e2b90c
@@@ -51,15 -51,6 +51,6 @@@ properties
        appropriate of the LOCHNAGARx_PIN_NUM_GPIOS define, see [3].
      maxItems: 1
  
-   pinctrl-0:
-     description:
-       A phandle to the default pinctrl state.
-   pinctrl-names:
-     description:
-       A pinctrl state named "default" must be defined.
-     const: default
    pin-settings:
      type: object
      patternProperties:
  
      additionalProperties: false
  
 +allOf:
 +  - $ref: "pinctrl.yaml#"
 +
  required:
    - compatible
    - gpio-controller
index e50d7ad5c2297909b32499add4f7ab677699a3df,8a90d82737676c8101259bb7335e5a69f8b4112a..c85f759ae5a3371408358639abb7214fe74e2721
@@@ -30,16 -30,6 +30,6 @@@ description: 
      Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
  
  properties:
-   pinctrl-0:
-     description:
-       A phandle to the node containing the subnodes containing default
-       configurations.
-   pinctrl-names:
-     description:
-       A pinctrl state named "default" must be defined.
-     const: default
    pin-settings:
      description:
        One subnode is required to contain the default settings. It
  
      additionalProperties: false
  
 +allOf:
 +  - $ref: "pinctrl.yaml#"
 +
  required:
    - pinctrl-0
    - pinctrl-names
index 9af1b0f4eceaf482b36592afa246008a0976e333,e285386f3de0e61b940c6762b2c3fe808cb5e456..091792ba993e858919db308f0866ecea3e1f6059
@@@ -31,7 -31,7 +31,7 @@@ properties
        - enum:
              # SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert and Over Temperature Pin
            - ad,ad7414
-             # ADM9240:  Complete System Hardware Monitor for uProcessor-Based Systems
+             # ADM9240: Complete System Hardware Monitor for uProcessor-Based Systems
            - ad,adm9240
              # AD5110 - Nonvolatile Digital Potentiometer
            - adi,ad5110
@@@ -43,7 -43,7 +43,7 @@@
            - adi,adp5589
              # AMS iAQ-Core VOC Sensor
            - ams,iaq-core
-             # i2c serial eeprom  (24cxx)
+             # i2c serial eeprom (24cxx)
            - at,24c08
              # i2c trusted platform module (TPM)
            - atmel,at97sc3204t
@@@ -73,8 -73,6 +73,8 @@@
            - dallas,ds4510
              # Digital Thermometer and Thermostat
            - dallas,ds75
 +            # Delta AHE-50DC Open19 power shelf fan control module
 +          - delta,ahe50dc-fan
              # Delta Electronics DPS-650-AB power supply
            - delta,dps650ab
            # Delta Electronics DPS920AB 920W 54V Power Supply
            - ibm,cffps2
              # Infineon IR36021 digital POL buck controller
            - infineon,ir36021
 +          # Infineon IR38060 Voltage Regulator
 +          - infineon,ir38060
              # Infineon IR38064 Voltage Regulator
            - infineon,ir38064
 +          # Infineon IR38164 Voltage Regulator
 +          - infineon,ir38164
 +          # Infineon IR38263 Voltage Regulator
 +          - infineon,ir38263
              # Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
            - infineon,slb9635tt
              # Infineon SLB9645 I2C TPM (new protocol, max 400khz)
            - skyworks,sky81452
              # Socionext SynQuacer TPM MMIO module
            - socionext,synquacer-tpm-mmio
-             # i2c serial eeprom  (24cxx)
-           - sparkfun,qwiic-joystick
              # SparkFun Qwiic Joystick (COM-15168) with i2c interface
+           - sparkfun,qwiic-joystick
+             # i2c serial eeprom (24cxx)
            - st,24c256
              # Ambient Light Sensor with SMBUS/Two Wire Serial Interface
            - taos,tsl2550
index c48ce3c549515d39930ef37bdcf8063f79d1d106,a2efbc26d945f90aab3b4caa004f6beaaa754eff..294093d45a2308fb51b6453e9ca791210ed125df
@@@ -25,6 -25,8 +25,8 @@@ patternProperties
    # Keep list in alphabetical order.
    "^70mai,.*":
      description: 70mai Co., Ltd.
+   "^8dev,.*":
+     description: 8devices, UAB
    "^abb,.*":
      description: ABB
    "^abilis,.*":
      description: Shanghai Broadmobi Communication Technology Co.,Ltd.
    "^brcm,.*":
      description: Broadcom Corporation
 +  "^bsh,.*":
 +    description: BSH Hausgeraete GmbH
    "^buffalo,.*":
      description: Buffalo, Inc.
    "^bur,.*":
      description: Silicon Laboratories (formerly Energy Micro AS)
    "^engicam,.*":
      description: Engicam S.r.l.
 +  "^engleder,.*":
 +    description: Engleder
    "^epcos,.*":
      description: EPCOS AG
    "^epfl,.*":
      description: Freescale Semiconductor
    "^fujitsu,.*":
      description: Fujitsu Ltd.
+   "^fxtec,.*":
+     description: FX Technology Ltd.
    "^gardena,.*":
      description: GARDENA GmbH
    "^gateworks,.*":
      description: HannStar Display Co.
    "^holtek,.*":
      description: Holtek Semiconductor, Inc.
+   "^huawei,.*":
+     description: Huawei Technologies Co., Ltd.
    "^hugsun,.*":
      description: Shenzhen Hugsun Technology Co. Ltd.
    "^hwacom,.*":
      description: JetHome (IP Sokolov P.A.)
    "^jianda,.*":
      description: Jiandangjing Technology Co., Ltd.
 +  "^joz,.*":
 +    description: JOZ BV
    "^kam,.*":
      description: Kamstrup A/S
    "^karo,.*":
      description: THine Electronics, Inc.
    "^thingyjp,.*":
      description: thingy.jp
+   "^thundercomm,.*":
+     description: Thundercomm Technology Co., Ltd.
    "^ti,.*":
      description: Texas Instruments
    "^tianma,.*":
      description: Truly Semiconductors Limited
    "^visionox,.*":
      description: Visionox
 +  "^team-source-display,.*":
 +    description: Shenzhen Team Source Display Technology Co., Ltd. (TSD)
    "^tsd,.*":
      description: Theobroma Systems Design und Consulting GmbH
    "^tyan,.*":
      description: Variscite Ltd.
    "^vdl,.*":
      description: Van der Laan b.v.
 +  "^vertexcom,.*":
 +    description: Vertexcom Technologies, Inc.
    "^via,.*":
      description: VIA Technologies, Inc.
    "^videostrong,.*":
      description: Wiligear, Ltd.
    "^winbond,.*":
      description: Winbond Electronics corp.
+   "^wingtech,.*":
+     description: Wingtech Technology Co., Ltd.
 +  "^winlink,.*":
 +    description: WinLink Co., Ltd
    "^winstar,.*":
      description: Winstar Display Corp.
    "^wits,.*":
      description: Wondermedia Technologies, Inc.
    "^wobo,.*":
      description: Wobo
 +  "^wanchanglong,.*":
 +    description: Wanchanglong Electronics Technology(SHENZHEN)Co.,Ltd.
    "^x-powers,.*":
      description: X-Powers
    "^xes,.*":
      description: Shenzhen Xunlong Software CO.,Limited
    "^xylon,.*":
      description: Xylon
 +  "^yadro,.*":
 +    description: YADRO
    "^yamaha,.*":
      description: Yamaha Corporation
    "^yes-optoelectronics,.*":