From patchwork Fri Dec 14 14:17:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 13583 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 A57E623FC0 for ; Fri, 14 Dec 2012 14:17:38 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3B650A18CC0 for ; Fri, 14 Dec 2012 14:17:38 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so3104383iag.11 for ; Fri, 14 Dec 2012 06:17:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=6I/oDEK2WI5VyaPGLM3G0Osywwd7giy2CtIJqPVwMso=; b=YzmkolnP5K9T1nUm09ISURxUrTqznx6mGJ1oyC/dEC9B+h+sJMILesT1xPwaDS7GbC Cou7KLKieXNNtUJyHilKSr5t434u/OdEAsREuW9QcPGwJfYNved/PJ1BZtWmvR9LnwSK 8KSRResNwo58Ig1WSdIUiJGiD29UyeeRMCHJVLXBd2nzzqRH5dVCJPxJzH46jwzE2VYX 51jqL0zm9DkvM3jBIwD+RyyLKXmTe5vaOPIHu4iO8OpQEagwWzc8hzME8iTu7fAGoedy vrTuFgZ+TJTSSyZtgtEcKQ958X1pOTzLPxxkVd8fPkq6qBb7vJduBN9L61mNLA1DN2Gy 3fHw== Received: by 10.42.32.200 with SMTP id f8mr4542772icd.18.1355494657591; Fri, 14 Dec 2012 06:17:37 -0800 (PST) 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.50.67.148 with SMTP id n20csp74537igt; Fri, 14 Dec 2012 06:17:36 -0800 (PST) Received: by 10.204.153.15 with SMTP id i15mr2941711bkw.64.1355494655990; Fri, 14 Dec 2012 06:17:35 -0800 (PST) Received: from eu1sys200aog109.obsmtp.com (eu1sys200aog109.obsmtp.com [207.126.144.127]) by mx.google.com with SMTP id ha9si8737158bkc.98.2012.12.14.06.17.21 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 06:17:35 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.127 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.127; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.127 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 eu1sys200aob109.postini.com ([207.126.147.11]) with SMTP ID DSNKUMs06+zpOsoc+SDCKm8AVobMVRi03NxQ@postini.com; Fri, 14 Dec 2012 14:17:35 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 CBAD5F0; Fri, 14 Dec 2012 14:08:57 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 3F9981103; Fri, 14 Dec 2012 14:17:09 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 6D26524C07C; Fri, 14 Dec 2012 15:17:01 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 14 Dec 2012 15:17:08 +0100 From: Linus Walleij To: Cc: , Anmar Oueja , Linus Walleij Subject: [PATCH] ARM: u300: delete custom pin hog code Date: Fri, 14 Dec 2012 15:17:02 +0100 Message-ID: <1355494622-26022-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmB8bJZos/Ed+aIF3iBWV/YxAxY/7qipDTorDwvBcJvhxPlCWNql7rEop3RZkGI/boiOY/r From: Linus Walleij With recent changes in the kernel, the MMCI and PL011 UART drivers will autonomously request their pins to be muxed in, so this machine-specific pin hogging code is just interfering with the proper mechanism and causing regressions in the v3.8 kernel. Delete it and the problems go away. Signed-off-by: Linus Walleij --- Hi ARM SoC guys: please line up this one U300 patch for the ARM fixes during/following the v3.8 merge window. --- arch/arm/mach-u300/core.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 12f3994..0374b98 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -1543,39 +1542,6 @@ static struct pinctrl_map __initdata u300_pinmux_map[] = { pin_highz_conf), }; -struct u300_mux_hog { - struct device *dev; - struct pinctrl *p; -}; - -static struct u300_mux_hog u300_mux_hogs[] = { - { - .dev = &uart0_device.dev, - }, - { - .dev = &mmcsd_device.dev, - }, -}; - -static int __init u300_pinctrl_fetch(void) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(u300_mux_hogs); i++) { - struct pinctrl *p; - - p = pinctrl_get_select_default(u300_mux_hogs[i].dev); - if (IS_ERR(p)) { - pr_err("u300: could not get pinmux hog for dev %s\n", - dev_name(u300_mux_hogs[i].dev)); - continue; - } - u300_mux_hogs[i].p = p; - } - return 0; -} -subsys_initcall(u300_pinctrl_fetch); - /* * Notice that AMBA devices are initialized before platform devices. *