From db21bc10127d721bbc3f7eb0343a9aeb17b28fcc Mon Sep 17 00:00:00 2001
From: George Hilliard <thirtythreeforty@gmail.com>
Date: Wed, 24 Jul 2019 13:29:35 -0500
Subject: [PATCH] Upgrade to Linux 5.2.2

---
 board/businesscard/v1/dts/businesscard.dts |  2 +-
 board/businesscard/v1/linux_defconfig      | 26 ++++++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/board/businesscard/v1/dts/businesscard.dts b/board/businesscard/v1/dts/businesscard.dts
index 0469ab0..45810a4 100644
--- a/board/businesscard/v1/dts/businesscard.dts
+++ b/board/businesscard/v1/dts/businesscard.dts
@@ -73,7 +73,7 @@
 
 &uart0 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_pins_a>;
+	pinctrl-0 = <&uart0_pe_pins>;
 	status = "okay";
 };
 
diff --git a/board/businesscard/v1/linux_defconfig b/board/businesscard/v1/linux_defconfig
index a34c377..6a9e775 100644
--- a/board/businesscard/v1/linux_defconfig
+++ b/board/businesscard/v1/linux_defconfig
@@ -7,22 +7,23 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EXPERT=y
 # CONFIG_MULTIUSER is not set
 # CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
 # CONFIG_AIO is not set
+# CONFIG_KALLSYMS is not set
 CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_STRICT_KERNEL_RWX=y
-# CONFIG_BLK_DEBUG_FS is not set
 # CONFIG_ARCH_MULTI_V7 is not set
-CONFIG_ARCH_SUNXI_V5=y
+CONFIG_ARCH_SUNXI=y
 CONFIG_AEABI=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
 # CONFIG_SUSPEND is not set
+CONFIG_JUMP_LABEL=y
+CONFIG_STRICT_KERNEL_RWX=y
+# CONFIG_BLK_DEBUG_FS is not set
+CONFIG_UEVENT_HELPER=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_SUNXI_RSB=y
@@ -59,11 +60,9 @@ CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=y
-CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-# CONFIG_RC_CORE is not set
 # CONFIG_HID is not set
 # CONFIG_USB_HID is not set
 CONFIG_USB=y
@@ -78,7 +77,7 @@ CONFIG_USB_MUSB_SUNXI=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_ZERO=y
+CONFIG_USB_G_ACM_MS=y
 CONFIG_MMC=y
 CONFIG_MMC_SUNXI=y
 CONFIG_NEW_LEDS=y
@@ -97,7 +96,6 @@ CONFIG_SUN8I_R_CCU=y
 CONFIG_PWM=y
 CONFIG_PWM_SUN4I=y
 CONFIG_PHY_SUN4I_USB=y
-CONFIG_NVMEM=y
 CONFIG_NVMEM_SUNXI_SID=y
 CONFIG_EXT4_FS=y
 CONFIG_VFAT_FS=y
@@ -108,11 +106,6 @@ CONFIG_SQUASHFS_FILE_DIRECT=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_FS=y
-CONFIG_STACKTRACE=y
-CONFIG_RCU_TRACE=y
-# CONFIG_FTRACE is not set
 CONFIG_KEYS=y
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_CCM=y
@@ -125,3 +118,8 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_FS=y
+CONFIG_STACKTRACE=y
+CONFIG_RCU_TRACE=y
+# CONFIG_FTRACE is not set