aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2014-02-04 10:53:50 -0500
committerSimon Horman <horms+renesas@verge.net.au>2014-02-06 01:33:28 -0500
commit5812b8b2bcc35e7928c0e5616bbe35a0e97c7749 (patch)
tree1eb2224d4d3715ce6b67d275a01087f3abb9abfb
parent235cda29e4d5047622ff9b82b1f0b4cb6cf95f6c (diff)
ARM: shmobile: Lager: pass Ether PHY IRQ
Pass Ether's PHY IRQ (which is IRQC's IRQ0) to the 'sh_eth' driver. Set the IRQ trigger type to be low-level as per the Micrel PHY driver's setup. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Magnus Damm <magnus.damm@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/board-lager.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index fdcc868de1fa..30ebd0805a34 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -22,6 +22,7 @@
22#include <linux/gpio_keys.h> 22#include <linux/gpio_keys.h>
23#include <linux/input.h> 23#include <linux/input.h>
24#include <linux/interrupt.h> 24#include <linux/interrupt.h>
25#include <linux/irq.h>
25#include <linux/kernel.h> 26#include <linux/kernel.h>
26#include <linux/leds.h> 27#include <linux/leds.h>
27#include <linux/mmc/host.h> 28#include <linux/mmc/host.h>
@@ -233,6 +234,7 @@ static const struct resource mmcif1_resources[] __initconst = {
233/* Ether */ 234/* Ether */
234static const struct sh_eth_plat_data ether_pdata __initconst = { 235static const struct sh_eth_plat_data ether_pdata __initconst = {
235 .phy = 0x1, 236 .phy = 0x1,
237 .phy_irq = irq_pin(0),
236 .edmac_endian = EDMAC_LITTLE_ENDIAN, 238 .edmac_endian = EDMAC_LITTLE_ENDIAN,
237 .phy_interface = PHY_INTERFACE_MODE_RMII, 239 .phy_interface = PHY_INTERFACE_MODE_RMII,
238 .ether_link_active_low = 1, 240 .ether_link_active_low = 1,
@@ -618,6 +620,8 @@ static void __init lager_init(void)
618{ 620{
619 lager_add_standard_devices(); 621 lager_add_standard_devices();
620 622
623 irq_set_irq_type(irq_pin(0), IRQ_TYPE_LEVEL_LOW);
624
621 if (IS_ENABLED(CONFIG_PHYLIB)) 625 if (IS_ENABLED(CONFIG_PHYLIB))
622 phy_register_fixup_for_id("r8a7790-ether-ff:01", 626 phy_register_fixup_for_id("r8a7790-ether-ff:01",
623 lager_ksz8041_fixup); 627 lager_ksz8041_fixup);