Raven is Google's code name for Pixel 6 Pro. Since there are differences compared to Pixel 6 (Oriole), we need to add a separate compatible for it. We also want to support a generic DT, which can work on any type of gs101-based Pixel device, e.g. Pixel 6, or Pixel 6 Pro, or Pixel 6a (as a future addition). Such a DT will have certain nodes disabled / not added. To facilitate such a generic gs101-based Pixel device, also add a more generic gs101-pixel compatible. We can not just use the existing google,gs101 for that, as it refers to the SoC, not a board. Signed-off-by: André Draszik <andre.draszik@xxxxxxxxxx> --- Documentation/devicetree/bindings/arm/google.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/google.yaml b/Documentation/devicetree/bindings/arm/google.yaml index e20b5c9b16bc..a8faf2256242 100644 --- a/Documentation/devicetree/bindings/arm/google.yaml +++ b/Documentation/devicetree/bindings/arm/google.yaml @@ -34,11 +34,21 @@ properties: const: '/' compatible: oneOf: - - description: Google Pixel 6 / Oriole + - description: Google GS101 Pixel devices, as generic Pixel, or Pixel 6 + (Oriole), or 6 Pro (Raven) + minItems: 2 + maxItems: 3 items: - - enum: - - google,gs101-oriole - - const: google,gs101 + enum: + - google,gs101-oriole + - google,gs101-raven + - google,gs101-pixel + - google,gs101 + allOf: + - contains: + const: google,gs101-pixel + - contains: + const: google,gs101 # Bootloader requires empty ect node to be present ect: -- 2.47.1.613.gc27f4b7a9f-goog