backport: typec: v5.4.58

Signed-off-by: Robert Nelson <[email protected]>

Author: RobertCNelson

patch.sh

@@ -498,40 +498,39 @@ patch_backports (){
 }
 
 backports () {
-	backport_tag="v5.3.18"
+	backport_tag="v5.4.58"
 
-	subsystem="stmpe"
+	subsystem="typec"
 	#regenerate="enable"
 	if [ "x${regenerate}" = "xenable" ] ; then
 		pre_backports
 
-		cp -v ~/linux-src/drivers/iio/adc/stmpe-adc.c ./drivers/iio/adc/
-		cp -v ~/linux-src/drivers/mfd/stmpe.c ./drivers/mfd/
-		cp -v ~/linux-src/include/linux/mfd/stmpe.h ./include/linux/mfd/
+		cp -rv ~/linux-src/drivers/usb/typec/ ./drivers/usb/typec/
 
 		post_backports
 		exit 2
 	else
 		patch_backports
 	fi
 
-	${git} "${DIR}/patches/backports/stmpe/0002-stmpe-wire-up-adc-Kconfig-Makefile.patch"
-
 	backport_tag="v5.3.18"
 
-	subsystem="typec"
+	subsystem="stmpe"
 	#regenerate="enable"
 	if [ "x${regenerate}" = "xenable" ] ; then
 		pre_backports
 
-		cp -rv ~/linux-src/drivers/usb/typec/ ./drivers/usb/typec/
+		cp -v ~/linux-src/drivers/iio/adc/stmpe-adc.c ./drivers/iio/adc/
+		cp -v ~/linux-src/drivers/mfd/stmpe.c ./drivers/mfd/
+		cp -v ~/linux-src/include/linux/mfd/stmpe.h ./include/linux/mfd/
 
 		post_backports
 		exit 2
 	else
 		patch_backports
 	fi
 
+	${git} "${DIR}/patches/backports/stmpe/0002-stmpe-wire-up-adc-Kconfig-Makefile.patch"
 
 	backport_tag="v5.0.21"