diff --git a/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml b/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml
index d982780c31f18..ce11949c34455 100644
--- a/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml
+++ b/Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml
@@ -16,6 +16,20 @@ description: >
   line of the attached DWC3 controller and acts as the Type-C orientation
   switch.
 
+$defs:
+  apple,tunable:
+    $ref: /schemas/types.yaml#/definitions/uint32-matrix
+    minItems: 1
+    maxItems: 512
+    items:
+      items:
+        - description: Register offset
+        - description: Mask to be applied to the register value
+        - description: Bits to be set after applying the mask
+    description: >
+      Calibration table from the device's Apple device tree, applied at every
+      USB3 power-on.
+
 properties:
   compatible:
     const: apple,t6040-atcphy
@@ -71,19 +85,49 @@ properties:
     $ref: /schemas/graph.yaml#/properties/port
     description: Link to the SuperSpeed lanes of the Type-C connector.
 
-patternProperties:
-  "^apple,tunable-(axi2af|axi2af-lioa|fabric|common-cfg|lane0|lane1|aus40cmn-shm|auspll|cio4pll|pipehandler|usb2-host)$":
-    $ref: /schemas/types.yaml#/definitions/uint32-matrix
-    minItems: 1
-    maxItems: 512
-    items:
-      items:
-        - description: Register offset
-        - description: Mask to be applied to the register value
-        - description: Bits to be set after applying the mask
-    description: >
-      Calibration tables from the device's Apple device tree, applied at
-      every USB3 power-on to the region the name refers to.
+  apple,tunable-axi2af:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the axi2af region.
+
+  apple,tunable-fabric:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the fabric region.
+
+  apple,tunable-common-cfg:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the common-cfg region.
+
+  apple,tunable-axi2af-lioa:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the axi2af-lioa region.
+
+  apple,tunable-lane0:
+    $ref: "#/$defs/apple,tunable"
+    description: Lane 0 tunables, applied to the core region.
+
+  apple,tunable-lane1:
+    $ref: "#/$defs/apple,tunable"
+    description: Lane 1 tunables, applied to the core region.
+
+  apple,tunable-aus40cmn-shm:
+    $ref: "#/$defs/apple,tunable"
+    description: AUS40CMN_SHM tunables, applied to the core region.
+
+  apple,tunable-auspll:
+    $ref: "#/$defs/apple,tunable"
+    description: AUSPLL tunables, applied to the core region.
+
+  apple,tunable-cio4pll:
+    $ref: "#/$defs/apple,tunable"
+    description: CIO4PLL tunables, applied to the core region.
+
+  apple,tunable-pipehandler:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the pipehandler region.
+
+  apple,tunable-usb2-host:
+    $ref: "#/$defs/apple,tunable"
+    description: USB2 host tunables, applied to the bank0 region.
 
 required:
   - compatible
diff --git a/Documentation/devicetree/bindings/usb/apple,dwc3.yaml b/Documentation/devicetree/bindings/usb/apple,dwc3.yaml
index 14061aa102b53..74ef99bccf870 100644
--- a/Documentation/devicetree/bindings/usb/apple,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/apple,dwc3.yaml
@@ -25,6 +25,20 @@ allOf:
       required:
         - power-domains
 
+$defs:
+  apple,tunable:
+    $ref: /schemas/types.yaml#/definitions/uint32-matrix
+    minItems: 1
+    maxItems: 512
+    items:
+      items:
+        - description: Register offset
+        - description: Mask to be applied to the register value
+        - description: Bits to be set after applying the mask
+    description: >
+      Controller table from the device's Apple device tree, applied after
+      every core reset (T6040).
+
 properties:
   compatible:
     oneOf:
@@ -66,19 +80,25 @@ properties:
   power-domains:
     maxItems: 1
 
-patternProperties:
-  "^apple,tunable-(gbl-default|gbl-host|dbg|cfg-host|link)$":
-    $ref: /schemas/types.yaml#/definitions/uint32-matrix
-    minItems: 1
-    maxItems: 512
-    items:
-      items:
-        - description: Register offset
-        - description: Mask to be applied to the register value
-        - description: Bits to be set after applying the mask
-    description: >
-      Controller tables from the device's Apple device tree, applied after
-      every core reset (T6040).
+  apple,tunable-gbl-default:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the DWC3 global registers.
+
+  apple,tunable-gbl-host:
+    $ref: "#/$defs/apple,tunable"
+    description: Host mode tunables applied to the DWC3 global registers.
+
+  apple,tunable-dbg:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the debug registers of the Apple region.
+
+  apple,tunable-cfg-host:
+    $ref: "#/$defs/apple,tunable"
+    description: Host mode tunables applied to the drd-cfg region.
+
+  apple,tunable-link:
+    $ref: "#/$defs/apple,tunable"
+    description: Tunables applied to the link registers of the Apple region.
 
 required:
   - compatible