From 01fd7cbc9e2b23e6515f1b553977f4f9c92d14f7 Mon Sep 17 00:00:00 2001 From: Zhaoyifeng Date: Mon, 16 Jun 2014 18:27:35 +0800 Subject: [PATCH] nand : move nand config form dtsi to dts,add nandc0reg config for sn read api. --- arch/arm/boot/dts/rk3288-tb.dts | 11 +++++++++++ arch/arm/boot/dts/rk3288.dtsi | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts index 6fa9837227de..87f1eb498a10 100755 --- a/arch/arm/boot/dts/rk3288-tb.dts +++ b/arch/arm/boot/dts/rk3288-tb.dts @@ -208,6 +208,17 @@ }; +&nandc0 { + status = "disabled"; // used nand set "disabled" ,used emmc set "okay" +}; +&nandc1 { + status = "disabled"; // used nand set "disabled" ,used emmc set "okay" +}; + +&nandc0reg { + status = "okay"; // used nand set "disabled" ,used emmc set "okay" +}; + &emmc { clock-frequency = <100000000>; clock-freq-min-max = <400000 100000000>; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index c36e5dd40bfe..0a72ddaf13a2 100755 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -246,7 +246,6 @@ nandc_id = <0>; clocks = <&clk_nandc0>, <&clk_gates5 5>, <&clk_gates7 14>; clock-names = "clk_nandc", "g_clk_nandc", "hclk_nandc"; - status = "okay"; }; nandc1: nandc@0xff410000 { @@ -256,7 +255,11 @@ nandc_id = <1>; clocks = <&clk_nandc1>, <&clk_gates5 6>, <&clk_gates7 15>; clock-names = "clk_nandc", "g_clk_nandc", "hclk_nandc"; - status = "okay"; + }; + + nandc0reg: nandc0@0xff400000 { + compatible = "rockchip,rk-nandc"; + reg = <0xff400000 0x4000>; }; emmc: rksdmmc@ff0f0000 { -- 2.34.1