From patchwork Mon Mar 31 15:16:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27488 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7418D202E0 for ; Mon, 31 Mar 2014 15:19:27 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf29567580iec.3 for ; Mon, 31 Mar 2014 08:19:26 -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=MXhMhqjTAi0EC379Nv6X903c5a3rrEySWcClj8heAtk=; b=dx7Kw6elP+/Xe+EVllQnjwCyd+L9WISvDJqbnFXoJGlHRrI8HBY2lN++yWJT8KVCMA R9bWYyb77LmVRJrXefQsAjVXm2S5Nd/NWbMbkgkFD2McsU+LK8zhnm8IueczHsTxHG8B Ha0LTMWNXq/IgBtmlKEIjEk8GJhBMjKCbDTZVLNaeouUZB0O8sxiO/rNQZXpyZN/+Hue W6IaiLccG/3PoNSLzlGnBY3BISD0btQmqH3qd7Zg7mb5Vu/5ZKjTBv4ApvDHEcTnLnIK I+c3TUUcmxzyzwEsBSAFwaAe9SxHoPAszUPwKX89u0PXbnMGp6WkVg14X88A6Royi6E/ cUEw== X-Gm-Message-State: ALoCoQnwtDQx9fm8U+vU7A4+pXyvpw5ffwQXMzmiiW25k6j+AuCmlcT0CvXBrUQdm6ZMOk/T1+Rb X-Received: by 10.43.69.210 with SMTP id yd18mr9508786icb.10.1396279166922; Mon, 31 Mar 2014 08:19:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.75 with SMTP id 69ls2635116qgm.94.gmail; Mon, 31 Mar 2014 08:19:26 -0700 (PDT) X-Received: by 10.221.55.199 with SMTP id vz7mr175343vcb.40.1396279166604; Mon, 31 Mar 2014 08:19:26 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id f17si2921326vco.135.2014.03.31.08.19.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:19:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 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.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so8160916veb.20 for ; Mon, 31 Mar 2014 08:19:26 -0700 (PDT) X-Received: by 10.59.7.102 with SMTP id db6mr8277648ved.17.1396279166523; Mon, 31 Mar 2014 08:19:26 -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 v8csp150871vcv; Mon, 31 Mar 2014 08:19:26 -0700 (PDT) X-Received: by 10.68.245.162 with SMTP id xp2mr25716843pbc.69.1396279165800; Mon, 31 Mar 2014 08:19:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uc9si9326144pac.458.2014.03.31.08.19.25; Mon, 31 Mar 2014 08:19:25 -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 S1754031AbaCaPTY (ORCPT + 5 others); Mon, 31 Mar 2014 11:19:24 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49952 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754026AbaCaPTX (ORCPT ); Mon, 31 Mar 2014 11:19:23 -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 s2VFIPTF015329; Mon, 31 Mar 2014 10:18:25 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFIPjX014557; Mon, 31 Mar 2014 10:18:25 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:18:25 -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 s2VFGm4U013169; Mon, 31 Mar 2014 10:18:24 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 43/55] ARM: OMAP4: PRM: get rid of prminst44xx.h header file Date: Mon, 31 Mar 2014 18:16:22 +0300 Message-ID: <1396278994-12624-44-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.175 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: , Only contains a few function prototypes, so move these to the public prm44xx.h header and remove the now unnecessary prminst44xx.h. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/io.c | 1 - arch/arm/mach-omap2/omap-mpuss-lowpower.c | 1 - arch/arm/mach-omap2/omap4-common.c | 1 - arch/arm/mach-omap2/omap4-restart.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 1 - arch/arm/mach-omap2/prminst44xx.c | 1 - arch/arm/mach-omap2/prminst44xx.h | 27 ------------------------- arch/arm/mach-omap2/prminst44xx_private.h | 2 +- arch/arm/mach-omap2/voltage.c | 1 - arch/arm/mach-omap2/voltagedomains44xx_data.c | 1 - include/linux/power/omap/prm44xx.h | 12 +++++++++++ 11 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 arch/arm/mach-omap2/prminst44xx.h diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index ed677bb..96d498f 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -48,7 +48,6 @@ #include "prm.h" #include #include "prcm_mpu44xx.h" -#include "prminst44xx.h" #include #include "prm2xxx.h" #include "prm3xxx.h" diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index 4b1b059..50127e1 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -57,7 +57,6 @@ #include "omap4-sar-layout.h" #include "pm.h" #include "prcm_mpu44xx.h" -#include "prminst44xx.h" #include "prcm44xx.h" #include "prm44xx.h" #include "prm-regbits-44xx.h" diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 6cd3f37..54e054a 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -35,7 +35,6 @@ #include "iomap.h" #include "common.h" #include "mmc.h" -#include "prminst44xx.h" #include "prcm_mpu44xx.h" #include "omap4-sar-layout.h" #include "omap-secure.h" diff --git a/arch/arm/mach-omap2/omap4-restart.c b/arch/arm/mach-omap2/omap4-restart.c index 41dfd7d..f0102d1 100644 --- a/arch/arm/mach-omap2/omap4-restart.c +++ b/arch/arm/mach-omap2/omap4-restart.c @@ -9,7 +9,7 @@ #include #include -#include "prminst44xx.h" +#include /** * omap44xx_restart - trigger a software restart of the SoC diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 4576f0b..096c43d 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -159,7 +159,6 @@ #include "prm3xxx.h" #include "prm44xx.h" #include "prm33xx.h" -#include "prminst44xx.h" #include "mux.h" #include "pm.h" diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c index feb508f..01f6b15 100644 --- a/arch/arm/mach-omap2/prminst44xx.c +++ b/arch/arm/mach-omap2/prminst44xx.c @@ -21,7 +21,6 @@ #include #include #include -#include "prminst44xx.h" #include "prcm44xx.h" #include "prcm_mpu44xx.h" diff --git a/arch/arm/mach-omap2/prminst44xx.h b/arch/arm/mach-omap2/prminst44xx.h deleted file mode 100644 index fec8f18..0000000 --- a/arch/arm/mach-omap2/prminst44xx.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * OMAP4 Power/Reset Management (PRM) function prototypes - * - * Copyright (C) 2010 Nokia Corporation - * Copyright (C) 2011 Texas Instruments, Inc. - * Paul Walmsley - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#ifndef __ARCH_ASM_MACH_OMAP2_PRMINST44XX_H -#define __ARCH_ASM_MACH_OMAP2_PRMINST44XX_H - -extern void omap4_prminst_global_warm_sw_reset(void); - -extern int omap4_prminst_is_hardreset_asserted(u8 shift, u8 part, s16 inst, - u16 rstctrl_offs); -extern int omap4_prminst_assert_hardreset(u8 shift, u8 part, s16 inst, - u16 rstctrl_offs); -extern int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst, - u16 rstctrl_offs); -void omap4_prminst_mpuss_clear_prev_logic_pwrst(void); - -extern void omap_prm_base_init(void); - -#endif diff --git a/arch/arm/mach-omap2/prminst44xx_private.h b/arch/arm/mach-omap2/prminst44xx_private.h index 59a6e55..5db33b7 100644 --- a/arch/arm/mach-omap2/prminst44xx_private.h +++ b/arch/arm/mach-omap2/prminst44xx_private.h @@ -12,7 +12,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRMINST44XX_PRIVATE_H #define __ARCH_ARM_MACH_OMAP2_PRMINST44XX_PRIVATE_H -#include "prminst44xx.h" +#include /* * In an ideal world, we would not export these low-level functions, diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index 3ac8fe1..78f5a68 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -33,7 +33,6 @@ #include "prm-regbits-44xx.h" #include "prm44xx.h" #include "prcm44xx.h" -#include "prminst44xx.h" #include "control.h" #include "voltage.h" diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c index 48b22a0..479b412 100644 --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c @@ -26,7 +26,6 @@ #include "prm-regbits-44xx.h" #include "prm44xx.h" #include "prcm44xx.h" -#include "prminst44xx.h" #include "voltage.h" #include "omap_opp_data.h" #include "vc.h" diff --git a/include/linux/power/omap/prm44xx.h b/include/linux/power/omap/prm44xx.h index e5cd9f3..3c5852e 100644 --- a/include/linux/power/omap/prm44xx.h +++ b/include/linux/power/omap/prm44xx.h @@ -417,4 +417,16 @@ #define OMAP4_PRM_MODEM_IF_CTRL_OFFSET 0x00f4 #define OMAP4_PRM_VC_ERRST_OFFSET 0x00f8 +#ifndef __ASSEMBLER__ +void omap4_prminst_global_warm_sw_reset(void); +int omap4_prminst_is_hardreset_asserted(u8 shift, u8 part, s16 inst, + u16 rstctrl_offs); +int omap4_prminst_assert_hardreset(u8 shift, u8 part, s16 inst, + u16 rstctrl_offs); +int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst, + u16 rstctrl_offs); +void omap4_prminst_mpuss_clear_prev_logic_pwrst(void); +void omap_prm_base_init(void); +#endif + #endif