From 7c2c371baec48dd974206d2e2630bb2dee84f278 Mon Sep 17 00:00:00 2001
From: trulyliu <2002385+trulyliu@users.noreply.github.com>
Date: Wed, 9 Jan 2019 17:43:56 +0800
Subject: [PATCH 1/2] Adjust sdio drive-strength to avoid sdio write error

---
 .../boot/dts/rockchip/rockpi-4b-linux.dts     | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rockpi-4b-linux.dts b/arch/arm64/boot/dts/rockchip/rockpi-4b-linux.dts
index a9d438dd437f4..b9a50b04e62db 100644
--- a/arch/arm64/boot/dts/rockchip/rockpi-4b-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rockpi-4b-linux.dts
@@ -281,15 +281,13 @@
 };
 
 &sdmmc {
-	clock-frequency = <100000000>;
-	clock-freq-min-max = <100000 100000000>;
 	supports-sd;
 	bus-width = <4>;
 	cap-mmc-highspeed;
 	cap-sd-highspeed;
 	disable-wp;
 	num-slots = <1>;
-	//sd-uhs-sdr104;
+	sd-uhs-sdr104;
 	vqmmc-supply = <&vcc_sd>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
@@ -298,8 +296,7 @@
 };
 
 &sdio0 {
-	clock-frequency = <100000000>;
-	clock-freq-min-max = <200000 100000000>;
+        max-frequency = <200000000>;
 	supports-sdio;
 	bus-width = <4>;
 	disable-wp;
@@ -311,7 +308,7 @@
 	num-slots = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
-	sd-uhs-sdr104;
+        sd-uhs-sdr104;
 	status = "okay";
 };
 
@@ -1036,6 +1033,30 @@
 			rockchip,pins =
 				<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
 		};
+		sdio0_cd: sdio0-cd {
+			rockchip,pins =
+				<2 26 RK_FUNC_1 &pcfg_pull_up_20ma>;
+		};
+
+		sdio0_pwr: sdio0-pwr {
+			rockchip,pins =
+				<2 27 RK_FUNC_1 &pcfg_pull_up_20ma>;
+		};
+
+		sdio0_bkpwr: sdio0-bkpwr {
+			rockchip,pins =
+				<2 28 RK_FUNC_1 &pcfg_pull_up_20ma>;
+		};
+
+		sdio0_wp: sdio0-wp {
+			rockchip,pins =
+				<0 3 RK_FUNC_1 &pcfg_pull_up_20ma>;
+			};
+
+		sdio0_int: sdio0-int {
+			rockchip,pins =
+				<0 4 RK_FUNC_1 &pcfg_pull_up_20ma>;
+		};
 	};
 
 	sdmmc {

From ae217e313902793278d630c1dd487237641868ec Mon Sep 17 00:00:00 2001
From: trulyliu <2002385+trulyliu@users.noreply.github.com>
Date: Wed, 9 Jan 2019 18:05:25 +0800
Subject: [PATCH 2/2] Enable SQUASHFS_XZ to support snap apps

---
 arch/arm/configs/rockchip_linux_defconfig   | 1 +
 arch/arm64/configs/rockchip_linux_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/configs/rockchip_linux_defconfig b/arch/arm/configs/rockchip_linux_defconfig
index 4eb7c9023b32c..95fd0e70085dd 100644
--- a/arch/arm/configs/rockchip_linux_defconfig
+++ b/arch/arm/configs/rockchip_linux_defconfig
@@ -486,6 +486,7 @@ CONFIG_ECRYPT_FS=y
 CONFIG_HFSPLUS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
 CONFIG_PSTORE=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=y
diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig
index 43d6dea09c540..0f8f5cc39689b 100644
--- a/arch/arm64/configs/rockchip_linux_defconfig
+++ b/arch/arm64/configs/rockchip_linux_defconfig
@@ -1222,6 +1222,7 @@ CONFIG_ECRYPT_FS=m
 CONFIG_HFSPLUS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
 CONFIG_PSTORE=y
 CONFIG_PSTORE_CONSOLE=y
 CONFIG_PSTORE_RAM=y