From patchwork Mon Sep 1 18:09:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 36408 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 29B7F2032B for ; Mon, 1 Sep 2014 18:10:19 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf65648267pad.2 for ; Mon, 01 Sep 2014 11:10:18 -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=P2vP16VAuzgx0CgS2j63gOLxeeI5bMuCF+AVUe2feYs=; b=X2oqokZdpQXhICHzNH2jutiZxhDq6pvrB1j66UzYnCQDkNh890JdiRzO3dbyjbksAc Brz18NPmxJDgiUoGfYzKCmmC+lAP4fQWoH5OcwepM4IDK9yAV0sNTsZ1FcYJNNHfo9Oi 4fyRJE1UbqmlsvUgFaRV1AsQ6qVIv+XvxMACPPPTlwTJVOqCLaVj6EhhFIl6tephMsgr Mo99DKvhEbEtsFxRNvmHRqdWxicI6HJWnRBNtvP4yS9EnUxxzH/Hff5EmehdBJ946G+t 7wiNEiPkOK/ghQzEtE0r5D0CeN5X+DcsihZ3amofh/xdWQVfGjbyQxKa54QIwHPYLcYI 2fWA== X-Gm-Message-State: ALoCoQn1ecjs7Hphb0r/RF2tkL3toK9wpJBcqrk3a3ebhriuSjb9xpR6L9XMfx6phX0ZrC46YiOb X-Received: by 10.69.31.75 with SMTP id kk11mr4471391pbd.8.1409595018497; Mon, 01 Sep 2014 11:10:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.25.148 with SMTP id 20ls1992803qgt.86.gmail; Mon, 01 Sep 2014 11:10:18 -0700 (PDT) X-Received: by 10.221.6.201 with SMTP id ol9mr26552472vcb.2.1409595018408; Mon, 01 Sep 2014 11:10:18 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id fd7si1088191vcb.71.2014.09.01.11.10.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Sep 2014 11:10:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so5797296vcb.21 for ; Mon, 01 Sep 2014 11:10:18 -0700 (PDT) X-Received: by 10.220.167.9 with SMTP id o9mr26715670vcy.8.1409595018338; Mon, 01 Sep 2014 11:10:18 -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 uj3csp421356vcb; Mon, 1 Sep 2014 11:10:17 -0700 (PDT) X-Received: by 10.68.171.101 with SMTP id at5mr40781287pbc.107.1409595017457; Mon, 01 Sep 2014 11:10:17 -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.10.16 for ; Mon, 01 Sep 2014 11:10:17 -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 S1754697AbaIASKP (ORCPT + 5 others); Mon, 1 Sep 2014 14:10:15 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:44843 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754691AbaIASKO (ORCPT ); Mon, 1 Sep 2014 14:10:14 -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 s81I9q5o007336; Mon, 1 Sep 2014 13:09:52 -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 s81I9q0o009915; Mon, 1 Sep 2014 13:09:52 -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:51 -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 s81I9JlG012145; Mon, 1 Sep 2014 13:09:50 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 17/26] ARM: OMAP4: CM: move public definitions from cminst44xx.h to cm44xx.h Date: Mon, 1 Sep 2014 21:09:06 +0300 Message-ID: <1409594955-1476-18-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.176 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: , cminst44xx.h will be removed, thus move the public APIs to cm44xx.h header. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm44xx.h | 3 +++ arch/arm/mach-omap2/cminst44xx.h | 3 --- arch/arm/mach-omap2/io.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/cm44xx.h b/arch/arm/mach-omap2/cm44xx.h index 3380bee..728d06a 100644 --- a/arch/arm/mach-omap2/cm44xx.h +++ b/arch/arm/mach-omap2/cm44xx.h @@ -23,4 +23,7 @@ #define OMAP4_CM_CLKSTCTRL 0x0000 #define OMAP4_CM_STATICDEP 0x0004 +void omap_cm_base_init(void); +int omap4_cm_init(void); + #endif diff --git a/arch/arm/mach-omap2/cminst44xx.h b/arch/arm/mach-omap2/cminst44xx.h index ffbd721..3ef3bf6 100644 --- a/arch/arm/mach-omap2/cminst44xx.h +++ b/arch/arm/mach-omap2/cminst44xx.h @@ -26,7 +26,4 @@ u32 omap4_cminst_clear_inst_reg_bits(u32 bits, u8 part, u16 inst, extern u32 omap4_cminst_read_inst_reg_bits(u8 part, u16 inst, s16 idx, u32 mask); -extern void omap_cm_base_init(void); -int omap4_cm_init(void); - #endif diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index f1db801..cdbf337 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -46,11 +46,11 @@ #include "cm2xxx.h" #include "cm3xxx.h" #include "cm33xx.h" +#include "cm44xx.h" #include "prm.h" #include "cm.h" #include "prcm_mpu44xx.h" #include "prminst44xx.h" -#include "cminst44xx.h" #include "prm2xxx.h" #include "prm3xxx.h" #include "prm33xx.h" diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 24d9599..1de87a7 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -153,7 +153,6 @@ #include "powerdomain.h" #include "cm2xxx.h" #include "cm3xxx.h" -#include "cminst44xx.h" #include "cm33xx.h" #include "prm.h" #include "prm3xxx.h"