]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'devicetree-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2020 03:11:25 +0000 (20:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2020 03:11:25 +0000 (20:11 -0700)
Pull devicetree updates from Rob Herring:

 - Convert various DT (non-binding) doc files to ReST

 - Various improvements to device link code

 - Fix __of_attach_node_sysfs refcounting bug

 - Add support for 'memory-region-names' with reserved-memory binding

 - Vendor prefixes for Protonic Holland, BeagleBoard.org, Alps, Check
   Point, Würth Elektronik, U-Boot, Vaisala, Baikal Electronics,
   Shanghai Awinic Technology Co., MikroTik, Silex Insight

 - A bunch more binding conversions to DT schema. Only 3K to go.

 - Add a minimum version check for schema tools

 - Treewide dropping of 'allOf' usage with schema references. Not needed
   in new json-schema spec.

 - Some formatting clean-ups of schemas

* tag 'devicetree-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (194 commits)
  dt-bindings: clock: Add documentation for X1830 bindings.
  dt-bindings: mailbox: Convert imx mu to json-schema
  dt-bindings: power: Convert imx gpcv2 to json-schema
  dt-bindings: power: Convert imx gpc to json-schema
  dt-bindings: Merge gpio-usb-b-connector with usb-connector
  dt-bindings: timer: renesas: cmt: Convert to json-schema
  dt-bindings: clock: Convert i.MX8QXP LPCG to json-schema
  dt-bindings: timer: Convert i.MX GPT to json-schema
  dt-bindings: thermal: rcar-thermal: Add device tree support for r8a7742
  dt-bindings: serial: Add binding for UART pin swap
  dt-bindings: geni-se: Add interconnect binding for GENI QUP
  dt-bindings: geni-se: Convert QUP geni-se bindings to YAML
  dt-bindings: vendor-prefixes: Add Silex Insight vendor prefix
  dt-bindings: input: touchscreen: edt-ft5x06: change reg property
  dt-bindings: usb: qcom,dwc3: Introduce interconnect properties for Qualcomm DWC3 driver
  dt-bindings: timer: renesas: mtu2: Convert to json-schema
  of/fdt: Remove redundant kbasename function call
  dt-bindings: clock: Convert i.MX1 clock to json-schema
  dt-bindings: clock: Convert i.MX21 clock to json-schema
  dt-bindings: clock: Convert i.MX25 clock to json-schema
  ...

24 files changed:
1  2 
Documentation/devicetree/bindings/arm/amlogic.yaml
Documentation/devicetree/bindings/arm/cpus.yaml
Documentation/devicetree/bindings/arm/socionext/uniphier.yaml
Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml
Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml
Documentation/devicetree/bindings/display/panel/panel-common.yaml
Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml
Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml
Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml
Documentation/devicetree/bindings/iommu/arm,smmu.yaml
Documentation/devicetree/bindings/net/qcom,ipa.yaml
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
Documentation/devicetree/bindings/sound/rockchip-i2s.yaml
Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml
Documentation/devicetree/bindings/usb/renesas,usbhs.yaml
Documentation/devicetree/bindings/usb/usb-xhci.txt
Documentation/devicetree/bindings/vendor-prefixes.yaml
Documentation/index.rst
MAINTAINERS
drivers/of/of_reserved_mem.c
include/linux/mfd/core.h
scripts/checkpatch.pl

index 10a7f0752281f9395e4dee1428966aee3e36dc3e,113f93b9ae55d98c8cee4e3c6ce1e72de1db999f..6caf1f9be390f281762243ef57bbabf710d6d480
@@@ -51,9 -51,8 +51,9 @@@ properties
        - description: LD20 SoC boards
          items:
            - enum:
-             - socionext,uniphier-ld20-akebi96
-             - socionext,uniphier-ld20-global
-             - socionext,uniphier-ld20-ref
++              - socionext,uniphier-ld20-akebi96
+               - socionext,uniphier-ld20-global
+               - socionext,uniphier-ld20-ref
            - const: socionext,uniphier-ld20
        - description: PXs3 SoC boards
          items:
