shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: rockchip: rk3126-m88: enabled nandc for emmc and nand compatibility

Browse Source 
Change-Id: Ifd5356aaffa00da2ba94897ee66cb0d7e8175994
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
This commit is contained in:
Wu Liangqing
2019-12-17 17:00:45 +08:00
committed by Tao Huang
parent a4524d29de
commit 3bb31a0e11
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/Makefile
View File

@@ -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 \

8
arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts → arch/arm/boot/dts/rk3126-m88.dts
View File

@@ -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 {