From patchwork Mon Mar 31 15:16:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27490 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f70.google.com (mail-pb0-f70.google.com [209.85.160.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C32E7202E0 for ; Mon, 31 Mar 2014 15:19:30 +0000 (UTC) Received: by mail-pb0-f70.google.com with SMTP id rp16sf21794678pbb.9 for ; Mon, 31 Mar 2014 08:19:29 -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=/qvUuyc3wqvBP2uu7QEshWLiY6ENfIcy4FC6cuOxiqw=; b=d2rqO/TRWUrsFCWbQn6RRVu8tXz0KSOvl5yuLVxYno8xuVhPhf8XPp+ZRDcy6XOaFB c/8R2srNdV4KS2DpAFC23TFhGHH/HLbQFTYwaUn/OCAuJ9E/Z9T1AZa+vBXfIXrNibD4 Yq8ls9YNOktEFfODfmpW/CbybBXdlgmBEyNl4FHac+BrNxrjSK9H6/2dqqFs9lj5ytpI JJWl6DMaSXk5m/4N2AA3VvKZMKFt3NingpzICBbRaaT6Vlon6XCUTXpql8/O4XmQ+jA1 WSTdqcieboNpsu3AbaCgB8btX+dtSikiswkN8I0YjHqPtLyXeKI0d6A0dwqbgriW+/H0 BR1g== X-Gm-Message-State: ALoCoQnM7Cy7VzFa4sf4nsEhPzSgNt5FuvD+lmfXidB2lXyLQQA898DCyB8ZpeVHl2he0mil5txu X-Received: by 10.66.65.109 with SMTP id w13mr10117478pas.21.1396279169939; Mon, 31 Mar 2014 08:19:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.105 with SMTP id y96ls1195355qgd.82.gmail; Mon, 31 Mar 2014 08:19:29 -0700 (PDT) X-Received: by 10.52.34.137 with SMTP id z9mr19682849vdi.12.1396279169827; Mon, 31 Mar 2014 08:19:29 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id xx5si3024260vcb.72.2014.03.31.08.19.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:19:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 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.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so8036876veb.22 for ; Mon, 31 Mar 2014 08:19:29 -0700 (PDT) X-Received: by 10.58.201.5 with SMTP id jw5mr22938159vec.6.1396279169748; Mon, 31 Mar 2014 08:19:29 -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 v8csp150875vcv; Mon, 31 Mar 2014 08:19:29 -0700 (PDT) X-Received: by 10.68.254.5 with SMTP id ae5mr25465311pbd.83.1396279169078; Mon, 31 Mar 2014 08:19:29 -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.28; Mon, 31 Mar 2014 08:19:28 -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 S1754034AbaCaPT0 (ORCPT + 5 others); Mon, 31 Mar 2014 11:19:26 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:58894 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754026AbaCaPTZ (ORCPT ); Mon, 31 Mar 2014 11:19:25 -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 s2VFIUOw022551; Mon, 31 Mar 2014 10:18:30 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFIUjN024216; Mon, 31 Mar 2014 10:18:30 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:18:30 -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 s2VFGm4X013169; Mon, 31 Mar 2014 10:18:29 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 46/55] ARM: OMAP3+: VP: move OMAP*_VP_VDD_*_ID definitions to prm public headers Date: Mon, 31 Mar 2014 18:16:25 +0300 Message-ID: <1396278994-12624-47-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.177 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: , vp.h is not publicly available, however the PRM driver requires access to these so moved to prm public headers. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prm3xxx.c | 1 - arch/arm/mach-omap2/prm44xx.c | 1 - arch/arm/mach-omap2/vp.h | 9 --------- include/linux/power/omap/prm3xxx.h | 3 +++ include/linux/power/omap/prm44xx.h | 4 ++++ 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 93f87e1..e7d409c 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -18,7 +18,6 @@ #include #include -#include "vp.h" #include "powerdomain.h" #include #include "prm2xxx_3xxx_private.h" diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index 7cbb35f..2b25710 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -19,7 +19,6 @@ #include -#include "vp.h" #include #include #include diff --git a/arch/arm/mach-omap2/vp.h b/arch/arm/mach-omap2/vp.h index 0fdf7080..7e08296 100644 --- a/arch/arm/mach-omap2/vp.h +++ b/arch/arm/mach-omap2/vp.h @@ -21,15 +21,6 @@ struct voltagedomain; -/* - * Voltage Processor (VP) identifiers - */ -#define OMAP3_VP_VDD_MPU_ID 0 -#define OMAP3_VP_VDD_CORE_ID 1 -#define OMAP4_VP_VDD_CORE_ID 0 -#define OMAP4_VP_VDD_IVA_ID 1 -#define OMAP4_VP_VDD_MPU_ID 2 - /* XXX document */ #define VP_IDLE_TIMEOUT 200 #define VP_TRANXDONE_TIMEOUT 300 diff --git a/include/linux/power/omap/prm3xxx.h b/include/linux/power/omap/prm3xxx.h index 3bdc372..af39ebd 100644 --- a/include/linux/power/omap/prm3xxx.h +++ b/include/linux/power/omap/prm3xxx.h @@ -18,6 +18,9 @@ #include +#define OMAP3_VP_VDD_MPU_ID 0 +#define OMAP3_VP_VDD_CORE_ID 1 + /* * OMAP3-specific global PRM registers * Use __raw_{read,write}l() with these registers. diff --git a/include/linux/power/omap/prm44xx.h b/include/linux/power/omap/prm44xx.h index 3c5852e..9395c0d 100644 --- a/include/linux/power/omap/prm44xx.h +++ b/include/linux/power/omap/prm44xx.h @@ -25,6 +25,10 @@ #ifndef __LINUX_POWER_OMAP_PRM44XX_H #define __LINUX_POWER_OMAP_PRM44XX_H +#define OMAP4_VP_VDD_CORE_ID 0 +#define OMAP4_VP_VDD_IVA_ID 1 +#define OMAP4_VP_VDD_MPU_ID 2 + /* PRM instances */ #define OMAP4430_PRM_OCP_SOCKET_INST 0x0000 #define OMAP4430_PRM_CKGEN_INST 0x0100