Devicetree fixes for v5.15, take 1:

- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmE7uQwQHHJvYmhAa2Vy
 bmVsLm9yZwAKCRD6+121jbxhwxw2D/9TQAoE6fW8uwojDqeOakRMuk+UALyqxIDt
 q9H2jb131iXo5RBrMN/oz4GgVRWD7iNr4QY7Ag/AX5dG7wnpsbeACeQkP4sJQ7GY
 +yN81WRJEU/9RG4yCE81Eqam9/oabqNnCIwj8YWF4m2p6VKBBgkrvxeik4KJgYfP
 7txqZ7I0O59fHR4+Ef3A6LO/xKhKx8WfbhXlOkolonyZ2UZk92l0/qgy9SocT74B
 G135ZgfGhT/1qIYKKErCqCKHU0yr/1Jg49Qb3yfo+io9bwoyjEwOCFkpneSJmDr7
 s8M1FQ0f2LOybMiIvPBnP1m1puORybtz0Stllpe5TVVzoJyaVeC48TUrFLeXfuqb
 dU0O1E6b9KryoDf9OtHrFcO4yzsfb/WCM6xoFGyKZXpWx73DtILImG2NWkjqgmbV
 QkfSnjqu56fdX6EqUG0tBJb1tsKgSb6mcevAZns8qfMBST43SkwmEJloEGHlio95
 XtStMqzBxexGIOIw+mGlsxF//7saH21X9/4pIKYhgJPOvHvgk1TQfX/6hq7rt/Hu
 pFe3/X+pZIkXcN+d5W+4piy5uxaB3xZIfC+5MiIJrXF43F0aFZcC2h3u8fhzEzHz
 S9gkA6JLg8h/kGXJ8/EEiQI3ayK/OUXWaA4JybP/Acdo365p+VKyK/8ITAvoaxxf
 S8S4jyVj4w==
 =a8nQ
 -----END PGP SIGNATURE-----

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

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;