From patchwork Fri Aug 23 12:23:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19466 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 395D0248E6 for ; Fri, 23 Aug 2013 12:24:54 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id m20sf445607qcx.3 for ; Fri, 23 Aug 2013 05:24:54 -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=u2DCWcJ3Kbzl0uRN5DonJRAYw9oQqsbs/iJsgfUkKEM=; b=ona8LYlqWe4iwV+N7GYOwiY8FnRsibsXeQtY5ZMGGuGF14fwQKT1ftRtTzaMwbeeyW gP2nD9DutrM9KuZIy4qaqoy35sTOt7fv2q9fJktdGIY9GMjF5rzju7XDHAHkJH6uP4Ia xR+Br5wOZhrqaavr9+DJhCnINtrDF2yotvUoo1RkWZ9zDCXoAQYMDXqswLkBK6fboTib MnkCUWes2SJsziGJ7de5eoRBFBUBA+tJFXYaJEy7Flt+MZLYTGySmCJ++bHhUxSWUTIr 5qUkbeO7GXvR3/5BtRYDmHrDepSFVeUhItjO0D2TQfVlLkaE8bxbD+/R2JKAZ9XoStKs vxRw== X-Received: by 10.236.189.37 with SMTP id b25mr1305955yhn.48.1377260694092; Fri, 23 Aug 2013 05:24:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.96.9 with SMTP id do9ls1382350qeb.80.gmail; Fri, 23 Aug 2013 05:24:54 -0700 (PDT) X-Received: by 10.52.164.102 with SMTP id yp6mr14205251vdb.14.1377260693931; Fri, 23 Aug 2013 05:24:53 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id j5si3082225vco.100.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.178 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.178; Received: by mail-vc0-f178.google.com with SMTP id ha12so361565vcb.37 for ; Fri, 23 Aug 2013 05:24:53 -0700 (PDT) X-Gm-Message-State: ALoCoQlDNFqb/dynegzzABp+652UoEVEm3sxjl/A7T5zG5n69V2Zc3n19143J/bOZKfQ+as9FtH8 X-Received: by 10.220.206.195 with SMTP id fv3mr16182919vcb.15.1377260693848; Fri, 23 Aug 2013 05:24:53 -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 u4csp90151vcz; Fri, 23 Aug 2013 05:24:53 -0700 (PDT) X-Received: by 10.14.110.72 with SMTP id t48mr69826eeg.89.1377260692558; Fri, 23 Aug 2013 05:24:52 -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 t9si16762067eeo.185.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:52 -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 m14so261291eaj.20 for ; Fri, 23 Aug 2013 05:24:52 -0700 (PDT) X-Received: by 10.14.184.3 with SMTP id r3mr26341096eem.49.1377260691919; Fri, 23 Aug 2013 05:24:51 -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:51 -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 32/40] ARM: ux500: Delete U8500 UIB support when booting with ATAGs Date: Fri, 23 Aug 2013 13:23:32 +0100 Message-Id: <1377260620-18829-33-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.178 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/Makefile | 1 - arch/arm/mach-ux500/board-mop500-u8500uib.c | 14 -------------- arch/arm/mach-ux500/board-mop500-uib.c | 30 +---------------------------- arch/arm/mach-ux500/board-mop500.h | 1 - 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-u8500uib.c diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index cac22ba..8634a3fa 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -10,7 +10,6 @@ obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ board-mop500-regulators.o \ board-mop500-uib.o board-mop500-stuib.o \ - board-mop500-u8500uib.o \ board-mop500-pins.o \ board-mop500-audio.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c deleted file mode 100644 index 43c9ff1..0000000 --- a/arch/arm/mach-ux500/board-mop500-u8500uib.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * Board data for the U8500 UIB, also known as the New UIB - * License terms: GNU General Public License (GPL), version 2 - */ -#include -#include - -#include "board-mop500.h" - -void __init mop500_u8500uib_init(void) -{ -} diff --git a/arch/arm/mach-ux500/board-mop500-uib.c b/arch/arm/mach-ux500/board-mop500-uib.c index bdaa422..0e94f1d 100644 --- a/arch/arm/mach-ux500/board-mop500-uib.c +++ b/arch/arm/mach-ux500/board-mop500-uib.c @@ -16,7 +16,6 @@ enum mop500_uib { STUIB, - U8500UIB, }; struct uib { @@ -31,11 +30,6 @@ static struct uib __initdata mop500_uibs[] = { .option = "stuib", .init = mop500_stuib_init, }, - [U8500UIB] = { - .name = "U8500-UIB", - .option = "u8500uib", - .init = mop500_u8500uib_init, - }, }; static struct uib *mop500_uib; @@ -93,14 +87,9 @@ static void __init __mop500_uib_init(struct uib *uib, const char *why) uib->init(); } -/* - * Detect the UIB attached based on the presence or absence of i2c devices. - */ int __init mop500_uib_init(void) { struct uib *uib = mop500_uib; - struct i2c_adapter *i2c0; - int ret; if (!cpu_is_u8500_family()) return -ENODEV; @@ -110,24 +99,7 @@ int __init mop500_uib_init(void) return 0; } - i2c0 = i2c_get_adapter(0); - if (!i2c0) { - __mop500_uib_init(&mop500_uibs[STUIB], - "fallback, could not get i2c0"); - return -ENODEV; - } - - /* U8500-UIB has the TC35893 at 0x44 on I2C0, the ST-UIB doesn't. */ - ret = i2c_smbus_xfer(i2c0, 0x44, 0, I2C_SMBUS_WRITE, 0, - I2C_SMBUS_QUICK, NULL); - i2c_put_adapter(i2c0); - - if (ret == 0) - uib = &mop500_uibs[U8500UIB]; - else - uib = &mop500_uibs[STUIB]; - - __mop500_uib_init(uib, "detected"); + __mop500_uib_init(&mop500_uibs[STUIB], "detected"); return 0; } diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index cf6b304..223639b 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -89,7 +89,6 @@ extern struct msp_i2s_platform_data msp2_platform_data; extern struct msp_i2s_platform_data msp3_platform_data; extern struct pl022_ssp_controller ssp0_plat; -void __init mop500_u8500uib_init(void); void __init mop500_stuib_init(void); void __init mop500_pinmaps_init(void); void __init snowball_pinmaps_init(void);