tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds a1406e42 2aae0a93

+17 -16
+4 -4
Documentation/devicetree/bindings/display/msm/dsi-phy-7nm.yaml
··· 14 14 15 15 properties: 16 16 compatible: 17 - oneOf: 18 - - const: qcom,dsi-phy-7nm 19 - - const: qcom,dsi-phy-7nm-8150 20 - - const: qcom,sc7280-dsi-phy-7nm 17 + enum: 18 + - qcom,dsi-phy-7nm 19 + - qcom,dsi-phy-7nm-8150 20 + - qcom,sc7280-dsi-phy-7nm 21 21 22 22 reg: 23 23 items:
+3 -3
Documentation/devicetree/bindings/spi/omap-spi.yaml
··· 84 84 if: 85 85 properties: 86 86 compatible: 87 - oneOf: 88 - - const: ti,omap2-mcspi 89 - - const: ti,omap4-mcspi 87 + enum: 88 + - ti,omap2-mcspi 89 + - ti,omap4-mcspi 90 90 91 91 then: 92 92 properties:
-2
Documentation/devicetree/bindings/spi/spi-xilinx.yaml
··· 27 27 28 28 xlnx,num-ss-bits: 29 29 description: Number of chip selects used. 30 - $ref: /schemas/types.yaml#/definitions/uint32 31 30 minimum: 1 32 31 maximum: 32 33 32 34 33 xlnx,num-transfer-bits: 35 34 description: Number of bits per transfer. This will be 8 if not specified. 36 - $ref: /schemas/types.yaml#/definitions/uint32 37 35 enum: [8, 16, 32] 38 36 default: 8 39 37
+7 -7
Documentation/devicetree/bindings/watchdog/maxim,max63xx.yaml
··· 15 15 16 16 properties: 17 17 compatible: 18 - oneOf: 19 - - const: maxim,max6369 20 - - const: maxim,max6370 21 - - const: maxim,max6371 22 - - const: maxim,max6372 23 - - const: maxim,max6373 24 - - const: maxim,max6374 18 + enum: 19 + - maxim,max6369 20 + - maxim,max6370 21 + - maxim,max6371 22 + - maxim,max6372 23 + - maxim,max6373 24 + - maxim,max6374 25 25 26 26 reg: 27 27 description: This is a 1-byte memory-mapped address
+3
drivers/of/property.c
··· 1444 1444 struct property *p; 1445 1445 struct device_node *con_np = to_of_node(fwnode); 1446 1446 1447 + if (IS_ENABLED(CONFIG_X86)) 1448 + return 0; 1449 + 1447 1450 if (!con_np) 1448 1451 return -EINVAL; 1449 1452