Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965115AbbLRURp (ORCPT ); Fri, 18 Dec 2015 15:17:45 -0500 Received: from mail.savoirfairelinux.com ([208.88.110.44]:37524 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964879AbbLRURl (ORCPT ); Fri, 18 Dec 2015 15:17:41 -0500 From: Damien Riegel To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-can@vger.kernel.org, devicetree@vger.kernel.org Cc: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Wolfgang Grandegger , Marc Kleine-Budde , kernel@savoirfairelinux.com, Damien Riegel Subject: [PATCH 2/2] can: sja1000: of: add compatibility with Technologic Systems version Date: Fri, 18 Dec 2015 15:17:25 -0500 Message-Id: <1450469845-12900-2-git-send-email-damien.riegel@savoirfairelinux.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1450469845-12900-1-git-send-email-damien.riegel@savoirfairelinux.com> References: <1450469845-12900-1-git-send-email-damien.riegel@savoirfairelinux.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2836 Lines: 91 Technologic Systems provides an IP compatible with the SJA1000, instantiated in an FPGA. Because of some bus widths issue, access to registers is made through a "window" that works like this: base + 0x0: address to read/write base + 0x2: 8-bit register value This commit adds a new compatible device, "technologic,sja1000", with read and write functions using the window mechanism. Signed-off-by: Damien Riegel --- drivers/net/can/sja1000/sja1000_platform.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c index 0552ed4..6cbf251 100644 --- a/drivers/net/can/sja1000/sja1000_platform.c +++ b/drivers/net/can/sja1000/sja1000_platform.c @@ -70,6 +70,18 @@ static void sp_write_reg32(const struct sja1000_priv *priv, int reg, u8 val) iowrite8(val, priv->reg_base + reg * 4); } +static u8 ts4800_read_reg16(const struct sja1000_priv *priv, int reg) +{ + sp_write_reg16(priv, 0, reg); + return sp_read_reg16(priv, 2); +} + +static void ts4800_write_reg16(const struct sja1000_priv *priv, int reg, u8 val) +{ + sp_write_reg16(priv, 0, reg); + sp_write_reg16(priv, 2, val); +} + static void sp_populate(struct sja1000_priv *priv, struct sja1000_platform_data *pdata, unsigned long resource_mem_flags) @@ -98,21 +110,34 @@ static void sp_populate(struct sja1000_priv *priv, static void sp_populate_of(struct sja1000_priv *priv, struct device_node *of) { + int is_technologic; int err; u32 prop; + is_technologic = of_device_is_compatible(of, "technologic,sja1000"); + err = of_property_read_u32(of, "reg-io-width", &prop); if (err) prop = 1; /* 8 bit is default */ + if (is_technologic && prop != 2) { + netdev_warn(priv->dev, "forcing reg-io-width to 2\n"); + prop = 2; + } + switch (prop) { case 4: priv->read_reg = sp_read_reg32; priv->write_reg = sp_write_reg32; break; case 2: - priv->read_reg = sp_read_reg16; - priv->write_reg = sp_write_reg16; + if (is_technologic) { + priv->read_reg = ts4800_read_reg16; + priv->write_reg = ts4800_write_reg16; + } else { + priv->read_reg = sp_read_reg16; + priv->write_reg = sp_write_reg16; + } break; case 1: /* fallthrough */ default: @@ -244,6 +269,7 @@ static int sp_remove(struct platform_device *pdev) static const struct of_device_id sp_of_table[] = { {.compatible = "nxp,sja1000"}, + {.compatible = "technologic,sja1000"}, {}, }; MODULE_DEVICE_TABLE(of, sp_of_table); -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/