In commit f48b5e8bc2e1 ("dt-bindings: gpio-mmio: Add compatible string
for opencores,gpio") we marked opencores,gpio to be allowed with
brcm,bcm6345-gpio. This was wrong, opencores,gpio is not compatible with
brcm,bcm6345-gpio. It has a different register map and is 8-bit vs
Broadcom which is 32-bit. Change opencores,gpio to be a separate
compatible string for MMIO GPIO.
Also, as this change rewrote the entire enum, I took this opportunity to
alphabetically sort the list.
Fixes: f48b5e8bc2e1 ("dt-bindings: gpio-mmio: Add compatible string for
opencores,gpio")
Signed-off-by: Stafford Horne <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
---
Since v5:
- Updated comment based on comments from Krzysztof and Geert.
- Added reviewed-by's.
- Sorted the enum list and added not to commit message based on comment
from Krzysztof.
Since v4:
- New patch.
- Rebased old patch and rewrote commit message.
.../devicetree/bindings/gpio/gpio-mmio.yaml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/Documentation/devicetree/bindings/gpio/gpio-mmio.yaml
b/Documentation/devicetree/bindings/gpio/gpio-mmio.yaml
index 7ee40b9bc562..1b2d253b19c1 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-mmio.yaml
+++ b/Documentation/devicetree/bindings/gpio/gpio-mmio.yaml
@@ -18,16 +18,12 @@ description:
properties:
compatible:
- oneOf:
- - enum:
- - brcm,bcm6345-gpio
- - ni,169445-nand-gpio
- - wd,mbl-gpio # Western Digital MyBook Live memory-mapped GPIO
controller
- - intel,ixp4xx-expansion-bus-mmio-gpio
- - items:
- - enum:
- - opencores,gpio
- - const: brcm,bcm6345-gpio
+ enum:
+ - brcm,bcm6345-gpio
+ - intel,ixp4xx-expansion-bus-mmio-gpio
+ - ni,169445-nand-gpio
+ - opencores,gpio
+ - wd,mbl-gpio # Western Digital MyBook Live memory-mapped GPIO controller
big-endian: true
--
2.51.0