From patchwork Wed Apr 23 17:35:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 28931 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E0753203AC for ; Wed, 23 Apr 2014 17:36:25 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id l13sf4231565iga.11 for ; Wed, 23 Apr 2014 10:36:25 -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=hRA0toE+1AObkbgDaryuyiSq1Xz8H/a/LeCNzrmPuMQ=; b=IBg5mK74v236Yw8T+dLCh1i9KGtbM1vnMNQorimfyGpTO0fVGd3DwCkTaTaB7NIsJe 2hkj7PsHpSDrN176DNvM/rahYLajbAxiHYgLWUrP/9wXfqWxrEwsq8W4usPfsmh3p9Oa zFEkI5gGVt2bPzkLfw31eohBSAQHmAyqTd92R55IgocA5AsLR5nzvqPIBokh5nL4TsHV MIQcDIMhj4xcKwtsfMqFxwwT/VkI4Ajouv3JEbKKlNchTlaBn13lgTIwVqyMtnrcEsUM xZRD5i3Ax6I5hs8f6lzTBk3GewXNACQfXbgRzXPg5FXLq6LeS2/eYz8Etf4ax4sLgyw+ OsIQ== X-Gm-Message-State: ALoCoQmXodSAyxStvkoJpSfzdPTV1Pgdkj4/DHaBBLcMOHSY0ufKk5Xk1aVNfueEda0m6/PYAlEn X-Received: by 10.182.79.41 with SMTP id g9mr27001300obx.41.1398274585274; Wed, 23 Apr 2014 10:36:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.103.118 with SMTP id x109ls217933qge.74.gmail; Wed, 23 Apr 2014 10:36:25 -0700 (PDT) X-Received: by 10.220.101.3 with SMTP id a3mr1802455vco.31.1398274585102; Wed, 23 Apr 2014 10:36:25 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id gx4si315578vcb.1.2014.04.23.10.36.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 10:36:25 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hr9so1591163vcb.1 for ; Wed, 23 Apr 2014 10:36:25 -0700 (PDT) X-Received: by 10.52.181.132 with SMTP id dw4mr119240vdc.86.1398274585005; Wed, 23 Apr 2014 10:36:25 -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.221.72 with SMTP id ib8csp121222vcb; Wed, 23 Apr 2014 10:36:24 -0700 (PDT) X-Received: by 10.68.237.228 with SMTP id vf4mr22544009pbc.131.1398274584197; Wed, 23 Apr 2014 10:36:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yd10si1024123pab.125.2014.04.23.10.36.23; Wed, 23 Apr 2014 10:36:23 -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 S1161000AbaDWRgM (ORCPT + 27 others); Wed, 23 Apr 2014 13:36:12 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:41871 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932472AbaDWRgJ (ORCPT ); Wed, 23 Apr 2014 13:36:09 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3NHa5Ri002392; Wed, 23 Apr 2014 12:36:06 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3NHa5nF011936; Wed, 23 Apr 2014 12:36:05 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 23 Apr 2014 12:36:05 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3NHa1u2031318; Wed, 23 Apr 2014 12:36:01 -0500 From: Roger Quadros To: CC: , , , , , , , , Nikhil Devshatwar , Benoit Cousson , Paul Walmsley , Roger Quadros Subject: [PATCH v4 3/4] ARM: DRA7: hwmod: Add ocp2scp3 and sata hwmods Date: Wed, 23 Apr 2014 20:35:59 +0300 Message-ID: <1398274559-24777-1-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1398274237-24510-1-git-send-email-rogerq@ti.com> References: <1398274237-24510-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=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: , From: Nikhil Devshatwar Add hwmods for ocp2scp3 and sata modules. [Roger Q] Clean up. CC: Benoit Cousson CC: Paul Walmsley Signed-off-by: Balaji T K Signed-off-by: Nikhil Devshatwar Signed-off-by: Roger Quadros Tested-by: Roger Quadros --- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 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 810c205..b02a4ab 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1215,6 +1215,30 @@ static struct omap_hwmod dra7xx_ocp2scp1_hwmod = { }, }; +/* ocp2scp3 */ +static struct omap_hwmod dra7xx_ocp2scp3_hwmod; + +/* l4_cfg -> ocp2scp3 */ +static struct omap_hwmod_ocp_if dra7xx_l4_cfg__ocp2scp3 = { + .master = &dra7xx_l4_cfg_hwmod, + .slave = &dra7xx_ocp2scp3_hwmod, + .clk = "l4_root_clk_div", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + +static struct omap_hwmod dra7xx_ocp2scp3_hwmod = { + .name = "ocp2scp3", + .class = &dra7xx_ocp2scp_hwmod_class, + .clkdm_name = "l3init_clkdm", + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET, + .context_offs = DRA7XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET, + .modulemode = MODULEMODE_HWCTRL, + }, + }, +}; + /* * 'qspi' class * @@ -1268,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", @@ -1278,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, @@ -1285,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), }; /* @@ -2682,6 +2702,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l4_per1__mmc4, &dra7xx_l4_cfg__mpu, &dra7xx_l4_cfg__ocp2scp1, + &dra7xx_l4_cfg__ocp2scp3, &dra7xx_l3_main_1__qspi, &dra7xx_l4_cfg__sata, &dra7xx_l4_cfg__smartreflex_core,