dt-bindings: Use 'enum' instead of 'oneOf' plus 'const' entries
Subsystems (24)
Rob Herring
maintainerPATCH 1/1 dt-bindings: Use 'enum' instead of 'oneOf' plus 'const' entries
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
--- .../bindings/display/msm/dsi-phy-10nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-14nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-28nm.yaml | 8 ++++---- .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 12 ++++++------ .../devicetree/bindings/firmware/arm,scpi.yaml | 6 +++--- .../devicetree/bindings/i2c/ti,omap4-i2c.yaml | 10 +++++----- .../interrupt-controller/loongson,liointc.yaml | 8 ++++---- .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 8 ++++---- .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 6 +++--- .../devicetree/bindings/net/realtek-bluetooth.yaml | 8 ++++---- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 8 ++++---- .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 6 +++--- Documentation/devicetree/bindings/pci/loongson.yaml | 8 ++++---- .../devicetree/bindings/phy/intel,lgm-emmc-phy.yaml | 6 +++--- .../devicetree/bindings/serial/8250_omap.yaml | 9 +++++---- .../devicetree/bindings/sound/qcom,sm8250.yaml | 6 +++--- .../devicetree/bindings/sound/tlv320adcx140.yaml | 8 ++++---- .../devicetree/bindings/spi/realtek,rtl-spi.yaml | 12 ++++++------ .../devicetree/bindings/timer/arm,sp804.yaml | 6 +++--- 19 files changed, 74 insertions(+), 73 deletions(-)
Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml +3 -3
@@ -14,9 +14,9 @@ allOf: properties: compatible: - oneOf: - - const: qcom,dsi-phy-10nm - - const: qcom,dsi-phy-10nm-8998 + enum: + - qcom,dsi-phy-10nm + - qcom,dsi-phy-10nm-8998 reg: items:
Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml +3 -3
@@ -14,9 +14,9 @@ allOf: properties: compatible: - oneOf: - - const: qcom,dsi-phy-14nm - - const: qcom,dsi-phy-14nm-660 + enum: + - qcom,dsi-phy-14nm + - qcom,dsi-phy-14nm-660 reg: items:
Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml +4 -4
@@ -14,10 +14,10 @@ allOf: properties: compatible: - oneOf: - - const: qcom,dsi-phy-28nm-hpm - - const: qcom,dsi-phy-28nm-lp - - const: qcom,dsi-phy-28nm-8960 + enum: + - qcom,dsi-phy-28nm-hpm + - qcom,dsi-phy-28nm-lp + - qcom,dsi-phy-28nm-8960 reg: items:
Documentation/devicetree/bindings/dma/allwinner,sun6i-a31-dma.yaml +6 -6
@@ -19,12 +19,12 @@ properties: description: The cell is the request line number. compatible: - oneOf: - - const: allwinner,sun6i-a31-dma - - const: allwinner,sun8i-a23-dma - - const: allwinner,sun8i-a83t-dma - - const: allwinner,sun8i-h3-dma - - const: allwinner,sun8i-v3s-dma + enum: + - allwinner,sun6i-a31-dma + - allwinner,sun8i-a23-dma + - allwinner,sun8i-a83t-dma + - allwinner,sun8i-h3-dma + - allwinner,sun8i-v3s-dma reg: maxItems: 1
Documentation/devicetree/bindings/firmware/arm,scpi.yaml +3 -3
@@ -131,9 +131,9 @@ properties: properties: compatible: - oneOf: - - const: arm,scpi-dvfs-clocks - - const: arm,scpi-variable-clocks + enum: + - arm,scpi-dvfs-clocks + - arm,scpi-variable-clocks '#clock-cells': const: 1
Documentation/devicetree/bindings/i2c/ti,omap4-i2c.yaml +5 -5
@@ -72,11 +72,11 @@ additionalProperties: false if: properties: compatible: - oneOf: - - const: ti,omap2420-i2c - - const: ti,omap2430-i2c - - const: ti,omap3-i2c - - const: ti,omap4-i2c + enum: + - ti,omap2420-i2c + - ti,omap2430-i2c + - ti,omap3-i2c + - ti,omap4-i2c then: properties:
Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml +4 -4
@@ -19,10 +19,10 @@ allOf: properties: compatible: - oneOf: - - const: loongson,liointc-1.0 - - const: loongson,liointc-1.0a - - const: loongson,liointc-2.0 + enum: + - loongson,liointc-1.0 + - loongson,liointc-1.0a + - loongson,liointc-2.0 reg: minItems: 1
Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml +4 -4
@@ -83,10 +83,10 @@ properties: link-frequencies: true data-lanes: true bus-type: - oneOf: - - const: 1 # CSI-2 C-PHY - - const: 3 # CCP2 - - const: 4 # CSI-2 D-PHY + enum: + - 1 # CSI-2 C-PHY + - 3 # CCP2 + - 4 # CSI-2 D-PHY required: - link-frequencies
Documentation/devicetree/bindings/mfd/ti,lp87565-q1.yaml +3 -3
@@ -11,9 +11,9 @@ maintainers: properties: compatible: - oneOf: - - const: ti,lp87565 - - const: ti,lp87565-q1 + enum: + - ti,lp87565 + - ti,lp87565-q1 reg: description: I2C slave address
Documentation/devicetree/bindings/net/realtek-bluetooth.yaml +4 -4
@@ -17,10 +17,10 @@ description: properties: compatible: - oneOf: - - const: "realtek,rtl8723bs-bt" - - const: "realtek,rtl8723cs-bt" - - const: "realtek,rtl8822cs-bt" + enum: + - realtek,rtl8723bs-bt + - realtek,rtl8723cs-bt + - realtek,rtl8822cs-bt device-wake-gpios: maxItems: 1
Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +4 -4
@@ -53,10 +53,10 @@ properties: "#size-cells": true compatible: - oneOf: - - const: ti,am654-cpsw-nuss - - const: ti,j721e-cpsw-nuss - - const: ti,am642-cpsw-nuss + enum: + - ti,am654-cpsw-nuss + - ti,j721e-cpsw-nuss + - ti,am642-cpsw-nuss reg: maxItems: 1
Documentation/devicetree/bindings/net/ti,k3-am654-cpts.yaml +3 -3
@@ -45,9 +45,9 @@ properties: pattern: "^cpts@[0-9a-f]+$" compatible: - oneOf: - - const: ti,am65-cpts - - const: ti,j721e-cpts + enum: + - ti,am65-cpts + - ti,j721e-cpts reg: maxItems: 1
Documentation/devicetree/bindings/pci/loongson.yaml +4 -4
@@ -17,10 +17,10 @@ allOf: properties: compatible: - oneOf: - - const: loongson,ls2k-pci - - const: loongson,ls7a-pci - - const: loongson,rs780e-pci + enum: + - loongson,ls2k-pci + - loongson,ls7a-pci + - loongson,rs780e-pci reg: minItems: 1
Documentation/devicetree/bindings/phy/intel,lgm-emmc-phy.yaml +3 -3
@@ -23,9 +23,9 @@ description: |+ properties: compatible: - oneOf: - - const: intel,lgm-emmc-phy - - const: intel,keembay-emmc-phy + enum: + - intel,lgm-emmc-phy + - intel,keembay-emmc-phy "#phy-cells": const: 0
Documentation/devicetree/bindings/serial/8250_omap.yaml +5 -4
@@ -90,10 +90,11 @@ additionalProperties: false if: properties: compatible: - oneOf: - - const: ti,omap2-uart - - const: ti,omap3-uart - - const: ti,omap4-uart + contains: + enum: + - ti,omap2-uart + - ti,omap3-uart + - ti,omap4-uart then: properties:
Documentation/devicetree/bindings/sound/qcom,sm8250.yaml +3 -3
@@ -15,9 +15,9 @@ description: properties: compatible: - oneOf: - - const: qcom,sm8250-sndcard - - const: qcom,qrb5165-rb5-sndcard + enum: + - qcom,sm8250-sndcard + - qcom,qrb5165-rb5-sndcard audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array
Documentation/devicetree/bindings/sound/tlv320adcx140.yaml +4 -4
@@ -24,10 +24,10 @@ description: | properties: compatible: - oneOf: - - const: ti,tlv320adc3140 - - const: ti,tlv320adc5140 - - const: ti,tlv320adc6140 + enum: + - ti,tlv320adc3140 + - ti,tlv320adc5140 + - ti,tlv320adc6140 reg: maxItems: 1
Documentation/devicetree/bindings/spi/realtek,rtl-spi.yaml +6 -6
@@ -15,12 +15,12 @@ allOf: properties: compatible: - oneOf: - - const: realtek,rtl8380-spi - - const: realtek,rtl8382-spi - - const: realtek,rtl8391-spi - - const: realtek,rtl8392-spi - - const: realtek,rtl8393-spi + enum: + - realtek,rtl8380-spi + - realtek,rtl8382-spi + - realtek,rtl8391-spi + - realtek,rtl8392-spi + - realtek,rtl8393-spi reg: maxItems: 1
Documentation/devicetree/bindings/timer/arm,sp804.yaml +3 -3
@@ -23,9 +23,9 @@ select: properties: compatible: contains: - oneOf: - - const: arm,sp804 - - const: hisilicon,sp804 + enum: + - arm,sp804 + - hisilicon,sp804 required: - compatible
Signature · 1 line
2.30.2
Hi Rob,
Thanks for the patch.
Quoted 19 lines · Rob Herring
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Cc Vinod Koul <[email protected]>Cc Maxime Ripard <[email protected]>Cc Vignesh R <[email protected]>Cc Marc Zyngier <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Lee Jones <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mark Brown <[email protected]>Cc Daniel Lezcano <[email protected]>
Quoted 8 lines
Signature · 1 line
Sakari Ailus
Quoted 2 lines · Rob Herring
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Quoted 27 lines · Rob Herring
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Cc Vinod Koul <[email protected]>Cc Maxime Ripard <[email protected]>Cc Vignesh R <[email protected]>Cc Marc Zyngier <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Lee Jones <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mark Brown <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 4 lines
--- .../bindings/display/msm/dsi-phy-10nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-14nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-28nm.yaml | 8 ++++----
Quoted 2 lines
.../bindings/dma/allwinner,sun6i-a31-dma.yaml | 12 ++++++------ .../devicetree/bindings/phy/intel,lgm-emmc-phy.yaml | 6 +++---
Signature · 1 line
~Vinod
Quoted 19 lines · Rob Herring
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Cc Vinod Koul <[email protected]>Cc Maxime Ripard <[email protected]>Cc Vignesh R <[email protected]>Cc Marc Zyngier <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Lee Jones <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mark Brown <[email protected]>Cc Daniel Lezcano <[email protected]>
Quoted 8 lines
Thanks!
Quoted 19 lines · Rob Herring
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Cc Vinod Koul <[email protected]>Cc Maxime Ripard <[email protected]>Cc Vignesh R <[email protected]>Cc Marc Zyngier <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Lee Jones <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mark Brown <[email protected]>Cc Daniel Lezcano <[email protected]>
Quoted 8 lines
Quoted 27 lines · Rob Herring
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Cc Vinod Koul <[email protected]>Cc Maxime Ripard <[email protected]>Cc Vignesh R <[email protected]>Cc Marc Zyngier <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Lee Jones <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mark Brown <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 10 lines
--- .../bindings/display/msm/dsi-phy-10nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-14nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-28nm.yaml | 8 ++++---- .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 12 ++++++------ .../devicetree/bindings/firmware/arm,scpi.yaml | 6 +++--- .../devicetree/bindings/i2c/ti,omap4-i2c.yaml | 10 +++++----- .../interrupt-controller/loongson,liointc.yaml | 8 ++++---- .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 8 ++++---- .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 6 +++---
Quoted 11 lines
.../devicetree/bindings/net/realtek-bluetooth.yaml | 8 ++++---- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 8 ++++---- .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 6 +++--- Documentation/devicetree/bindings/pci/loongson.yaml | 8 ++++---- .../devicetree/bindings/phy/intel,lgm-emmc-phy.yaml | 6 +++--- .../devicetree/bindings/serial/8250_omap.yaml | 9 +++++---- .../devicetree/bindings/sound/qcom,sm8250.yaml | 6 +++--- .../devicetree/bindings/sound/tlv320adcx140.yaml | 8 ++++---- .../devicetree/bindings/spi/realtek,rtl-spi.yaml | 12 ++++++------ .../devicetree/bindings/timer/arm,sp804.yaml | 6 +++--- 19 files changed, 74 insertions(+), 73 deletions(-)
Signature · 9 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Em Tue, 24 Aug 2021 15:20:14 -0500
Rob Herring <[email protected]> escreveu:
Quoted 37 lines
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Cc Vinod Koul <[email protected]>Cc Maxime Ripard <[email protected]>Cc Vignesh R <[email protected]>Cc Marc Zyngier <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Lee Jones <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mark Brown <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>--- .../bindings/display/msm/dsi-phy-10nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-14nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-28nm.yaml | 8 ++++---- .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 12 ++++++------ .../devicetree/bindings/firmware/arm,scpi.yaml | 6 +++--- .../devicetree/bindings/i2c/ti,omap4-i2c.yaml | 10 +++++----- .../interrupt-controller/loongson,liointc.yaml | 8 ++++----
Quoted 1 line
.../devicetree/bindings/media/i2c/mipi-ccs.yaml | 8 ++++----
For media:
Thanks,
Mauro
Quoted 44 lines · Rob Herring
'enum' is equivalent to 'oneOf' with a list of 'const' entries, but 'enum' is more concise and yields better error messages.
Cc Vinod Koul <[email protected]>Cc Maxime Ripard <[email protected]>Cc Vignesh R <[email protected]>Cc Marc Zyngier <[email protected]>Cc Sakari Ailus <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Cc Lee Jones <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Kishon Vijay Abraham I <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Mark Brown <[email protected]>Cc Daniel Lezcano <[email protected]>Signed-off-by Rob Herring <[email protected]>--- .../bindings/display/msm/dsi-phy-10nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-14nm.yaml | 6 +++--- .../bindings/display/msm/dsi-phy-28nm.yaml | 8 ++++---- .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 12 ++++++------ .../devicetree/bindings/firmware/arm,scpi.yaml | 6 +++--- .../devicetree/bindings/i2c/ti,omap4-i2c.yaml | 10 +++++----- .../interrupt-controller/loongson,liointc.yaml | 8 ++++---- .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 8 ++++---- .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 6 +++--- .../devicetree/bindings/net/realtek-bluetooth.yaml | 8 ++++---- .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 8 ++++---- .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 6 +++--- Documentation/devicetree/bindings/pci/loongson.yaml | 8 ++++---- .../devicetree/bindings/phy/intel,lgm-emmc-phy.yaml | 6 +++--- .../devicetree/bindings/serial/8250_omap.yaml | 9 +++++----
Quoted 1 line
.../devicetree/bindings/sound/qcom,sm8250.yaml | 6 +++---
for sm8250 sound card,
Quoted 5 lines
.../devicetree/bindings/sound/tlv320adcx140.yaml | 8 ++++---- .../devicetree/bindings/spi/realtek,rtl-spi.yaml | 12 ++++++------ .../devicetree/bindings/timer/arm,sp804.yaml | 6 +++--- 19 files changed, 74 insertions(+), 73 deletions(-)