index a747b755ad0609a1af45780ad626f4afccd290b1,db3d270a33c63f152eebbfd0951ea2805ecc72c6..45fe8fe5faba6f370e6d873bc0c494aab7805c4c
@@@ -63,11 -61,10 +61,10 @@@ properties
  
    display-timings:
      description:
 -      Some display panels supports several resolutions with different timing.
 +      Some display panels support several resolutions with different timings.
        The display-timings bindings supports specifying several timings and
 -      optional specify which is the native mode.
 +      optionally specifying which is the native mode.
-     allOf:
-       - $ref: display-timings.yaml#
+     $ref: display-timings.yaml#
  
    # Connectivity
    port:
index 7b749fc04c32cdd27648d0a33553f9ff9aa9502a,b2ac7606095b128a43714aebb2402f2e15d6ef81..a3561276e6099f714c4ddf0aaaf398074faed8b8
@@@ -171,10 -162,9 +169,10 @@@ examples
                  modem-init;
                  modem-remoteproc = <&mss_pil>;
  
-                 reg = <0 0x1e40000 0 0x7000>,
-                         <0 0x1e47000 0 0x2000>,
-                         <0 0x1e04000 0 0x2c000>;
 +                iommus = <&apps_smmu 0x720 0x3>;
+                 reg = <0x1e40000 0x7000>,
+                         <0x1e47000 0x2000>,
+                         <0x1e04000 0x2c000>;
                  reg-names = "ipa-reg",
                              "ipa-shared",
                              "gsi";
index c87395f360a69b840ed3a5a1f54ae373c277e474,7f2cd163a0e27cbe7bd704ac73c1783d4f6376d0..71d9e6c1c72e617ffdd8568994a9e6bbee1be4d4
@@@ -171,40 -163,42 +170,44 @@@ examples
      #include <dt-bindings/pinctrl/k3.h>
      #include <dt-bindings/soc/ti,sci_pm_domain.h>
      #include <dt-bindings/net/ti-dp83867.h>
 +    #include <dt-bindings/interrupt-controller/irq.h>
 +    #include <dt-bindings/interrupt-controller/arm-gic.h>
  
