From patchwork Mon Mar 31 15:16:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27450 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6F4BB202E0 for ; Mon, 31 Mar 2014 15:18:22 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id gq1sf29168402obb.11 for ; Mon, 31 Mar 2014 08:18:22 -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=RTIlyXpnZ9McVvyVz3c0LR35RFbpEHGWod1edDX6aAw=; b=kBk80KbhSufOV0nJ2D3sadIsnPy5kMUpRXhEChrZyqbBZWTv63WVvp29GsQU9IBf+b SJUC/R6zqzzP/EMLBAHM/fOHlgC+uVBkran717ua/F/N+i3ZephdPUAhnT0sn2nX49vE apdg1mhMPIYULX55D95zinSI4jbFv/8vd/VoWMNmne5Q/G4HtporvXktzziBX5ZEUaxT Laz+1Ky/ttLb9KwITiLSi3ddfBRqAVsfnYkeS8ynSSk+n20uQO7xfqhKtIahMPl0yV0p KqCuBAqyPIQbF0iyX/JmnxS9IprxMOlZHL1VWWOfaZst7Fy4YiGPsUDuP1axtba0qe2T oTMA== X-Gm-Message-State: ALoCoQkbS7JQh3XLDUV3CE6hjvrR0EMAwQRCMUhQ4Rpi7/UZ8xR/kIMJVyu0HzTSEs51mf6S/3sg X-Received: by 10.43.125.196 with SMTP id gt4mr9517820icc.32.1396279102011; Mon, 31 Mar 2014 08:18:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.136 with SMTP id 8ls2498818qgh.43.gmail; Mon, 31 Mar 2014 08:18:21 -0700 (PDT) X-Received: by 10.58.196.145 with SMTP id im17mr43673vec.47.1396279101815; Mon, 31 Mar 2014 08:18:21 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id bf4si3024413vec.100.2014.03.31.08.18.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 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.179; Received: by mail-ve0-f179.google.com with SMTP id db12so8130573veb.24 for ; Mon, 31 Mar 2014 08:18:21 -0700 (PDT) X-Received: by 10.58.150.68 with SMTP id ug4mr42998veb.50.1396279101749; Mon, 31 Mar 2014 08:18:21 -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 v8csp150740vcv; Mon, 31 Mar 2014 08:18:21 -0700 (PDT) X-Received: by 10.69.31.43 with SMTP id kj11mr25530968pbd.67.1396279101032; Mon, 31 Mar 2014 08:18:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k1si9354231pao.142.2014.03.31.08.18.20; Mon, 31 Mar 2014 08:18:20 -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 S1753869AbaCaPST (ORCPT + 5 others); Mon, 31 Mar 2014 11:18:19 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:58788 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753483AbaCaPSS (ORCPT ); Mon, 31 Mar 2014 11:18:18 -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 s2VFHkVF022174; Mon, 31 Mar 2014 10:17:46 -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 s2VFHkmR023500; Mon, 31 Mar 2014 10:17:46 -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:17:45 -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 s2VFGm4G013169; Mon, 31 Mar 2014 10:17:44 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 29/55] ARM: OMAP4: CM: rename cminst44xx.h to cm44xx.h and move it to public location Date: Mon, 31 Mar 2014 18:16:08 +0300 Message-ID: <1396278994-12624-30-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.179 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: , The new name follows the naming convention of the other public CM header files. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cminst44xx.c | 2 +- arch/arm/mach-omap2/cminst44xx.h | 29 ----------------------------- arch/arm/mach-omap2/io.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 2 +- include/linux/power/omap/cm44xx.h | 30 ++++++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 32 deletions(-) delete mode 100644 arch/arm/mach-omap2/cminst44xx.h create mode 100644 include/linux/power/omap/cm44xx.h diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 20681de..2f780df 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -25,7 +25,7 @@ #include "cm.h" #include "cm1_44xx.h" #include "cm2_44xx.h" -#include "cminst44xx.h" +#include #include "prcm44xx.h" #include "prm44xx.h" #include "prcm_mpu44xx.h" diff --git a/arch/arm/mach-omap2/cminst44xx.h b/arch/arm/mach-omap2/cminst44xx.h deleted file mode 100644 index ad06525..0000000 --- a/arch/arm/mach-omap2/cminst44xx.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * OMAP4 Clock Management (CM) function prototypes - * - * Copyright (C) 2010 Nokia Corporation - * 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_CMINST44XX_H -#define __ARCH_ASM_MACH_OMAP2_CMINST44XX_H - -bool omap4_cminst_is_clkdm_in_hwsup(u8 part, u16 inst, u16 cdoffs); -void omap4_cminst_clkdm_enable_hwsup(u8 part, u16 inst, u16 cdoffs); -void omap4_cminst_clkdm_disable_hwsup(u8 part, u16 inst, u16 cdoffs); -void omap4_cminst_clkdm_force_sleep(u8 part, u16 inst, u16 cdoffs); -void omap4_cminst_clkdm_force_wakeup(u8 part, u16 inst, u16 cdoffs); -extern int omap4_cminst_wait_module_ready(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_offs); -extern int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, - u16 clkctrl_offs); -extern void omap4_cminst_module_enable(u8 mode, u8 part, u16 inst, s16 cdoffs, - u16 clkctrl_offs); -extern void omap4_cminst_module_disable(u8 part, u16 inst, s16 cdoffs, - u16 clkctrl_offs); - -extern void omap_cm_base_init(void); - -#endif diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index dfba898..6212c10 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -49,7 +49,7 @@ #include "cm.h" #include "prcm_mpu44xx.h" #include "prminst44xx.h" -#include "cminst44xx.h" +#include #include "prm2xxx.h" #include "prm3xxx.h" #include "prm44xx.h" diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 54c24e1..4576f0b 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -153,7 +153,7 @@ #include "powerdomain.h" #include "cm2xxx.h" #include "cm3xxx.h" -#include "cminst44xx.h" +#include #include "cm33xx.h" #include "prm.h" #include "prm3xxx.h" diff --git a/include/linux/power/omap/cm44xx.h b/include/linux/power/omap/cm44xx.h new file mode 100644 index 0000000..eda5670 --- /dev/null +++ b/include/linux/power/omap/cm44xx.h @@ -0,0 +1,30 @@ +/* + * OMAP4 Clock Management (CM) function prototypes + * + * Copyright (C) 2010 Nokia Corporation + * 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 __LINUX_POWER_OMAP_CM44XX_H +#define __LINUX_POWER_OMAP_CM44XX_H + +bool omap4_cminst_is_clkdm_in_hwsup(u8 part, u16 inst, u16 cdoffs); +void omap4_cminst_clkdm_enable_hwsup(u8 part, u16 inst, u16 cdoffs); +void omap4_cminst_clkdm_disable_hwsup(u8 part, u16 inst, u16 cdoffs); +void omap4_cminst_clkdm_force_sleep(u8 part, u16 inst, u16 cdoffs); +void omap4_cminst_clkdm_force_wakeup(u8 part, u16 inst, u16 cdoffs); +int omap4_cminst_wait_module_ready(u8 part, u16 inst, s16 cdoffs, + u16 clkctrl_offs); +int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, + u16 clkctrl_offs); +void omap4_cminst_module_enable(u8 mode, u8 part, u16 inst, s16 cdoffs, + u16 clkctrl_offs); +void omap4_cminst_module_disable(u8 part, u16 inst, s16 cdoffs, + u16 clkctrl_offs); + +void omap_cm_base_init(void); + +#endif