From 9e8eeafaf998e18ecfbb279ae49ecf3b03538394 Mon Sep 17 00:00:00 2001
From: suyuan168 <175338101@qq.com>
Date: Thu, 9 Jun 2022 01:16:23 +0800
Subject: [PATCH] Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch

---
 ...0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch
index 21e02cb3..57053c9c 100755
--- a/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch
+++ b/root/target/linux/bcm27xx/patches-5.4/950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch
@@ -372,52 +372,47 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 +	
 +		wlan2g {
 +				label = "wlan2g";
-<<<<<<< HEAD
 +				gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
-+			};6
-=======
-+				gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 +			};
->>>>>>> parent of 07a0b22b (Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch)
 +	
 +		wlan5g {
 +				label = "wlan5g";
-+				gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 +			};
 +	
 +		wan {
 +				label = "wan";
-+				gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 +			};  
 +	   
 +		5g1 {
 +				label = "5g1";
-+				gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
 +			};  
 +	   
 +		5g2 {
 +				label = "5g2";
-+				gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 +			};  
 +	   
 +		5g3 {
 +				label = "5g3";
-+				gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
 +			};  
 +	
 +		5g4 {
 +				label = "5g4";
-+				gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 +			};   
 +	  
 +		5g5 {
 +				label = "5g5";
-+				gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
 +			}; 
 +	    
 +		5g6 {
 +				label = "5g6";
-+				gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
 +			};
 +	  
 +		5gpwr1 {
@@ -437,17 +432,17 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 +	
 +		5gpwr4 {
 +				label = "5gpwr4";
-+				gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 +			};    
 +	 
 +		5gpwr5 {
 +				label = "5gpwr5";
-+				gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 +			};  
 +	   
 +		5gpwr6 {
 +				label = "5gpwr6";
-+				gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
++				gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
 +			};  
 +};
 +