Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1751084imu; Wed, 28 Nov 2018 14:38:31 -0800 (PST) X-Google-Smtp-Source: AFSGD/VSHAEvwv/9KzadtDhtir2QSBTSSEaeQhL54PY27E0cliUkh1gWYq3UVZcJAkTt1coqvlpc X-Received: by 2002:a63:d604:: with SMTP id q4mr34492089pgg.175.1543444711020; Wed, 28 Nov 2018 14:38:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543444710; cv=none; d=google.com; s=arc-20160816; b=qkQ3pdmVY1Fpvlf9QR6Dovz5XSdb9Vtl4k5eUqSGoLzCyWmtTPzFO/5KKRI1CQgTgv lH0hIiLw18XZAoa1WkAs/y0cB+fmSmOuij2LO+Qt4eSnAFIJ6nQAsJICMCfzWGdmJNk+ xcH47qBvKsxLwXr+tKZz0Bd1awYp+K/UHzjFLicbWNcTEbEPbvoayV35ywhZUtMi/Ilk Zh3fGmrWj4dChhU4IMmzOe1kapCGZ/8ogVeffeu6rjWFTFXFAS7GuQ0aF6ZOkv4tGm3B p7bta2m4ax7r+u5vP5k1USKL9w1EeOWi9d1pOubDz/LSjAT6ECNV6D5JSKHvo8PDapps jrUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=6Tg/Nlf4DVosGXWUAPR1HKg7aUMJ7+jsissUOrruo7A=; b=FJQUQ9/XuXJDBV+TCduxdQnKZcWgJRJkHIbVe1ZTWTTpnpwG8K9dg7XroLhHykdmAr 0ElVpySnxeEqgsU1ffsrTOHnLIKzIo0vXNuf6JFvxflktDL9MyOu7DF+fLiytr+PvPtE 0vyzPWN1IeE6XScVQadGAngz2u41iLUqeo/B+jJkcZSu9634O94st6FlRqGQUQLx7+Xu 7F8QqCbCcW4JYeMF35av0Xlrj4/N3l0e++7q7JjpB4n53TRcfFf6Vb7LA7FGcQhnaQPv 95psZYecp5YQy5J/GbNOMFUPMp3eCQ40ajFXuVcbusRiq6p9h17Yt9mjaK5d8GR54z/r Ns+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=T+prGM+W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t64si8509080pgd.202.2018.11.28.14.38.16; Wed, 28 Nov 2018 14:38:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=T+prGM+W; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726923AbeK2Jhe (ORCPT + 99 others); Thu, 29 Nov 2018 04:37:34 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39083 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726492AbeK2Jhd (ORCPT ); Thu, 29 Nov 2018 04:37:33 -0500 Received: by mail-wm1-f67.google.com with SMTP id n133so270881wmd.4; Wed, 28 Nov 2018 14:34:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6Tg/Nlf4DVosGXWUAPR1HKg7aUMJ7+jsissUOrruo7A=; b=T+prGM+Wav3wTg9CrhaN6IBiHW7sSC3S8hk8BKdsnqYhOSLC4also0ykf7PRi51zET xkccAf4VylnY1bBO6jtOcJccnHEAeHcR7bxdviopsbJbyQbIeE4diIHEdGH8SUU5Quvq CZJDUkyg8upBkaopeimQfpf0qbSzUFQCHPivOHdCaVcopJWPg4wTZytLdI6yy7DikpnG ehID3LNWYUIuDDOAe/2H1Hkcpb2WPegW5mz0eM2eBPhQsTQ/F7SBs5EXqar+ZXyMwdHb BxxjESPnaDCCQLpL2IyFqIEfVi3j4RLX/Fk7pPLQc2m7HjMMrG7Ubdn/YMOSW7Ase/6j khYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6Tg/Nlf4DVosGXWUAPR1HKg7aUMJ7+jsissUOrruo7A=; b=e3wLT8TRHNa3sZWd1jAN0Gq1T4gbcU9Merl95EJVShcHpGvVIdJ73gsqXVujOiqJuf TG0d4wBVuuTd1h7nECp6UTs3naIOycW91C/J/8Yx0uxuFkyKHXAISxcVYZOLCpAHURBZ tXzt34kIGQ8i8KwVji4s2nSft8dq87Oink5M4OKKvMJPO+JszozQimvZOnm+Acgp7HUG R8FG/hyM5QzOlXJ0McgJA+hrWvtmrAqTOjZAWkc9ZQm03nwMxXX4+tgsrSQqS+kfpmeD yFEHXZP+EoMmUNfMq0I7Mpn3yt5d7ta1pu4J/6afPCURQGGgFEYgl+ZEfXOijT9VuTUq LDlQ== X-Gm-Message-State: AA+aEWYMJU4yVlZW+cWd+I4nYxkCpAeWEG/GOgJHbP1OoLpqX9kE7T8Y Bgws14NcrDE2FQNQhZw4tv/SlJylqYc= X-Received: by 2002:a1c:e287:: with SMTP id z129mr131642wmg.71.1543444461628; Wed, 28 Nov 2018 14:34:21 -0800 (PST) Received: from ThinkPad.home ([185.219.177.239]) by smtp.gmail.com with ESMTPSA id g198sm180244wmd.23.2018.11.28.14.34.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Nov 2018 14:34:21 -0800 (PST) From: Mesih Kilinc To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, linux-sunxi@googlegroups.com Cc: Mesih Kilinc , Maxime Ripard , Chen-Yu Tsai , Russell King , Daniel Lezcano , Marc Zyngier , Linus Walleij , Icenowy Zheng , Rob Herring , Julian Calaby Subject: [PATCH v5 06/17] irqchip/sun4i: Move IC specific register offsets to struct Date: Thu, 29 Nov 2018 01:33:16 +0300 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch moves IC specific register offsets to sun4i_irq_chip_data struct in order to support different chips. Signed-off-by: Mesih Kilinc Acked-by: Maxime Ripard --- drivers/irqchip/irq-sun4i.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/irqchip/irq-sun4i.c b/drivers/irqchip/irq-sun4i.c index 0c32506..507f4e3 100644 --- a/drivers/irqchip/irq-sun4i.c +++ b/drivers/irqchip/irq-sun4i.c @@ -28,12 +28,16 @@ #define SUN4I_IRQ_NMI_CTRL_REG 0x0c #define SUN4I_IRQ_PENDING_REG(x) (0x10 + 0x4 * x) #define SUN4I_IRQ_FIQ_PENDING_REG(x) (0x20 + 0x4 * x) -#define SUN4I_IRQ_ENABLE_REG(x) (0x40 + 0x4 * x) -#define SUN4I_IRQ_MASK_REG(x) (0x50 + 0x4 * x) +#define SUN4I_IRQ_ENABLE_REG(data, x) ((data)->enable_reg_offset + 0x4 * x) +#define SUN4I_IRQ_MASK_REG(data, x) ((data)->mask_reg_offset + 0x4 * x) +#define SUN4I_IRQ_ENABLE_REG_OFFSET 0x40 +#define SUN4I_IRQ_MASK_REG_OFFSET 0x50 struct sun4i_irq_chip_data { void __iomem *irq_base; struct irq_domain *irq_domain; + u32 enable_reg_offset; + u32 mask_reg_offset; }; static struct sun4i_irq_chip_data *irq_ic_data; @@ -57,9 +61,10 @@ static void sun4i_irq_mask(struct irq_data *irqd) int reg = irq / 32; u32 val; - val = readl(irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); + val = readl(irq_ic_data->irq_base + + SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg)); writel(val & ~(1 << irq_off), - irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); + irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg)); } static void sun4i_irq_unmask(struct irq_data *irqd) @@ -69,9 +74,10 @@ static void sun4i_irq_unmask(struct irq_data *irqd) int reg = irq / 32; u32 val; - val = readl(irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); + val = readl(irq_ic_data->irq_base + + SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg)); writel(val | (1 << irq_off), - irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(reg)); + irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, reg)); } static struct irq_chip sun4i_irq_chip = { @@ -105,20 +111,23 @@ static int __init sun4i_of_init(struct device_node *node, return -ENOMEM; } + irq_ic_data->enable_reg_offset = SUN4I_IRQ_ENABLE_REG_OFFSET; + irq_ic_data->mask_reg_offset = SUN4I_IRQ_MASK_REG_OFFSET; + irq_ic_data->irq_base = of_iomap(node, 0); if (!irq_ic_data->irq_base) panic("%pOF: unable to map IC registers\n", node); /* Disable all interrupts */ - writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(0)); - writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(1)); - writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(2)); + writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, 0)); + writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, 1)); + writel(0, irq_ic_data->irq_base + SUN4I_IRQ_ENABLE_REG(irq_ic_data, 2)); /* Unmask all the interrupts, ENABLE_REG(x) is used for masking */ - writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(0)); - writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(1)); - writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(2)); + writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(irq_ic_data, 0)); + writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(irq_ic_data, 1)); + writel(0, irq_ic_data->irq_base + SUN4I_IRQ_MASK_REG(irq_ic_data, 2)); /* Clear all the pending interrupts */ writel(0xffffffff, irq_ic_data->irq_base + SUN4I_IRQ_PENDING_REG(0)); -- 2.7.4