From patchwork Tue May 18 12:05:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 100437 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4IC6PfV020560 for ; Tue, 18 May 2010 12:06:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757426Ab0ERMGL (ORCPT ); Tue, 18 May 2010 08:06:11 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:55350 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757218Ab0ERMGE (ORCPT ); Tue, 18 May 2010 08:06:04 -0400 Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LbvF2-1NXLlF19hU-00jlcu; Tue, 18 May 2010 14:06:01 +0200 Received: from localhost.localdomain (unknown [192.168.102.87]) by corscience.de (Postfix) with ESMTP id C27FC51E0C; Tue, 18 May 2010 14:05:59 +0200 (CEST) From: Thomas Weber To: linux-omap@vger.kernel.org Cc: tony@atomide.com, Thomas Weber Subject: [PATCH 06/14] OMAP2: Devkit8000: Remove nonexisting vsim Date: Tue, 18 May 2010 14:05:27 +0200 Message-Id: <1274184335-29322-7-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1274184335-29322-1-git-send-email-weber@corscience.de> References: <1274184335-29322-1-git-send-email-weber@corscience.de> X-Provags-ID: V01U2FsdGVkX18oZ2x95IJH5l47URpvJQayZYpWWPjvbvZaGJV H4d5M+tIOhb/OcbijVgHG574C7i7dnBzP0w648t2VlPcrfubqN 9BHx/QUDYPfXwRnL68KeQ== 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]); Tue, 18 May 2010 12:06:25 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 4611274..7d68016 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -168,15 +168,10 @@ static void devkit8000_panel_disable_tv(struct omap_dss_device *dssdev) { } - static struct regulator_consumer_supply devkit8000_vmmc1_supply = { .supply = "vmmc", }; -static struct regulator_consumer_supply devkit8000_vsim_supply = { - .supply = "vmmc_aux", -}; - /* ads7846 on SPI */ static struct regulator_consumer_supply devkit8000_vio_supplies[] = { REGULATOR_SUPPLY("vcc", "spi2.0") @@ -281,7 +276,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev, /* link regulators to MMC adapters */ devkit8000_vmmc1_supply.dev = mmc[0].dev; - devkit8000_vsim_supply.dev = mmc[0].dev; /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; @@ -334,21 +328,6 @@ static struct regulator_init_data devkit8000_vmmc1 = { .consumer_supplies = &devkit8000_vmmc1_supply, }; -/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ -static struct regulator_init_data devkit8000_vsim = { - .constraints = { - .min_uV = 1800000, - .max_uV = 3000000, - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, - }, - .num_consumer_supplies = 1, - .consumer_supplies = &devkit8000_vsim_supply, -}; - /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ static struct regulator_init_data devkit8000_vdac = { .constraints = { @@ -414,7 +393,6 @@ static struct twl4030_platform_data devkit8000_twldata = { .gpio = &devkit8000_gpio_data, .codec = &devkit8000_codec_data, .vmmc1 = &devkit8000_vmmc1, - .vsim = &devkit8000_vsim, .vdac = &devkit8000_vdac, .vpll1 = &devkit8000_vpll1, .vio = &devkit8000_vio,