From patchwork Wed Dec 14 02:10:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9473607 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 9D5E760823 for ; Wed, 14 Dec 2016 02:11:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85CE1286E4 for ; Wed, 14 Dec 2016 02:11:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76979286E6; Wed, 14 Dec 2016 02:11:29 +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 F08E7286E4 for ; Wed, 14 Dec 2016 02:11:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754643AbcLNCL1 (ORCPT ); Tue, 13 Dec 2016 21:11:27 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:48229 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750999AbcLNCL1 (ORCPT ); Tue, 13 Dec 2016 21:11:27 -0500 Received: from pug.jp.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id uBE2Anb2004036; Wed, 14 Dec 2016 11:10:49 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com uBE2Anb2004036 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1481681450; bh=3HZ+EltkyJrEFWXUBcW6lKEMju0a3AnknHckhUKJC/E=; h=From:To:Cc:Subject:Date:From; b=VaCw94es24m1IZJMkbGvti7LYdKHm7dLDvPpiLAR8ceYViXXb4Ksh1ugZJ/JKRCdf LXaIEBeBYAY8CfEPV4AJukP8rCreieIiI9sC/hjEmNACyzPRNouGgAXSvydAzdmJ57 1oFl1EYcMUoSXjw6PUuurj5/jkLIrpSfg/h+c8t4w49Iq9ISy6qZRQaL+7phd8aJyG sgNSe/NwFKvu4vLax6gvtY2XqFdYXkEedWW7Hv/OekmHNPJMukpLG3DJVcqwCSU8yA cOYxgFbWlJXzY9V5lsfMybHKQdwdESTTOfecL048avGcESriG/6a1aC+tjrxcbvOwP zxh+eSEN1msnQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mmc@vger.kernel.org Cc: Rob Herring , Adrian Hunter , Ulf Hansson , Masahiro Yamada , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland Subject: [PATCH v2] mmc: sdhci-cadence: add Socionext UniPhier specific compatible string Date: Wed, 14 Dec 2016 11:10:46 +0900 Message-Id: <1481681446-29832-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a Socionext SoC specific compatible (suggested by Rob Herring). No SoC specific data are associated with the compatible strings for now, but other SoC vendors may use this IP and want to differentiate IP variants in the future. Signed-off-by: Masahiro Yamada Acked-by: Rob Herring Acked-by: Adrian Hunter --- Changes in v2: - Add "uniphier" to the compatible to make it more SoC-specific Documentation/devicetree/bindings/mmc/sdhci-cadence.txt | 6 ++++-- drivers/mmc/host/sdhci-cadence.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt b/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt index 750374f..c0f37cb 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt +++ b/Documentation/devicetree/bindings/mmc/sdhci-cadence.txt @@ -1,7 +1,9 @@ * Cadence SD/SDIO/eMMC Host Controller Required properties: -- compatible: should be "cdns,sd4hc". +- compatible: should be one of the following: + "cdns,sd4hc" - default of the IP + "socionext,uniphier-sd4hc" - for Socionext UniPhier SoCs - reg: offset and length of the register set for the device. - interrupts: a single interrupt specifier. - clocks: phandle to the input clock. @@ -19,7 +21,7 @@ if supported. See mmc.txt for details. Example: emmc: sdhci@5a000000 { - compatible = "cdns,sd4hc"; + compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc"; reg = <0x5a000000 0x400>; interrupts = <0 78 4>; clocks = <&clk 4>; diff --git a/drivers/mmc/host/sdhci-cadence.c b/drivers/mmc/host/sdhci-cadence.c index 1501cfd..4b0ecb9 100644 --- a/drivers/mmc/host/sdhci-cadence.c +++ b/drivers/mmc/host/sdhci-cadence.c @@ -262,6 +262,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev) } static const struct of_device_id sdhci_cdns_match[] = { + { .compatible = "socionext,uniphier-sd4hc" }, { .compatible = "cdns,sd4hc" }, { /* sentinel */ } };