From patchwork Tue Mar 4 16:19:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 25694 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 658D32066C for ; Tue, 4 Mar 2014 16:20:17 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id fb1sf3753452pad.0 for ; Tue, 04 Mar 2014 08:20:16 -0800 (PST) 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=GElS0rWeddpRbsCgVFJo3Yd9WvftH/vx+Ax4fn5whDE=; b=hKRHayEfDpPbO52VL4GQpizdwR/PSNCS6mj46t3EX9uxb76XDIY/C0IllhazetDOSt 3vqkZpM/3/vtk6BYzozyaTFVS87C0I6uEDOCrMLtpZl0fQ2+u+R4g84ufDx8V/yvtMY9 HKD63pSB+cChjnCXctiqHWqewFJVlSQNlmBb85UAkDR6Xi4sPtphBXIle7KQq+rTrKt4 2ZqvNXrL8/90phxJgunNVGw5MNZRLAG6BdieVjWQ7vcSdM51ct90LXL5fDlwJclR36Nq 7+WTlQ0ej8DYWa1eCSGVwgsU2s2Lxr8u/2k+w0hRhA/HjQwUZMlPBdKPcLU+Cydg6wo0 GuCQ== X-Gm-Message-State: ALoCoQmvYCSFo9zjetfZYBw4czDUlcfp7rWND/erLMmAQXZMoEG1sJG/sZYBjdUuX9Dc2TvoI9Wu X-Received: by 10.66.241.8 with SMTP id we8mr254484pac.16.1393950016456; Tue, 04 Mar 2014 08:20:16 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.47 with SMTP id s44ls2637430qgs.70.gmail; Tue, 04 Mar 2014 08:20:16 -0800 (PST) X-Received: by 10.58.69.111 with SMTP id d15mr189776veu.3.1393950016329; Tue, 04 Mar 2014 08:20:16 -0800 (PST) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id kl10si4687682vdb.90.2014.03.04.08.20.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 08:20:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so5976803veb.14 for ; Tue, 04 Mar 2014 08:20:16 -0800 (PST) X-Received: by 10.221.2.138 with SMTP id nu10mr216630vcb.52.1393950016228; Tue, 04 Mar 2014 08:20:16 -0800 (PST) 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.130.193 with SMTP id u1csp138047vcs; Tue, 4 Mar 2014 08:20:15 -0800 (PST) X-Received: by 10.68.190.228 with SMTP id gt4mr526360pbc.94.1393950015333; Tue, 04 Mar 2014 08:20:15 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wq4si14758274pbc.137.2014.03.04.08.20.14; Tue, 04 Mar 2014 08:20:14 -0800 (PST) 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 S1753729AbaCDQUO (ORCPT + 5 others); Tue, 4 Mar 2014 11:20:14 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:48460 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751282AbaCDQUN (ORCPT ); Tue, 4 Mar 2014 11:20:13 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s24GJlGC003098; Tue, 4 Mar 2014 10:19:47 -0600 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 s24GJl9x032337; Tue, 4 Mar 2014 10:19:47 -0600 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; Tue, 4 Mar 2014 10:19:47 -0600 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 s24GJdR2017797; Tue, 4 Mar 2014 10:19:45 -0600 From: Tero Kristo To: , , , CC: Subject: [PATCH 03/18] ARM: OMAP2/3: CM: remove some external dependencies Date: Tue, 4 Mar 2014 18:19:03 +0200 Message-ID: <1393949958-816-4-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393949958-816-1-git-send-email-t-kristo@ti.com> References: <1393949958-816-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.128.169 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 move the CM driver to its own driver folder. These drivers will not have access to functionality under mach-omap2 anymore. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm2xxx.c | 15 ++------------- arch/arm/mach-omap2/cm3xxx.c | 13 +------------ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-omap2/cm2xxx.c b/arch/arm/mach-omap2/cm2xxx.c index ce25abb..8be6ea5 100644 --- a/arch/arm/mach-omap2/cm2xxx.c +++ b/arch/arm/mach-omap2/cm2xxx.c @@ -18,9 +18,6 @@ #include #include -#include "soc.h" -#include "iomap.h" -#include "common.h" #include "prm2xxx.h" #include "cm.h" #include "cm2xxx.h" @@ -390,7 +387,7 @@ void omap2xxx_cm_set_mod_dividers(u32 mpu, u32 dsp, u32 gfx, u32 core, u32 mdm) tmp = omap2_cm_read_mod_reg(CORE_MOD, CM_CLKSEL1) & OMAP24XX_CLKSEL_DSS2_MASK; omap2_cm_write_mod_reg(core | tmp, CORE_MOD, CM_CLKSEL1); - if (cpu_is_omap2430()) + if (mdm) omap2_cm_write_mod_reg(mdm, OMAP2430_MDM_MOD, CM_CLKSEL); } @@ -405,19 +402,11 @@ static struct cm_ll_data omap2xxx_cm_ll_data = { int __init omap2xxx_cm_init(void) { - if (!cpu_is_omap24xx()) - return 0; - return cm_register(&omap2xxx_cm_ll_data); } static void __exit omap2xxx_cm_exit(void) { - if (!cpu_is_omap24xx()) - return; - - /* Should never happen */ - WARN(cm_unregister(&omap2xxx_cm_ll_data), - "%s: cm_ll_data function pointer mismatch\n", __func__); + cm_unregister(&omap2xxx_cm_ll_data); } __exitcall(omap2xxx_cm_exit); diff --git a/arch/arm/mach-omap2/cm3xxx.c b/arch/arm/mach-omap2/cm3xxx.c index 60c2c9f..129a4e7 100644 --- a/arch/arm/mach-omap2/cm3xxx.c +++ b/arch/arm/mach-omap2/cm3xxx.c @@ -18,9 +18,6 @@ #include #include -#include "soc.h" -#include "iomap.h" -#include "common.h" #include "prm2xxx_3xxx.h" #include "cm.h" #include "cm3xxx.h" @@ -673,19 +670,11 @@ static struct cm_ll_data omap3xxx_cm_ll_data = { int __init omap3xxx_cm_init(void) { - if (!cpu_is_omap34xx()) - return 0; - return cm_register(&omap3xxx_cm_ll_data); } static void __exit omap3xxx_cm_exit(void) { - if (!cpu_is_omap34xx()) - return; - - /* Should never happen */ - WARN(cm_unregister(&omap3xxx_cm_ll_data), - "%s: cm_ll_data function pointer mismatch\n", __func__); + cm_unregister(&omap3xxx_cm_ll_data); } __exitcall(omap3xxx_cm_exit);