From patchwork Thu Jul 1 10:12:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lesly A M X-Patchwork-Id: 109039 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o61AFtfM019393 for ; Thu, 1 Jul 2010 10:15:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755156Ab0GAKPx (ORCPT ); Thu, 1 Jul 2010 06:15:53 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:59122 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755152Ab0GAKPw (ORCPT ); Thu, 1 Jul 2010 06:15:52 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o61AFm4E002006 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Jul 2010 05:15:51 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o61AFjl5027678; Thu, 1 Jul 2010 15:45:45 +0530 (IST) From: Lesly A M To: linux-omap@vger.kernel.org Cc: Lesly A M , Nishanth Menon , David Derrick , Samuel Ortiz Subject: [PATCH v7 8/8] omap3: pm: Use generic TRITON power scripts for ZOOM[2, 3], 3630SDP board Date: Thu, 1 Jul 2010 15:42:24 +0530 Message-Id: <1277979144-2210-1-git-send-email-leslyam@ti.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 01 Jul 2010 10:15:55 +0000 (UTC) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index f60dca3..ba3de05 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -137,14 +137,17 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ board-zoom-peripherals.o \ hsmmc.o \ - board-zoom-debugboard.o + board-zoom-debugboard.o \ + twl4030.o obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \ board-zoom-peripherals.o \ hsmmc.o \ - board-zoom-debugboard.o + board-zoom-debugboard.o \ + twl4030.o obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \ board-zoom-peripherals.o \ - hsmmc.o + hsmmc.o \ + twl4030.o obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ hsmmc.o obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \ diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 6b39849..ea9b921 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -26,6 +26,7 @@ #include "mux.h" #include "hsmmc.h" +#include "twl4030.h" /* Zoom2 has Qwerty keyboard*/ static int board_keymap[] = { @@ -94,6 +95,8 @@ static struct twl4030_keypad_data zoom_kp_twl4030_data = { .rep = 1, }; +static struct __initdata twl4030_power_data zoom_t2scripts_data; + static struct regulator_consumer_supply zoom_vmmc1_supply = { .supply = "vmmc", }; @@ -239,6 +242,7 @@ static struct twl4030_platform_data zoom_twldata = { .usb = &zoom_usb_data, .gpio = &zoom_gpio_data, .keypad = &zoom_kp_twl4030_data, + .power = &zoom_t2scripts_data, .codec = &zoom_codec_data, .vmmc1 = &zoom_vmmc1, .vmmc2 = &zoom_vmmc2, @@ -279,6 +283,8 @@ static void enable_board_wakeup_source(void) void __init zoom_peripherals_init(void) { + twl4030_get_scripts(&zoom_t2scripts_data); + omap_i2c_init(); usb_musb_init(&musb_board_data); enable_board_wakeup_source();