diff options
author | Tom Rini <trini@ti.com> | 2013-02-12 10:18:31 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-02-12 10:18:31 -0500 |
commit | 951c6baaf44c7fd4335b75fb92840d4e42c94927 (patch) | |
tree | 6a09cce20c4f3affb7b500d018eb84f848e42c20 /board/nvidia/dts/tegra20-harmony.dts | |
parent | 58864ddc7276ca7403ddbb716da5853638f37519 (diff) | |
parent | fd8e1c3866578d87ed14a04a59faae341fd415df (diff) | |
download | u-boot-imx-951c6baaf44c7fd4335b75fb92840d4e42c94927.zip u-boot-imx-951c6baaf44c7fd4335b75fb92840d4e42c94927.tar.gz u-boot-imx-951c6baaf44c7fd4335b75fb92840d4e42c94927.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/nvidia/dts/tegra20-harmony.dts')
-rw-r--r-- | board/nvidia/dts/tegra20-harmony.dts | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/board/nvidia/dts/tegra20-harmony.dts b/board/nvidia/dts/tegra20-harmony.dts index 5645a8d..aeda3a1 100644 --- a/board/nvidia/dts/tegra20-harmony.dts +++ b/board/nvidia/dts/tegra20-harmony.dts @@ -15,23 +15,20 @@ reg = <0x00000000 0x40000000>; }; - clocks { - clk_32k: clk_32k { - clock-frequency = <32000>; - }; - osc { - clock-frequency = <12000000>; - }; - }; - - clock@60006000 { - clocks = <&clk_32k &osc>; - }; - serial@70006300 { clock-frequency = < 216000000 >; }; + 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"; + }; + }; + i2c@7000c000 { status = "disabled"; }; @@ -55,14 +52,4 @@ usb@c5004000 { nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ }; - - 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"; - }; - }; }; |