Apply android14-5.15-2024-05_r3 devicetree bindings changes to android14-msm-pixelwatch-5.15 private/msm-google/Documentation/devicetree/bindings is a symlink to this project, but Git doesn't understand that, so it misapplies those changes there, and we have to apply them manually here. Sync SHA: 5fc7a0734ae6 BACKPORT: FROMGIT: usb: typec: tcpm: Check for port partner validity before consuming it Bug: 336352496 Change-Id: I142887c7d554a2d1c2e2cf4116336833807107f0 Signed-off-by: Ben Fennema <fennema@google.com>
diff --git a/bindings/nvmem/mxs-ocotp.yaml b/bindings/nvmem/mxs-ocotp.yaml index ff317fd..2e1fcff 100755 --- a/bindings/nvmem/mxs-ocotp.yaml +++ b/bindings/nvmem/mxs-ocotp.yaml
@@ -14,9 +14,11 @@ properties: compatible: - enum: - - fsl,imx23-ocotp - - fsl,imx28-ocotp + items: + - enum: + - fsl,imx23-ocotp + - fsl,imx28-ocotp + - const: fsl,ocotp "#address-cells": const: 1 @@ -40,7 +42,7 @@ examples: - | ocotp: efuse@8002c000 { - compatible = "fsl,imx28-ocotp"; + compatible = "fsl,imx28-ocotp", "fsl,ocotp"; #address-cells = <1>; #size-cells = <1>; reg = <0x8002c000 0x2000>;