From patchwork Fri Jul  1 02:08:01 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rajendra Nayak <rnayak@ti.com>
X-Patchwork-Id: 934052
X-Patchwork-Delegate: tony@atomide.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6128INN026986
	for <patchwork-omap@patchwork.kernel.org>;
	Fri, 1 Jul 2011 02:08:30 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754205Ab1GACI3 (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 30 Jun 2011 22:08:29 -0400
Received: from arroyo.ext.ti.com ([192.94.94.40]:55698 "EHLO
	arroyo.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754088Ab1GACI3 (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Thu, 30 Jun 2011 22:08:29 -0400
Received: from dbdp20.itg.ti.com ([172.24.170.38])
	by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id p6128OA8005370
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 30 Jun 2011 21:08:26 -0500
Received: from dbde70.ent.ti.com (localhost [127.0.0.1])
	by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p6128OeZ019288;
	Fri, 1 Jul 2011 07:38:24 +0530 (IST)
Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE70.ent.ti.com
	(172.24.170.148) with Microsoft SMTP Server id 8.3.106.1;
	Fri, 1 Jul 2011 07:38:23 +0530
Received: from linfarm476.india.ti.com (linfarm476.india.ti.com
	[10.24.132.205])	by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id
	p6128JAa018895;	Fri, 1 Jul 2011 07:38:20 +0530 (IST)
Received: (from a0131687@localhost)	by linfarm476.india.ti.com
	(8.12.11/8.13.8/Submit) id p6128J1M008335;
	Fri, 1 Jul 2011 07:38:19 +0530
From: Rajendra Nayak <rnayak@ti.com>
To: <linux-omap@vger.kernel.org>
CC: paul@pwsan.com, khilman@ti.com, b-cousson@ti.com,
	Rajendra Nayak <rnayak@ti.com>, Nishanth Menon <nm@ti.com>,
	Moiz Sonasath <m-sonasath@ti.com>
Subject: [PATCH 7/7] 4460sdp/blaze/panda: hwmod: Prevent gpio1 reset during
	hwmod init
Date: Fri, 1 Jul 2011 07:38:01 +0530
Message-ID: <1309486081-8257-8-git-send-email-rnayak@ti.com>
X-Mailer: git-send-email 1.5.6.6
In-Reply-To: <1309486081-8257-7-git-send-email-rnayak@ti.com>
References: <1309486081-8257-1-git-send-email-rnayak@ti.com>
	<1309486081-8257-2-git-send-email-rnayak@ti.com>
	<1309486081-8257-3-git-send-email-rnayak@ti.com>
	<1309486081-8257-4-git-send-email-rnayak@ti.com>
	<1309486081-8257-5-git-send-email-rnayak@ti.com>
	<1309486081-8257-6-git-send-email-rnayak@ti.com>
	<1309486081-8257-7-git-send-email-rnayak@ti.com>
MIME-Version: 1.0
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]);
	Fri, 01 Jul 2011 02:08:30 +0000 (UTC)

For 4460sdp/blaze/panda, GPIO-7 of bank1 is used for controlling
the TPS modes, hence GPIO1 should not be reset
during init as reset will cause the TPS voltage to
drop to 0.9 V preventing the system from continuing the boot.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Moiz Sonasath <m-sonasath@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
 arch/arm/mach-omap2/board-4430sdp.c    |   14 ++++++++++++++
 arch/arm/mach-omap2/board-omap4panda.c |   14 ++++++++++++++
 2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 63de2d3..7343209 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -36,6 +36,7 @@
 #include <plat/usb.h>
 #include <plat/mmc.h>
 #include <plat/omap4-keypad.h>
+#include <plat/omap_hwmod.h>
 #include <video/omapdss.h>
 
 #include "mux.h"
@@ -298,6 +299,19 @@ static void __init omap_4430sdp_init_early(void)
 #ifdef CONFIG_OMAP_32K_TIMER
 	omap2_gp_clockevent_set_gptimer(1);
 #endif
+	/*
+	 * For 4460sdp/blaze, GPIO-7 of bank1 is used for controlling
+	 * the TPS modes, hence GPIO1 should not be reset
+	 * during init as reset will cause the TPS voltage to
+	 * drop to 0.9 V  preventing the system from continuing the boot.
+	 */
+	if (cpu_is_omap446x()) {
+		struct omap_hwmod *gpio1 = omap_hwmod_lookup("gpio1");
+		if (gpio1)
+			omap_hwmod_no_setup_reset(gpio1);
+		else
+			pr_err("%s: gpio1 hwmod lookup failed\n", __func__);
+	}
 }
 
 static struct omap_musb_board_data musb_board_data = {
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 0cfe200..75a847c 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -40,6 +40,7 @@
 #include <plat/common.h>
 #include <plat/usb.h>
 #include <plat/mmc.h>
+#include <plat/omap_hwmod.h>
 #include <video/omap-panel-generic-dpi.h>
 #include "timer-gp.h"
 
@@ -100,6 +101,19 @@ static void __init omap4_panda_init_early(void)
 {
 	omap2_init_common_infrastructure();
 	omap2_init_common_devices(NULL, NULL);
+	/*
+	 * For 4460panda, GPIO-7 of bank1 is used for controling
+	 * the TPS modes, hence GPIO1 should not be reset
+	 * during init as reset will cause the TPS voltage to
+	 * drop to 0.9 V preventing the system from continuing the boot.
+	 */
+	if (cpu_is_omap446x()) {
+		struct omap_hwmod *gpio1 = omap_hwmod_lookup("gpio1");
+		if (gpio1)
+			omap_hwmod_no_setup_reset(gpio1);
+		else
+			pr_err("%s: gpio1 hwmod lookup failed\n", __func__);
+	}
 }
 
 static const struct usbhs_omap_board_data usbhs_bdata __initconst = {