From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfgang Grandegger Subject: [RFC v2 4/7] c_can_pci: introduce board specific PCI bar Date: Thu, 29 Nov 2012 15:39:44 +0100 Message-ID: <1354199987-10350-5-git-send-email-wg@grandegger.com> References: <1354199987-10350-1-git-send-email-wg@grandegger.com> Return-path: Received: from ngcobalt02.manitu.net ([217.11.48.102]:44200 "EHLO ngcobalt02.manitu.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754824Ab2K2Oj5 (ORCPT ); Thu, 29 Nov 2012 09:39:57 -0500 In-Reply-To: <1354199987-10350-1-git-send-email-wg@grandegger.com> Sender: linux-can-owner@vger.kernel.org List-ID: To: linux-can@vger.kernel.org Cc: bhupesh.sharma@st.com, tomoya.rohm@gmail.com, Wolfgang Grandegger Also fix minor issue with pci_iomap specifying size 0 for mapping the full range. Signed-off-by: Wolfgang Grandegger --- drivers/net/can/c_can/c_can_pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c index 3d7830b..7b73f90 100644 --- a/drivers/net/can/c_can/c_can_pci.c +++ b/drivers/net/can/c_can/c_can_pci.c @@ -31,6 +31,8 @@ struct c_can_pci_data { enum c_can_pci_reg_align reg_align; /* Set the frequency */ unsigned int freq; + /* PCI bar number */ + int bar; }; /* @@ -87,7 +89,7 @@ static int __devinit c_can_pci_probe(struct pci_dev *pdev, pci_set_master(pdev); pci_enable_msi(pdev); - addr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0)); + addr = pci_iomap(pdev, c_can_pci_data->bar, 0); if (!addr) { dev_err(&pdev->dev, "device has no PCI memory resources, " @@ -195,6 +197,7 @@ static struct c_can_pci_data c_can_sta2x11= { .type = BOSCH_C_CAN, .reg_align = C_CAN_REG_ALIGN_32, .freq = 52000000, /* 52 Mhz */ + .bar = 0, }; #define C_CAN_ID(_vend, _dev, _driverdata) { \ -- 1.7.9.5