From c706c98ef3b8c6063ed10cf9234f56b332aa5589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=2E=20Andrei=20M=C4=83ce=C8=99?= Date: Sat, 6 Aug 2016 11:11:52 -0400 Subject: [PATCH] Revert "nookhd: dts: Add and use B&N Elpida timings (4G/S4)" This reverts commit d5ea2d215cca0a685b1b82b2dffcab59bfab8ce6. --- arch/arm/boot/dts/elpida_bn.dtsi | 155 ------------------------ arch/arm/boot/dts/omap4-hummingbird.dts | 6 +- 2 files changed, 3 insertions(+), 158 deletions(-) delete mode 100644 arch/arm/boot/dts/elpida_bn.dtsi diff --git a/arch/arm/boot/dts/elpida_bn.dtsi b/arch/arm/boot/dts/elpida_bn.dtsi deleted file mode 100644 index 9d7f8465ad25..000000000000 --- a/arch/arm/boot/dts/elpida_bn.dtsi +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Common devices used in different OMAP boards - */ - -/ { - elpida_BN: lpddr2 { - compatible = "Elpida,BN","jedec,lpddr2-s4"; - density = <4096>; - io-width = <32>; - - tRPab-min-tck = <3>; - tRCD-min-tck = <3>; - tWR-min-tck = <3>; - tRASmin-min-tck = <3>; - tRRD-min-tck = <2>; - tWTR-min-tck = <2>; - tXP-min-tck = <2>; - tRTP-min-tck = <2>; - tCKE-min-tck = <3>; - tCKESR-min-tck = <3>; - tFAW-min-tck = <8>; - - timings_elpida_BN_533mhz: lpddr2-timings@0 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <533333333>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <7500>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <5620>; - }; - - timings_elpida_BN_466mhz: lpddr2-timings@1 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <466666666>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <7500>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <6000>; - }; - - timings_elpida_BN_400mhz: lpddr2-timings@2 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <400000000>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <7500>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <6000>; - }; - - timings_elpida_BN_333mhz: lpddr2-timings@3 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <333000000>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <7500>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <6000>; - }; - - timings_elpida_BN_233mhz: lpddr2-timings@4 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <233333333>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <10000>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <6000>; - }; - - timings_elpida_BN_200mhz: lpddr2-timings@5 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <200000000>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <10000>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <6000>; - }; - }; -}; diff --git a/arch/arm/boot/dts/omap4-hummingbird.dts b/arch/arm/boot/dts/omap4-hummingbird.dts index f62d16a47803..c84dd3ed64e3 100644 --- a/arch/arm/boot/dts/omap4-hummingbird.dts +++ b/arch/arm/boot/dts/omap4-hummingbird.dts @@ -8,7 +8,7 @@ /dts-v1/; #include "omap4460.dtsi" -#include "elpida_bn.dtsi" +#include "elpida_ecb240abacn.dtsi" / { model = "B&N Nook HD (hummingbird)"; @@ -232,12 +232,12 @@ &emif1 { //cs1-used; - device-handle = <&elpida_BN>; + device-handle = <&elpida_ECB240ABACN>; }; &emif2 { //cs1-used; - device-handle = <&elpida_BN>; + device-handle = <&elpida_ECB240ABACN>; }; &uart1 {