From patchwork Mon Mar 31 15:16:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27443 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f199.google.com (mail-yk0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DA638202E0 for ; Mon, 31 Mar 2014 15:18:02 +0000 (UTC) Received: by mail-yk0-f199.google.com with SMTP id 200sf12710060ykr.2 for ; Mon, 31 Mar 2014 08:18:02 -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=wd7Aeb4eD5rVDaW/M9HHWd1PIgXCDzKpsmPw1jIEjL0=; b=fpLD6sDzfeBvhIgjSNZxYrOywExhXsADpSKAbdUmTz4srOv01Cmzpn/twioXQkMyK5 c0+iNKWrwlt+48oHACFprnoV8AkoNA845RhorDAJIabhtWpw1ZlC4/o2DIeT7IoYAjPn aHcRN0bY/eFSYK8UuFsnE69Fxq3pOb5482swt2y1TiNN9iFeTIMIghdIdrIbUEXQHkGC Imyuo9SZGpwp0dZoYPuSOrFG004xuFllrO+BU3OqV+LO8uvna1NMM1SgrEa9tYpvtRu2 vOAZvfHLXqcLcn6bklRG8wdfMDbMP0C1xz6BfHbCaJpeA7CZsYfeKoPe2jlz4WLCHZfe PynQ== X-Gm-Message-State: ALoCoQkP5hpNDtO0w8+8daduP2VWl9C4jrh3/hVoe/UprORnPkCk55HgT1u+itf5sANCatRQ9ntP X-Received: by 10.236.132.239 with SMTP id o75mr9530795yhi.19.1396279082628; Mon, 31 Mar 2014 08:18:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.177 with SMTP id t46ls1756347qgt.16.gmail; Mon, 31 Mar 2014 08:18:02 -0700 (PDT) X-Received: by 10.221.40.10 with SMTP id to10mr1808270vcb.22.1396279082543; Mon, 31 Mar 2014 08:18:02 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id 16si2920345vce.120.2014.03.31.08.18.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:18:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 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.177; Received: by mail-vc0-f177.google.com with SMTP id if17so8162979vcb.22 for ; Mon, 31 Mar 2014 08:18:02 -0700 (PDT) X-Received: by 10.221.22.71 with SMTP id qv7mr174844vcb.34.1396279082468; Mon, 31 Mar 2014 08:18:02 -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 v8csp150711vcv; Mon, 31 Mar 2014 08:18:02 -0700 (PDT) X-Received: by 10.67.13.226 with SMTP id fb2mr4190620pad.146.1396279081612; Mon, 31 Mar 2014 08:18:01 -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.01; Mon, 31 Mar 2014 08:18:01 -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 S1753809AbaCaPSA (ORCPT + 5 others); Mon, 31 Mar 2014 11:18:00 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:58767 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753483AbaCaPR6 (ORCPT ); Mon, 31 Mar 2014 11:17:58 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFHWNG021901; Mon, 31 Mar 2014 10:17:32 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFHWhP023382; Mon, 31 Mar 2014 10:17:32 -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:32 -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 s2VFGm48013169; Mon, 31 Mar 2014 10:17:30 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 21/55] ARM: OMAP2+: PRCM: remove references to clock.h from PRCM core code Date: Mon, 31 Mar 2014 18:16:00 +0300 Message-ID: <1396278994-12624-22-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.177 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/clockdomain.c | 1 - arch/arm/mach-omap2/clockdomain.h | 2 +- arch/arm/mach-omap2/prcm-common.h | 2 ++ arch/arm/mach-omap2/prm_common.c | 11 ++++------- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c index 2da3b5e..9a59efb 100644 --- a/arch/arm/mach-omap2/clockdomain.c +++ b/arch/arm/mach-omap2/clockdomain.c @@ -29,7 +29,6 @@ #include #include "soc.h" -#include "clock.h" #include "clockdomain.h" /* clkdm_list contains all registered struct clockdomains */ diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h index 82c37b1..4322a28 100644 --- a/arch/arm/mach-omap2/clockdomain.h +++ b/arch/arm/mach-omap2/clockdomain.h @@ -17,7 +17,6 @@ #include #include "powerdomain.h" -#include "clock.h" /* * Clockdomain flags @@ -98,6 +97,7 @@ struct clkdm_dep { #define _CLKDM_FLAG_HWSUP_ENABLED BIT(0) struct omap_hwmod; +struct clk; /** * struct clockdomain - OMAP clockdomain diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h index f356532..1a05d04 100644 --- a/arch/arm/mach-omap2/prcm-common.h +++ b/arch/arm/mach-omap2/prcm-common.h @@ -519,6 +519,8 @@ struct omap_prcm_irq_setup { struct of_device_id; +extern void __iomem *clk_memmaps[]; + extern void omap_prcm_irq_cleanup(void); extern int omap_prcm_register_chain_handler( struct omap_prcm_irq_setup *irq_setup); diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index 080b3ed..090d13f 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c @@ -32,7 +32,6 @@ #include "prm2xxx.h" #include "prm3xxx.h" #include "prm44xx.h" -#include "clock.h" /* * OMAP_PRCM_MAX_NR_PENDING_REG: maximum number of PRM_IRQ*_MPU regs @@ -481,18 +480,16 @@ static struct of_device_id omap_prcm_dt_match_table[] = { { } }; -static struct clk_hw_omap memmap_dummy_ck = { - .flags = MEMMAP_ADDRESSING, -}; - static u32 prm_clk_readl(void __iomem *reg) { - return omap2_clk_readl(&memmap_dummy_ck, reg); + struct clk_omap_reg *r = (struct clk_omap_reg *)® + return readl_relaxed(clk_memmaps[r->index] + r->offset); } static void prm_clk_writel(u32 val, void __iomem *reg) { - omap2_clk_writel(val, &memmap_dummy_ck, reg); + struct clk_omap_reg *r = (struct clk_omap_reg *)® + writel_relaxed(val, clk_memmaps[r->index] + r->offset); } static struct ti_clk_ll_ops omap_clk_ll_ops = {