diff options
| author | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
| commit | 495dbd72dd1172de866ba323263a5b62cf454972 (patch) | |
| tree | 3ecfb8ae44c871055115941890fd93f175f8761d /board/avionic-design | |
| parent | 50d924b45911b24eeb7623bed11b9297d99b840a (diff) | |
| parent | d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8 (diff) | |
| download | talos-obmc-uboot-495dbd72dd1172de866ba323263a5b62cf454972.tar.gz talos-obmc-uboot-495dbd72dd1172de866ba323263a5b62cf454972.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/avionic-design')
| -rw-r--r-- | board/avionic-design/common/tamonten.c | 2 | ||||
| -rw-r--r-- | board/avionic-design/dts/tegra20-tec.dts | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c index a0a4d1d07d..93f12ea4f1 100644 --- a/board/avionic-design/common/tamonten.c +++ b/board/avionic-design/common/tamonten.c @@ -78,7 +78,7 @@ int board_mmc_init(bd_t *bd) pin_mux_mmc(); /* init dev 0, SD slot, with 4-bit bus */ - tegra20_mmc_init(0, 4, GPIO_PI6, GPIO_PH2); + tegra_mmc_init(0, 4, GPIO_PI6, GPIO_PH2); return 0; } diff --git a/board/avionic-design/dts/tegra20-tec.dts b/board/avionic-design/dts/tegra20-tec.dts index 9faebd8bc6..bb3851b57d 100644 --- a/board/avionic-design/dts/tegra20-tec.dts +++ b/board/avionic-design/dts/tegra20-tec.dts @@ -55,4 +55,15 @@ usb@c5004000 { status = "disabled"; }; + + nand-controller@70008000 { + nvidia,wp-gpios = <&gpio 23 0>; /* PC7 */ + nvidia,width = <8>; + nvidia,timing = <26 100 20 80 20 10 12 10 70>; + + nand@0 { + reg = <0>; + compatible = "hynix,hy27uf4g2b", "nand-flash"; + }; + }; }; |