-     mcu_cpsw: ethernet@46000000 {
-         compatible = "ti,am654-cpsw-nuss";
+     bus {
          #address-cells = <2>;
          #size-cells = <2>;
-         reg = <0x0 0x46000000 0x0 0x200000>;
-         reg-names = "cpsw_nuss";
-         ranges = <0x0 0x0 0x46000000 0x0 0x200000>;
-         dma-coherent;
-         clocks = <&k3_clks 5 10>;
-         clock-names = "fck";
-         power-domains = <&k3_pds 5 TI_SCI_PD_EXCLUSIVE>;
-         pinctrl-names = "default";
-         pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;
-         dmas = <&mcu_udmap 0xf000>,
-                <&mcu_udmap 0xf001>,
-                <&mcu_udmap 0xf002>,
-                <&mcu_udmap 0xf003>,
-                <&mcu_udmap 0xf004>,
-                <&mcu_udmap 0xf005>,
-                <&mcu_udmap 0xf006>,
-                <&mcu_udmap 0xf007>,
-                <&mcu_udmap 0x7000>;
-         dma-names = "tx0", "tx1", "tx2", "tx3", "tx4", "tx5", "tx6", "tx7",
-                     "rx";
-         ethernet-ports {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               cpsw_port1: port@1 {
+         mcu_cpsw: ethernet@46000000 {
+             compatible = "ti,am654-cpsw-nuss";
+             #address-cells = <2>;
+             #size-cells = <2>;
+             reg = <0x0 0x46000000 0x0 0x200000>;
+             reg-names = "cpsw_nuss";
+             ranges = <0x0 0x0 0x0 0x46000000 0x0 0x200000>;
+             dma-coherent;
+             clocks = <&k3_clks 5 10>;
+             clock-names = "fck";
+             power-domains = <&k3_pds 5 TI_SCI_PD_EXCLUSIVE>;
+             pinctrl-names = "default";
+             pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;
+             dmas = <&mcu_udmap 0xf000>,
+                    <&mcu_udmap 0xf001>,
+                    <&mcu_udmap 0xf002>,
+                    <&mcu_udmap 0xf003>,
+                    <&mcu_udmap 0xf004>,
+                    <&mcu_udmap 0xf005>,
+                    <&mcu_udmap 0xf006>,
+                    <&mcu_udmap 0xf007>,
+                    <&mcu_udmap 0x7000>;
+             dma-names = "tx0", "tx1", "tx2", "tx3", "tx4", "tx5", "tx6", "tx7",
+                         "rx";
+             ethernet-ports {
+                 #address-cells = <1>;
+                 #size-cells = <0>;
+                 cpsw_port1: port@1 {
                      reg = <1>;
                      ti,mac-only;
                      label = "port1";
                      reg = <0>;
                      ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
                      ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
-               };
+                 };
+             };
          };
 +
 +        cpts@3d000 {
 +             compatible = "ti,am65-cpts";
 +             reg = <0x0 0x3d000 0x0 0x400>;
 +             clocks = <&k3_clks 18 2>;
 +             clock-names = "cpts";
 +             interrupts-extended = <&gic500 GIC_SPI 858 IRQ_TYPE_LEVEL_HIGH>;
 +             interrupt-names = "cpts";
 +             ti,cpts-ext-ts-inputs = <4>;
 +             ti,cpts-periodic-outputs = <2>;
 +        };
      };
index 51a6fac892e3f1e2efdea4322f035e7bf05077f8,49fd3feabba501987d9bbb195f8a68d5a15c132e..4f524f822e8428e70286d06042f25366015a9ff9
@@@ -54,85 -56,8 +54,84 @@@ properties
  
    amlogic,ao-sysctrl:
      description: phandle to the AO sysctrl node
-     allOf:
-       - $ref: /schemas/types.yaml#/definitions/phandle
+     $ref: /schemas/types.yaml#/definitions/phandle
  
 +allOf:
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - amlogic,meson8b-pwrc
 +            - amlogic,meson8m2-pwrc
 +    then:
 +      properties:
 +        reset-names:
 +          items:
 +            - const: dblk
 +            - const: pic_dc
 +            - const: hdmi_apb
 +            - const: hdmi_system
 +            - const: venci
 +            - const: vencp
 +            - const: vdac
 +            - const: vencl
 +            - const: viu
 +            - const: venc
 +            - const: rdma
 +      required:
 +        - resets
 +        - reset-names
 +
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - amlogic,meson-gxbb-pwrc
 +    then:
 +      properties:
 +        reset-names:
 +          items:
 +            - const: viu
 +            - const: venc
 +            - const: vcbus
 +            - const: bt656
 +            - const: dvin
 +            - const: rdma
 +            - const: venci
 +            - const: vencp
 +            - const: vdac
 +            - const: vdi6
 +            - const: vencl
 +            - const: vid_lock
 +      required:
 +        - resets
 +        - reset-names
 +
 +  - if:
 +      properties:
 +        compatible:
 +          enum:
 +            - amlogic,meson-g12a-pwrc
 +            - amlogic,meson-sm1-pwrc
 +    then:
 +      properties:
 +        reset-names:
 +          items:
 +            - const: viu
 +            - const: venc
 +            - const: vcbus
 +            - const: bt656
 +            - const: rdma
 +            - const: venci
 +            - const: vencp
 +            - const: vdac
 +            - const: vdi6
 +            - const: vencl
 +            - const: vid_lock
 +      required:
 +        - resets
 +        - reset-names
 +
  required:
    - compatible
    - clocks
index 10f9d3ad0d4821c876d219d076a696391ac3e756,886efabdcec354e7725438a7cda7f347713326bd..acb2b888dbfce9b81d3ab53cb98067fed1929eb5
@@@ -48,22 -47,17 +48,21 @@@ properties
        - const: i2s_hclk
  
    dmas:
 -    items:
 -      - description: TX DMA Channel
 -      - description: RX DMA Channel
 +    minItems: 1
 +    maxItems: 2
  
    dma-names:
 -    items:
 -      - const: tx
 +    oneOf:
        - const: rx
 +      - items:
 +        - const: tx
 +        - const: rx
 +
 +  power-domains:
 +    maxItems: 1
  
    rockchip,capture-channels:
-     allOf:
-       - $ref: /schemas/types.yaml#/definitions/uint32
+     $ref: /schemas/types.yaml#/definitions/uint32
      default: 2
      description:
        Max capture channels, if not set, 2 channels default.
index 306ac3d006dc92941930d22206d2fb2b440c029c,d14e1a944a98a9a75c747b5b285e301892fa35d9..c5b5b426049635ace64651b9d71e20a7181a690e
@@@ -59,59 -58,9 +58,58 @@@ properties
         0 - Set VREF to 2.75V
         1 - Set VREF to 2.5V
         2 - Set VREF to 1.375V
-     allOf:
-       - $ref: /schemas/types.yaml#/definitions/uint32
-       - enum: [0, 1, 2]
+     $ref: /schemas/types.yaml#/definitions/uint32
+     enum: [0, 1, 2]
  
 +  ti,pdm-edge-select:
 +    description: |
 +       Defines the PDMCLK sampling edge configuration for the PDM inputs.  This
 +       array is defined as <PDMIN1 PDMIN2 PDMIN3 PDMIN4>.
 +
 +       0 - (default) Odd channel is latched on the negative edge and even
 +       channel is latched on the the positive edge.
 +       1 - Odd channel is latched on the positive edge and even channel is
 +       latched on the the negative edge.
 +
 +       PDMIN1 - PDMCLK latching edge used for channel 1 and 2 data
 +       PDMIN2 - PDMCLK latching edge used for channel 3 and 4 data
 +       PDMIN3 - PDMCLK latching edge used for channel 5 and 6 data
 +       PDMIN4 - PDMCLK latching edge used for channel 7 and 8 data
 +
 +    allOf:
 +      - $ref: /schemas/types.yaml#/definitions/uint32-array
 +      - minItems: 1
 +        maxItems: 4
 +        items:
 +          maximum: 1
 +        default: [0, 0, 0, 0]
 +
 +  ti,gpi-config:
 +    description: |
 +       Defines the configuration for the general purpose input pins (GPI).
 +       The array is defined as <GPI1 GPI2 GPI3 GPI4>.
 +
 +       0 - (default) disabled
 +       1 - GPIX is configured as a general-purpose input (GPI)
 +       2 - GPIX is configured as a master clock input (MCLK)
 +       3 - GPIX is configured as an ASI input for daisy-chain (SDIN)
 +       4 - GPIX is configured as a PDM data input for channel 1 and channel
 +            (PDMDIN1)
 +       5 - GPIX is configured as a PDM data input for channel 3 and channel
 +            (PDMDIN2)
 +       6 - GPIX is configured as a PDM data input for channel 5 and channel
 +            (PDMDIN3)
 +       7 - GPIX is configured as a PDM data input for channel 7 and channel
 +            (PDMDIN4)
 +
 +    allOf:
 +      - $ref: /schemas/types.yaml#/definitions/uint32-array
 +      - minItems: 1
 +        maxItems: 4
 +        items:
 +          maximum: 7
 +        default: [0, 0, 0, 0]
 +
  required:
    - compatible
    - reg
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge