From patchwork Fri Aug 23 12:23:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19453 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f69.google.com (mail-qe0-f69.google.com [209.85.128.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 433D3248E6 for ; Fri, 23 Aug 2013 12:24:30 +0000 (UTC) Received: by mail-qe0-f69.google.com with SMTP id 5sf439626qeb.0 for ; Fri, 23 Aug 2013 05:24:30 -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=bpZINtyp2la8boMdKozGWno/z6T5gL8Y+vNuUv+mAZg=; b=PCs1K90qTmPROufc0i2D6xBSmelQZKa50wtGBNWsetpS5ukqCzjsAQzLC/Rdk2YhG9 Zq1wlWQkBqX6tkb0PoauFI+bC6ug75aBux6Oiylq1HZG9kPg4pQO79RcmoBp418Ef1hx oKbBK0Bpk1jeMqXi8Z6OuRa2mrfCG2VnedrVPyEn/Z51YJfS+7NFSEpmNMW7uMBzSunA etz2/mHg2I8kT8vZWc5n94SDtf+KEge1xl/gDBx2KA2ECdlyXR2SLpni8/ZstmIB4yUK ROQThXwRlGtT4E1P5f1btd1niAoThSF/97vlZwIjHucakKJAH3L7Sx7EXDiFE8R1lAdu oyyQ== X-Received: by 10.236.19.225 with SMTP id n61mr1316065yhn.8.1377260670052; Fri, 23 Aug 2013 05:24:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.70.228 with SMTP id p4ls1490938qeu.43.gmail; Fri, 23 Aug 2013 05:24:29 -0700 (PDT) X-Received: by 10.52.249.102 with SMTP id yt6mr13823551vdc.21.1377260669949; Fri, 23 Aug 2013 05:24:29 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id oz2si5479110veb.8.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id m17so363735vca.17 for ; Fri, 23 Aug 2013 05:24:29 -0700 (PDT) X-Gm-Message-State: ALoCoQmqNamtAW8S6JjeOlawHk+oo/2erdzYQQzHpnJGZhiF6UwrRvLTHAXArnuhVXlptKWcyS3d X-Received: by 10.52.120.78 with SMTP id la14mr7253757vdb.9.1377260669880; Fri, 23 Aug 2013 05:24:29 -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 u4csp90115vcz; Fri, 23 Aug 2013 05:24:29 -0700 (PDT) X-Received: by 10.14.241.74 with SMTP id f50mr26356232eer.29.1377260668745; Fri, 23 Aug 2013 05:24:28 -0700 (PDT) Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com [209.85.215.178]) by mx.google.com with ESMTPS id l45si16799077eep.34.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.178; Received: by mail-ea0-f178.google.com with SMTP id a15so262012eae.9 for ; Fri, 23 Aug 2013 05:24:28 -0700 (PDT) X-Received: by 10.15.27.133 with SMTP id p5mr2711580eeu.65.1377260668109; Fri, 23 Aug 2013 05:24:28 -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:27 -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 19/40] ARM: ux500: Rip out keypad initialisation which is no longer used Date: Fri, 23 Aug 2013 13:23:19 +0100 Message-Id: <1377260620-18829-20-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.172 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: , This is part of the ux500 conversion over to Device Tree only booting, but this stuff haven't been used for years. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/devices-db8500.c | 20 -------------------- arch/arm/mach-ux500/devices-db8500.h | 15 --------------- arch/arm/mach-ux500/devices.h | 1 - 3 files changed, 36 deletions(-) diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 516a6f5..3c5393b 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -56,26 +56,6 @@ struct platform_device u8500_dma40_device = { .resource = dma40_resources }; -struct resource keypad_resources[] = { - [0] = { - .start = U8500_SKE_BASE, - .end = U8500_SKE_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_DB8500_KB, - .end = IRQ_DB8500_KB, - .flags = IORESOURCE_IRQ, - }, -}; - -struct platform_device u8500_ske_keypad_device = { - .name = "nmk-ske-keypad", - .id = -1, - .num_resources = ARRAY_SIZE(keypad_resources), - .resource = keypad_resources, -}; - struct prcmu_pdata db8500_prcmu_pdata = { .ab_platdata = &ab8500_platdata, .ab_irq = IRQ_DB8500_AB8500, diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index e47039b..be1d538 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -13,7 +13,6 @@ #include "db8500-regs.h" #include "devices-common.h" -struct ske_keypad_platform_data; struct pl022_ssp_controller; struct platform_device; @@ -21,20 +20,6 @@ extern struct ab8500_platform_data ab8500_platdata; extern struct prcmu_pdata db8500_prcmu_pdata; extern struct platform_device db8500_prcmu_device; -static inline struct platform_device * -db8500_add_ske_keypad(struct device *parent, - struct ske_keypad_platform_data *pdata, - size_t size) -{ - struct resource resources[] = { - DEFINE_RES_MEM(U8500_SKE_BASE, SZ_4K), - DEFINE_RES_IRQ(IRQ_DB8500_KB), - }; - - return platform_device_register_resndata(parent, "nmk-ske-keypad", -1, - resources, 2, pdata, size); -} - static inline struct amba_device * db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, int irq, struct pl022_ssp_controller *pdata) diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h index 9b5eb69..eafb07a 100644 --- a/arch/arm/mach-ux500/devices.h +++ b/arch/arm/mach-ux500/devices.h @@ -15,6 +15,5 @@ extern struct platform_device u8500_gpio_devs[]; extern struct amba_device ux500_pl031_device; extern struct platform_device u8500_dma40_device; -extern struct platform_device ux500_ske_keypad_device; #endif