From patchwork Mon Mar 31 15:16:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27486 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 66F6920558 for ; Mon, 31 Mar 2014 15:19:21 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id oz11sf20419548veb.1 for ; Mon, 31 Mar 2014 08:19:21 -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=OCcByExikEgcEgeyL5SRgj35C5md4dq0AC9ImhRa/A8=; b=TQBC/OboG4YORMljjwcavIjGtgRswqdA9tcIHpG+xYZtETtZ2YtbTS0L63AXTI7hLY l59ySuXvTq6lEc8oIGte5elpC2TGDptEBgwaCnXYMlUmumPqChM4bx9AgDt4YNJx0nke HD7p/1Vr6Wk7D67Y4qhl75J3/YDbVO4hTA7a5MkHNqPzkzRTtRJx01E67oFBtGrRI7ju cBjBLuknwsyxovu8TBT5pvbF+hz6lFFiR8f+fxTHrZM9XZ0T7x2Pt6zLaRV7luMyJpeQ bNIVPdaymhIizEssPitlnEo0kZSBW54Pb/ISVCbDgzPwsdmIvlLXexHk1NS98cJ6ZMfO Acjg== X-Gm-Message-State: ALoCoQn5TKGUet1jERQYj1QfZhD6dVX0CY5gQy98868haO1cdhm0mKrvv0yamSLtyJOdoNFK0E+N X-Received: by 10.58.58.41 with SMTP id n9mr8567209veq.23.1396279161186; Mon, 31 Mar 2014 08:19:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.166 with SMTP id q35ls2571680qga.89.gmail; Mon, 31 Mar 2014 08:19:21 -0700 (PDT) X-Received: by 10.52.108.164 with SMTP id hl4mr1810192vdb.25.1396279161067; Mon, 31 Mar 2014 08:19:21 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id sy7si3018103vdc.64.2014.03.31.08.19.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:19:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so8275050vcb.2 for ; Mon, 31 Mar 2014 08:19:21 -0700 (PDT) X-Received: by 10.52.78.231 with SMTP id e7mr1139049vdx.28.1396279160982; Mon, 31 Mar 2014 08:19:20 -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 v8csp150868vcv; Mon, 31 Mar 2014 08:19:20 -0700 (PDT) X-Received: by 10.66.192.162 with SMTP id hh2mr4130622pac.150.1396279159926; Mon, 31 Mar 2014 08:19:19 -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.19; Mon, 31 Mar 2014 08:19:19 -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 S1754014AbaCaPTP (ORCPT + 5 others); Mon, 31 Mar 2014 11:19:15 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:58882 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754000AbaCaPTO (ORCPT ); Mon, 31 Mar 2014 11:19:14 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFITVG022542; Mon, 31 Mar 2014 10:18:29 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFITdS024182; Mon, 31 Mar 2014 10:18:29 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:18:28 -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 s2VFGm4W013169; Mon, 31 Mar 2014 10:18:27 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 45/55] ARM: OMAP4: PRM: move prm44xx_54xx.h header to public location Date: Mon, 31 Mar 2014 18:16:24 +0300 Message-ID: <1396278994-12624-46-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.220.171 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: , This file needs to be accessible from the PRCM core and mach-omap2 board support code. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prm44xx.c | 2 +- arch/arm/mach-omap2/prm44xx.h | 2 +- arch/arm/mach-omap2/prm44xx_54xx.h | 61 ------------------------------- arch/arm/mach-omap2/prm54xx.h | 2 +- arch/arm/mach-omap2/prm7xx.h | 2 +- include/linux/power/omap/prm44xx_54xx.h | 61 +++++++++++++++++++++++++++++++ 6 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 arch/arm/mach-omap2/prm44xx_54xx.h create mode 100644 include/linux/power/omap/prm44xx_54xx.h diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index f1f3e78..7cbb35f 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -28,7 +28,7 @@ #include "powerdomain.h" #include "prm.h" #include "prcm-common.h" -#include "prm44xx_54xx.h" +#include #define OMAP4430_GLOBAL_COLD_RST_SHIFT 0 #define OMAP4430_GLOBAL_WARM_SW_RST_SHIFT 1 diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h index 1f7a3a6..52585e1 100644 --- a/arch/arm/mach-omap2/prm44xx.h +++ b/arch/arm/mach-omap2/prm44xx.h @@ -25,7 +25,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRM44XX_H #define __ARCH_ARM_MACH_OMAP2_PRM44XX_H -#include "prm44xx_54xx.h" +#include #include "prcm-common.h" #include "prm.h" #include diff --git a/arch/arm/mach-omap2/prm44xx_54xx.h b/arch/arm/mach-omap2/prm44xx_54xx.h deleted file mode 100644 index 4b36d3d..0000000 --- a/arch/arm/mach-omap2/prm44xx_54xx.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * OMAP44xx and 54xx PRM common functions - * - * Copyright (C) 2009-2013 Texas Instruments, Inc. - * Copyright (C) 2009-2010 Nokia Corporation - * - * Paul Walmsley (paul@pwsan.com) - * Rajendra Nayak (rnayak@ti.com) - * Benoit Cousson (b-cousson@ti.com) - * - * This file is automatically generated from the OMAP hardware databases. - * We respectfully ask that any modifications to this file be coordinated - * with the public linux-omap@vger.kernel.org mailing list and the - * authors above to ensure that the autogeneration scripts are kept - * up-to-date with the file contents. - * - * 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_ARM_MACH_OMAP2_PRM44XX_54XX_H -#define __ARCH_ARM_MACH_OMAP2_PRM44XX_54XX_H - -/* Function prototypes */ -#ifndef __ASSEMBLER__ - -/* OMAP4/OMAP5-specific VP functions */ -u32 omap4_prm_vp_check_txdone(u8 vp_id); -void omap4_prm_vp_clear_txdone(u8 vp_id); - -/* - * OMAP4/OMAP5 access functions for voltage controller (VC) and - * voltage proccessor (VP) in the PRM. - */ -extern u32 omap4_prm_vcvp_read(u8 offset); -extern void omap4_prm_vcvp_write(u32 val, u8 offset); -extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset); - -#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) -void omap44xx_prm_reconfigure_io_chain(void); -#else -static inline void omap44xx_prm_reconfigure_io_chain(void) -{ -} -#endif - -/* PRM interrupt-related functions */ -extern void omap44xx_prm_read_pending_irqs(unsigned long *events); -extern void omap44xx_prm_ocp_barrier(void); -extern void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask); -extern void omap44xx_prm_restore_irqen(u32 *saved_mask); - -int __init omap44xx_prm_init(u16 cpu_type); -extern u32 omap44xx_prm_get_reset_sources(void); - -#endif - -#endif diff --git a/arch/arm/mach-omap2/prm54xx.h b/arch/arm/mach-omap2/prm54xx.h index 64d0859..34a0835 100644 --- a/arch/arm/mach-omap2/prm54xx.h +++ b/arch/arm/mach-omap2/prm54xx.h @@ -21,7 +21,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRM54XX_H #define __ARCH_ARM_MACH_OMAP2_PRM54XX_H -#include "prm44xx_54xx.h" +#include #include "prcm-common.h" #include "prm.h" #include diff --git a/arch/arm/mach-omap2/prm7xx.h b/arch/arm/mach-omap2/prm7xx.h index c6dc341..2637d62 100644 --- a/arch/arm/mach-omap2/prm7xx.h +++ b/arch/arm/mach-omap2/prm7xx.h @@ -22,7 +22,7 @@ #ifndef __ARCH_ARM_MACH_OMAP2_PRM7XX_H #define __ARCH_ARM_MACH_OMAP2_PRM7XX_H -#include "prm44xx_54xx.h" +#include #include "prcm-common.h" #include "prm.h" #include diff --git a/include/linux/power/omap/prm44xx_54xx.h b/include/linux/power/omap/prm44xx_54xx.h new file mode 100644 index 0000000..b6d6d65 --- /dev/null +++ b/include/linux/power/omap/prm44xx_54xx.h @@ -0,0 +1,61 @@ +/* + * OMAP44xx and 54xx PRM common functions + * + * Copyright (C) 2009-2013 Texas Instruments, Inc. + * Copyright (C) 2009-2010 Nokia Corporation + * + * Paul Walmsley (paul@pwsan.com) + * Rajendra Nayak (rnayak@ti.com) + * Benoit Cousson (b-cousson@ti.com) + * + * This file is automatically generated from the OMAP hardware databases. + * We respectfully ask that any modifications to this file be coordinated + * with the public linux-omap@vger.kernel.org mailing list and the + * authors above to ensure that the autogeneration scripts are kept + * up-to-date with the file contents. + * + * 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 __LINUX_POWER_OMAP_PRM44XX_54XX_H +#define __LINUX_POWER_OMAP_PRM44XX_54XX_H + +/* Function prototypes */ +#ifndef __ASSEMBLER__ + +/* OMAP4/OMAP5-specific VP functions */ +u32 omap4_prm_vp_check_txdone(u8 vp_id); +void omap4_prm_vp_clear_txdone(u8 vp_id); + +/* + * OMAP4/OMAP5 access functions for voltage controller (VC) and + * voltage proccessor (VP) in the PRM. + */ +u32 omap4_prm_vcvp_read(u8 offset); +void omap4_prm_vcvp_write(u32 val, u8 offset); +u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset); + +#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) +void omap44xx_prm_reconfigure_io_chain(void); +#else +static inline void omap44xx_prm_reconfigure_io_chain(void) +{ +} +#endif + +/* PRM interrupt-related functions */ +void omap44xx_prm_read_pending_irqs(unsigned long *events); +void omap44xx_prm_ocp_barrier(void); +void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask); +void omap44xx_prm_restore_irqen(u32 *saved_mask); + +int __init omap44xx_prm_init(u16 cpu_type); +u32 omap44xx_prm_get_reset_sources(void); + +#endif + +#endif