diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 23:36:51 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 23:36:51 +0200 |
| commit | f54ffe0fef2b0bd635e2ee2738155fca70854675 (patch) | |
| tree | 428619d8ce8cd123c2733bb96e7e641058665e6d /arch/arm/boot | |
| parent | Merge tag 's3c24xx-driver-1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | ARM: OMAP2+: gpmc: Converts GPMC driver to pm_runtime capable (diff) | |
| download | linux-f54ffe0fef2b0bd635e2ee2738155fca70854675.tar.xz linux-f54ffe0fef2b0bd635e2ee2738155fca70854675.zip | |
Merge tag 'omap-for-v3.11/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
From Tony Lindgren:
Omap GPMC (General Purpose Memory Controller) changes.
* tag 'omap-for-v3.11/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: gpmc: Converts GPMC driver to pm_runtime capable
ARM: OMAP2+: gpmc: get number of useable GPMC chip-selects via DT
ARM: dts: OMAP2+: Simplify NAND support
ARM: OMAP2+: Allow NAND transfer mode to be specified in DT
ARM: OMAP2+: nand: reorganize gpmc timing values
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/omap3430-sdp.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts index 144ae43453c4..6076d016b479 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts @@ -105,7 +105,6 @@ nand-bus-width = <8>; ti,nand-ecc-opt = "sw"; - gpmc,device-nand; gpmc,cs-on-ns = <0>; gpmc,cs-rd-off-ns = <36>; gpmc,cs-wr-off-ns = <36>; |