From patchwork Thu Apr 21 21:19:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 12822437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB680C433F5 for ; Thu, 21 Apr 2022 21:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1386732AbiDUVXU (ORCPT ); Thu, 21 Apr 2022 17:23:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231982AbiDUVXT (ORCPT ); Thu, 21 Apr 2022 17:23:19 -0400 Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6B8649917; Thu, 21 Apr 2022 14:20:28 -0700 (PDT) Received: from g550jk.arnhem.chello.nl (a246182.upc-a.chello.nl [62.163.246.182]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id 24CB2CC10C; Thu, 21 Apr 2022 21:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1650575997; bh=5ScSxn4n5ySRopwqFbclap1GFEUkLSSL+DlpBzrrvQk=; h=From:To:Cc:Subject:Date; b=KoUyVqigeI1pJrTPGIqB1K06o9w5tlY0D/m6/YssQKeRf+3HZd29OO5GVU7rVamOG 5CsZU/QKsPuUWkM9HaelMXLps0RmexhLMiFRsP4iM8+RzYCL03h6kakQ6sBQve0/cI tBJkd7EC/6KTxy/ZpNIAYQzpddD7FpKRi9Ofx1R4= From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Luca Weiss , Arnd Bergmann , Olof Johansson , soc@kernel.org, Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] ARM: dts: msm8974-FP2: We're msm8974pro Date: Thu, 21 Apr 2022 23:19:33 +0200 Message-Id: <20220421211936.345168-1-luca@z3ntu.xyz> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Fairphone 2 always uses Snapdragon 801, a.k.a msm8974pro so change the include and filename to that. Signed-off-by: Luca Weiss --- arch/arm/boot/dts/Makefile | 2 +- ...8974-fairphone-fp2.dts => qcom-msm8974pro-fairphone-fp2.dts} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/boot/dts/{qcom-msm8974-fairphone-fp2.dts => qcom-msm8974pro-fairphone-fp2.dts} (99%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 3541e5eec611..728bbd0f8c26 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1010,10 +1010,10 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-msm8660-surf.dtb \ qcom-msm8916-samsung-serranove.dtb \ qcom-msm8960-cdp.dtb \ - qcom-msm8974-fairphone-fp2.dtb \ qcom-msm8974-lge-nexus5-hammerhead.dtb \ qcom-msm8974-sony-xperia-rhine-amami.dtb \ qcom-msm8974-sony-xperia-rhine-honami.dtb \ + qcom-msm8974pro-fairphone-fp2.dtb \ qcom-msm8974pro-samsung-klte.dtb \ qcom-msm8974pro-sony-xperia-shinano-castor.dtb \ qcom-mdm9615-wp8548-mangoh-green.dtb \ diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts similarity index 99% rename from arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts rename to arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts index 97d109a5c71d..08e723f2bdfc 100644 --- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts @@ -1,4 +1,4 @@ -#include "qcom-msm8974.dtsi" +#include "qcom-msm8974pro.dtsi" #include "qcom-pm8841.dtsi" #include "qcom-pm8941.dtsi" #include From patchwork Thu Apr 21 21:19:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 12822435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B846DC43217 for ; Thu, 21 Apr 2022 21:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441898AbiDUVXV (ORCPT ); Thu, 21 Apr 2022 17:23:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382346AbiDUVXT (ORCPT ); Thu, 21 Apr 2022 17:23:19 -0400 Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC90749F2B; Thu, 21 Apr 2022 14:20:28 -0700 (PDT) Received: from g550jk.arnhem.chello.nl (a246182.upc-a.chello.nl [62.163.246.182]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id 8864CCDE54; Thu, 21 Apr 2022 21:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1650575997; bh=vh2MH7zJGRV4zHtBhgIEo9vG9GwiuVBWVXSamH70+rc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xNEQhDwYkAdAdZzQ1UdP8T8FVswpIQ2MpkatDtQtCrLBhqb6hB6q+W18eBaBA0KCQ Zmv06BCMfchccxdVJSnYhp39PApqsqHtXAQVm17WbEje3HPvyqj4aIMZ4a9jb/uIPW thJSo4fbtwOoFF+3xe7AxVD8njf8N9UZ3ZTPaB+w= From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Luca Weiss , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] ARM: dts: msm8974-FP2: Add mmc* aliases Date: Thu, 21 Apr 2022 23:19:34 +0200 Message-Id: <20220421211936.345168-2-luca@z3ntu.xyz> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220421211936.345168-1-luca@z3ntu.xyz> References: <20220421211936.345168-1-luca@z3ntu.xyz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add aliases for internal storage and SD card so they don't randomly switch around. Signed-off-by: Luca Weiss --- arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts index 08e723f2bdfc..5a00a4f9fbe4 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts @@ -9,6 +9,8 @@ / { compatible = "fairphone,fp2", "qcom,msm8974"; aliases { + mmc0 = &sdhc_1; + mmc1 = &sdhc_2; serial0 = &blsp1_uart2; }; From patchwork Thu Apr 21 21:19:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 12822436 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C660C4321E for ; Thu, 21 Apr 2022 21:20:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1441901AbiDUVXV (ORCPT ); Thu, 21 Apr 2022 17:23:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382911AbiDUVXU (ORCPT ); Thu, 21 Apr 2022 17:23:20 -0400 Received: from mail.z3ntu.xyz (mail.z3ntu.xyz [128.199.32.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 675B149F8C; Thu, 21 Apr 2022 14:20:29 -0700 (PDT) Received: from g550jk.arnhem.chello.nl (a246182.upc-a.chello.nl [62.163.246.182]) by mail.z3ntu.xyz (Postfix) with ESMTPSA id 0A270CEA6C; Thu, 21 Apr 2022 21:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=z3ntu.xyz; s=z3ntu; t=1650575998; bh=Izkcwt3YBt89cT8YErCxy5POdcKGAd3b1m2UZ4U0r0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=f6O4aEx1KftmRrDvYEvELwpoge6DNiDSOy0dj8C/UlMaNNe+k/oZ2/8Y3uWgf0QJi L1uBQ6YBPnClN4YkGD0IohHM9/FwEMhfpHKOtHWhMiVwh7xPNGIwPCSTn7zyruUFjm pgN1MaJrg2Wc7AcUzTDNFHZPFz5o3Bm6FY7xxXaQ= From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Luca Weiss , Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ARM: dts: qcom: msm8974: Add missing license headers Date: Thu, 21 Apr 2022 23:19:35 +0200 Message-Id: <20220421211936.345168-3-luca@z3ntu.xyz> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220421211936.345168-1-luca@z3ntu.xyz> References: <20220421211936.345168-1-luca@z3ntu.xyz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org All other msm8974 dts files are licensed as GPL-2.0 so add the same header to the files where it's missing. Signed-off-by: Luca Weiss --- arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 1 + arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 1 + arch/arm/boot/dts/qcom-msm8974pro.dtsi | 1 + 3 files changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts index 5a00a4f9fbe4..96427d75ea82 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" #include "qcom-pm8841.dtsi" #include "qcom-pm8941.dtsi" diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 34aed41856a6..9bd8faea61a5 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" #include "qcom-pm8841.dtsi" #include "qcom-pm8941.dtsi" diff --git a/arch/arm/boot/dts/qcom-msm8974pro.dtsi b/arch/arm/boot/dts/qcom-msm8974pro.dtsi index 973bd1dafbfe..1e882e16a221 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974pro.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974.dtsi" &gcc {