From patchwork Sun Dec 8 22:53:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Yanovich X-Patchwork-Id: 3307811 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 12B8AC0D4A for ; Sun, 8 Dec 2013 22:55:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C89E20251 for ; Sun, 8 Dec 2013 22:55:34 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 677E72024F for ; Sun, 8 Dec 2013 22:55:33 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpnFc-0002W1-Pl; Sun, 08 Dec 2013 22:55:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpnFR-0007j7-LM; Sun, 08 Dec 2013 22:54:49 +0000 Received: from mail-la0-x230.google.com ([2a00:1450:4010:c03::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpnFH-0007g0-Pr for linux-arm-kernel@lists.infradead.org; Sun, 08 Dec 2013 22:54:41 +0000 Received: by mail-la0-f48.google.com with SMTP id n7so1054249lam.21 for ; Sun, 08 Dec 2013 14:54:17 -0800 (PST) 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=FP/ttSCHDHMpjb0hNdJZZEAck1BO7tv5mJvSQb9j2sk=; b=Y77nxANKtj1V6EfnnWZQBfwxWfHQYdGWd4/X0g8aY8OR9BzEtYDGbgTu9pezA53yrn VEJYDOoXUbYhvZZ9KY1GG8e6uRp6O0n048bvdg3vyBOotT7YdfvXPZhkZo/GZ/mT1D54 udTlfxMXjIEztY/KoTp/ge8jr8FbDEtTmNY/WBB12OKe5zWMuv7Bsh9h3W7+An2ASDH1 rZTorJk8MyQlR00zylqcZMBw2DslTACmbfOvFORoJWMh4mY1+BjUU2Ymtul5W4eWFahE uySaYif6DEN+q0Mhj8GPBadVvQzjGQlA1Ni5dwexpRjns2eurCiX2pw11gA7NehUsDkb ezpg== X-Received: by 10.152.87.142 with SMTP id ay14mr3766301lab.7.1386543257481; Sun, 08 Dec 2013 14:54:17 -0800 (PST) Received: from host5.omatika.ru (0893675324.static.corbina.ru. [95.31.1.192]) by mx.google.com with ESMTPSA id a8sm9892011lae.5.2013.12.08.14.54.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Dec 2013 14:54:16 -0800 (PST) From: Sergei Ianovich To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/9] ARM: dts: pxa2xx fix compatible strings Date: Mon, 9 Dec 2013 02:53:41 +0400 Message-Id: <1386543229-1542-2-git-send-email-ynvich@gmail.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386543229-1542-1-git-send-email-ynvich@gmail.com> References: <1386348542-9584-1-git-send-email-ynvich@gmail.com> <1386543229-1542-1-git-send-email-ynvich@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131208_175440_092112_E4BE45FD X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Mark Rutland , "open list:OPEN FIRMWARE AND..." , Russell King , Arnd Bergmann , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , Daniel Mack , Sergei Ianovich 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SBL, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no 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: Arnd Bergmann --- 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";