From patchwork Fri Jul 18 12:11:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 33850 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C5FDD208CF for ; Fri, 18 Jul 2014 13:35:28 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id l6sf10941068qcy.1 for ; Fri, 18 Jul 2014 06:35:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=I5I3oE2Z6gDMYPvjruG6dsblRMRVJlX43B4MVI9ziVY=; b=YNE4t1uShjn+F4QCB7ZRQLTGFUKTkZ72O5EOdd/suFkfJhNNdHzm/qQSSS9qXz10Xi DWHjHi6AQNJqAnCtctsuuSUYUVJ31vZIPmnXcDQUgs46rCZeKO4EC2GOZjG7nKT9cQ52 8xI2G5jQ86zTRSbq2clVzb4wYPGgZ9Ikeff2HFl/DqKSZoj3dv8Pm2bWGobmJm/nDlnm UmGXMvcHk1dMZu9Dy07g74XQUjjkhl2oydeudlPkuyj5JbweZp/hp2PWyU+Zww4qNVLm FaLdeG6Yvxzfew2YRW2pZd1ll46vTclOdK+ng3jg5ZBB5XkP08N3Bok04IN9y2e52gMl Qb0A== X-Gm-Message-State: ALoCoQnhb7TH7QRwjwI1aLP64Jxhm4TYZYewmJMyjMjxdUpEOP1Z6O3Wrd8taw5SjOdxAF3lzd9/ X-Received: by 10.224.171.130 with SMTP id h2mr2342853qaz.7.1405690525952; Fri, 18 Jul 2014 06:35:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.38 with SMTP id g35ls967172qgg.1.gmail; Fri, 18 Jul 2014 06:35:25 -0700 (PDT) X-Received: by 10.221.68.135 with SMTP id xy7mr5699070vcb.65.1405690525779; Fri, 18 Jul 2014 06:35:25 -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 dj5si5695455vcb.21.2014.07.18.06.35.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jul 2014 06:35:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so7213218vcb.31 for ; Fri, 18 Jul 2014 06:35:21 -0700 (PDT) X-Received: by 10.52.120.38 with SMTP id kz6mr4876070vdb.86.1405690520989; Fri, 18 Jul 2014 06:35:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp11787vcb; Fri, 18 Jul 2014 06:35:20 -0700 (PDT) X-Received: by 10.70.100.34 with SMTP id ev2mr5066926pdb.81.1405690520003; Fri, 18 Jul 2014 06:35:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jx3si5886387pbc.150.2014.07.18.06.35.10; Fri, 18 Jul 2014 06:35:10 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965943AbaGRNay (ORCPT + 25 others); Fri, 18 Jul 2014 09:30:54 -0400 Received: from bband-dyn38.178-41-141.t-com.sk ([178.41.141.38]:17830 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1161114AbaGRNPi (ORCPT ); Fri, 18 Jul 2014 09:15:38 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.82) (envelope-from ) id 1X8720-0004us-RN; Fri, 18 Jul 2014 14:12:56 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Linus Walleij , Arnd Bergmann , Felipe Balbi , Jiri Slaby Subject: [PATCH 3.12 068/170] usb: musb: ux500: don't propagate the OF node Date: Fri, 18 Jul 2014 14:11:13 +0200 Message-Id: <52b2230ba2b957ab4a995f13cd7cd40310610755.1405685481.git.jslaby@suse.cz> X-Mailer: git-send-email 2.0.0 In-Reply-To: <48e8cad86bb1241c08bdaa80db022c25068ff8e0.1405685481.git.jslaby@suse.cz> References: <48e8cad86bb1241c08bdaa80db022c25068ff8e0.1405685481.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 82363cf2eeafeea6ba88849f5e2febdc8a05943f upstream. There is a regression in the upcoming v3.16-rc1, that is caused by a problem that has been around for a while but now finally hangs the system. The bootcrawl looks like this: pinctrl-nomadik soc:pinctrl: pin GPIO256_AF28 already requested by a03e0000.usb_per5; cannot claim for musb-hdrc.0.auto pinctrl-nomadik soc:pinctrl: pin-256 (musb-hdrc.0.auto) status -22 pinctrl-nomadik soc:pinctrl: could not request pin 256 (GPIO256_AF28) from group usb_a_1 on device pinctrl-nomadik musb-hdrc musb-hdrc.0.auto: Error applying setting, reverse things back HS USB OTG: no transceiver configured musb-hdrc musb-hdrc.0.auto: musb_init_controller failed with status -517 platform musb-hdrc.0.auto: Driver musb-hdrc requests probe deferral (...) The ux500 MUSB driver propagates the OF node to the dynamically created musb-hdrc device, which is incorrect as it makes the OF core believe there are two devices spun from the very same DT node, which confuses other parts of the device core, notably the pin control subsystem, which will try to apply all the pin control settings also to the HDRC device as it gets instantiated. (The OMAP2430 for example, does not set the of_node member.) Cc: Arnd Bergmann Acked-by: Lee Jones Signed-off-by: Linus Walleij Signed-off-by: Felipe Balbi Signed-off-by: Jiri Slaby --- drivers/usb/musb/ux500.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index 59256b12f746..8264256271f8 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -275,7 +275,6 @@ static int ux500_probe(struct platform_device *pdev) musb->dev.parent = &pdev->dev; musb->dev.dma_mask = &pdev->dev.coherent_dma_mask; musb->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask; - musb->dev.of_node = pdev->dev.of_node; glue->dev = &pdev->dev; glue->musb = musb;