Commit a1406e42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree fixes from Rob Herring:

 - Disable fw_devlinks on x86 DT platforms to fix OLPC

 - More replacing oneOf+const with enum on a few new schemas

 - Drop unnecessary type references on Xilinx SPI binding schema

* tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  spi: dt-bindings: xilinx: Drop type reference on *-bits properties
  dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries
  of: property: Disable fw_devlink DT support for X86
parents 2aae0a93 094b147c

Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml

+4 −4
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ allOf: 


properties:

  compatible:

    oneOf:

      - const: qcom,dsi-phy-7nm

      - const: qcom,dsi-phy-7nm-8150

      - const: qcom,sc7280-dsi-phy-7nm

    enum:

      - qcom,dsi-phy-7nm

      - qcom,dsi-phy-7nm-8150

      - qcom,sc7280-dsi-phy-7nm



  reg:

    items:

Documentation/devicetree/bindings/spi/omap-spi.yaml

+3 −3
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ unevaluatedProperties: false 
if:

  properties:

    compatible:

      oneOf:

        - const: ti,omap2-mcspi

        - const: ti,omap4-mcspi

      enum:

        - ti,omap2-mcspi

        - ti,omap4-mcspi



then:

  properties:

Documentation/devicetree/bindings/spi/spi-xilinx.yaml

+0 −2
Original line number Diff line number Diff line
@@ -27,13 +27,11 @@ properties: 


  xlnx,num-ss-bits:

    description: Number of chip selects used.

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

    minimum: 1

    maximum: 32



  xlnx,num-transfer-bits:

    description: Number of bits per transfer. This will be 8 if not specified.

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

    enum: [8, 16, 32]

    default: 8

Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml

+7 −7
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ maintainers: 


properties:

  compatible:

    oneOf:

      - const: maxim,max6369

      - const: maxim,max6370

      - const: maxim,max6371

      - const: maxim,max6372

      - const: maxim,max6373

      - const: maxim,max6374

    enum:

      - maxim,max6369

      - maxim,max6370

      - maxim,max6371

      - maxim,max6372

      - maxim,max6373

      - maxim,max6374



  reg:

    description: This is a 1-byte memory-mapped address

drivers/of/property.c

+3 −0
Original line number Diff line number Diff line
@@ -1444,6 +1444,9 @@ static int of_fwnode_add_links(struct fwnode_handle *fwnode) 
	struct property *p;

	struct device_node *con_np = to_of_node(fwnode);



	if (IS_ENABLED(CONFIG_X86))

		return 0;



	if (!con_np)

		return -EINVAL;