From patchwork Wed Jul 2 08:47:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 32946 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2550920560 for ; Wed, 2 Jul 2014 08:48:04 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id hn18sf80481igb.3 for ; Wed, 02 Jul 2014 01:48:03 -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=r6U8FBCvQUX1aLaUf5WkhdHzfOLTeYQTa/KeIMpIjDw=; b=aou74d59+woDZZpHcfjk3QQUm7fAPAS+hKfhOs4j8kfletlwqQQglgrKrJPm8a7jbI ndIj4XXsXUhcTYl1o2ehWmGhupM1n6DdODF6CZmOMsRj/GoYn0g9KvgiV9YQkCFrNres +ksiQqBjZzbJ+glpzRtYqh0VYjXymKZwkMwHfn4nKo6GsktZvgTxJ0FLqAc/3Wqf+a/X sZ9P0XdvePKwTxtYdZtgO5udR74Kt6PGtFweIwCUsdA95foB8DpQkTuoPMMKenhvK2Uk /aJ1k/eCdyrQipDEgnmGb3k8EYxZMRVFtYAKpJOyi7t0RIRGXPtr3jCJMbRZqQnx43jN 43Wg== X-Gm-Message-State: ALoCoQlOogf8Q0befv4NvHdsHlonjDolS9m8QZFdMWW/awQXfVE1XO0RGqCECMtwU1/gvkbzdir8 X-Received: by 10.182.120.129 with SMTP id lc1mr26952506obb.21.1404290883669; Wed, 02 Jul 2014 01:48:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.165 with SMTP id d34ls2453405qgd.25.gmail; Wed, 02 Jul 2014 01:48:03 -0700 (PDT) X-Received: by 10.220.81.194 with SMTP id y2mr13819822vck.29.1404290883543; Wed, 02 Jul 2014 01:48:03 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id mg9si12623000vcb.58.2014.07.02.01.48.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 01:48:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.173 as permitted sender) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id db11so10919775veb.32 for ; Wed, 02 Jul 2014 01:48:03 -0700 (PDT) X-Received: by 10.52.139.101 with SMTP id qx5mr40195818vdb.17.1404290883452; Wed, 02 Jul 2014 01:48:03 -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.37.5 with SMTP id tc5csp277210vcb; Wed, 2 Jul 2014 01:48:03 -0700 (PDT) X-Received: by 10.68.135.42 with SMTP id pp10mr68649095pbb.58.1404290882932; Wed, 02 Jul 2014 01:48:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cl5si29620598pad.108.2014.07.02.01.48.02; Wed, 02 Jul 2014 01:48:02 -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 S1752004AbaGBIsA (ORCPT + 6 others); Wed, 2 Jul 2014 04:48:00 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:38797 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751897AbaGBIr4 (ORCPT ); Wed, 2 Jul 2014 04:47:56 -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 s628lYjQ013411; Wed, 2 Jul 2014 03:47:34 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s628lYHJ004425; Wed, 2 Jul 2014 03:47:34 -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; Wed, 2 Jul 2014 03:47:34 -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 s628lOXa007645; Wed, 2 Jul 2014 03:47:33 -0500 From: Tero Kristo To: , , , CC: Subject: [PATCH 04/13] ARM: OMAP4+: dpll44xx: remove cm-regbits-44xx.h and clock44xx.h includes Date: Wed, 2 Jul 2014 11:47:38 +0300 Message-ID: <1404290867-6768-5-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404290867-6768-1-git-send-email-t-kristo@ti.com> References: <1404290867-6768-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.128.173 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: , Instead, copy the used bitfield definitions to the source file. Done in preparation to migrate the clock implementation under clock driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/dpll44xx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c index b071891..4613f1e 100644 --- a/arch/arm/mach-omap2/dpll44xx.c +++ b/arch/arm/mach-omap2/dpll44xx.c @@ -16,8 +16,6 @@ #include #include "clock.h" -#include "clock44xx.h" -#include "cm-regbits-44xx.h" /* * Maximum DPLL input frequency (FINT) and output frequency (FOUT) that @@ -28,6 +26,16 @@ #define OMAP4_DPLL_LP_FINT_MAX 1000000 #define OMAP4_DPLL_LP_FOUT_MAX 100000000 +/* + * Bitfield declarations + */ +#define OMAP4430_DPLL_CLKOUT_GATE_CTRL_MASK (1 << 8) +#define OMAP4430_DPLL_CLKOUTX2_GATE_CTRL_MASK (1 << 10) +#define OMAP4430_DPLL_REGM4XEN_MASK (1 << 11) + +/* Static rate multiplier for OMAP4 REGM4XEN clocks */ +#define OMAP4430_REGM4XEN_MULT 4 + /* Supported only on OMAP4 */ int omap4_dpllmx_gatectrl_read(struct clk_hw_omap *clk) {