From patchwork Tue Jul 15 17:00:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sam-the-6 X-Patchwork-Id: 33683 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 41826201F1 for ; Tue, 15 Jul 2014 17:17:21 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id v10sf22235183qac.0 for ; Tue, 15 Jul 2014 10:17:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Iid46Pb4bdzIzuVNez3whRImogpScFsZfEHnPUGITSI=; b=excAr8cmRyEVU0Q1bMw76kneUQhP7+KhscQl7IZcAfxOh2peRn6yPI0lKn99OUVyzM SNtzvXZT4Tjpg8KJy1sm8MU8VdxjHPInKgpYVRD4aaWr9W3R0ji2u2lYHW8g3ag+cyte OElM7j1LDW5VBbeyEzffMDfIAOQ158xncgtDAsTsIZKQvC0oeiY6LOF0SEd6cHClzeWd K8wUVTXTm5d/a/rG5EuKtqhNrB4rJ/SWhKo1lUMEdaozQoOLMHZN6vhjANx1+oqdSoVb MbRMfH4MpARYEWo4vtr3bce7DRxUbU4QMMWXXNXdvtzpetMz7kjyh+35m76Wc4MO/jol PH+Q== X-Gm-Message-State: ALoCoQkH55vUgoJB2aLfozCNj/9wr9LXbBeUNIGD3yau/dri+3vqHv3X9MvCOFkojrEcFGlnVeCv X-Received: by 10.58.195.180 with SMTP id if20mr11743716vec.21.1405444641086; Tue, 15 Jul 2014 10:17:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.36 with SMTP id k33ls162804qgf.79.gmail; Tue, 15 Jul 2014 10:17:21 -0700 (PDT) X-Received: by 10.220.192.129 with SMTP id dq1mr2173320vcb.57.1405444641007; Tue, 15 Jul 2014 10:17:21 -0700 (PDT) Received: from mail-vc0-x22c.google.com (mail-vc0-x22c.google.com [2607:f8b0:400c:c03::22c]) by mx.google.com with ESMTPS id rn6si7068702vcb.80.2014.07.15.10.17.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Jul 2014 10:17:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22c as permitted sender) client-ip=2607:f8b0:400c:c03::22c; Received: by mail-vc0-f172.google.com with SMTP id im17so1054769vcb.3 for ; Tue, 15 Jul 2014 10:17:20 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr2283668vca.45.1405444640921; Tue, 15 Jul 2014 10:17:20 -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.37.5 with SMTP id tc5csp231522vcb; Tue, 15 Jul 2014 10:17:20 -0700 (PDT) X-Received: by 10.66.230.163 with SMTP id sz3mr3476304pac.136.1405444639931; Tue, 15 Jul 2014 10:17:19 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bl15si6111231pdb.341.2014.07.15.10.17.19; Tue, 15 Jul 2014 10:17:19 -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 S1758516AbaGORPS (ORCPT + 28 others); Tue, 15 Jul 2014 13:15:18 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:46855 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755675AbaGORCM (ORCPT ); Tue, 15 Jul 2014 13:02:12 -0400 Received: by mail-wg0-f52.google.com with SMTP id a1so5157031wgh.23 for ; Tue, 15 Jul 2014 10:02:10 -0700 (PDT) X-Received: by 10.194.187.101 with SMTP id fr5mr6535521wjc.125.1405443730922; Tue, 15 Jul 2014 10:02:10 -0700 (PDT) Received: from Debian ([94.54.73.8]) by mx.google.com with ESMTPSA id o9sm45768669wib.22.2014.07.15.10.02.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Jul 2014 10:02:10 -0700 (PDT) Received: from sam by Debian with local (Exim 4.80) (envelope-from ) id 1X767C-00041w-5K; Tue, 15 Jul 2014 20:02:06 +0300 From: Sam Asadi To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Roger Quadros , Paul Walmsley , sam-the-6 Subject: [PATCH 36/94] ARM: DRA7: hwmod: Fixup SATA hwmod Date: Tue, 15 Jul 2014 20:00:51 +0300 Message-Id: <1405443709-15288-36-git-send-email-asadi.samuel@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405443709-15288-1-git-send-email-asadi.samuel@gmail.com> References: <1405443709-15288-1-git-send-email-asadi.samuel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: asadi.samuel@gmail.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22c as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com 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: , From: Roger Quadros 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 Reviewed-by: Rajendra Nayak Tested-by: Sekhar Nori Signed-off-by: Paul Walmsley Signed-off-by: sam-the-6 --- 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 20b4398..1209266 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1268,9 +1268,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", @@ -1278,6 +1275,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, @@ -1285,8 +1283,6 @@ static struct omap_hwmod dra7xx_sata_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .opt_clks = sata_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(sata_opt_clks), }; /*