From patchwork Mon Mar 31 15:16:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27446 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8FDF6202E0 for ; Mon, 31 Mar 2014 15:18:13 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id to1sf29555133ieb.5 for ; Mon, 31 Mar 2014 08:18:13 -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=eKi1oa+eyIOFWHY8zBsm8CzI7yPSC0Ld9IuHaMc4JF0=; b=NomSW4fQ9QWLpD6sxmtIzCYLbKbp/jMXCYS9MYyffitd0Sfs1PZHs+o3I1+SCEKQ5o 4smqc4JbBWkS+fA2BIX8yZrKW9Fw2JOj6HwpadHpIvp666uuHMbhvLoVgqUiMbnL3z6Q Ozf30nTKhXJxaDF5apjEeRC8MyJcVNc+c6/y3uRN6cHZ++m3WczTPCHXJ/lM0rGuGCM2 DuFlbMq0n7gjbdfKOsrqSVQLfm3TSSECmtilRMwqhL2qpWL9fFq7N8DkTxpI8bzZNdOL X3f9QEFRxSPb03FuSB7D2qipFdfn75Q0tXRRfn60ttfiJhDuHmTpgsb4P1kAW6Ya88M4 xU6Q== X-Gm-Message-State: ALoCoQn1HNUducpp4SYszIiytGg3wZW4QJHveZ8RRCLcVyuwO/qlAc3DZweBaPUKa3diaU5RLxnT X-Received: by 10.42.28.2 with SMTP id l2mr9014213icc.20.1396279093102; Mon, 31 Mar 2014 08:18:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.3 with SMTP id 3ls2368256qgc.83.gmail; Mon, 31 Mar 2014 08:18:13 -0700 (PDT) X-Received: by 10.52.108.228 with SMTP id hn4mr107315vdb.43.1396279092994; Mon, 31 Mar 2014 08:18:12 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id x7si3022077vel.162.2014.03.31.08.18.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:12 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 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.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so8511500vcb.15 for ; Mon, 31 Mar 2014 08:18:12 -0700 (PDT) X-Received: by 10.220.48.194 with SMTP id s2mr44359vcf.43.1396279092905; Mon, 31 Mar 2014 08:18:12 -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 v8csp150727vcv; Mon, 31 Mar 2014 08:18:12 -0700 (PDT) X-Received: by 10.68.197.66 with SMTP id is2mr25825909pbc.96.1396279092176; Mon, 31 Mar 2014 08:18:12 -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.18.11; Mon, 31 Mar 2014 08:18:11 -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 S1753839AbaCaPSK (ORCPT + 5 others); Mon, 31 Mar 2014 11:18:10 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49842 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753483AbaCaPSJ (ORCPT ); Mon, 31 Mar 2014 11:18:09 -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 s2VFHdO2015218; Mon, 31 Mar 2014 10:17:39 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFHd76013988; Mon, 31 Mar 2014 10:17:39 -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:39 -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 s2VFGm4C013169; Mon, 31 Mar 2014 10:17:37 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 25/55] ARM: OMAP4: CM: remove unnecessary cm44xx.h header file Date: Mon, 31 Mar 2014 18:16:04 +0300 Message-ID: <1396278994-12624-26-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.170 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: , Contains only two defines used by a single source code file, so move the definitions over and delete the file. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm44xx.h | 26 -------------------------- arch/arm/mach-omap2/cm_common.c | 3 ++- arch/arm/mach-omap2/cminst44xx.c | 4 +++- arch/arm/mach-omap2/powerdomain.c | 1 - 4 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 arch/arm/mach-omap2/cm44xx.h diff --git a/arch/arm/mach-omap2/cm44xx.h b/arch/arm/mach-omap2/cm44xx.h deleted file mode 100644 index 3380bee..0000000 --- a/arch/arm/mach-omap2/cm44xx.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * OMAP4 Clock Management (CM) definitions - * - * Copyright (C) 2007-2011 Texas Instruments, Inc. - * Copyright (C) 2007-2009 Nokia Corporation - * - * Written by Paul Walmsley - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * OMAP4 has two separate CM blocks, CM1 and CM2. This file contains - * macros and function prototypes that are applicable to both. - */ -#ifndef __ARCH_ASM_MACH_OMAP2_CM44XX_H -#define __ARCH_ASM_MACH_OMAP2_CM44XX_H - - -#include "prcm-common.h" -#include "cm.h" - -#define OMAP4_CM_CLKSTCTRL 0x0000 -#define OMAP4_CM_STATICDEP 0x0004 - -#endif diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c index f8f9343..8655538 100644 --- a/arch/arm/mach-omap2/cm_common.c +++ b/arch/arm/mach-omap2/cm_common.c @@ -18,7 +18,8 @@ #include #include -#include "cm44xx.h" +#include "cm.h" +#include "prcm-common.h" /* * cm_ll_data: function pointers to SoC-specific implementations of diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 58e01c7..dfb1a93 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -25,7 +25,6 @@ #include "cm.h" #include "cm1_44xx.h" #include "cm2_44xx.h" -#include "cm44xx.h" #include "cminst44xx.h" #include "prcm44xx.h" #include "prm44xx.h" @@ -44,6 +43,9 @@ #define OMAP34XX_CLKSTCTRL_FORCE_WAKEUP 0x2 #define OMAP34XX_CLKSTCTRL_ENABLE_AUTO 0x3 +#define OMAP4_CM_CLKSTCTRL 0x0000 +#define OMAP4_CM_STATICDEP 0x0004 + /* * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield: * diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index faebd5f..62649ba 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -24,7 +24,6 @@ #include "cm2xxx_3xxx.h" #include "prcm44xx.h" -#include "cm44xx.h" #include "prm2xxx_3xxx.h" #include "prm44xx.h"