diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-15 07:17:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-15 07:17:40 +0200 |
| commit | 882ebfc28c389be86535bda4a7d9e407020356bf (patch) | |
| tree | e8f3ddeda13196f40040f3ba4701ece5d38c63cc /arch/arm/boot/dts/am437x-gp-evm.dts | |
| parent | mips/uapi: Add definition of TIOC[SG]RS485 (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.xz linux-882ebfc28c389be86535bda4a7d9e407020356bf.zip | |
Merge 3.17-rc5 into tty-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/am437x-gp-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/am437x-gp-evm.dts | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts index 646a6eade788..e7ac47fa6615 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts @@ -260,7 +260,7 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; - clock-frequency = <400000>; + clock-frequency = <100000>; tps65218: tps65218@24 { reg = <0x24>; @@ -424,7 +424,7 @@ ranges = <0 0 0 0x01000000>; /* minimum GPMC partition = 16MB */ nand@0,0 { reg = <0 0 4>; /* device IO registers */ - ti,nand-ecc-opt = "bch8"; + ti,nand-ecc-opt = "bch16"; ti,elm-id = <&elm>; nand-bus-width = <8>; gpmc,device-width = <1>; @@ -443,8 +443,6 @@ gpmc,rd-cycle-ns = <40>; gpmc,wr-cycle-ns = <40>; gpmc,wait-pin = <0>; - gpmc,wait-on-read; - gpmc,wait-on-write; gpmc,bus-turnaround-ns = <0>; gpmc,cycle2cycle-delay-ns = <0>; gpmc,clk-activation-ns = <0>; |