From patchwork Wed Mar 27 21:03:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 15707 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4488323EB1 for ; Wed, 27 Mar 2013 21:03:49 +0000 (UTC) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by fiordland.canonical.com (Postfix) with ESMTP id 01BE7A183DE for ; Wed, 27 Mar 2013 21:03:48 +0000 (UTC) Received: by mail-ve0-f174.google.com with SMTP id jz10so4641704veb.33 for ; Wed, 27 Mar 2013 14:03:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type:x-gm-message-state; bh=58ymGe4zqb420enQs8dxZI33MUWy5fCX8sY/1KKaLF4=; b=Y32a6RPo0aPn7/y4YfLCvNt6H2vqjGLJmQUuRCTOTCPHPqUiq1Mqrn3BTaaM3k1n7m zyhK4gQQvpXmMs8taJCQh6Nr0aKJBs+ffdBNisiySYSn0ueYG64PqUeY+ppCsmcdipxb qDIidwZlUtdWuniTKM23rjMDZCRZUmySrGDciEdMXsTWEI6gzj/7fuvQQ9qccXoAHKmZ 5qinSjGlDsg212Y3QpCspX+G0eeDYOf92ejt0kge9FctxR/y7G/e0BIqFlJOzg626s3N 8K6DD8byLMai1/FdBpVumbK3QutVXSVK+uTiL6Q9AEoifaHN0Q8Fsb2CaNJPmmA50Tvb 0Jqw== X-Received: by 10.220.153.143 with SMTP id k15mr25013071vcw.33.1364418228506; Wed, 27 Mar 2013 14:03:48 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.59.4.204 with SMTP id cg12csp133382ved; Wed, 27 Mar 2013 14:03:47 -0700 (PDT) X-Received: by 10.15.23.193 with SMTP id h41mr59854658eeu.17.1364418227385; Wed, 27 Mar 2013 14:03:47 -0700 (PDT) Received: from eu1sys200aog107.obsmtp.com (eu1sys200aog107.obsmtp.com [207.126.144.123]) by mx.google.com with SMTP id i43si34884352eem.132.2013.03.27.14.03.41 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 27 Mar 2013 14:03:47 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.123 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.123; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.123 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob107.postini.com ([207.126.147.11]) with SMTP ID DSNKUVNeq3Qrf9h//KVcbwu/qvgssgJYkrQU@postini.com; Wed, 27 Mar 2013 21:03:47 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 9B8C8B3; Wed, 27 Mar 2013 20:55:26 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 383B010DC; Wed, 27 Mar 2013 21:03:33 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 6C181A8074; Wed, 27 Mar 2013 22:03:24 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.279.5; Wed, 27 Mar 2013 22:03:31 +0100 From: Linus Walleij To: Cc: , Lee Jones , Linus Walleij Subject: [PATCH 2/3] ARM: ux500: Stop passing ios_handler() as an MMCI power controlling call-back Date: Wed, 27 Mar 2013 22:03:19 +0100 Message-ID: <1364418200-15628-3-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1364418200-15628-1-git-send-email-linus.walleij@stericsson.com> References: <1364418200-15628-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQm6llNkfAhma4YVPolJnGW+n7LUNXSir8WAkcCxThwONax8AXKUYfhT6xW1CLn4x71xQ+5L From: Lee Jones This fixes a regression introduced during the v3.9 merge window. Now MMCI on/off functionality is using the regulator framework from the MMCI driver, if we provide the ios_handler call-back we essentially duplicate functionality, which causes a large mess and lots of booting issues. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500-sdi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 051b62c..7f2cb6c 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -81,7 +81,6 @@ static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = { #endif struct mmci_platform_data mop500_sdi0_data = { - .ios_handler = mop500_sdi0_ios_handler, .ocr_mask = MMC_VDD_29_30, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA |