From patchwork Tue Jun 10 08:54:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 31607 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 57D9820675 for ; Tue, 10 Jun 2014 08:54:53 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id j17sf20653734oag.8 for ; Tue, 10 Jun 2014 01:54:53 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=d8e03Ll/vZM9iyYolxEnZ/uYwx+tEhVHflgpXbrNdeQ=; b=fPBEsPiOY5TbXwInbQPT+z5bvsltpwfaIadA4XkN9FZ4nrk7UhCDVYi4kE0A6pv9OH UZCNSzq2X0yyyNZYcGcR9SUOh0t/fd1ckwH2PoDpVoRbrAW5tm6MwBvKCafOTN4Fxa9Z ZilKnOAmFzi0tmM3ueCw8CQgmX226uROrKNi832T8gVL2LnNSsPVdZbkLjdV3ch7RDRv Hl9rlq8DCqN2vs8cqZTS0rjiuOCpuNBEWBnuNLPbpJ5nJcjQ33vULVj5eRTwN8lPy6Y7 xkjvDyHOI6OW6C+ZrEy4kw5B+EQCt04P60oX+e4i00f1GF6uQ8Ct5AlqO8WU84JDY8DF m3Kg== X-Gm-Message-State: ALoCoQkr3P6sMuf741Pm8yc+V5US+KfRvUn1+IjFXBUW64i0Kyt6rHXuHrn8sFJGpY0+XA3E6TJp X-Received: by 10.42.194.207 with SMTP id dz15mr3924709icb.10.1402390492981; Tue, 10 Jun 2014 01:54:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.106.98 with SMTP id d89ls2044651qgf.57.gmail; Tue, 10 Jun 2014 01:54:52 -0700 (PDT) X-Received: by 10.58.109.71 with SMTP id hq7mr32171381veb.26.1402390492815; Tue, 10 Jun 2014 01:54:52 -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 kj8si12829256vdb.27.2014.06.10.01.54.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 01:54:52 -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 hy10so2066068vcb.17 for ; Tue, 10 Jun 2014 01:54:52 -0700 (PDT) X-Received: by 10.58.127.101 with SMTP id nf5mr777082veb.50.1402390492494; Tue, 10 Jun 2014 01:54:52 -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.54.6 with SMTP id vs6csp209025vcb; Tue, 10 Jun 2014 01:54:52 -0700 (PDT) X-Received: by 10.68.202.167 with SMTP id kj7mr9337636pbc.160.1402390491725; Tue, 10 Jun 2014 01:54:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cw3si33633418pbc.117.2014.06.10.01.54.51; Tue, 10 Jun 2014 01:54:51 -0700 (PDT) Received-SPF: none (google.com: linux-usb-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 S1751144AbaFJIyr (ORCPT + 3 others); Tue, 10 Jun 2014 04:54:47 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:34879 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751135AbaFJIy0 (ORCPT ); Tue, 10 Jun 2014 04:54:26 -0400 Received: by mail-wi0-f171.google.com with SMTP id n15so2649805wiw.16 for ; Tue, 10 Jun 2014 01:54:25 -0700 (PDT) X-Received: by 10.194.77.39 with SMTP id p7mr12792937wjw.85.1402390465338; Tue, 10 Jun 2014 01:54:25 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id vp5sm28580309wjc.31.2014.06.10.01.54.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jun 2014 01:54:24 -0700 (PDT) From: Linus Walleij To: Felipe Balbi Cc: linux-usb@vger.kernel.org, Linus Walleij , stable@vger.kernel.org, Lee Jones , Arnd Bergmann Subject: [PATCH] usb: musb: ux500: don't propagate the OF node Date: Tue, 10 Jun 2014 10:54:16 +0200 Message-Id: <1402390456-26794-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-usb-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.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: , 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: stable@vger.kernel.org Cc: Lee Jones Cc: Arnd Bergmann Cc: Felipe Balbi Signed-off-by: Linus Walleij --- 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 c2e45e632723..f202e5088461 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -274,7 +274,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;