From patchwork Thu Feb 14 14:52:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10813007 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 A4E4613A4 for ; Thu, 14 Feb 2019 15:10:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91C2E2E9F0 for ; Thu, 14 Feb 2019 15:10:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8622A2E9B0; Thu, 14 Feb 2019 15:10:34 +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 F33592EA07 for ; Thu, 14 Feb 2019 15:10:33 +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=Ev7UY7Xa3TUY7yBYpJr8w2M7bKydBJhKzKPB2S87xl4=; b=dICaVh3ifUPQM9 RIGRO1l7J3DApNik9pue+FzpAd7ouIyTj9Vd3B6824nZNaqWWzdsym+6GQXBOdmWRE2I9HWgZlCKI q5Rox1F4xNPhaYkD87dcpilpCf5zCzarEHAjIO9QCBw59p9lG57oWGRwPDtdH8HosqNUQZpN3+rMK +NsaGWujisM1I/uU9iXVJHpRgoSresHmpQLUgzghNiyrEwuGCY5rEM0wu5jlRrAtJJDBIW/8+/Asi JBxCnsmuN9lEAFyN3pEvjJNC0mNW60rA5G3X7L6FYcEq0y0nOYa63Vqwv5iA/hlg2cPG6gOwbW1an Tn0p4vTwa5rWqYkDDdBg==; 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 1guIem-0002lL-4T; Thu, 14 Feb 2019 15:10:32 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guIeJ-0000l0-4S for linux-arm-kernel@bombadil.infradead.org; Thu, 14 Feb 2019 15:10:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=yRSCRg5rDKszKeNaGzOxkxAIRW2gEt2oxrvbVDGGZhU=; b=SutJ+LNLt/esSyvrqV/FBWDFJ2 n1ObECZGBfDZ7asbrAe5z7r/spLKd5zd5pqbhBN5nBmMEZ3IYGDNrzVT6k6f5ZBct/Rc5f6CFbXve 5bYFLWJ8G5iMWAqA1tRaZCZbK3rsaM+oRCzBOJ2uiUrfn4W8wyajD4k3q7hneB4k2fEoLD9HbJW9/ 9cZf1txhtdVaSNHcK0XjA70VvX3VYsdroHqnh8Z1qzHC95xAXd73Q5qarx5al22xtMV7Ux+XEQZB7 DE7R3vp2Sz9YoABumOD5f+3KKEFSk3G5GGGdX95Sczyr8jUHsj6vIMmQEmfJT8ypyygWbPJZpNow0 zI/8b8xg==; Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1guIO1-0007nO-0G for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2019 14:53:14 +0000 Received: by mail-wr1-x444.google.com with SMTP id o17so6814461wrw.3 for ; Thu, 14 Feb 2019 06:53:12 -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=yRSCRg5rDKszKeNaGzOxkxAIRW2gEt2oxrvbVDGGZhU=; b=1a8MxIk7mzrEZuGEL8O4slwTer4ZVWRwPyAzAyUhE0CsWaAfIqsgulUDDWm9qZ9a6S dGGvkJkCFh3xFZgm0lzFH9t9N6v+WBrOpeAQJXMV5AEmkL3yl6sh3RiQO4D/fZuB82R2 SQuEl3lLMzDGJApN52XUhF/4OYSAEDAZkEg/VUbwxloO76YbdNlGqA+yFOtRQ02JMIOU i9glJleOfdoR67JYMlZS+aWkRXDyojtBAKYo1VIQ+72C2qq/4G4TvPBuFZByKHJrOVud RZ+9JPgWUHTTHR2NJ1PTSOGO0BNJGNSRFPdHHwuOcb8znbxIrOvHcX1wUuTIrjCgF0sa w45g== 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=yRSCRg5rDKszKeNaGzOxkxAIRW2gEt2oxrvbVDGGZhU=; b=oLMAwMtSMsS0Uu8PLsjSt1yFyayyffEBXnnxwwvmhVUBRpxu095mULuUiwskELb8HJ hx3PDhKUKP456X+dRJzmJKiPmY7XfolzXvNvYCYDwzk8B0LEHGWJrWC9zvOyzLyWSEY7 PH8fW1xow9NPT6QSU4iW7HsoKg95Qi87AyQbVHwg5fIOYdPm1VMZi2h4NdwoNykxoun6 O61pjsUwykgoddcsBmeSRhT1qLrlLW+RYWHW6G3oGK7wOiPabtbGHUXTiExLERzFFSLx qcr0C8yoprZW0RkJFfkl/m5Q77jaxr8GvSeNNIl9AyiTvoLHAzy9yZR/i6Pc5zeykppJ r44Q== X-Gm-Message-State: AHQUAuZvFAzMrl0kHlmPP8xjjCtUPZGMI243KK6mboeyv6BUHwyusSAq aoZU6Gm3yUvcSW5OgTqQ5oWbog== X-Google-Smtp-Source: AHgI3IYlwv+S6KMpy90axf4Pnr1NPwXKpzfHdRCsbHE2F6qdY0zNpTPnXr4i416rFfcjcUJre+/CPA== X-Received: by 2002:adf:e30f:: with SMTP id b15mr3130403wrj.0.1550155991656; Thu, 14 Feb 2019 06:53:11 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id y20sm4181005wra.51.2019.02.14.06.53.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 06:53:11 -0800 (PST) From: Bartosz Golaszewski To: Dmitry Torokhov , Sekhar Nori , Kevin Hilman , Thomas Gleixner , Jason Cooper , Marc Zyngier , David Lechner Subject: [PATCH v4 24/37] ARM: davinci: cp-intc: add a wrapper around cp_intc_init() Date: Thu, 14 Feb 2019 15:52:18 +0100 Message-Id: <20190214145231.8750-25-brgl@bgdev.pl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214145231.8750-1-brgl@bgdev.pl> References: <20190214145231.8750-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190214_145313_092580_7B32BEA0 X-CRM114-Status: GOOD ( 17.31 ) 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 We're going to extend the cp_intc_init() function with a config structure so we can drop the intc-related fields from davinci_soc_info. Once we do it, we won't be able to use this routine directly as the init_irq callback. Wrap the calls in additional helpers that don't take parameters and can be assigned to init_irq. Signed-off-by: Bartosz Golaszewski Reviewed-by: David Lechner --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- arch/arm/mach-davinci/da830.c | 5 +++++ arch/arm/mach-davinci/da850.c | 5 +++++ arch/arm/mach-davinci/include/mach/da8xx.h | 2 ++ 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index f81c92b9cf07..1ae7dcb8f59d 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -694,7 +694,7 @@ static void __init da830_evm_map_io(void) MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM") .atag_offset = 0x100, .map_io = da830_evm_map_io, - .init_irq = cp_intc_init, + .init_irq = da830_init_irq, .init_time = da830_init_time, .init_machine = da830_evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 1cc49e7bf128..8022ca8ac4ef 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -1522,7 +1522,7 @@ static void __init da850_evm_map_io(void) MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") .atag_offset = 0x100, .map_io = da850_evm_map_io, - .init_irq = cp_intc_init, + .init_irq = da850_init_irq, .init_time = da850_init_time, .init_machine = da850_evm_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index eb6a9465f229..815f155eb349 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -623,7 +623,7 @@ static void __init mityomapl138_map_io(void) MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808") .atag_offset = 0x100, .map_io = mityomapl138_map_io, - .init_irq = cp_intc_init, + .init_irq = da850_init_irq, .init_time = da850_init_time, .init_machine = mityomapl138_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 7f852722ff08..673d890c2e3e 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -461,7 +461,7 @@ static void __init omapl138_hawk_map_io(void) MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard") .atag_offset = 0x100, .map_io = omapl138_hawk_map_io, - .init_irq = cp_intc_init, + .init_irq = da850_init_irq, .init_time = da850_init_time, .init_machine = omapl138_hawk_init, .init_late = davinci_init_late, diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index ca903c9105e4..5cfd30c57429 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -821,6 +821,11 @@ void __init da830_init(void) WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module"); } +void __init da830_init_irq(void) +{ + cp_intc_init(); +} + void __init da830_init_time(void) { void __iomem *pll; diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 486d53481636..6df6994c0f26 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -759,6 +759,11 @@ void __init da850_init(void) WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module"); } +void __init da850_init_irq(void) +{ + cp_intc_init(); +} + void __init da850_init_time(void) { void __iomem *pll0; diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index ab4a57f433f4..1618b30661a9 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -88,10 +88,12 @@ extern unsigned int da850_max_speed; #define DA8XX_ARM_RAM_BASE 0xffff0000 void da830_init(void); +void da830_init_irq(void); void da830_init_time(void); void da830_register_clocks(void); void da850_init(void); +void da850_init_irq(void); void da850_init_time(void); void da850_register_clocks(void);