From patchwork Fri Aug 23 12:23:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19443 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E55F7248E6 for ; Fri, 23 Aug 2013 12:24:10 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id a41sf483067yho.8 for ; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=zveWslQl/D43+iiEavSBUDvATu+zxlAIKTHtIk+COZI=; b=QbU/isdhtFxoC7O0lmnTEqMcu/A07Ar264Q3LH00eCFC8E+NgZKvwGqoqVYn409BBg spPX3Pt2W1X65273AFq3+Rwy5G73jdBwPDlotCIl3Ips7KTt2BvCthJRUpOSrSHDnPsm 2x0+WllSoV/dVFnweEsiljCi9w1nvHkR6QxPJyJtkde6F6QnI5lRUPdrbDeoLaTuTha3 7PEVGwU8A5z0AvQW/Su62cDpTs5emQMXCJ4mP64hhlDR2ghta0wDHQQiOyovQ57k5NeJ T8q4UhL8zqhVYVvVnShaBLM/Y0PopFVCjRi5SPH4nFZi6iY/7iajb7yilW2mJmLIMvk/ QNtQ== X-Received: by 10.224.74.72 with SMTP id t8mr16771439qaj.4.1377260650738; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.119.9 with SMTP id kq9ls1589380qeb.48.gmail; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) X-Received: by 10.58.208.130 with SMTP id me2mr16344135vec.13.1377260650661; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id j6si5467281vet.93.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hz10so363210vcb.26 for ; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) X-Gm-Message-State: ALoCoQnrNwqukXBO/XMdVWWhK+Go5OrLJYmVlj5nvC1nIw/68+X2MNuB9JfluVBVBg7KrtGbTuhf X-Received: by 10.220.206.195 with SMTP id fv3mr16180325vcb.15.1377260650574; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp90092vcz; Fri, 23 Aug 2013 05:24:09 -0700 (PDT) X-Received: by 10.15.33.132 with SMTP id c4mr26362679eev.2.1377260649427; Fri, 23 Aug 2013 05:24:09 -0700 (PDT) Received: from mail-ea0-f176.google.com (mail-ea0-f176.google.com [209.85.215.176]) by mx.google.com with ESMTPS id z6si16801182eey.13.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.176 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.176; Received: by mail-ea0-f176.google.com with SMTP id q16so259379ead.7 for ; Fri, 23 Aug 2013 05:24:08 -0700 (PDT) X-Received: by 10.14.176.8 with SMTP id a8mr26350439eem.12.1377260648841; Fri, 23 Aug 2013 05:24:08 -0700 (PDT) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginmedia.com. [92.233.57.238]) by mx.google.com with ESMTPSA id f49sm24417729eec.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:08 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 09/40] ARM: ux500: Purge SDI regulator support when booting with ATAGs enable Date: Fri, 23 Aug 2013 13:23:09 +0100 Message-Id: <1377260620-18829-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> References: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , It's time to remove all ATAG support from ux500 and rely solely on Device Tree booting. This patch is part of that endeavour. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 53 -------------------------------------- 1 file changed, 53 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index deda6a1..b8b5ebe 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -54,37 +53,6 @@ #include "board-mop500.h" #include "board-mop500-regulators.h" -/* Dynamically populated. */ -static struct gpio sdi0_reg_gpios[] = { - { 0, GPIOF_OUT_INIT_LOW, "mmci_vsel" }, -}; - -static struct gpio_regulator_state sdi0_reg_states[] = { - { .value = 2900000, .gpios = (0 << 0) }, - { .value = 1800000, .gpios = (1 << 0) }, -}; - -static struct gpio_regulator_config sdi0_reg_info = { - .supply_name = "ext-mmc-level-shifter", - .gpios = sdi0_reg_gpios, - .nr_gpios = ARRAY_SIZE(sdi0_reg_gpios), - .states = sdi0_reg_states, - .nr_states = ARRAY_SIZE(sdi0_reg_states), - .type = REGULATOR_VOLTAGE, - .enable_high = 1, - .enabled_at_boot = 0, - .init_data = &sdi0_reg_init_data, - .startup_delay = 100, -}; - -static struct platform_device sdi0_regulator = { - .name = "gpio-regulator", - .id = -1, - .dev = { - .platform_data = &sdi0_reg_info, - }, -}; - static struct abx500_gpio_platform_data ab8500_gpio_pdata = { .gpio_base = MOP500_AB8500_PIN_GPIO(1), }; @@ -233,7 +201,6 @@ static struct hash_platform_data u8500_hash1_platform_data = { /* add any platform devices here - TODO */ static struct platform_device *mop500_platform_devs[] __initdata = { &mop500_gpio_keys_device, - &sdi0_regulator, }; #ifdef CONFIG_STE_DMA40 @@ -346,10 +313,6 @@ static void __init u8500_cryp1_hash1_init(struct device *parent) db8500_add_hash1(parent, &u8500_hash1_platform_data); } -static struct platform_device *snowball_platform_devs[] __initdata = { - &sdi0_regulator, -}; - static void __init mop500_init_machine(void) { struct device *parent = NULL; @@ -359,9 +322,6 @@ static void __init mop500_init_machine(void) platform_device_register(&db8500_prcmu_device); mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR; - sdi0_reg_info.enable_gpio = GPIO_SDMMC_EN; - sdi0_reg_info.gpios[0].gpio = GPIO_SDMMC_1V8_3V_SEL; - mop500_pinmaps_init(); parent = u8500_init_devices(); @@ -391,22 +351,12 @@ static void __init mop500_init_machine(void) static void __init snowball_init_machine(void) { struct device *parent = NULL; - int i; platform_device_register(&db8500_prcmu_device); - sdi0_reg_info.enable_gpio = SNOWBALL_SDMMC_EN_GPIO; - sdi0_reg_info.gpios[0].gpio = SNOWBALL_SDMMC_1V8_3V_GPIO; - snowball_pinmaps_init(); parent = u8500_init_devices(); - for (i = 0; i < ARRAY_SIZE(snowball_platform_devs); i++) - snowball_platform_devs[i]->dev.parent = parent; - - platform_add_devices(snowball_platform_devs, - ARRAY_SIZE(snowball_platform_devs)); - mop500_i2c_init(parent); snowball_sdi_init(parent); mop500_spi_init(parent); @@ -432,9 +382,6 @@ static void __init hrefv60_init_machine(void) */ mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO; - sdi0_reg_info.enable_gpio = HREFV60_SDMMC_EN_GPIO; - sdi0_reg_info.gpios[0].gpio = HREFV60_SDMMC_1V8_3V_GPIO; - hrefv60_pinmaps_init(); parent = u8500_init_devices();