From 3bb31a0e114404248d8f7ed4e935505a2b6f51c7 Mon Sep 17 00:00:00 2001
From: Wu Liangqing <wlq@rock-chips.com>
Date: Tue, 17 Dec 2019 17:00:45 +0800
Subject: [PATCH] ARM: dts: rockchip: rk3126-m88: enabled nandc for emmc and
 nand compatibility

Change-Id: Ifd5356aaffa00da2ba94897ee66cb0d7e8175994
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
---
 arch/arm/boot/dts/Makefile                                | 2 +-
 .../boot/dts/{rk3126-bnd-m88-emmc.dts => rk3126-m88.dts}  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename arch/arm/boot/dts/{rk3126-bnd-m88-emmc.dts => rk3126-m88.dts} (98%)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 8572731af19b..feed69aad526 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -850,8 +850,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3066a-rayeager.dtb \
 	rk3126-bnd-d708.dtb \
 	rk3126-bnd-d708-avb.dtb \
-	rk3126-bnd-m88-emmc.dtb \
 	rk3126-evb.dtb \
+	rk3126-m88.dtb \
 	rk3128-fireprime.dtb \
 	rk3128h-box.dtb \
 	rk3128h-box-avb.dtb \
diff --git a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts b/arch/arm/boot/dts/rk3126-m88.dts
similarity index 98%
rename from arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
rename to arch/arm/boot/dts/rk3126-m88.dts
index 80c9c6ba7d5e..2248687cb30b 100644
--- a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
+++ b/arch/arm/boot/dts/rk3126-m88.dts
@@ -13,8 +13,8 @@
 #include "rk312x-android.dtsi"
 
 / {
-	model = "Rockchip RK3126 bnd-m88 board";
-	compatible = "rockchip,rk3126-bnd-m88-emmc", "rockchip,rk3126";
+	model = "Rockchip RK3126 m88 board";
+	compatible = "rockchip,rk3126-m88", "rockchip,rk3126";
 
 	adc-keys {
 		compatible = "adc-keys";
@@ -238,8 +238,6 @@
 	disable-wp;
 	non-removable;
 	num-slots = <1>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
 	status = "okay";
 };
 
@@ -514,7 +512,7 @@
 };
 
 &nandc {
-	status = "disabled";
+	status = "okay";
 };
 
 &pinctrl {