From patchwork Thu Apr 18 10:11:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 237605 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C53472C01D9 for ; Thu, 18 Apr 2013 20:11:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967690Ab3DRKLf (ORCPT ); Thu, 18 Apr 2013 06:11:35 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:40216 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967682Ab3DRKLe (ORCPT ); Thu, 18 Apr 2013 06:11:34 -0400 Received: by mail-pa0-f52.google.com with SMTP id fb10so1491174pad.39 for ; Thu, 18 Apr 2013 03:11:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=fb7MM5qv72fZN0iPbnUCkqRO36inS2PlHq+x9Vmm/v4=; b=LelUJNl0vJf3L6+QSnbeUj6+9sgLs/7AwAFfI0tXbnQWOHTyQkimT157vcwf20JWyw dDt88TBClqMis5sLqm9+sNo1L+C2Z2mMonzJU2cBYjqa/kW+3UgjLDvs5mh0GZFXktfo gTy04N90kR97C5VtFq/pYziCrRrZL4WMQg8KSx7V7dvzbyivhdGXPTrBIWfLm5A6OQVe d+/k1HW55Gb29f+HneYQgqC8mGYA0R0TDGdQWx/WdQ/azias3orAr+km1juj7SNpVUCG ecThMZgr/VVjw2NazBoodbI+BNmmMVKBG6KdhYFHrbSBE0mK4shAVhCA7iVOnNlieIqv dtZQ== X-Received: by 10.68.97.130 with SMTP id ea2mr12645732pbb.129.1366279893660; Thu, 18 Apr 2013 03:11:33 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id kd7sm9364960pbb.34.2013.04.18.03.11.31 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 03:11:32 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, Nobuhiro Iwamatsu Subject: [PATCH v2 6/8] net: sh-eth: Add irq configureation flags in sh_eth_cpu_data Date: Thu, 18 Apr 2013 19:11:07 +0900 Message-Id: <1366279869-23387-6-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366279869-23387-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1366279869-23387-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Gm-Message-State: ALoCoQlu5IJmuWtBu0TE9vBSwlecpAKCODWbjMeXWKFiXLiw3GcyR+bRtuX5ZHHnFPNrTyMLbsMj Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sh-eth is supporting some SH and shmobile CPU. CPU with two or more networked devices is in these, these specify IRQF_SHARED as IRQ configureation flags. This changes to set IRQ configureation flags using in sh_eth_cpu_data. Signed-off-by: Nobuhiro Iwamatsu --- v2: no change. drivers/net/ethernet/renesas/sh_eth.c | 12 ++++-------- drivers/net/ethernet/renesas/sh_eth.h | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index af8c225..a4e337f 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -468,6 +468,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, + .irq_flags = IRQF_SHARED, .apr = 1, .mpr = 1, .tpauser = 1, @@ -576,6 +577,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data_giga = { .fdr_value = 0x0000072f, .rmcr_value = 0x00000001, + .irq_flags = IRQF_SHARED, .apr = 1, .mpr = 1, .tpauser = 1, @@ -658,6 +660,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { .hw_crc = 1, .select_mii = 1, #else + .irq_flags = IRQF_SHARED, .tsu_multi_reg = 1, #endif }; @@ -1920,14 +1923,7 @@ static int sh_eth_open(struct net_device *ndev) pm_runtime_get_sync(&mdp->pdev->dev); ret = request_irq(ndev->irq, sh_eth_interrupt, -#if defined(CONFIG_CPU_SUBTYPE_SH7763) || \ - defined(CONFIG_CPU_SUBTYPE_SH7764) || \ - defined(CONFIG_CPU_SUBTYPE_SH7757) - IRQF_SHARED, -#else - 0, -#endif - ndev->name, ndev); + mdp->cd->irq_flags, ndev->name, ndev); if (ret) { dev_err(&ndev->dev, "Can not assign IRQ number\n"); return ret; diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index f86ea96..0772ec1 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h @@ -463,6 +463,7 @@ struct sh_eth_cpu_data { unsigned long tx_error_check; /* hardware features */ + unsigned long irq_flags; /* IRQ configuration flags */ unsigned no_psr:1; /* EtherC DO NOT have PSR */ unsigned apr:1; /* EtherC have APR */ unsigned mpr:1; /* EtherC have MPR */ @@ -508,6 +509,7 @@ struct sh_eth_private { int duplex; int port; /* for TSU */ int vlan_num_ids; /* for VLAN tag filter */ + unsigned long irq_flags; /* IRQ configuration flags */ unsigned no_ether_link:1; unsigned ether_link_active_low:1;