From patchwork Mon Feb 10 18:10:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 24410 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AF2F620143 for ; Mon, 10 Feb 2014 18:11:12 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wp4sf27548709obc.1 for ; Mon, 10 Feb 2014 10:11:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=jdxsJAvMst9kTZwonzElFdpiNduvfi5uZ9qmKHEfgP0=; b=DCQutd2I9RmlmtaefYjphvaPh5AUEfAvKKypwGILRFwOkIFeH7Q6T5I7UkwNERfkMj IbKek5ahKYqAGwD6rtdEj0x/myo+Ue8/5lOFCkn9akd4lONcV8vOdnfmuJJX/Cu6Iq4V OOACuk/Imu6Ywed/G1ZlT6eY7qk8EvOD4OwjfdXaH3OAZyPYU8ZFEU3UD5QoAzZjY6Kf 37SKzFaA/VQBzvfMAEw/yJswcol/E6LL5BJNZxILincf/FRcrMIGo1/fPxDm/Q+VoETa zdrlPfIoFOTSpQy5kAlISw5sQgK8W+TBvA/VN7ukAjcj/RT/4jyp/bXSxeiFK6mAwu9C l42Q== X-Gm-Message-State: ALoCoQlZBq5XhkOiE3Y5CQo2FpHpMPCkrD5iTu+kMw4vqJoT5Ca6ziyMbD0Tq1wBzozyHBXCg83A X-Received: by 10.50.108.46 with SMTP id hh14mr6877083igb.1.1392055871632; Mon, 10 Feb 2014 10:11:11 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.40 with SMTP id 37ls2101153qgu.46.gmail; Mon, 10 Feb 2014 10:11:11 -0800 (PST) X-Received: by 10.52.69.172 with SMTP id f12mr268984vdu.58.1392055871515; Mon, 10 Feb 2014 10:11:11 -0800 (PST) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id vd4si4995639vdc.91.2014.02.10.10.11.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 10:11:11 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id la4so4969987vcb.7 for ; Mon, 10 Feb 2014 10:11:11 -0800 (PST) X-Received: by 10.52.184.73 with SMTP id es9mr220625vdc.31.1392055871161; Mon, 10 Feb 2014 10:11:11 -0800 (PST) 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.220.174.196 with SMTP id u4csp187486vcz; Mon, 10 Feb 2014 10:11:10 -0800 (PST) X-Received: by 10.68.171.193 with SMTP id aw1mr38964210pbc.117.1392055870125; Mon, 10 Feb 2014 10:11:10 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zk9si16186124pac.289.2014.02.10.10.11.09; Mon, 10 Feb 2014 10:11:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752924AbaBJSLI (ORCPT + 9 others); Mon, 10 Feb 2014 13:11:08 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:33107 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752369AbaBJSLH (ORCPT ); Mon, 10 Feb 2014 13:11:07 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1AIAfAI023789; Mon, 10 Feb 2014 12:10:41 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1AIAfal001980; Mon, 10 Feb 2014 12:10:41 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Mon, 10 Feb 2014 12:10:40 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1AIAb8g030821; Mon, 10 Feb 2014 12:10:38 -0600 From: Roger Quadros To: CC: , , , , , , , Roger Quadros Subject: [PATCH] ARM: dts: OMAP2+: Fix boot with multi_v7_defconfig Date: Mon, 10 Feb 2014 20:10:35 +0200 Message-ID: <1392055835-6494-1-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 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 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: , The OMAP EHCI controller is not compatible with the EHCI platform HCD driver so don't claim that we are. This fixes boot on OMAP platforms with CONFIG_USB_EHCI_HCD_PLATFORM=y e.g. multi_v7_defconfig Reported-by: Nishanth Menon Signed-off-by: Roger Quadros --- arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/boot/dts/omap4.dtsi | 2 +- arch/arm/boot/dts/omap5.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index a5fc83b..6b5dbf8 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -641,7 +641,7 @@ }; usbhsehci: ehci@48064800 { - compatible = "ti,ehci-omap", "usb-ehci"; + compatible = "ti,ehci-omap"; reg = <0x48064800 0x400>; interrupt-parent = <&intc>; interrupts = <77>; diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index d3f8a6e..f5d754b 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -706,7 +706,7 @@ }; usbhsehci: ehci@4a064c00 { - compatible = "ti,ehci-omap", "usb-ehci"; + compatible = "ti,ehci-omap"; reg = <0x4a064c00 0x400>; interrupt-parent = <&gic>; interrupts = ; diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index a72813a..42fcffd 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -784,7 +784,7 @@ }; usbhsehci: ehci@4a064c00 { - compatible = "ti,ehci-omap", "usb-ehci"; + compatible = "ti,ehci-omap"; reg = <0x4a064c00 0x400>; interrupt-parent = <&gic>; interrupts = ;