From patchwork Mon Sep 1 18:08:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 36398 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6A1F920C7F for ; Mon, 1 Sep 2014 18:09:59 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wn1sf33395280obc.2 for ; Mon, 01 Sep 2014 11:09:59 -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=GJM9yFkHJucuxTbUb/b+goR79VEOO9RrXfHASj9V5TE=; b=YfO79YSjil8Be9og8qwjCvgwWjNyzH9QygJ2Hdtv3oIsoOg1PmiB9tB5O5qJFI1CMa j0DDG4maXd4XPiH9OkE/vasWCMlKnahXcd4ycET/DEaehWl2VN5863VEAwjUyq6St8+y Fp66fdMDu+UnU3tmrio1fnlwkmd+dAcSPf0aqfm19vDxzSBdnVcvB6mL3iNFTQy3nq2j IypNegchhUJrX61KQoSKBFHD1qIwY/lXpxxN3rHuum7MXYbqBtFOwDE+jjoSYxoZTKWu jxRkHP8fOmm/wEdSTMRKOvhODy8SYW7xASU5o3Okso+cicBThrgcbrQBdkfa5OK919OY rEMQ== X-Gm-Message-State: ALoCoQlpDQjbBui0jvK2YcmTyIIS3WcSJoaXKLNk1JZxKgO4j41qTtvMTxXwbDh+zhXeZukroIdb X-Received: by 10.182.117.231 with SMTP id kh7mr16551365obb.0.1409594999091; Mon, 01 Sep 2014 11:09:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.130 with SMTP id a2ls2096740qgf.90.gmail; Mon, 01 Sep 2014 11:09:59 -0700 (PDT) X-Received: by 10.52.183.136 with SMTP id em8mr1300243vdc.76.1409594999027; Mon, 01 Sep 2014 11:09:59 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id sl18si1100127vdb.42.2014.09.01.11.09.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Sep 2014 11:09:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ij19so5822007vcb.40 for ; Mon, 01 Sep 2014 11:09:58 -0700 (PDT) X-Received: by 10.52.165.116 with SMTP id yx20mr22481333vdb.13.1409594998957; Mon, 01 Sep 2014 11:09:58 -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.221.45.67 with SMTP id uj3csp421315vcb; Mon, 1 Sep 2014 11:09:58 -0700 (PDT) X-Received: by 10.66.152.131 with SMTP id uy3mr41681049pab.13.1409594998014; Mon, 01 Sep 2014 11:09:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tf5si2430384pab.88.2014.09.01.11.09.57 for ; Mon, 01 Sep 2014 11:09:58 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754521AbaIASJz (ORCPT + 5 others); Mon, 1 Sep 2014 14:09:55 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:37228 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754579AbaIASJu (ORCPT ); Mon, 1 Sep 2014 14:09:50 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s81I9OP4020890; Mon, 1 Sep 2014 13:09:24 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s81I9O6i009744; Mon, 1 Sep 2014 13:09:24 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Mon, 1 Sep 2014 13:09:23 -0500 Received: from sokoban.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s81I9Jl0012145; Mon, 1 Sep 2014 13:09:22 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 01/26] ARM: DRA7: PRM: add voltage processor check behind a prm_feature flag Date: Mon, 1 Sep 2014 21:08:50 +0300 Message-ID: <1409594955-1476-2-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1409594955-1476-1-git-send-email-t-kristo@ti.com> References: <1409594955-1476-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) 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 is done in attempt to get rid of cpu_is_X calls from the PRM core. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prm.h | 1 + arch/arm/mach-omap2/prm44xx.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h index 48480d5..9f4d747 100644 --- a/arch/arm/mach-omap2/prm.h +++ b/arch/arm/mach-omap2/prm.h @@ -29,6 +29,7 @@ int of_prcm_init(void); * PRM_HAS_VOLTAGE: has voltage domains */ #define PRM_HAS_IO_WAKEUP (1 << 0) +#define PRM_HAS_VOLTAGE (1 << 1) /* * MAX_MODULE_SOFTRESET_WAIT: Maximum microseconds to wait for OMAP diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index 0958d07..76e75aa 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -652,11 +652,10 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm) static int omap4_check_vcvp(void) { - /* No VC/VP on dra7xx devices */ - if (soc_is_dra7xx()) - return 0; + if (prm_features & PRM_HAS_VOLTAGE) + return 1; - return 1; + return 0; } struct pwrdm_ops omap4_pwrdm_operations = { @@ -696,6 +695,9 @@ int __init omap44xx_prm_init(void) if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx()) prm_features |= PRM_HAS_IO_WAKEUP; + if (!soc_is_dra7xx()) + prm_features |= PRM_HAS_VOLTAGE; + return prm_register(&omap44xx_prm_ll_data); }