From patchwork Fri Aug 23 12:23:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19451 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BA2F3248E6 for ; Fri, 23 Aug 2013 12:24:26 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id bv4sf445797qab.0 for ; Fri, 23 Aug 2013 05:24:26 -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=ldnAcGEMoG0XOUKDkgY4XVRjrrHIAswLouVOeTDoQPI=; b=gpl4ni8XcvUlyuhvkuLpKZZFC8zl9uzgM+/aYY35UAnpSPbfUE7kSQn50/ieqRwiWt KU+7ml0h098swhvMqh6aRwHHfecklqRlqok6I9n9X1xVb/l0lTOdxDXtBYOSm/ndBK68 3hAZ/ibagFb1nTG9KBuzIGNXTtcgzx1AX12QaJFX0028+zMGta3tq/Of7sW8Vlo4rQ3j MYXIl0tj6ueP4BlXAb61CRCCVgqBrlLkgZykxrISr6EBBO7PaYXUCYnS3S9EBzc+3/ue b0O+w+B/M0/SKEV0RiD9mKsn99ix2yu0+D/qxiVGVP6bWnfCfUTf3CBhzyRT6p73yr9i azKw== X-Received: by 10.224.74.72 with SMTP id t8mr16772095qaj.4.1377260666612; Fri, 23 Aug 2013 05:24:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.96.9 with SMTP id do9ls1382159qeb.80.gmail; Fri, 23 Aug 2013 05:24:26 -0700 (PDT) X-Received: by 10.52.120.78 with SMTP id la14mr7253602vdb.9.1377260666532; Fri, 23 Aug 2013 05:24:26 -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 to10si729858vdc.18.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:26 -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 c13so364880vea.38 for ; Fri, 23 Aug 2013 05:24:26 -0700 (PDT) X-Gm-Message-State: ALoCoQnejvGN9vQj7BiYVYI2w9DXVIFlsK1rSRcQAeGGKyGkyj35USH/l7WrGMFFmrdLmDv9xN09 X-Received: by 10.58.155.68 with SMTP id vu4mr16416472veb.21.1377260666442; Fri, 23 Aug 2013 05:24:26 -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 u4csp90109vcz; Fri, 23 Aug 2013 05:24:25 -0700 (PDT) X-Received: by 10.14.220.200 with SMTP id o48mr2883385eep.62.1377260665262; Fri, 23 Aug 2013 05:24:25 -0700 (PDT) Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by mx.google.com with ESMTPS id i5si16800644eeg.25.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.171 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.171; Received: by mail-ea0-f171.google.com with SMTP id n15so262592ead.2 for ; Fri, 23 Aug 2013 05:24:24 -0700 (PDT) X-Received: by 10.14.103.69 with SMTP id e45mr11273710eeg.51.1377260664621; Fri, 23 Aug 2013 05:24:24 -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:23 -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 17/40] ARM: ux500: Remove I2C support when booting with ATAG support Date: Fri, 23 Aug 2013 13:23:17 +0100 Message-Id: <1377260620-18829-18-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 | 13 ------------- arch/arm/mach-ux500/board-mop500.h | 1 - arch/arm/mach-ux500/devices-common.h | 14 -------------- arch/arm/mach-ux500/devices-db8500.h | 11 ----------- 4 files changed, 39 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index fd1e0bc..447d37d 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -14,8 +14,6 @@ #include #include #include -#include -#include #include #include #include @@ -54,14 +52,6 @@ struct ab8500_platform_data ab8500_platdata = { .regulator = &ab8500_regulator_plat_data, }; -static void __init mop500_i2c_init(struct device *parent) -{ - db8500_add_i2c0(parent, NULL); - db8500_add_i2c1(parent, NULL); - db8500_add_i2c2(parent, NULL); - db8500_add_i2c3(parent, NULL); -} - #ifdef CONFIG_STE_DMA40 static struct stedma40_chan_cfg ssp0_dma_cfg_rx = { .mode = STEDMA40_MODE_LOGICAL, @@ -175,7 +165,6 @@ static void __init mop500_init_machine(void) mop500_pinmaps_init(); parent = u8500_init_devices(); - mop500_i2c_init(parent); mop500_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); @@ -193,7 +182,6 @@ static void __init snowball_init_machine(void) snowball_pinmaps_init(); parent = u8500_init_devices(); - mop500_i2c_init(parent); snowball_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); @@ -211,7 +199,6 @@ static void __init hrefv60_init_machine(void) hrefv60_pinmaps_init(); parent = u8500_init_devices(); - mop500_i2c_init(parent); hrefv60_sdi_init(parent); mop500_spi_init(parent); mop500_uart_init(parent); diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index cfc553c..341fad1 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -79,7 +79,6 @@ #define SNOWBALL_EN_3V3_ETH_GPIO MOP500_AB8500_PIN_GPIO(26) /* GPIO26 */ struct device; -struct i2c_board_info; extern struct mmci_platform_data mop500_sdi0_data; extern struct mmci_platform_data mop500_sdi1_data; extern struct mmci_platform_data mop500_sdi2_data; diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index 04fa009..34ec2f7 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h @@ -12,7 +12,6 @@ #include #include #include -#include struct spi_master_cntlr; @@ -44,19 +43,6 @@ dbx500_add_uart(struct device *parent, const char *name, resource_size_t base, return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0); } -struct nmk_i2c_controller; - -static inline struct amba_device * -dbx500_add_i2c(struct device *parent, int id, resource_size_t base, int irq, - struct nmk_i2c_controller *data) -{ - /* Conjure a name similar to what the platform device used to have */ - char name[16]; - - snprintf(name, sizeof(name), "nmk-i2c.%d", id); - return amba_apb_device_add(parent, name, base, SZ_4K, irq, 0, data, 0); -} - static inline struct amba_device * dbx500_add_rtc(struct device *parent, resource_size_t base, int irq) { diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index 3d32668..64667f6 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h @@ -42,17 +42,6 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0); } -#define db8500_add_i2c0(parent, pdata) \ - dbx500_add_i2c(parent, 0, U8500_I2C0_BASE, IRQ_DB8500_I2C0, pdata) -#define db8500_add_i2c1(parent, pdata) \ - dbx500_add_i2c(parent, 1, U8500_I2C1_BASE, IRQ_DB8500_I2C1, pdata) -#define db8500_add_i2c2(parent, pdata) \ - dbx500_add_i2c(parent, 2, U8500_I2C2_BASE, IRQ_DB8500_I2C2, pdata) -#define db8500_add_i2c3(parent, pdata) \ - dbx500_add_i2c(parent, 3, U8500_I2C3_BASE, IRQ_DB8500_I2C3, pdata) -#define db8500_add_i2c4(parent, pdata) \ - dbx500_add_i2c(parent, 4, U8500_I2C4_BASE, IRQ_DB8500_I2C4, pdata) - #define db8500_add_rtc(parent) \ dbx500_add_rtc(parent, U8500_RTC_BASE, IRQ_DB8500_RTC);