From patchwork Mon Mar 31 15:16:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27493 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6FBCC202E0 for ; Mon, 31 Mar 2014 15:19:57 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id j7sf17522755qaq.2 for ; Mon, 31 Mar 2014 08:19:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=H5wuI5nnIpJUVF3d6P0rk6JCxMt4RSoiSPLT7s5IeBI=; b=LfKKGBO71nKXzhvYJDc3IVVZxuc2dm6fUpwf9G/mczZC/szUGzEht9t9CPG/NoXdNd nZsMRVDwqPV5aPJ7To7T8BkFM6tHFCwleewAaKZ2TNFUnfQGYwEmhZUTRp7gysqahg5q CJMfq/fJSDeizmRixnxfhfB0OemFV33a3hEmPN/ZtQCziqZOjsPht8HFzLj4hkk26Ww2 zBONpt5+z664Ou2gKW+vhkEqvBPEpW60gloaV4SF5xUZYaoLHhpGobijtOiP46+qMLK8 2pjnqgcaVtbaJlVPd+Wxybp+gSVWAxISQOpo3cgmlCZRg331YxWI5FZYoxvs5ZMtoZ0I jMTQ== X-Gm-Message-State: ALoCoQmtltM3iE48X/osno8zBmiBxOZmTUtrHEbEEAoZ16ZK6Qm1o8i4uCGbyEwNlZj9MrRFauOZ X-Received: by 10.58.195.202 with SMTP id ig10mr9423967vec.38.1396279197061; Mon, 31 Mar 2014 08:19:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.134 with SMTP id b6ls2539460qgb.91.gmail; Mon, 31 Mar 2014 08:19:56 -0700 (PDT) X-Received: by 10.58.110.74 with SMTP id hy10mr43322veb.52.1396279196907; Mon, 31 Mar 2014 08:19:56 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id pe7si3027526vec.101.2014.03.31.08.19.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:19:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id jw12so8496611veb.27 for ; Mon, 31 Mar 2014 08:19:56 -0700 (PDT) X-Received: by 10.59.7.102 with SMTP id db6mr8279089ved.17.1396279196834; Mon, 31 Mar 2014 08:19:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp150905vcv; Mon, 31 Mar 2014 08:19:56 -0700 (PDT) X-Received: by 10.68.162.1 with SMTP id xw1mr7551153pbb.128.1396279195973; Mon, 31 Mar 2014 08:19:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yx10si1003624pab.466.2014.03.31.08.19.55; Mon, 31 Mar 2014 08:19:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754042AbaCaPTy (ORCPT + 5 others); Mon, 31 Mar 2014 11:19:54 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:50006 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752911AbaCaPTy (ORCPT ); Mon, 31 Mar 2014 11:19:54 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFImxU015428; Mon, 31 Mar 2014 10:18:48 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFImTc014929; Mon, 31 Mar 2014 10:18:48 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:18:48 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFGm4f013169; Mon, 31 Mar 2014 10:18:46 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 54/55] ARM: OMAP4: PRCM: move prcm_mpu_base definition to a public header Date: Mon, 31 Mar 2014 18:16:33 +0300 Message-ID: <1396278994-12624-55-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396278994-12624-1-git-send-email-t-kristo@ti.com> References: <1396278994-12624-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Needed from both PRCM core code and mach-omap2 board code. This gets rid of need to include the prcm_mpu_44xx_54xx.h header to the PRCM core code. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cminst44xx.c | 1 - arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h | 2 -- arch/arm/mach-omap2/prminst44xx.c | 1 - include/linux/power/omap/prcm-common.h | 1 + 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 3d0b8ae..875634b 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -27,7 +27,6 @@ #include #include #include -#include "prcm_mpu44xx.h" #include #define OMAP4430_IDLEST_SHIFT 16 diff --git a/arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h b/arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h index ca149e7..2b1c995 100644 --- a/arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h +++ b/arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h @@ -24,8 +24,6 @@ #define __ARCH_ARM_MACH_OMAP2_PRCM_MPU_44XX_54XX_H #ifndef __ASSEMBLER__ -extern void __iomem *prcm_mpu_base; - extern u32 omap4_prcm_mpu_read_inst_reg(s16 inst, u16 idx); extern void omap4_prcm_mpu_write_inst_reg(u32 val, s16 inst, u16 idx); extern u32 omap4_prcm_mpu_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c index 5b7c17e..e97d877 100644 --- a/arch/arm/mach-omap2/prminst44xx.c +++ b/arch/arm/mach-omap2/prminst44xx.c @@ -22,7 +22,6 @@ #include #include #include -#include "prcm_mpu44xx.h" #define OMAP4430_RST_GLOBAL_WARM_SW_MASK (1 << 0) diff --git a/include/linux/power/omap/prcm-common.h b/include/linux/power/omap/prcm-common.h index b9cce23..a881607 100644 --- a/include/linux/power/omap/prcm-common.h +++ b/include/linux/power/omap/prcm-common.h @@ -535,6 +535,7 @@ enum { }; extern void __iomem *clk_memmaps[]; +extern void __iomem *prcm_mpu_base; void omap_prcm_irq_cleanup(void); int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup);