From patchwork Fri Dec 2 10:36:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9458177 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5239360515 for ; Fri, 2 Dec 2016 10:37:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3067B1FFBD for ; Fri, 2 Dec 2016 10:37:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25439284E3; Fri, 2 Dec 2016 10:37:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B99871FFBD for ; Fri, 2 Dec 2016 10:37:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933938AbcLBKhZ (ORCPT ); Fri, 2 Dec 2016 05:37:25 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:36275 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933919AbcLBKhY (ORCPT ); Fri, 2 Dec 2016 05:37:24 -0500 Received: from penelope.kanocho.kobe.vergenet.net (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPSA id BBA5E25B853; Fri, 2 Dec 2016 21:37:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1480675034; bh=TmrNNrI9wdMsCZUdX9QluYfcvu0mpgzS0sxIZbc3OOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vqx+H7Nudho1IyjkdhxR9ZEQEx+HvbLiWkhe3ev0t5zxhMcSqZpRIqtSag92eX+Gg cPF2GZRXYuB2kjQ24G6vQqBslaQRVFzsunByqkADlt9T/yy0ufVbxqPccxgRgJRHqt UvK289JwRBX6df/3CVXyr1MHriyKNdQgqXZFrZzc= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id 3821F60786; Fri, 2 Dec 2016 11:37:10 +0100 (CET) From: Simon Horman To: Bjorn Helgaas Cc: Phil Edworthy , Magnus Damm , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Rob Herring , devicetree@vger.kernel.org, Simon Horman Subject: [PATCH v2 2/3 pci/next] PCI: rcar: Use gen2 fallback compatibility last Date: Fri, 2 Dec 2016 11:36:59 +0100 Message-Id: <1480675020-26346-3-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1480675020-26346-1-git-send-email-horms+renesas@verge.net.au> References: <1480675020-26346-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fallback compatibility strings should be used only if more specific ones are matched and the order of compatibility strings in the corresponding struct of_device_id should implement this. This does not have a run-time effect as current all relevant compatibility strings result in the same initialisation. Signed-off-by: Simon Horman Reviewed-by: Geert Uytterhoeven --- v2 * New patch --- drivers/pci/host/pcie-rcar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 62700d1896f4..85971bc276c6 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -1071,12 +1071,12 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie, static const struct of_device_id rcar_pcie_of_match[] = { { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 }, - { .compatible = "renesas,pcie-rcar-gen2", - .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init_gen2 }, + { .compatible = "renesas,pcie-rcar-gen2", + .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init }, {}, };