From patchwork Wed Jun 18 12:16:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 32133 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DCC03203F3 for ; Wed, 18 Jun 2014 12:17:45 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id dc16sf1977352qab.1 for ; Wed, 18 Jun 2014 05:17:45 -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=iFbJQAjvUJ+INgD3iYQkk93g0Ng1zo9+qT+NQhNwqhY=; b=GLYA6FAfMWFU8+gyIufiNu6Xt0u5oNwT3+0SVxDt+s6F3vfhVN3Z0A7/LcgJZDFDyy dHaLGJm+mEws9HZ8iE1eCQ98mX1VJAwH/NIGLcwjjqKBYq0b6Xc94QnkdZtXO42VagxP s5vnPR4tcl+kL7+Ur3iP9uU7YJPmp8mZDAhqA/aFYSh/x4mspbUkwCcYkQA/SGawP1UE dY35LR+iew8E5OTvw+mrC+iplrwzXGuv1xFgTQ5o1af2U/F0N2hJbOFBv6a3Ku3xM2An EjUzdsMSxA/KDYs5HoK9bAvxsphdduOrG+umQkE6z17Ejdcxm41UwFojBJLuLOh3CDFU jT5A== X-Gm-Message-State: ALoCoQneG7zK+DHFuqNMLrmWl68TgmEjV/kb4Bwz7ecpDfkxILkPd1xlB3UpCjljjRHitfVse3gU X-Received: by 10.58.65.38 with SMTP id u6mr641950ves.16.1403093865707; Wed, 18 Jun 2014 05:17:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.43.135 with SMTP id e7ls91162qga.70.gmail; Wed, 18 Jun 2014 05:17:45 -0700 (PDT) X-Received: by 10.58.119.75 with SMTP id ks11mr1038009veb.20.1403093865632; Wed, 18 Jun 2014 05:17:45 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id tv5si788834vcb.38.2014.06.18.05.17.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Jun 2014 05:17:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id jx11so703091veb.33 for ; Wed, 18 Jun 2014 05:17:45 -0700 (PDT) X-Received: by 10.220.92.135 with SMTP id r7mr966858vcm.11.1403093865380; Wed, 18 Jun 2014 05:17:45 -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.54.6 with SMTP id vs6csp280111vcb; Wed, 18 Jun 2014 05:17:44 -0700 (PDT) X-Received: by 10.66.132.81 with SMTP id os17mr1949634pab.137.1403093864652; Wed, 18 Jun 2014 05:17:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rq2si1992118pbc.163.2014.06.18.05.17.43; Wed, 18 Jun 2014 05:17:43 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S966389AbaFRMRU (ORCPT + 22 others); Wed, 18 Jun 2014 08:17:20 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:46793 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966363AbaFRMRN (ORCPT ); Wed, 18 Jun 2014 08:17:13 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5ICHBdu014562; Wed, 18 Jun 2014 07:17:11 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5ICHBHn012246; Wed, 18 Jun 2014 07:17:11 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Wed, 18 Jun 2014 07:17:10 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5ICGxW4026917; Wed, 18 Jun 2014 07:17:07 -0500 From: Roger Quadros To: , CC: , , , , , , , , , Roger Quadros Subject: [PATCH 2/2] ARM: DRA7: hwmod: Fixup SATA hwmod Date: Wed, 18 Jun 2014 15:16:56 +0300 Message-ID: <1403093816-10960-3-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1403093816-10960-1-git-send-email-rogerq@ti.com> References: <1403093816-10960-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@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.174 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: , Get rid of optional clock as that is now managed by the AHCI platform driver. Correct .mpu_rt_idx to 1 as the module register space (SYSCONFIG..) is passed as the second memory resource in the device tree. Signed-off-by: Roger Quadros Tested-by: Roger Quadros Reviewed-by: Rajendra Nayak --- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index cedef6b..bc42eab 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1292,9 +1292,6 @@ static struct omap_hwmod_class dra7xx_sata_hwmod_class = { }; /* sata */ -static struct omap_hwmod_opt_clk sata_opt_clks[] = { - { .role = "ref_clk", .clk = "sata_ref_clk" }, -}; static struct omap_hwmod dra7xx_sata_hwmod = { .name = "sata", @@ -1302,6 +1299,7 @@ static struct omap_hwmod dra7xx_sata_hwmod = { .clkdm_name = "l3init_clkdm", .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, .main_clk = "func_48m_fclk", + .mpu_rt_idx = 1, .prcm = { .omap4 = { .clkctrl_offs = DRA7XX_CM_L3INIT_SATA_CLKCTRL_OFFSET, @@ -1309,8 +1307,6 @@ static struct omap_hwmod dra7xx_sata_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .opt_clks = sata_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(sata_opt_clks), }; /*