From patchwork Fri Aug 23 12:23:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19450 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f198.google.com (mail-ve0-f198.google.com [209.85.128.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D959E248E6 for ; Fri, 23 Aug 2013 12:24:24 +0000 (UTC) Received: by mail-ve0-f198.google.com with SMTP id 15sf437408vea.5 for ; Fri, 23 Aug 2013 05:24:24 -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=BQ5m+UqwexhB303YuLtKBxUaQmF16nxO5Z5nGHutaz0=; b=LCzxXsaVLmiZc21iQByUeI5kGid0hZiI3iL+7wVVB01iG5L1UVvJy340C2cw3A2vN1 Y1QOhOWv/JfnSNIEgxmy9dtvb8ySyYWHf++1/8cnWBMfwAN7p4wPtZtUnpPQ9UDuqyTk fg2o/xiRggOP0UjGGJ+xskMoJO2fhDCq8j1PGF0cmzd8AfA9lw/DDm5R4us25groSkJb yRp8UG7O6eIVVBeKCbgCObHlEnRHGWMbt1SxI/WRG+3+io9HAd/KQdxViphjbJHRBroG YSAv59FCCXqNcJUdtibJFrLoZbIY5DCkC2H9gasdHYLKV9vYwtTXBlvXR8uTHMSqdKWK L0AQ== X-Received: by 10.224.173.4 with SMTP id n4mr16765502qaz.3.1377260664717; Fri, 23 Aug 2013 05:24:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.244 with SMTP id u20ls1441569qeq.74.gmail; Fri, 23 Aug 2013 05:24:24 -0700 (PDT) X-Received: by 10.221.51.206 with SMTP id vj14mr16501239vcb.17.1377260664593; Fri, 23 Aug 2013 05:24:24 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id f8si5463800vec.123.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:24 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id c13so368867vea.24 for ; Fri, 23 Aug 2013 05:24:24 -0700 (PDT) X-Gm-Message-State: ALoCoQmqHGo4f8wfqEbXNDK+wuh7QU11B2cFFclQaTSg3l+oWYXfrwAhQyEPITcLhIirIBISI+Ny X-Received: by 10.220.181.136 with SMTP id by8mr16714373vcb.11.1377260664507; Fri, 23 Aug 2013 05:24:24 -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 u4csp90106vcz; Fri, 23 Aug 2013 05:24:24 -0700 (PDT) X-Received: by 10.15.111.136 with SMTP id cj8mr67507eeb.91.1377260663470; Fri, 23 Aug 2013 05:24:23 -0700 (PDT) Received: from mail-ea0-f175.google.com (mail-ea0-f175.google.com [209.85.215.175]) by mx.google.com with ESMTPS id z8si16732031eee.323.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:23 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.175 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.175; Received: by mail-ea0-f175.google.com with SMTP id m14so261085eaj.20 for ; Fri, 23 Aug 2013 05:24:22 -0700 (PDT) X-Received: by 10.15.73.134 with SMTP id h6mr511273eey.76.1377260662853; Fri, 23 Aug 2013 05:24:22 -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:22 -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 16/40] ARM: ux500: Purge SFH7741 Proximity Sensor support when booting with ATAGs Date: Fri, 23 Aug 2013 13:23:16 +0100 Message-Id: <1377260620-18829-17-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.128.179 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 | 75 -------------------------------------- 1 file changed, 75 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index e0db81d..fd1e0bc 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -63,59 +62,6 @@ static void __init mop500_i2c_init(struct device *parent) db8500_add_i2c3(parent, NULL); } -static struct gpio_keys_button mop500_gpio_keys[] = { - { - .desc = "SFH7741 Proximity Sensor", - .type = EV_SW, - .code = SW_FRONT_PROXIMITY, - .active_low = 0, - .can_disable = 1, - } -}; - -static struct regulator *prox_regulator; -static int mop500_prox_activate(struct device *dev); -static void mop500_prox_deactivate(struct device *dev); - -static struct gpio_keys_platform_data mop500_gpio_keys_data = { - .buttons = mop500_gpio_keys, - .nbuttons = ARRAY_SIZE(mop500_gpio_keys), - .enable = mop500_prox_activate, - .disable = mop500_prox_deactivate, -}; - -static struct platform_device mop500_gpio_keys_device = { - .name = "gpio-keys", - .id = 0, - .dev = { - .platform_data = &mop500_gpio_keys_data, - }, -}; - -static int mop500_prox_activate(struct device *dev) -{ - prox_regulator = regulator_get(&mop500_gpio_keys_device.dev, - "vcc"); - if (IS_ERR(prox_regulator)) { - dev_err(&mop500_gpio_keys_device.dev, - "no regulator\n"); - return PTR_ERR(prox_regulator); - } - - return regulator_enable(prox_regulator); -} - -static void mop500_prox_deactivate(struct device *dev) -{ - regulator_disable(prox_regulator); - regulator_put(prox_regulator); -} - -/* add any platform devices here - TODO */ -static struct platform_device *mop500_platform_devs[] __initdata = { - &mop500_gpio_keys_device, -}; - #ifdef CONFIG_STE_DMA40 static struct stedma40_chan_cfg ssp0_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -223,20 +169,12 @@ static void __init mop500_uart_init(struct device *parent) static void __init mop500_init_machine(void) { struct device *parent = NULL; - int i; platform_device_register(&db8500_prcmu_device); - mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR; mop500_pinmaps_init(); parent = u8500_init_devices(); - for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) - mop500_platform_devs[i]->dev.parent = parent; - - platform_add_devices(mop500_platform_devs, - ARRAY_SIZE(mop500_platform_devs)); - mop500_i2c_init(parent); mop500_sdi_init(parent); mop500_spi_init(parent); @@ -267,25 +205,12 @@ static void __init snowball_init_machine(void) static void __init hrefv60_init_machine(void) { struct device *parent = NULL; - int i; platform_device_register(&db8500_prcmu_device); - /* - * The HREFv60 board removed a GPIO expander and routed - * all these GPIO pins to the internal GPIO controller - * instead. - */ - mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO; hrefv60_pinmaps_init(); parent = u8500_init_devices(); - for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++) - mop500_platform_devs[i]->dev.parent = parent; - - platform_add_devices(mop500_platform_devs, - ARRAY_SIZE(mop500_platform_devs)); - mop500_i2c_init(parent); hrefv60_sdi_init(parent); mop500_spi_init(parent);