From: Russell King <rmk+kernel@armlinux.org.uk>
To: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org
Cc: Nicolas Pitre <nico@fluxnic.net>
Subject: [PATCH 4/4] net: smc91x: remove neponset specific oscillator hack
Date: Tue, 30 Aug 2016 11:52:50 +0100 [thread overview]
Message-ID: <E1begew-00077B-LY@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20160830105117.GM1041@n2100.armlinux.org.uk>
Remove the neponset specific oscillator hack from the smc91x driver,
relying instead on the gpio controls provided.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
drivers/net/ethernet/smsc/smc91x.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 43dbc1c7b9a5..e53aa640f0d7 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -92,11 +92,6 @@ static const char version[] =
#include "smc91x.h"
-#if defined(CONFIG_ASSABET_NEPONSET)
-#include <mach/assabet.h>
-#include <mach/neponset.h>
-#endif
-
#ifndef SMC_NOWAIT
# define SMC_NOWAIT 0
#endif
@@ -2384,10 +2379,6 @@ static int smc_drv_probe(struct platform_device *pdev)
ret = smc_request_attrib(pdev, ndev);
if (ret)
goto out_release_io;
-#if defined(CONFIG_ASSABET_NEPONSET)
- if (machine_is_assabet() && machine_has_neponset())
- neponset_ncr_set(NCR_ENET_OSC_EN);
-#endif
if (lp->xtal) {
ret = clk_prepare_enable(lp->xtal);
if (ret)
--
2.1.0
next prev parent reply other threads:[~2016-08-30 10:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160829120531.GG1041@n2100.armlinux.org.uk>
[not found] ` <E1beLKT-0001U1-HK@rmk-PC.armlinux.org.uk>
2016-08-30 10:51 ` [PATCH 0/4] SA11x0 Clocks and removal of Neponset SMC91x hack Russell King - ARM Linux
2016-08-30 10:52 ` [PATCH 1/4] ARM: sa1100: convert to common clock framework Russell King
2016-08-30 10:52 ` [PATCH 2/4] net: smc91x: add external clock support Russell King
2016-08-30 10:52 ` [PATCH 3/4] ARM: sa1100/neponset: add ethernet oscillator Russell King
2016-08-30 10:52 ` Russell King [this message]
2016-08-30 15:31 ` [PATCH 0/4] SA11x0 Clocks and removal of Neponset SMC91x hack Nicolas Pitre
2016-09-01 23:32 ` David Miller
2016-09-02 18:59 ` Russell King - ARM Linux
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=E1begew-00077B-LY@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.net \
/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).