From patchwork Tue Aug 28 23:18:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Grinberg X-Patchwork-Id: 1383081 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B106F3FC85 for ; Tue, 28 Aug 2012 23:19:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752314Ab2H1XTk (ORCPT ); Tue, 28 Aug 2012 19:19:40 -0400 Received: from softlayer.compulab.co.il ([50.23.254.55]:35716 "EHLO compulab.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751412Ab2H1XTR (ORCPT ); Tue, 28 Aug 2012 19:19:17 -0400 Received: from [62.90.235.247] (port=60801 helo=zimbra-mta.compulab.co.il) by softlayer.compulab.co.il with esmtp (Exim 4.77) (envelope-from ) id 1T6V3z-00021T-Cn; Wed, 29 Aug 2012 02:19:15 +0300 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id ACB31644192; Wed, 29 Aug 2012 02:19:14 +0300 (IDT) X-Virus-Scanned: amavisd-new at compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TKciraRhsO+M; Wed, 29 Aug 2012 02:19:13 +0300 (IDT) Received: from grinberg-linux (grinberg-pc.compulab.local [10.1.1.13]) by zimbra-mta.compulab.co.il (Postfix) with SMTP id C6A2B64419A; Wed, 29 Aug 2012 02:19:12 +0300 (IDT) Received: by grinberg-linux (sSMTP sendmail emulation); Wed, 29 Aug 2012 02:19:05 +0300 From: Igor Grinberg To: Tony Lindgren Cc: Kevin Hilman , Paul Walmsley , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Igor Grinberg Subject: [PATCH 3/9] ARM: OMAP: remove the sti console workaround Date: Wed, 29 Aug 2012 02:18:51 +0300 Message-Id: <1346195937-6383-4-git-send-email-grinberg@compulab.co.il> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1346195937-6383-1-git-send-email-grinberg@compulab.co.il> References: <1346195937-6383-1-git-send-email-grinberg@compulab.co.il> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The sti console workaround uses the OMAP custom tags. Those tags are not used in upstream kernel and therefore the workaround never fires on upstream kernels. Remove the sti console workaround tags part. This leaves the workaround functional part intact so can be reused if needed. Signed-off-by: Igor Grinberg --- arch/arm/mach-omap2/pm24xx.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index 2edeffc..9e54dc9 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c @@ -352,16 +352,6 @@ int __init omap2_pm_init(void) prcm_setup_regs(); - /* Hack to prevent MPU retention when STI console is enabled. */ - { - const struct omap_sti_console_config *sti; - - sti = omap_get_config(OMAP_TAG_STI_CONSOLE, - struct omap_sti_console_config); - if (sti != NULL && sti->enable) - sti_console_enabled = 1; - } - /* * We copy the assembler sleep/wakeup routines to SRAM. * These routines need to be in SRAM as that's the only