From patchwork Mon Nov 5 21:09:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10669125 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE10815E9 for ; Mon, 5 Nov 2018 21:09:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E16BA299F2 for ; Mon, 5 Nov 2018 21:09:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3EF7299FF; Mon, 5 Nov 2018 21:09:48 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 76064299F2 for ; Mon, 5 Nov 2018 21:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729779AbeKFGbV (ORCPT ); Tue, 6 Nov 2018 01:31:21 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:39429 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726902AbeKFGbV (ORCPT ); Tue, 6 Nov 2018 01:31:21 -0500 Received: by mail-pl1-f193.google.com with SMTP id b5-v6so5052983pla.6 for ; Mon, 05 Nov 2018 13:09:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZR3dSpwHeHS8JNLbewKBD8mo1RLBu0PiM26k3ABT1to=; b=bydYF52tEvWY8DDZ6mhpcKU63fegOm1orauRUs3GhtGTxHQQ7FP9sqhFkOCkWeIX/o RpF65818iQkPLSI4y841EgK5YxCulRrihFhgjja1XRg9Qu81jFPYCgbW42mIF09wcfyN 6bKLPclYQOc9/91aiRoxJQiDEOoA9hcLvYYgs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZR3dSpwHeHS8JNLbewKBD8mo1RLBu0PiM26k3ABT1to=; b=R1VB3G2ymhMsNWIODC5NdK7VCC9U/rvHzvP8P8977NkZBCSggovbbZ3m8NmanCdaiW sV6+fSCjSMRgg+2x2JcUJCl+6oh2Azu8gfJQKvUssOcKnICpkjRDYfIaM4DMgm5/BJ6n VBMq1pYw1Ha4hp7q3MKdL2kONCWNyHfgFOYbc1Bii+S5WvLMYY9CJgR/OB/bND3IsCmQ vTkoEEzw7vkToKgg+hLLdzlS/dtBV1sHQwQeWkSVvaZeZ4oGn/ocf+4QeJ/KE7Qn0SoQ koiDOM0gfhTqszVW2B6tnmxiSbcFpXmGMGbXSF0wrK1gWHVRdYhbJ6Y2005wirRkcWYT Vhgw== X-Gm-Message-State: AGRZ1gKBfz7imaiI4YovBj1JFyQUyG49+6cOL69NzkBz2Op1mCw8H2Rz z4vfCrzM1jQ2uIR/dXQJzwncxQ== X-Google-Smtp-Source: AJdET5fKQ3HCIi5v6GOsjX4+UDMBFjLz4X+OpLlpId30Lkk2XSVq3vXsosiahzWutfEfWp6PHYQ5qA== X-Received: by 2002:a17:902:7282:: with SMTP id d2-v6mr22824433pll.272.1541452185891; Mon, 05 Nov 2018 13:09:45 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id l26-v6sm79437452pfg.161.2018.11.05.13.09.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 13:09:45 -0800 (PST) From: Douglas Anderson To: Andy Gross , Rob Herring Cc: Douglas Anderson , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, David Brown , Mark Rutland , linux-soc@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes Date: Mon, 5 Nov 2018 13:09:20 -0800 Message-Id: <20181105210921.253707-1-dianders@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As per upstream discussion [1], we should have an SoC-specific compatible string for Qualcomm's SDHCI nodes. Let's add it. [1] https://lkml.kernel.org/r/20181105203657.GA32282@bogus Signed-off-by: Douglas Anderson Acked-by: Bjorn Andersson --- arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++-- arch/arm/boot/dts/qcom-msm8974.dtsi | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi index 0e1e98707e3f..899f28533ed7 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -412,7 +412,7 @@ }; sdhci@f9824900 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf9824900 0x11c>, <0xf9824000 0x800>; reg-names = "hc_mem", "core_mem"; interrupts = <0 123 0>, <0 138 0>; @@ -425,7 +425,7 @@ }; sdhci@f98a4900 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>; reg-names = "hc_mem", "core_mem"; interrupts = <0 125 0>, <0 221 0>; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index aba159d5a95a..891990c0d0b4 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -602,7 +602,7 @@ }; sdhci@f9824900 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf9824900 0x11c>, <0xf9824000 0x800>; reg-names = "hc_mem", "core_mem"; interrupts = , @@ -616,7 +616,7 @@ }; sdhci@f9864900 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf9864900 0x11c>, <0xf9864000 0x800>; reg-names = "hc_mem", "core_mem"; interrupts = , @@ -630,7 +630,7 @@ }; sdhci@f98a4900 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>; reg-names = "hc_mem", "core_mem"; interrupts = , From patchwork Mon Nov 5 21:09:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10669127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 81EE115E9 for ; Mon, 5 Nov 2018 21:09:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 774BD299F2 for ; Mon, 5 Nov 2018 21:09:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67C67299FF; Mon, 5 Nov 2018 21:09:56 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 E6A58299F2 for ; Mon, 5 Nov 2018 21:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387598AbeKFGb2 (ORCPT ); Tue, 6 Nov 2018 01:31:28 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:34645 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730197AbeKFGbW (ORCPT ); Tue, 6 Nov 2018 01:31:22 -0500 Received: by mail-pg1-f193.google.com with SMTP id k1-v6so4792645pgq.1 for ; Mon, 05 Nov 2018 13:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=96QNBMGBYUONd7YA4Rof9glJ141QHgV69o0Smunt7gs=; b=jelXfYer3sJh278jBs6rL7O85F/RO6ZGvxms4tzTz+AiY+h3J01ACasZQJdLlx079Z EXb9/XVLCzwqLhNu3lLe56BFEPRTCmTMcAPtmHrcBuLgoajeGsV3tQO6LDHbdRUnTb3w vzj9avL5tQBxvjvY+3u9Bob0aQeBm7IV3XayI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=96QNBMGBYUONd7YA4Rof9glJ141QHgV69o0Smunt7gs=; b=AFeYMq53wb+UCsCKmeZ+YgyPGHa4+xv+lvSaTC+EC5Tv5lY231WBinjhYqpqpwBOKx auvRCiG132MTqfUF+o9zEAFNpCl8rHa5Eirf8SuuLNGxKcx75QOk2SGeLnjYO/GrXh0K NgxwerEvq3jSfN+/HVGDLOabbUt8rRc6nYLQQ8vi2dbrKirATTWe1ssarHc8SrzM4epX wVWmd1/1cJK948/txmIC8aljBW5lE/HdRzeUCUw4lvxW9O3HkM/nVVV0FtiZilhVnHkn POZvykr4XyujeNRJR9Wtl83xIWqvkRDLI8OIrfv3lWhb7W5jW3gXTihyz/85DxUPmFn3 PCAw== X-Gm-Message-State: AGRZ1gInIwYssnQlSNpOY1wVPUbTtaOrVbeaWl85DPrT20VITUYTn6P6 j8Pna8C86R4O2fzI0g2HAXRVJg== X-Google-Smtp-Source: AJdET5cW19JlrUoLsd3vbq9EsGgmxlKi366eoHtuMrDisOUZ+pffILyV1UVubaOJAOm596PifMfqeQ== X-Received: by 2002:a62:5982:: with SMTP id k2-v6mr23073870pfj.180.1541452186991; Mon, 05 Nov 2018 13:09:46 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id l26-v6sm79437452pfg.161.2018.11.05.13.09.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 13:09:46 -0800 (PST) From: Douglas Anderson To: Andy Gross , Rob Herring Cc: Douglas Anderson , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, David Brown , Mark Rutland , linux-soc@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: qcom: Add SoC-specific string for sdhci-msm-v4 nodes Date: Mon, 5 Nov 2018 13:09:21 -0800 Message-Id: <20181105210921.253707-2-dianders@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181105210921.253707-1-dianders@chromium.org> References: <20181105210921.253707-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As per upstream discussion [1], we should have an SoC-specific compatible string for Qualcomm's SDHCI nodes. Let's add it. [1] https://lkml.kernel.org/r/20181105203657.GA32282@bogus Signed-off-by: Douglas Anderson Acked-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index d302d8d639a1..0a7335526063 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -587,7 +587,7 @@ }; sdhc_1: sdhci@7824000 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07824900 0x11c>, <0x07824000 0x800>; reg-names = "hc_mem", "core_mem"; @@ -604,7 +604,7 @@ }; sdhc_2: sdhci@7864000 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07864900 0x11c>, <0x07864000 0x800>; reg-names = "hc_mem", "core_mem"; diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index cf5cacdd624d..09d0234cfd99 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -203,7 +203,7 @@ }; sdhci1: mmc@f9824900 { - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,msm8992-sdhci", "qcom,sdhci-msm-v4"; reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>; reg-names = "hc_mem", "core_mem"; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index b29fe80d7288..5e19f87df020 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -535,7 +535,7 @@ sdhc2: sdhci@74a4900 { status = "disabled"; - compatible = "qcom,sdhci-msm-v4"; + compatible = "qcom,msm8996-sdhci", "qcom,sdhci-msm-v4"; reg = <0x74a4900 0x314>, <0x74a4000 0x800>; reg-names = "hc_mem", "core_mem";