From patchwork Wed Apr 16 17:13:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Yanovich X-Patchwork-Id: 4003001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 09F86BFF02 for ; Wed, 16 Apr 2014 17:16:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 327A320377 for ; Wed, 16 Apr 2014 17:16:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 78E2B20374 for ; Wed, 16 Apr 2014 17:16:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaTQ5-0007uy-C2; Wed, 16 Apr 2014 17:14:45 +0000 Received: from mail-la0-x229.google.com ([2a00:1450:4010:c03::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WaTQ2-0007iR-3b for linux-arm-kernel@lists.infradead.org; Wed, 16 Apr 2014 17:14:42 +0000 Received: by mail-la0-f41.google.com with SMTP id gl10so8549223lab.0 for ; Wed, 16 Apr 2014 10:14:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lUrB8fcvkwYO/jXA74D3fTcJ78PP4scSxTTQKdR1bxw=; b=noFmLHxd7GPgnOC319oY1A360IHAfU/uW2hOftwNggfZ2lWwtheqMc+ISX2ydKeVR3 Ktw5OmRPdXNeliRXDU1aSQi0D6Ixjtd9RzJR0Fw5hUflNwCd900aWQt0gj+8pRwd0bWA nEN69ZCQ2fNYy3ugTXg2iZxL9qz8qS0xTYC+JnWkL8mv2mN2rnq/wlvS5jK5O3XHdvHN KDZWSOKC8rTG2p5HZG1tv40ApAWVCGm5S15oRKEBvOc1oXe07jP6mO+5GKBjv4CKsfJN sHIh7wAdjRQ/fQEIOb/psbugKcOYFd9s4bY4JFIyZRCz9+A4bpDrqOO2zmvMBbhYQI/c 3Xww== X-Received: by 10.112.205.35 with SMTP id ld3mr3555629lbc.1.1397668459626; Wed, 16 Apr 2014 10:14:19 -0700 (PDT) Received: from host5.omatika.ru (0893675324.static.corbina.ru. [95.31.1.192]) by mx.google.com with ESMTPSA id jp6sm21178322lbc.15.2014.04.16.10.14.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Apr 2014 10:14:18 -0700 (PDT) From: Sergei Ianovich To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 02/21] ARM: dts: pxa2xx fix compatible strings Date: Wed, 16 Apr 2014 21:13:12 +0400 Message-Id: <1397668411-27162-3-git-send-email-ynvich@gmail.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1397668411-27162-1-git-send-email-ynvich@gmail.com> References: <1387309071-22382-1-git-send-email-ynvich@gmail.com> <1397668411-27162-1-git-send-email-ynvich@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140416_101442_336359_E7A7010E X-CRM114-Status: GOOD ( 10.57 ) X-Spam-Score: -0.1 (/) Cc: Mark Rutland , "open list:OPEN FIRMWARE AND..." , Russell King , Arnd Bergmann , Pawel Moll , Ian Campbell , Haojian Zhuang , Daniel Mack , Sergei Ianovich , Rob Herring , Kumar Gala X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Sergei Ianovich CC: Daniel Mack CC: Haojian Zhuang CC: Arnd Bergmann --- v3..v4 v2..v3 v1..v2 * no changes arch/arm/boot/dts/pxa2xx.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index a5e90f0..3419f87 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -18,7 +18,6 @@ serial1 = &btuart; serial2 = &stuart; serial3 = &hwuart; - i2c0 = &pwri2c; i2c1 = &pxai2c1; }; @@ -113,14 +112,14 @@ }; usb0: ohci@4c000000 { - compatible = "mrvl,pxa-ohci"; + compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x10000>; interrupts = <3>; status = "disabled"; }; mmc0: mmc@41100000 { - compatible = "mrvl,pxa-mmc"; + compatible = "marvell,pxa-mmc"; reg = <0x41100000 0x1000>; interrupts = <23>; status = "disabled";