From patchwork Mon Mar 31 15:15:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27441 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 8C8F6202E0 for ; Mon, 31 Mar 2014 15:18:01 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf21950500pad.11 for ; Mon, 31 Mar 2014 08:18:00 -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=EYnennPWIdPURlaMH+c8mL02PxyFBbtNbjpxkCpWq0g=; b=Fbc2PdQeDrvdUM+Iuh+ftIK8w//c9gYXjHflUxNXRFofxMxHfeHztCQ4sGaFzJFkW7 ZyYWnzFRZ3q5NkwCTLpAKVRI8JFl9QmjH9eJ82TtJ93IWK8Ij1G6Xwdy5nIozlJ7335M 950W7r9noSb3i7+jkcSKFTp7i2ROnEz+hwbbOX8RT+3sCR2KIuL5Vh8n8oxLCYx/mShk M7Yqx7QaA7kgpr30vDepfMW1ydsmNm3BwLfjL8zRNCu+R7gqB7dUdViTh6lhIksbDK55 DItKWpZlrHK47A/6Rv0p8kAJiZ6uwj4XSz5bMIlCdLIu7MXFbEC89pJAWUu7x0fHiJee Qazg== X-Gm-Message-State: ALoCoQkrKePrTu8kjT4GSqtu6qUQ4vzc7JXdNj+6iSOJzprUCdoZgZ+Hz3tjXWEYnrt6Gxx8Kfkb X-Received: by 10.66.102.36 with SMTP id fl4mr10040444pab.20.1396279080632; Mon, 31 Mar 2014 08:18:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.194 with SMTP id d60ls1198110qge.86.gmail; Mon, 31 Mar 2014 08:18:00 -0700 (PDT) X-Received: by 10.58.55.170 with SMTP id t10mr576864vep.29.1396279080490; Mon, 31 Mar 2014 08:18:00 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id dl6si3025951veb.73.2014.03.31.08.18.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id oz11so8318308veb.33 for ; Mon, 31 Mar 2014 08:18:00 -0700 (PDT) X-Received: by 10.220.7.131 with SMTP id d3mr43915vcd.45.1396279080388; Mon, 31 Mar 2014 08:18:00 -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 v8csp150704vcv; Mon, 31 Mar 2014 08:17:59 -0700 (PDT) X-Received: by 10.68.194.97 with SMTP id hv1mr3888303pbc.162.1396279079598; Mon, 31 Mar 2014 08:17:59 -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.17.59; Mon, 31 Mar 2014 08:17:59 -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 S1753797AbaCaPR4 (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:56 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49831 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753789AbaCaPRz (ORCPT ); Mon, 31 Mar 2014 11:17:55 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFHUbE015193; Mon, 31 Mar 2014 10:17:30 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFHUbW013900; Mon, 31 Mar 2014 10:17:30 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:17: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 s2VFGm47013169; Mon, 31 Mar 2014 10:17:29 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 20/55] ARM: OMAP3+: PRCM: remove references to cm-regbits-34xx.h from PRCM core code Date: Mon, 31 Mar 2014 18:15:59 +0300 Message-ID: <1396278994-12624-21-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.174 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 PRCM a standalone driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm33xx.c | 6 +++++- arch/arm/mach-omap2/cm3xxx.c | 8 +++++++- arch/arm/mach-omap2/cminst44xx.c | 6 +++++- arch/arm/mach-omap2/powerdomain-common.c | 1 - arch/arm/mach-omap2/prm3xxx.c | 7 ++++++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/cm33xx.c b/arch/arm/mach-omap2/cm33xx.c index 728ac3f..c7be4e4 100644 --- a/arch/arm/mach-omap2/cm33xx.c +++ b/arch/arm/mach-omap2/cm33xx.c @@ -25,7 +25,6 @@ #include "clockdomain.h" #include "cm.h" #include "cm33xx.h" -#include "cm-regbits-34xx.h" #include "prm33xx.h" #define AM33XX_MODULEMODE_SHIFT 0 @@ -36,6 +35,11 @@ #define AM33XX_IDLEST_SHIFT 16 #define AM33XX_IDLEST_MASK (0x3 << 16) +#define OMAP34XX_CLKSTCTRL_DISABLE_AUTO 0x0 +#define OMAP34XX_CLKSTCTRL_FORCE_SLEEP 0x1 +#define OMAP34XX_CLKSTCTRL_FORCE_WAKEUP 0x2 +#define OMAP34XX_CLKSTCTRL_ENABLE_AUTO 0x3 + /* * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield: * diff --git a/arch/arm/mach-omap2/cm3xxx.c b/arch/arm/mach-omap2/cm3xxx.c index 989590e..859c2fd 100644 --- a/arch/arm/mach-omap2/cm3xxx.c +++ b/arch/arm/mach-omap2/cm3xxx.c @@ -22,9 +22,15 @@ #include "cm.h" #include "cm2xxx_3xxx_private.h" #include "cm3xxx.h" -#include "cm-regbits-34xx.h" #include "clockdomain.h" +#define OMAP34XX_CLKSTCTRL_DISABLE_AUTO 0x0 +#define OMAP34XX_CLKSTCTRL_FORCE_SLEEP 0x1 +#define OMAP34XX_CLKSTCTRL_FORCE_WAKEUP 0x2 +#define OMAP34XX_CLKSTCTRL_ENABLE_AUTO 0x3 + +#define OMAP3430_AUTO_PERIPH_DPLL_MASK (0x7 << 3) + static const u8 omap3xxx_cm_idlest_offs[] = { CM_IDLEST1, CM_IDLEST2, OMAP2430_CM_IDLEST3 }; diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index c2712d3..58e01c7 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -27,7 +27,6 @@ #include "cm2_44xx.h" #include "cm44xx.h" #include "cminst44xx.h" -#include "cm-regbits-34xx.h" #include "prcm44xx.h" #include "prm44xx.h" #include "prcm_mpu44xx.h" @@ -40,6 +39,11 @@ #define OMAP4430_MODULEMODE_SHIFT 0 #define OMAP4430_MODULEMODE_MASK (0x3 << 0) +#define OMAP34XX_CLKSTCTRL_DISABLE_AUTO 0x0 +#define OMAP34XX_CLKSTCTRL_FORCE_SLEEP 0x1 +#define OMAP34XX_CLKSTCTRL_FORCE_WAKEUP 0x2 +#define OMAP34XX_CLKSTCTRL_ENABLE_AUTO 0x3 + /* * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield: * diff --git a/arch/arm/mach-omap2/powerdomain-common.c b/arch/arm/mach-omap2/powerdomain-common.c index c40e5f0..2c62cd9 100644 --- a/arch/arm/mach-omap2/powerdomain-common.c +++ b/arch/arm/mach-omap2/powerdomain-common.c @@ -16,7 +16,6 @@ #include #include "pm.h" #include "cm.h" -#include "cm-regbits-34xx.h" #include "prm-regbits-34xx.h" #include "prm-regbits-44xx.h" diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 8ae209a..852bc4d 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -24,7 +24,6 @@ #include "prm2xxx_3xxx_private.h" #include "cm2xxx_3xxx_private.h" #include "cm3xxx.h" -#include "cm-regbits-34xx.h" #define OMAP3430_GLOBAL_COLD_RST_MASK (1 << 0) #define OMAP3430_GLOBAL_COLD_RST_SHIFT 0 @@ -79,6 +78,12 @@ #define OMAP3430_LASTPOWERSTATEENTERED_MASK (0x3 << 0) #define OMAP3430_LOGICSTATEST_MASK (1 << 2) +#define OMAP3430ES2_EN_USBHOST2_SHIFT 1 + +#define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK (1 << 0) + +#define OMAP3430_CLKACTIVITY_IVA2_MASK (1 << 0) + static const struct omap_prcm_irq omap3_prcm_irqs[] = { OMAP_PRCM_IRQ("wkup", 0, 0), OMAP_PRCM_IRQ("io", 9, 1),