diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 07:37:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 07:37:58 +0200 |
| commit | 550b05766e2768638463ff2a52612d65fa6cd6a4 (patch) | |
| tree | 1348d24d287d86275fba040045c1d1b4a80e36b5 /dts/src/arm/am43x-epos-evm.dts | |
| parent | 48199fd57c38e6acd63213334ef86119e16496c7 (diff) | |
| download | barebox-550b05766e2768638463ff2a52612d65fa6cd6a4.tar.gz barebox-550b05766e2768638463ff2a52612d65fa6cd6a4.tar.xz | |
dts: update to v3.17-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/am43x-epos-evm.dts')
| -rw-r--r-- | dts/src/arm/am43x-epos-evm.dts | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dts/src/arm/am43x-epos-evm.dts b/dts/src/arm/am43x-epos-evm.dts index ed7dd23959..ac3e485993 100644 --- a/dts/src/arm/am43x-epos-evm.dts +++ b/dts/src/arm/am43x-epos-evm.dts @@ -435,13 +435,13 @@ }; &gpmc { - status = "okay"; + status = "okay"; /* Disable QSPI when enabling GPMC (NAND) */ pinctrl-names = "default"; pinctrl-0 = <&nand_flash_x8>; ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */ nand@0,0 { reg = <0 0 0>; /* CS0, offset 0 */ - ti,nand-ecc-opt = "bch8"; + ti,nand-ecc-opt = "bch16"; ti,elm-id = <&elm>; nand-bus-width = <8>; gpmc,device-width = <1>; @@ -459,8 +459,7 @@ gpmc,access-ns = <30>; /* tCEA + 4*/ gpmc,rd-cycle-ns = <40>; gpmc,wr-cycle-ns = <40>; - gpmc,wait-on-read = "true"; - gpmc,wait-on-write = "true"; + gpmc,wait-pin = <0>; gpmc,bus-turnaround-ns = <0>; gpmc,cycle2cycle-delay-ns = <0>; gpmc,clk-activation-ns = <0>; @@ -557,7 +556,7 @@ }; &qspi { - status = "okay"; + status = "disabled"; /* Disable GPMC (NAND) when enabling QSPI */ pinctrl-names = "default"; pinctrl-0 = <&qspi1_default>; |