diff --git a/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml b/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml
index 924442134b248..0be283d25641f 100644
--- a/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml
+++ b/Documentation/devicetree/bindings/input/apple,dockchannel-hid.yaml
@@ -29,7 +29,11 @@ description: |
 
 properties:
   compatible:
-    const: apple,dockchannel-hid
+    oneOf:
+      - const: apple,dockchannel-hid
+      - items:
+          - const: apple,t6041-dockchannel-hid
+          - const: apple,dockchannel-hid
 
   reg:
     minItems: 4
diff --git a/Documentation/devicetree/bindings/mfd/apple,smc.yaml b/Documentation/devicetree/bindings/mfd/apple,smc.yaml
index 31d1940f9d3dc..575ca5fc512dd 100644
--- a/Documentation/devicetree/bindings/mfd/apple,smc.yaml
+++ b/Documentation/devicetree/bindings/mfd/apple,smc.yaml
@@ -19,6 +19,7 @@ properties:
       - items:
           - enum:
               - apple,t6020-smc
+              - apple,t6041-smc
               - apple,t8122-smc
               - apple,t8140-smc
               - apple,t8142-smc
diff --git a/arch/arm64/boot/dts/apple/t6040-j616s.dts b/arch/arm64/boot/dts/apple/t6040-j616s.dts
index ee36e3e012cf9..7c8280cd45850 100644
--- a/arch/arm64/boot/dts/apple/t6040-j616s.dts
+++ b/arch/arm64/boot/dts/apple/t6040-j616s.dts
@@ -340,8 +340,19 @@
 / {
 	pcie0: pcie@1cb0000000 {
 		compatible = "apple,t6041-pcie", "apple,t6020-pcie";
-		reg = <0x1c 0xb0000000 0 0x1000000 4 0x14000000 0 0x4000 4 0x10028000 0 0x4000 4 0x17020000 0 0x4000>;
-		reg-names = "config", "rc", "port0", "phy0";
+		reg = <0x1c 0xb0000000 0x0 0x1000000>,	/* config */
+		      <0x4 0x14000000 0x0 0x4000>,	/* rc */
+		      <0x4 0x10028000 0x0 0x4000>,	/* port0 */
+		      <0x4 0x11028000 0x0 0x4000>,	/* port1 */
+		      <0x4 0x12028000 0x0 0x4000>,	/* port2 */
+		      <0x4 0x13028000 0x0 0x4000>,	/* port3 */
+		      <0x4 0x17020000 0x0 0x4000>,	/* phy0 */
+		      <0x4 0x17024000 0x0 0x4000>,	/* phy1 */
+		      <0x4 0x17028000 0x0 0x4000>,	/* phy2 */
+		      <0x4 0x1702c000 0x0 0x4000>;	/* phy3 */
+		reg-names = "config", "rc",
+			    "port0", "port1", "port2", "port3",
+			    "phy0", "phy1", "phy2", "phy3";
 		ranges = <0x43000000 0xb 0xc0000000 0xb 0xc0000000 0 0x20000000 0x2000000 0 0x80000000 0xb 0x80000000 0 0x40000000>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&wifi_clkreq>;
diff --git a/arch/arm64/boot/dts/apple/t6040.dtsi b/arch/arm64/boot/dts/apple/t6040.dtsi
index 1046aec7d6208..85114b04d9b20 100644
--- a/arch/arm64/boot/dts/apple/t6040.dtsi
+++ b/arch/arm64/boot/dts/apple/t6040.dtsi
@@ -1072,7 +1072,7 @@
 	};
 
 	smc: smc@50c600000 {
-		compatible = "apple,t6041-smc", "apple,t8103-smc", "apple,smc";
+		compatible = "apple,t6041-smc", "apple,t8103-smc";
 		reg = <0x5 0x0c600000 0x0 0x4000>,
 		      <0x5 0x0de70000 0x0 0x100000>;
 		reg-names = "smc", "sram";