From patchwork Thu Jan 31 13:39:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10790611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A297922 for ; Thu, 31 Jan 2019 13:43:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AFB230E64 for ; Thu, 31 Jan 2019 13:43:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F366B30E76; Thu, 31 Jan 2019 13:43:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8F15F30E64 for ; Thu, 31 Jan 2019 13:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dNrd/oZrc7HywTIIUYA106uralFV9pbQw7W9o9ZAZDM=; b=J93ulXaBF2G/ep DdxUg6+vl3BWeWpvJ9aDFXIqunyI0efkjq5OeHnuzBSwfAdHXZ0Gs6+mFQpPs3PXhXOnBYgiASzuh sp+BqOPvwCGLFFtwULnncuNv0VkPXElJfzCYi/+3LbJXy3QmYQZftohKNc8K3V+Ts9rbKIgFNmGME XYpGERDJtVJxo5ERNhSekxl3MPNTIRfz2yGEYuKX/4cDwg1hS2De0XSlZjFfBxNb4rZsxIrZtrlUM b5cuOGuQ8fASLb1Leq63e10PViwYUVkn6cRvAM6eDoKIHx0NJMC7htFkXd/Z4UGCFo00C/b7p5b6P goGBx+8tFJqadMqmLGBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCcf-0000dx-09; Thu, 31 Jan 2019 13:43:17 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gpCZU-0004my-4B for linux-arm-kernel@lists.infradead.org; Thu, 31 Jan 2019 13:40:23 +0000 Received: by mail-wr1-x442.google.com with SMTP id z5so3294773wrt.11 for ; Thu, 31 Jan 2019 05:39:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XB8DAnrnVgkm1ZLSZXHvJRftRpL7JEyZD/bNFtysJOk=; b=eostOMYyaHRaga+KnRffQARNh5CgS6967wxV0VVsFcyCF1lfpNbJ5ilYa7QGZUsRzD VIekdUk99tn9omPvZgnU5DnLnv7U7VjYBDw1skPe7ICcaDBg+6Hql2RFnYJRtxTFDn2k LgL0cEy8+tqhcAvo2fuWmbgDNlPzpkH3NKv+lh92smT+eNn6ZQdv5PvKaP3isSxqt1IZ rHzeIkx0dPIYqbm0ukdRdFO1kcPJ1rQe9tiAlLdFX2a/WTsc11ONOKBtgWCBaOJP9n5B cODZJszqH5MQnsCyMECG2eAKBdZywV1drX9xJfl3c05+Wd7HPiIq1ZMCBqe/2rgtDzXv pozA== 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:mime-version:content-transfer-encoding; bh=XB8DAnrnVgkm1ZLSZXHvJRftRpL7JEyZD/bNFtysJOk=; b=jKWUNAaGAwj8I8z1yd/ygXXGq6ddcnurgG1fzNUYRduJ8XkQ6Vy93a1evYKXuRkUfy W8x8koxl2/3bDg8YkPMhKuU3B5ZYsQts3inJ8oq5txLiPO8pYhwdW6oz8lSaoleqEvat IA1TaoOnouH8g+UXKx+OhcDqDz2HivcyINSh/l/jSJCFiEOUSk3GRCS8m4HWY2TI2aOM 6D02wToHnzf9QUo+Qo0Ilb7zCbHqphnUf1YJO6bx+6XqW/pRe5dV3g7QW8C+2vf4NN0v F4d4+cpQN5ndFA55PIJvofEM09xslAs8Rq9fAU7nKIprA5uifVGDs+3EmXJtKWArHdHL AALQ== X-Gm-Message-State: AJcUukf+Wt8AHdUC2i7kAZe10XHDmIQz4BnI9h11da9Z2jmjY4Ag/SmM L4W46DSWRaYMZ2qcFz/g3hXyag== X-Google-Smtp-Source: ALg8bN6GZcbUijMNLIaisJR8PKK8dAjuebBkv/27WuNbbPa0HijHFl0ZhRJ8Co84cYI1dreXIohiDA== X-Received: by 2002:adf:e64d:: with SMTP id b13mr35313826wrn.276.1548941998507; Thu, 31 Jan 2019 05:39:58 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id h10sm5479768wmf.44.2019.01.31.05.39.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 05:39:57 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH 14/35] ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs Date: Thu, 31 Jan 2019 14:39:07 +0100 Message-Id: <20190131133928.17985-15-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl> References: <20190131133928.17985-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_054001_158776_D8A0DCC2 X-CRM114-Status: GOOD ( 11.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Add the new-style config structures for dm* SoCs. They will be used once we make the aintc driver stop using davinci_soc_info. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/dm355.c | 11 +++++++++++ arch/arm/mach-davinci/dm365.c | 11 +++++++++++ arch/arm/mach-davinci/dm644x.c | 11 +++++++++++ arch/arm/mach-davinci/dm646x.c | 11 +++++++++++ 4 files changed, 44 insertions(+) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index cf574956ce1d..0dcfcbec522a 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -738,6 +739,16 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg, return 0; } +static const struct davinci_aintc_config dm355_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm355_aintc_prios, +}; + void __init dm355_init_irqs(void) { davinci_aintc_init(); diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index e63153a6ae41..1878c97e5df5 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -995,6 +996,16 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg, return 0; } +static const struct davinci_aintc_config dm365_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm365_aintc_prios, +}; + void __init dm365_init_irqs(void) { davinci_aintc_init(); diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 0904baa1d008..5c48a5e4090b 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -672,6 +673,16 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg, return 0; } +static const struct davinci_aintc_config dm644x_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm644x_aintc_prios, +}; + void __init dm644x_init_irqs(void) { davinci_aintc_init(); diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 27831d6fc5a5..e06ea3b61011 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -633,6 +634,16 @@ void __init dm646x_register_clocks(void) platform_device_register(&dm646x_pll2_device); } +static const struct davinci_aintc_config dm646x_aintc_config = { + .reg = { + .start = DAVINCI_ARM_INTC_BASE, + .end = DAVINCI_ARM_INTC_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + .num_irqs = 64, + .prios = dm646x_aintc_prios, +}; + void __init dm646x_init_irqs(void) { davinci_aintc_init();