From patchwork Mon Mar 31 15:16:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27485 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1D788202E0 for ; Mon, 31 Mar 2014 15:19:20 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf21954654pad.11 for ; Mon, 31 Mar 2014 08:19:20 -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=zw+uqP0pBbq8QUYtkYLljyi2ANYrLu+8K7R45qeMxhA=; b=DzXshOOYR86cxYY3M5tQjSoWdXZ/dj6EPNgQGhjTI2U8GthLEaTvpF7l+TBoD7620C SuPsqyMQ6L+WUanX4X0b6+Odgy30nQ0zB7ZkGKcg69/EXusQeQdDag1UlHQhShZ5Txdm Nib4MrRa7if+rF/13Z6tpeTu2pa2fKgywDWBzHF1cHicKuQPw0SHsNzrPJobr80/f6T8 sBg19b1os5uBWAc7iGfFGFE1tUUVLBxA3xOmL1OC48NHU1iB4MXky0a6MEHF6sNzYvOP OGrxi3OCwWgPZpnSxWv6Vv5yi2IfvR7uR0ZWIGy9Be6Jt/OUghu0mzgNBrODZ4aGVDUH PQKw== X-Gm-Message-State: ALoCoQlo6ky+pPB3SmewKBkGKogmRlUFANjT281VnTSTDiSn4DeEL2o3DM6ITuFcF1/t9erzp9kh X-Received: by 10.66.140.8 with SMTP id rc8mr9049839pab.41.1396279160372; Mon, 31 Mar 2014 08:19:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.169 with SMTP id z38ls2428415qgz.36.gmail; Mon, 31 Mar 2014 08:19:20 -0700 (PDT) X-Received: by 10.58.225.233 with SMTP id rn9mr42477vec.53.1396279160257; Mon, 31 Mar 2014 08:19:20 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id bf4si3029228vec.46.2014.03.31.08.19.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:19:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.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.128.171; Received: by mail-ve0-f171.google.com with SMTP id jy13so5339385veb.30 for ; Mon, 31 Mar 2014 08:19:20 -0700 (PDT) X-Received: by 10.52.26.161 with SMTP id m1mr1905218vdg.24.1396279160175; 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 v8csp150867vcv; Mon, 31 Mar 2014 08:19:19 -0700 (PDT) X-Received: by 10.68.231.196 with SMTP id ti4mr25942003pbc.48.1396279159302; 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.18; Mon, 31 Mar 2014 08:19:18 -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 S1754022AbaCaPTQ (ORCPT + 5 others); Mon, 31 Mar 2014 11:19:16 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:54797 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657AbaCaPTN (ORCPT ); Mon, 31 Mar 2014 11:19:13 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFIbTY028834; Mon, 31 Mar 2014 10:18:37 -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 s2VFIbrw024322; Mon, 31 Mar 2014 10:18:37 -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:37 -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 s2VFGm4a013169; Mon, 31 Mar 2014 10:18:35 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 49/55] ARM: OMAP4: move prcm44xx.h header to public location Date: Mon, 31 Mar 2014 18:16:28 +0300 Message-ID: <1396278994-12624-50-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.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/clockdomains43xx_data.c | 1 - arch/arm/mach-omap2/clockdomains44xx_data.c | 2 +- arch/arm/mach-omap2/clockdomains54xx_data.c | 2 +- arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +- arch/arm/mach-omap2/cminst44xx.c | 2 +- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +- arch/arm/mach-omap2/powerdomain.c | 2 +- arch/arm/mach-omap2/powerdomains43xx_data.c | 1 - arch/arm/mach-omap2/powerdomains44xx_data.c | 2 +- arch/arm/mach-omap2/powerdomains54xx_data.c | 2 +- arch/arm/mach-omap2/powerdomains7xx_data.c | 2 +- arch/arm/mach-omap2/prcm44xx.h | 53 ------------------------- arch/arm/mach-omap2/prm44xx.c | 2 +- arch/arm/mach-omap2/prminst44xx.c | 2 +- arch/arm/mach-omap2/voltage.c | 2 +- arch/arm/mach-omap2/voltagedomains44xx_data.c | 1 - include/linux/power/omap/prcm44xx.h | 53 +++++++++++++++++++++++++ 17 files changed, 65 insertions(+), 68 deletions(-) delete mode 100644 arch/arm/mach-omap2/prcm44xx.h create mode 100644 include/linux/power/omap/prcm44xx.h diff --git a/arch/arm/mach-omap2/clockdomains43xx_data.c b/arch/arm/mach-omap2/clockdomains43xx_data.c index 6d71c60..11a319b 100644 --- a/arch/arm/mach-omap2/clockdomains43xx_data.c +++ b/arch/arm/mach-omap2/clockdomains43xx_data.c @@ -12,7 +12,6 @@ #include #include "clockdomain.h" -#include "prcm44xx.h" #include "prcm43xx.h" static struct clockdomain l4_cefuse_43xx_clkdm = { diff --git a/arch/arm/mach-omap2/clockdomains44xx_data.c b/arch/arm/mach-omap2/clockdomains44xx_data.c index 95192a0..a335303 100644 --- a/arch/arm/mach-omap2/clockdomains44xx_data.c +++ b/arch/arm/mach-omap2/clockdomains44xx_data.c @@ -28,7 +28,7 @@ #include "cm-regbits-44xx.h" #include "prm44xx.h" -#include "prcm44xx.h" +#include #include "prcm_mpu44xx.h" /* Static Dependencies for OMAP4 Clock Domains */ diff --git a/arch/arm/mach-omap2/clockdomains54xx_data.c b/arch/arm/mach-omap2/clockdomains54xx_data.c index 1a3c69d..59ea31e 100644 --- a/arch/arm/mach-omap2/clockdomains54xx_data.c +++ b/arch/arm/mach-omap2/clockdomains54xx_data.c @@ -27,7 +27,7 @@ #include "cm-regbits-54xx.h" #include "prm54xx.h" -#include "prcm44xx.h" +#include #include "prcm_mpu54xx.h" /* Static Dependencies for OMAP4 Clock Domains */ diff --git a/arch/arm/mach-omap2/clockdomains7xx_data.c b/arch/arm/mach-omap2/clockdomains7xx_data.c index 57d5df0..b169667 100644 --- a/arch/arm/mach-omap2/clockdomains7xx_data.c +++ b/arch/arm/mach-omap2/clockdomains7xx_data.c @@ -29,7 +29,7 @@ #include "cm-regbits-7xx.h" #include "prm7xx.h" -#include "prcm44xx.h" +#include #include "prcm_mpu7xx.h" /* Static Dependencies for DRA7xx Clock Domains */ diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 0fd50d7..3b95fc6 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -27,7 +27,7 @@ #include "cm1_44xx.h" #include "cm2_44xx.h" #include -#include "prcm44xx.h" +#include #include #include "prcm_mpu44xx.h" #include diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index 50127e1..33f5774 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -57,7 +57,7 @@ #include "omap4-sar-layout.h" #include "pm.h" #include "prcm_mpu44xx.h" -#include "prcm44xx.h" +#include #include "prm44xx.h" #include "prm-regbits-44xx.h" diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 7262b3d..86ef5f6 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -23,7 +23,7 @@ #include #include -#include "prcm44xx.h" +#include #include #include diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c index b99eac7..91802f1 100644 --- a/arch/arm/mach-omap2/powerdomains43xx_data.c +++ b/arch/arm/mach-omap2/powerdomains43xx_data.c @@ -14,7 +14,6 @@ #include "powerdomain.h" #include -#include "prcm44xx.h" #include "prcm43xx.h" static struct powerdomain gfx_43xx_pwrdm = { diff --git a/arch/arm/mach-omap2/powerdomains44xx_data.c b/arch/arm/mach-omap2/powerdomains44xx_data.c index ea1ffc1..793c611 100644 --- a/arch/arm/mach-omap2/powerdomains44xx_data.c +++ b/arch/arm/mach-omap2/powerdomains44xx_data.c @@ -25,7 +25,7 @@ #include "powerdomain.h" #include -#include "prcm44xx.h" +#include #include "prm-regbits-44xx.h" #include "prm44xx.h" #include "prcm_mpu44xx.h" diff --git a/arch/arm/mach-omap2/powerdomains54xx_data.c b/arch/arm/mach-omap2/powerdomains54xx_data.c index b4a815b..37017f2 100644 --- a/arch/arm/mach-omap2/powerdomains54xx_data.c +++ b/arch/arm/mach-omap2/powerdomains54xx_data.c @@ -24,7 +24,7 @@ #include "powerdomain.h" #include -#include "prcm44xx.h" +#include #include "prm54xx.h" #include "prcm_mpu54xx.h" diff --git a/arch/arm/mach-omap2/powerdomains7xx_data.c b/arch/arm/mach-omap2/powerdomains7xx_data.c index cf33ef6..cedc84b 100644 --- a/arch/arm/mach-omap2/powerdomains7xx_data.c +++ b/arch/arm/mach-omap2/powerdomains7xx_data.c @@ -26,7 +26,7 @@ #include "powerdomain.h" #include -#include "prcm44xx.h" +#include #include "prm7xx.h" #include "prcm_mpu7xx.h" diff --git a/arch/arm/mach-omap2/prcm44xx.h b/arch/arm/mach-omap2/prcm44xx.h deleted file mode 100644 index 4fea2cf..0000000 --- a/arch/arm/mach-omap2/prcm44xx.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * OMAP4 PRCM definitions - * - * Copyright (C) 2010 Texas Instruments, Inc. - * 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. - * - * This file contains macros and functions that are common to all of - * the PRM/CM/PRCM blocks on the OMAP4 devices: PRM, CM1, CM2, - * PRCM_MPU, SCRM - */ - -#ifndef __ARCH_ARM_MACH_OMAP2_PRCM44XX_H -#define __ARCH_ARM_MACH_OMAP2_PRCM44XX_H - -/* - * OMAP4 PRCM partition IDs - * - * The numbers and order are arbitrary, but 0 is reserved for the - * 'invalid' partition in case someone forgets to add a - * .prcm_partition field. - */ -#define OMAP4430_INVALID_PRCM_PARTITION 0 -#define OMAP4430_PRM_PARTITION 1 -#define OMAP4430_CM1_PARTITION 2 -#define OMAP4430_CM2_PARTITION 3 -#define OMAP4430_SCRM_PARTITION 4 -#define OMAP4430_PRCM_MPU_PARTITION 5 - -#define OMAP54XX_PRM_PARTITION 1 -#define OMAP54XX_CM_CORE_AON_PARTITION 2 -#define OMAP54XX_CM_CORE_PARTITION 3 -#define OMAP54XX_SCRM_PARTITION 4 -#define OMAP54XX_PRCM_MPU_PARTITION 5 - -#define DRA7XX_PRM_PARTITION 1 -#define DRA7XX_CM_CORE_AON_PARTITION 2 -#define DRA7XX_CM_CORE_PARTITION 3 -#define DRA7XX_MPU_PRCM_PARTITION 5 - -/* - * OMAP4_MAX_PRCM_PARTITIONS: set to the highest value of the PRCM partition - * IDs, plus one - */ -#define OMAP4_MAX_PRCM_PARTITIONS 6 - - -#endif diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index cf312a8..69a974b 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -22,7 +22,7 @@ #include #include #include -#include "prcm44xx.h" +#include #include "prminst44xx_private.h" #include "powerdomain.h" #include diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c index 30015d1..5b7c17e 100644 --- a/arch/arm/mach-omap2/prminst44xx.c +++ b/arch/arm/mach-omap2/prminst44xx.c @@ -21,7 +21,7 @@ #include #include #include -#include "prcm44xx.h" +#include #include "prcm_mpu44xx.h" #define OMAP4430_RST_GLOBAL_WARM_SW_MASK (1 << 0) diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c index 78f5a68..b707328 100644 --- a/arch/arm/mach-omap2/voltage.c +++ b/arch/arm/mach-omap2/voltage.c @@ -32,7 +32,7 @@ #include "prm-regbits-34xx.h" #include "prm-regbits-44xx.h" #include "prm44xx.h" -#include "prcm44xx.h" +#include #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 479b412..f452ab8 100644 --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c @@ -25,7 +25,6 @@ #include "soc.h" #include "prm-regbits-44xx.h" #include "prm44xx.h" -#include "prcm44xx.h" #include "voltage.h" #include "omap_opp_data.h" #include "vc.h" diff --git a/include/linux/power/omap/prcm44xx.h b/include/linux/power/omap/prcm44xx.h new file mode 100644 index 0000000..4f58ed1 --- /dev/null +++ b/include/linux/power/omap/prcm44xx.h @@ -0,0 +1,53 @@ +/* + * OMAP4 PRCM definitions + * + * Copyright (C) 2010 Texas Instruments, Inc. + * 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. + * + * This file contains macros and functions that are common to all of + * the PRM/CM/PRCM blocks on the OMAP4 devices: PRM, CM1, CM2, + * PRCM_MPU, SCRM + */ + +#ifndef __LINUX_POWER_OMAP_PRCM44XX_H +#define __LINUX_POWER_OMAP_PRCM44XX_H + +/* + * OMAP4 PRCM partition IDs + * + * The numbers and order are arbitrary, but 0 is reserved for the + * 'invalid' partition in case someone forgets to add a + * .prcm_partition field. + */ +#define OMAP4430_INVALID_PRCM_PARTITION 0 +#define OMAP4430_PRM_PARTITION 1 +#define OMAP4430_CM1_PARTITION 2 +#define OMAP4430_CM2_PARTITION 3 +#define OMAP4430_SCRM_PARTITION 4 +#define OMAP4430_PRCM_MPU_PARTITION 5 + +#define OMAP54XX_PRM_PARTITION 1 +#define OMAP54XX_CM_CORE_AON_PARTITION 2 +#define OMAP54XX_CM_CORE_PARTITION 3 +#define OMAP54XX_SCRM_PARTITION 4 +#define OMAP54XX_PRCM_MPU_PARTITION 5 + +#define DRA7XX_PRM_PARTITION 1 +#define DRA7XX_CM_CORE_AON_PARTITION 2 +#define DRA7XX_CM_CORE_PARTITION 3 +#define DRA7XX_MPU_PRCM_PARTITION 5 + +/* + * OMAP4_MAX_PRCM_PARTITIONS: set to the highest value of the PRCM partition + * IDs, plus one + */ +#define OMAP4_MAX_PRCM_PARTITIONS 6 + + +#endif