From patchwork Mon Mar 31 15:15:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27438 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6333E202E0 for ; Mon, 31 Mar 2014 15:17:56 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id dc16sf8591274qab.3 for ; Mon, 31 Mar 2014 08:17:56 -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=vjYbTZ15kIpsw8/LOGmWZgH0a896AG3VF412RsMNt28=; b=glnhdggqpXKPEQh6X/5YwnPfylDaLlzqD4/fg6OACFnMBHusmDy9gycDdkX7fhCWXb Jgm5KxQQrPYGrwm2777N0gAfxKVBDzHkbduiXgBCY1d6lbsj+k+8VUt+h14QxFekegjR Iyli9Bj04DKxbsj3fgRBRWKX7qgyb9p9yroL0mlX2yBLo3EiK4+xJTCiJoh5dauCKHSH IzeSgUm4XQK+sle/fXoukuHXZcd5ik6lCEnDPJjNR4nQflQ39wj0gdkoJlzFeQeZ7uBU SN+zsc8TMHopgZzpNmWMAzCH568AtE36SqYXQ+l9aK9OXH9TwBVemATdQfe1aVME5BA4 o4NQ== X-Gm-Message-State: ALoCoQk3A4ynLkBJVLBGxIojiA7yAz+cD0IA/Q6TC2d725g9aHm2NV1qAjH6z1tF3s8yIU8MQaOg X-Received: by 10.58.91.162 with SMTP id cf2mr8593131veb.17.1396279076112; Mon, 31 Mar 2014 08:17:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.105 with SMTP id y96ls1194871qgd.82.gmail; Mon, 31 Mar 2014 08:17:56 -0700 (PDT) X-Received: by 10.52.124.66 with SMTP id mg2mr36262vdb.50.1396279075992; Mon, 31 Mar 2014 08:17:55 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id i3si2911350vca.185.2014.03.31.08.17.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.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.220.175; Received: by mail-vc0-f175.google.com with SMTP id lh14so8242488vcb.6 for ; Mon, 31 Mar 2014 08:17:55 -0700 (PDT) X-Received: by 10.221.39.196 with SMTP id tn4mr40899vcb.51.1396279075893; Mon, 31 Mar 2014 08:17:55 -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 v8csp150694vcv; Mon, 31 Mar 2014 08:17:55 -0700 (PDT) X-Received: by 10.68.138.165 with SMTP id qr5mr8031030pbb.123.1396279075079; Mon, 31 Mar 2014 08:17:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ua2si9337117pab.487.2014.03.31.08.17.52; Mon, 31 Mar 2014 08:17:52 -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 S1753592AbaCaPRj (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:39 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49803 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753424AbaCaPRh (ORCPT ); Mon, 31 Mar 2014 11:17:37 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFHH5g015181; Mon, 31 Mar 2014 10:17:17 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFHH6G023290; Mon, 31 Mar 2014 10:17:17 -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:17:17 -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 s2VFGm41013169; Mon, 31 Mar 2014 10:17:16 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 14/55] ARM: OMAP2: CM: remove references to cm-regbits-24xx.h from CM core code Date: Mon, 31 Mar 2014 18:15:53 +0300 Message-ID: <1396278994-12624-15-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.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: , Done in preparation to make CM a standalone driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm2xxx.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/cm2xxx.c b/arch/arm/mach-omap2/cm2xxx.c index 4c29f63..e74484a 100644 --- a/arch/arm/mach-omap2/cm2xxx.c +++ b/arch/arm/mach-omap2/cm2xxx.c @@ -22,7 +22,6 @@ #include "cm.h" #include "cm2xxx_3xxx_private.h" #include "cm2xxx.h" -#include "cm-regbits-24xx.h" #include "clockdomain.h" /* CM_AUTOIDLE_PLL.AUTO_* bit values for DPLLs */ @@ -36,6 +35,24 @@ /* CM_IDLEST_PLL bit value offset for APLLs (OMAP2xxx only) */ #define EN_APLL_LOCKED 3 +#define OMAP24XX_CLKSTCTRL_DISABLE_AUTO 0x0 +#define OMAP24XX_CLKSTCTRL_ENABLE_AUTO 0x1 + +#define OMAP24XX_CORE_CLK_SRC_MASK (0x3 << 0) + +#define OMAP24XX_EN_54M_PLL_SHIFT 6 +#define OMAP24XX_EN_96M_PLL_SHIFT 2 +#define OMAP24XX_ST_54M_APLL_SHIFT 9 +#define OMAP24XX_ST_96M_APLL_SHIFT 8 +#define OMAP24XX_AUTO_54M_MASK (0x3 << 6) +#define OMAP24XX_AUTO_96M_MASK (0x3 << 2) +#define OMAP24XX_AUTO_DPLL_SHIFT 0 +#define OMAP24XX_AUTO_DPLL_MASK (0x3 << 0) + +#define OMAP24XX_EN_DSS1_MASK (1 << 0) + +#define OMAP24XX_CLKSEL_DSS2_MASK (0x1 << 13) + static const u8 omap2xxx_cm_idlest_offs[] = { CM_IDLEST1, CM_IDLEST2, OMAP2430_CM_IDLEST3, OMAP24XX_CM_IDLEST4 };