From patchwork Thu Jul 3 11:01:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 33019 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6AEAB20560 for ; Thu, 3 Jul 2014 11:01:43 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id y10sf173523pdj.5 for ; Thu, 03 Jul 2014 04:01:42 -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=E7gapQ8CItuyelSrn11t2utls9s2mQTZwRvEsH7QdUs=; b=OI8HzqaUt6IHVW9L0dD2qUW2thuZQIF/KTLy+++nGvnSn8OSalB6lg9vpQuCyCPorD 3a14lc7mPEEDE5q5pqpjXxiEsCaGQ+LjvHcP7WDZAbA0Vb/CiMM1fBkVhz1Kx0jqNCsx F6gAXHDgGoElkA/8RlxFWFrVfN2J+mca+P/coXdBZ9rzfjAD0psRtYfGfN+Rho3NAwko sQ3OpwKvgPlULPG0DafceDJocdsGoPvONcMU6g8GoXQ2Mi/3muS/amYfbn1DxI8J7zM1 m+yJTV3z0OLEu6sa4YpWDgunigF0Xo4AZevZC3zuArI+sZvjnrGpD1gDjI5ZPiKa3KRz xdqQ== X-Gm-Message-State: ALoCoQlpe83+ZZMJnOGcODid96qoIYm4uwMHKJ+7/AvG/Ao1u+Wkb+ORcgn3FodWZWfBeuIneSWY X-Received: by 10.66.160.34 with SMTP id xh2mr1990125pab.6.1404385302677; Thu, 03 Jul 2014 04:01:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.229 with SMTP id 92ls441650qgz.61.gmail; Thu, 03 Jul 2014 04:01:42 -0700 (PDT) X-Received: by 10.52.252.193 with SMTP id zu1mr2625662vdc.7.1404385302551; Thu, 03 Jul 2014 04:01:42 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id bz10si8538334vcb.76.2014.07.03.04.01.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Jul 2014 04:01:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so31573vcb.2 for ; Thu, 03 Jul 2014 04:01:42 -0700 (PDT) X-Received: by 10.221.40.193 with SMTP id tr1mr601297vcb.31.1404385302421; Thu, 03 Jul 2014 04:01:42 -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 tc5csp363666vcb; Thu, 3 Jul 2014 04:01:41 -0700 (PDT) X-Received: by 10.68.104.66 with SMTP id gc2mr3851180pbb.17.1404385301522; Thu, 03 Jul 2014 04:01:41 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cb12si32676104pac.144.2014.07.03.04.01.40; Thu, 03 Jul 2014 04:01:40 -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 S1754111AbaGCLBg (ORCPT + 27 others); Thu, 3 Jul 2014 07:01:36 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:37405 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbaGCLBd (ORCPT ); Thu, 3 Jul 2014 07:01:33 -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 s63B1Win013657; Thu, 3 Jul 2014 06:01:32 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s63B1WWO025540; Thu, 3 Jul 2014 06:01:32 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Thu, 3 Jul 2014 06:01:31 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s63B1LSO018213; Thu, 3 Jul 2014 06:01:28 -0500 From: Roger Quadros To: , CC: , , , , , , , , Roger Quadros Subject: [PATCH v2 2/3] ARM: DRA7: hwmod: Fixup SATA hwmod Date: Thu, 3 Jul 2014 14:01:13 +0300 Message-ID: <1404385274-5093-3-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404385274-5093-1-git-send-email-rogerq@ti.com> References: <1404385274-5093-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.220.171 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 Reviewed-by: Rajendra Nayak Tested-by: Sekhar Nori --- 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 c9daee4..5ea094a 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1283,9 +1283,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", @@ -1293,6 +1290,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, @@ -1300,8 +1298,6 @@ static struct omap_hwmod dra7xx_sata_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .opt_clks = sata_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(sata_opt_clks), }; /*