From patchwork Wed Jun 19 19:54:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 2751871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 35CD79F96B for ; Wed, 19 Jun 2013 19:59:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 327042025C for ; Wed, 19 Jun 2013 19:59:05 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CB54D2023E for ; Wed, 19 Jun 2013 19:59:03 +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 1UpOUu-0006W2-R4; Wed, 19 Jun 2013 19:56:55 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpOUB-0004CY-Tj; Wed, 19 Jun 2013 19:56:07 +0000 Received: from smtp11.mail.ru ([94.100.176.85]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpOTW-00047m-43 for linux-arm-kernel@lists.infradead.org; Wed, 19 Jun 2013 19:55:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=A+b77g/CjKuyB9QoSZhC4Lvw4WQNsKtSTm9MB3j4xIs=; b=mtlhC2f4gEGy2yYdRYUFr2D0/mo52A7IXXowk7TwDhM97piDfb25KjkvrJtimIKo54duAEfGBvcPHy14OtVt70TvQLMl4RG/AEdEUTmQ4VPTpWZjIofklAjwOap1wee+xJEWNgcSEtBurc2QoQy6u47yepooRG5c6syOWtMksZw=; Received: from [188.134.40.128] (port=25762 helo=shc.zet) by smtp11.mail.ru with esmtpa (envelope-from ) id 1UpOT5-0005WI-Rv; Wed, 19 Jun 2013 23:55:00 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 7/7] drivers: bus: imx-weim: Change compatible string for i.MX6Q Date: Wed, 19 Jun 2013 23:54:38 +0400 Message-Id: <1371671678-6345-7-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1371671678-6345-1-git-send-email-shc_work@mail.ru> References: <1371671678-6345-1-git-send-email-shc_work@mail.ru> X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130619_155526_868350_20F2FD0C X-CRM114-Status: GOOD ( 13.35 ) X-Spam-Score: -2.0 (--) Cc: Russell King , Alexander Shiyan , Arnd Bergmann , Sascha Hauer , Huang Shijie , Olof Johansson , Shawn Guo 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=-5.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 This patch changes compatible string for i.MX6Q to "fsl,imx50-weim" since this is a lowest CPU type with same bus. Signed-off-by: Alexander Shiyan --- Documentation/devicetree/bindings/bus/imx-weim.txt | 2 +- drivers/bus/imx-weim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/bus/imx-weim.txt b/Documentation/devicetree/bindings/bus/imx-weim.txt index 99406e4..b134811 100644 --- a/Documentation/devicetree/bindings/bus/imx-weim.txt +++ b/Documentation/devicetree/bindings/bus/imx-weim.txt @@ -33,7 +33,7 @@ Timing property for child nodes. It is mandatory, not optional. Example for an imx6q-sabreauto board, the NOR flash connected to the WEIM: weim: weim@021b8000 { - compatible = "fsl,imx6q-weim"; + compatible = "fsl,imx6q-weim", "fsl,imx50-weim"; reg = <0x021b8000 0x4000>; clocks = <&clks 196>; #address-cells = <2>; diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 77fa1d4..3f665f8 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -47,7 +47,7 @@ static const struct of_device_id weim_id_table[] = { /* i.MX25/27/31/35 */ { .compatible = "fsl,imx25-weim", .data = &imx25_weim_devtype, }, /* i.MX50/53/6Q */ - { .compatible = "fsl,imx6q-weim", .data = &imx50_weim_devtype, }, + { .compatible = "fsl,imx50-weim", .data = &imx50_weim_devtype, }, /* i.MX51 */ { .compatible = "fsl,imx51-weim", .data = &imx51_weim_devtype, }, { }