From patchwork Thu Apr 18 07:01:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 237468 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 A99162C01D5 for ; Thu, 18 Apr 2013 17:02:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755254Ab3DRHCY (ORCPT ); Thu, 18 Apr 2013 03:02:24 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:55925 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755160Ab3DRHCQ (ORCPT ); Thu, 18 Apr 2013 03:02:16 -0400 Received: by mail-pd0-f176.google.com with SMTP id r11so1325134pdi.21 for ; Thu, 18 Apr 2013 00:02:15 -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=q67OiuqFeyetgYWAe1APNbXLdTRPmDHtPhVQV4qvP4o=; b=liVxPLwJr6o0JL2NjmOed49AmWybqtQkLLitDkNkm+You/YRzb+U4iYY1Oz8IDfGXs nmWIOS+7fXsyQJSc1WBUD3I/+aLCm7iaCGLhWmgtinI6nO19QvmG4FTDgXGrBtQVQNd6 3ZB0Nk3wBV+B+3HEVWkg/EAF4jn5cFJgGNsHB4yuK46zjgEZczcHEKcZxR/eDUN+3fJd 4K/+kIX7BskRCfR7r7lUVdthToYJ0wuSrNAu1XW/D0dJ685/fNbWJGa3bjz88rqoFSFt VmI5bDGrIybbi0Js87tLiY38C2IwS+a28qzyEjHlMQq92E/MKHrXKf4BgcMo5AP5VWvI g7/A== X-Received: by 10.69.3.4 with SMTP id bs4mr12410096pbd.5.1366268535539; Thu, 18 Apr 2013 00:02:15 -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 ba10sm8838249pbd.21.2013.04.18.00.02.13 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 00:02:14 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, Nobuhiro Iwamatsu Subject: [PATCH 6/8] net: sh-eth: Add irq configureation flags in sh_eth_cpu_data Date: Thu, 18 Apr 2013 16:01:48 +0900 Message-Id: <1366268510-8121-6-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366268510-8121-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1366268510-8121-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Gm-Message-State: ALoCoQmKqgjbU1bvRtPn5SeH2kvzfXXt8y9yDVaWV+2BAQEu8C3FMOjisI21OH0Cqg9/TBbzAfY3 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 --- 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;