From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/12] ARM: dts: Add support for Ethernet on some N900 macro boards
Date: Mon, 15 Sep 2014 20:12:00 -0700 [thread overview]
Message-ID: <1410837126-31553-6-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <1410837126-31553-1-git-send-email-tony@atomide.com>
As we have support for this in board-rx51-peripherals.c, let's
add it to the .dts files too.
Note that the reset GPIO will eventually go to the driver.
For now let's just pull it down and skip any further reset
in case the bootloader has configured the MAC address so
NFSroot works.
Also note that after 3430-sdp are using proper GPMC timings
we can remove the tests for smsc,lan91c94 in gpmc.c.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/omap3-n900.dts | 42 ++++++++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/pdata-quirks.c | 3 +++
2 files changed, 45 insertions(+)
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index f0d8236..19a5857 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -134,6 +134,14 @@
>;
};
+ ethernet_pins: pinmux_ethernet_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x20b4, PIN_INPUT_PULLDOWN | MUX_MODE4) /* gpmc_ncs3.gpio_54 */
+ OMAP3_CORE1_IOPAD(0x20fc, PIN_OUTPUT | MUX_MODE4) /* dss_data16.gpio_86 */
+ OMAP3_CORE1_IOPAD(0x219c, PIN_OUTPUT | MUX_MODE4) /* uart3_rts_sd.gpio_164 */
+ >;
+ };
+
i2c1_pins: pinmux_i2c1_pins {
pinctrl-single,pins = <
0x18a (PIN_INPUT | MUX_MODE0) /* i2c1_scl */
@@ -578,6 +586,8 @@
&gpmc {
ranges = <0 0 0x04000000 0x10000000>; /* 256MB */
+ ranges = <0 0 0x01000000 0x01000000>, /* 16 MB for OneNAND */
+ <1 0 0x02000000 0x01000000>; /* 16 MB for smc91c96 */
/* gpio-irq for dma: 65 */
@@ -646,6 +656,38 @@
reg = <0x004c0000 0x0fb40000>;
};
};
+
+ ethernet at gpmc {
+ compatible = "smsc,lan91c94";
+ interrupt-parent = <&gpio2>;
+ interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
+ reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */
+ bank-width = <2>;
+ pinctrl-names = "default";
+ pinctrl-0 = <ðernet_pins>;
+ gpmc,device-width = <2>;
+ gpmc,sync-clk-ps = <0>;
+ gpmc,cs-on-ns = <0>;
+ gpmc,cs-rd-off-ns = <48>;
+ gpmc,cs-wr-off-ns = <24>;
+ gpmc,adv-on-ns = <0>;
+ gpmc,adv-rd-off-ns = <0>;
+ gpmc,adv-wr-off-ns = <0>;
+ gpmc,we-on-ns = <12>;
+ gpmc,we-off-ns = <18>;
+ gpmc,oe-on-ns = <12>;
+ gpmc,oe-off-ns = <48>;
+ gpmc,page-burst-access-ns = <0>;
+ gpmc,access-ns = <42>;
+ gpmc,rd-cycle-ns = <180>;
+ gpmc,wr-cycle-ns = <180>;
+ gpmc,bus-turnaround-ns = <0>;
+ gpmc,cycle2cycle-delay-ns = <0>;
+ gpmc,wait-monitoring-ns = <0>;
+ gpmc,clk-activation-ns = <0>;
+ gpmc,wr-access-ns = <0>;
+ gpmc,wr-data-mux-bus-ns = <12>;
+ };
};
&mcspi1 {
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index ead7736..540f3f8 100644
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -252,6 +252,9 @@ static void __init nokia_n900_legacy_init(void)
platform_device_register(&omap3_rom_rng_device);
}
+
+ /* Only on some development boards */
+ gpio_request_one(164, GPIOF_OUT_INIT_LOW, "smc91x reset");
}
static void __init omap3_tao3530_legacy_init(void)
--
2.1.0
next prev parent reply other threads:[~2014-09-16 3:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-16 3:11 [PATCH 01/12] ARM: OMAP2+: Add hwmod flag for HWMOD_RECONFIG_IO_CHAIN Tony Lindgren
2014-09-16 3:11 ` [PATCH 02/12] ARM: OMAP3: Use force-idle for UARTs because of DMA errata Tony Lindgren
2014-09-16 17:00 ` Paul Walmsley
2014-09-16 17:44 ` Tony Lindgren
2014-09-17 16:46 ` Paul Walmsley
2014-09-16 3:11 ` [PATCH 03/12] ARM: dts: omap3-overo: Fix UART wake-up events Tony Lindgren
2014-09-16 3:11 ` [PATCH 04/12] ARM: dts: omap: Remove WAKEUPENABLE mux options for UARTs Tony Lindgren
2014-09-16 3:11 ` [PATCH 05/12] ARM: dts: Do not set pulls for I2C lines Tony Lindgren
2014-09-16 3:12 ` Tony Lindgren [this message]
2014-09-16 3:12 ` [PATCH 07/12] ARM: dts: Enable PMIC idle configuration for LDP Tony Lindgren
2014-09-16 3:12 ` [PATCH 08/12] ARM: omap2plus_defconfig: Shrink with savedefconfig Tony Lindgren
2014-09-16 4:56 ` Felipe Balbi
2014-09-18 15:57 ` Tony Lindgren
2014-09-18 16:03 ` Felipe Balbi
2014-09-16 3:12 ` [PATCH 09/12] ARM: omap2plus_defconfig: Add cpufreq to defconfig Tony Lindgren
2014-09-18 16:11 ` Nishanth Menon
2014-09-18 16:20 ` Tony Lindgren
2014-09-18 16:23 ` Nishanth Menon
2014-09-16 3:12 ` [PATCH 10/12] ARM: omap2plus_defconfig: Add support for distros with systemd Tony Lindgren
2014-09-18 7:01 ` Javier Martinez Canillas
2014-09-16 3:12 ` [PATCH 11/12] ARM: omap2plus_defconfig: Enable battery and reset drivers Tony Lindgren
2014-09-16 3:12 ` [PATCH 12/12] ARM: omap2plus_defconfig: Enable some display features Tony Lindgren
2014-09-16 16:04 ` [PATCH 01/12] ARM: OMAP2+: Add hwmod flag for HWMOD_RECONFIG_IO_CHAIN Paul Walmsley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410837126-31553-6-git-send-email-tony@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).