diff options
author | Florian Vaussard <florian.vaussard@epfl.ch> | 2014-03-07 14:22:17 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-03-12 13:18:16 -0400 |
commit | c3fba2d05b4d87aae6380e81b118a6b82bfcfa5a (patch) | |
tree | 8868d833ab08d5196684442577684a5eb48b72bc | |
parent | aac9aa37e55bdf1f4e9e67402e5027907e221718 (diff) |
ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
Use the timings provided by omap-gpmc-smsc9221. This does not change
the timings, but it avoids code duplication.
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi index 7375cda0f5c9..e7f2ac76c226 100644 --- a/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi +++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | |||
@@ -19,18 +19,6 @@ | |||
19 | linux,default-trigger = "heartbeat"; | 19 | linux,default-trigger = "heartbeat"; |
20 | }; | 20 | }; |
21 | }; | 21 | }; |
22 | |||
23 | vddvario: regulator-vddvario { | ||
24 | compatible = "regulator-fixed"; | ||
25 | regulator-name = "vddvario"; | ||
26 | regulator-always-on; | ||
27 | }; | ||
28 | |||
29 | vdd33a: regulator-vdd33a { | ||
30 | compatible = "regulator-fixed"; | ||
31 | regulator-name = "vdd33a"; | ||
32 | regulator-always-on; | ||
33 | }; | ||
34 | }; | 22 | }; |
35 | 23 | ||
36 | &omap3_pmx_core { | 24 | &omap3_pmx_core { |
@@ -42,39 +30,15 @@ | |||
42 | }; | 30 | }; |
43 | }; | 31 | }; |
44 | 32 | ||
33 | #include "omap-gpmc-smsc9221.dtsi" | ||
34 | |||
45 | &gpmc { | 35 | &gpmc { |
46 | ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ | 36 | ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ |
47 | 37 | ||
48 | ethernet@5,0 { | 38 | ethernet@gpmc { |
49 | compatible = "smsc,lan9221", "smsc,lan9115"; | ||
50 | reg = <5 0 0xff>; | 39 | reg = <5 0 0xff>; |
51 | bank-width = <2>; | ||
52 | |||
53 | gpmc,mux-add-data; | ||
54 | gpmc,cs-on-ns = <0>; | ||
55 | gpmc,cs-rd-off-ns = <42>; | ||
56 | gpmc,cs-wr-off-ns = <36>; | ||
57 | gpmc,adv-on-ns = <6>; | ||
58 | gpmc,adv-rd-off-ns = <12>; | ||
59 | gpmc,adv-wr-off-ns = <12>; | ||
60 | gpmc,oe-on-ns = <0>; | ||
61 | gpmc,oe-off-ns = <42>; | ||
62 | gpmc,we-on-ns = <0>; | ||
63 | gpmc,we-off-ns = <36>; | ||
64 | gpmc,rd-cycle-ns = <60>; | ||
65 | gpmc,wr-cycle-ns = <54>; | ||
66 | gpmc,access-ns = <36>; | ||
67 | gpmc,page-burst-access-ns = <0>; | ||
68 | gpmc,bus-turnaround-ns = <0>; | ||
69 | gpmc,cycle2cycle-delay-ns = <0>; | ||
70 | gpmc,wr-data-mux-bus-ns = <18>; | ||
71 | gpmc,wr-access-ns = <42>; | ||
72 | gpmc,cycle2cycle-samecsen; | ||
73 | gpmc,cycle2cycle-diffcsen; | ||
74 | |||
75 | interrupt-parent = <&gpio6>; | 40 | interrupt-parent = <&gpio6>; |
76 | interrupts = <16 IRQ_TYPE_LEVEL_LOW>; /* GPIO 176 */ | 41 | interrupts = <16 IRQ_TYPE_LEVEL_LOW>; /* GPIO 176 */ |
77 | reg-io-width = <4>; | ||
78 | }; | 42 | }; |
79 | }; | 43 | }; |
80 | 44 | ||