From patchwork Thu Sep 24 14:26:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 54106 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id C8C2322DC2 for ; Thu, 24 Sep 2015 14:27:53 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf42166183wic.3 for ; Thu, 24 Sep 2015 07:27:53 -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:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=Et5mJPUfvF274YvO+p9370iPHOJGRTBgJOv2hsgoW8Y=; b=X8M+KAzhOmk5/S9cNcW9duTOWzx5sj7fpbJ2n1SIm/sjP0cGayPwF92Ks9upJD/M8h m5glrGfyG7cAzA3J9aCcmX3tsZHWHnrfv/KZ9kvlOrKKIr26varxtPiSvPvkS3djkccw Yh7PV8cJn6a12Yn+xz5L+ZBucYlfBB2I3YcGX3yqdOTn2KB+tXPT5WYUlT44/HA6yY1N 1rcCQl77NvIAbE0g8bvCEDBrHNUTCskhZ0veQWcdIGkgpmrmgxbjVhHmx7pQTcLZ9Vl9 X0Mlq29rE3K+SotLTEgd72U3gKRSXaayXfLPO5GnkLK4ylSAeOVP2CjLEsWqqnf6vnbd FtGw== X-Gm-Message-State: ALoCoQl+qJRVGg3hXGqet8+k8kN0i+ec8nO2pZbRoyfnOEPUvbgyePfk10ojv4Xtvh4Rb3bBJVoh X-Received: by 10.194.240.230 with SMTP id wd6mr3968wjc.0.1443104873122; Thu, 24 Sep 2015 07:27:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.167.140 with SMTP id q134ls173266lfe.23.gmail; Thu, 24 Sep 2015 07:27:52 -0700 (PDT) X-Received: by 10.112.162.2 with SMTP id xw2mr13197786lbb.98.1443104872971; Thu, 24 Sep 2015 07:27:52 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id lh7si6715967lab.56.2015.09.24.07.27.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 07:27:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lacdq2 with SMTP id dq2so10428796lac.1 for ; Thu, 24 Sep 2015 07:27:52 -0700 (PDT) X-Received: by 10.25.150.199 with SMTP id y190mr5246397lfd.35.1443104872810; Thu, 24 Sep 2015 07:27:52 -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.112.59.35 with SMTP id w3csp378820lbq; Thu, 24 Sep 2015 07:27:51 -0700 (PDT) X-Received: by 10.68.217.8 with SMTP id ou8mr45288162pbc.164.1443104860578; Thu, 24 Sep 2015 07:27:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ou3si18845730pbb.11.2015.09.24.07.27.40; Thu, 24 Sep 2015 07:27:40 -0700 (PDT) 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 S1752848AbbIXO1k (ORCPT + 5 others); Thu, 24 Sep 2015 10:27:40 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:60440 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752751AbbIXO1j (ORCPT ); Thu, 24 Sep 2015 10:27:39 -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 t8OERIh5021858; Thu, 24 Sep 2015 09:27:18 -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 t8OERIGt013032; Thu, 24 Sep 2015 09:27:18 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Thu, 24 Sep 2015 09:27:18 -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 t8OEQjRd012528; Thu, 24 Sep 2015 09:27:16 -0500 From: Tero Kristo To: , , , CC: Subject: [PATCH 14/17] ARM: OMAP2: hwmod: AMx3xx: remove redundant reset info Date: Thu, 24 Sep 2015 17:26:55 +0300 Message-ID: <1443104818-993-15-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1443104818-993-1-git-send-email-t-kristo@ti.com> References: <1443104818-993-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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mailfrom=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: , AMx3xx reset info is now parsed from DT, so the data under hwmod database can be removed. Signed-off-by: Tero Kristo --- .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 30 -------------------- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 8 ------ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 8 ------ 3 files changed, 46 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c index 907a452b..7405e78 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c @@ -27,8 +27,6 @@ #include "common.h" #define CLKCTRL(oh, clkctrl) ((oh).prcm.omap4.clkctrl_offs = (clkctrl)) -#define RSTCTRL(oh, rstctrl) ((oh).prcm.omap4.rstctrl_offs = (rstctrl)) -#define RSTST(oh, rstst) ((oh).prcm.omap4.rstst_offs = (rstst)) /* * 'l3' class @@ -143,10 +141,6 @@ static struct omap_hwmod_class am33xx_pruss_hwmod_class = { .name = "pruss", }; -static struct omap_hwmod_rst_info am33xx_pruss_resets[] = { - { .name = "pruss", .rst_shift = 1 }, -}; - /* pru-icss */ /* Pseudo hwmod for reset control purpose only */ struct omap_hwmod am33xx_pruss_hwmod = { @@ -159,8 +153,6 @@ struct omap_hwmod am33xx_pruss_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .rst_lines = am33xx_pruss_resets, - .rst_lines_cnt = ARRAY_SIZE(am33xx_pruss_resets), }; /* gfx */ @@ -169,10 +161,6 @@ static struct omap_hwmod_class am33xx_gfx_hwmod_class = { .name = "gfx", }; -static struct omap_hwmod_rst_info am33xx_gfx_resets[] = { - { .name = "gfx", .rst_shift = 0, .st_shift = 0}, -}; - struct omap_hwmod am33xx_gfx_hwmod = { .name = "gfx", .class = &am33xx_gfx_hwmod_class, @@ -183,8 +171,6 @@ struct omap_hwmod am33xx_gfx_hwmod = { .modulemode = MODULEMODE_SWCTRL, }, }, - .rst_lines = am33xx_gfx_resets, - .rst_lines_cnt = ARRAY_SIZE(am33xx_gfx_resets), }; /* @@ -1397,17 +1383,9 @@ static void omap_hwmod_am33xx_clkctrl(void) CLKCTRL(am33xx_aes0_hwmod , AM33XX_CM_PER_AES0_CLKCTRL_OFFSET); } -static void omap_hwmod_am33xx_rst(void) -{ - RSTCTRL(am33xx_pruss_hwmod, AM33XX_RM_PER_RSTCTRL_OFFSET); - RSTCTRL(am33xx_gfx_hwmod, AM33XX_RM_GFX_RSTCTRL_OFFSET); - RSTST(am33xx_gfx_hwmod, AM33XX_RM_GFX_RSTST_OFFSET); -} - void omap_hwmod_am33xx_reg(void) { omap_hwmod_am33xx_clkctrl(); - omap_hwmod_am33xx_rst(); } static void omap_hwmod_am43xx_clkctrl(void) @@ -1470,15 +1448,7 @@ static void omap_hwmod_am43xx_clkctrl(void) CLKCTRL(am33xx_aes0_hwmod , AM43XX_CM_PER_AES0_CLKCTRL_OFFSET); } -static void omap_hwmod_am43xx_rst(void) -{ - RSTCTRL(am33xx_pruss_hwmod, AM43XX_RM_PER_RSTCTRL_OFFSET); - RSTCTRL(am33xx_gfx_hwmod, AM43XX_RM_GFX_RSTCTRL_OFFSET); - RSTST(am33xx_gfx_hwmod, AM43XX_RM_GFX_RSTST_OFFSET); -} - void omap_hwmod_am43xx_reg(void) { omap_hwmod_am43xx_clkctrl(); - omap_hwmod_am43xx_rst(); } diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index cc0791d..e4fc8b3 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -64,10 +64,6 @@ static struct omap_hwmod am33xx_l4_hs_hwmod = { }, }; -static struct omap_hwmod_rst_info am33xx_wkup_m3_resets[] = { - { .name = "wkup_m3", .rst_shift = 3, .st_shift = 5 }, -}; - /* wkup_m3 */ static struct omap_hwmod am33xx_wkup_m3_hwmod = { .name = "wkup_m3", @@ -79,13 +75,9 @@ static struct omap_hwmod am33xx_wkup_m3_hwmod = { .prcm = { .omap4 = { .clkctrl_offs = AM33XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET, - .rstctrl_offs = AM33XX_RM_WKUP_RSTCTRL_OFFSET, - .rstst_offs = AM33XX_RM_WKUP_RSTST_OFFSET, .modulemode = MODULEMODE_SWCTRL, }, }, - .rst_lines = am33xx_wkup_m3_resets, - .rst_lines_cnt = ARRAY_SIZE(am33xx_wkup_m3_resets), }; /* diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c index e97a894..d486c42 100644 --- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c @@ -52,10 +52,6 @@ static struct omap_hwmod am43xx_l4_hs_hwmod = { }, }; -static struct omap_hwmod_rst_info am33xx_wkup_m3_resets[] = { - { .name = "wkup_m3", .rst_shift = 3, .st_shift = 5 }, -}; - static struct omap_hwmod am43xx_wkup_m3_hwmod = { .name = "wkup_m3", .class = &am33xx_wkup_m3_hwmod_class, @@ -66,13 +62,9 @@ static struct omap_hwmod am43xx_wkup_m3_hwmod = { .prcm = { .omap4 = { .clkctrl_offs = AM43XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET, - .rstctrl_offs = AM43XX_RM_WKUP_RSTCTRL_OFFSET, - .rstst_offs = AM43XX_RM_WKUP_RSTST_OFFSET, .modulemode = MODULEMODE_SWCTRL, }, }, - .rst_lines = am33xx_wkup_m3_resets, - .rst_lines_cnt = ARRAY_SIZE(am33xx_wkup_m3_resets), }; static struct omap_hwmod am43xx_control_hwmod = {