From patchwork Wed Jun 24 15:00:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623361 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0ECA5912 for ; Wed, 24 Jun 2020 15:01:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB87E20781 for ; Wed, 24 Jun 2020 15:01:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aiyuM0gn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391257AbgFXPBY (ORCPT ); Wed, 24 Jun 2020 11:01:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390251AbgFXPBX (ORCPT ); Wed, 24 Jun 2020 11:01:23 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 031FAC061573; Wed, 24 Jun 2020 08:01:22 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id z13so2619654wrw.5; Wed, 24 Jun 2020 08:01:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5YzgOuYewZUDJEPZZEMrFZJbmkFe555mznSERqhNf/o=; b=aiyuM0gnM7Z8xQaZsO8mWW0wdw5aqdz4j06GqkF8fPL9KlfyQRax+qb6m+zkVTHJ6n fJKhcYsXTe7DC3Cjojt1wWizWl/FaiusevE3BaD4cTB3H1e2fXvZxsEaskZEAUTRgcMO gpmqHHGc4JFTO+DTk4okdUJYYm0+eWT4hQv96vUg6ynzfnB3NYdhz0oV1zcryP5QGjlt TQG604IBh4laON6X780epWbeiZ42/bEhTEs9hp+u/NJjDpnmp/6E+QGWD/PWkwgHXog9 3j6r3CQXFoi1tBpQPRFhND63M07CLYIdBm5dFDdYZusXYOzFjZ3R5nTICDId8TKrw9jt cpfw== 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=5YzgOuYewZUDJEPZZEMrFZJbmkFe555mznSERqhNf/o=; b=GVT4nGrqDMmy4QWSROjkuQuXIO7XTGnidTnLBxCZZ2I2Hrt9KRgu9COdENv4/hMZvv zT5obP5VbWgGlgqdvnvGAF8bHrZrWqcCYkUS61mZF6wh+VupRtZZ5yjPc3fS+OWw305I VH3rrnaBy9yHlZIn/mgs5j56UmRYBWrii44x539Q/ginKxZFWNOsu+lervMnGrfouftt BWQR8GNWbydopSrurT0FQyfxOlDR5WdZhJeKfDcRtjvTujENl/gduoMhYOIVHRLV9nAt 1zWdLVdGZFT4sElhWFBRCoL6gJUaAK3r3+8wEfSYs7BqpJNJEQK9CdqCZx3izK2o96T2 mFtw== X-Gm-Message-State: AOAM532MQSazTY04MZN36nHwr90dKP9T7YkpFic/hGyZKlKc521w5EFu 5cFhqrAUzzpJPKyrT7r4dK8= X-Google-Smtp-Source: ABdhPJySaaRY74gPR2axOufGFbY6U1vbM1Scd3Z/NwEpNt1CCJgL0pfqrlwPvcN8o2u/SyXYRwPs/g== X-Received: by 2002:a5d:444e:: with SMTP id x14mr30260748wrr.279.1593010880772; Wed, 24 Jun 2020 08:01:20 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:20 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/8] firmware: qcom_scm: Add msm8994 compatible Date: Wed, 24 Jun 2020 17:00:59 +0200 Message-Id: <20200624150107.76234-2-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 This change adds a compatible for msm8994, which requires no additional clocks for scm to probe correctly. Signed-off-by: Konrad Dybcio Acked-by: Rob Herring --- Documentation/devicetree/bindings/firmware/qcom,scm.txt | 1 + drivers/firmware/qcom_scm.c | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt index 354b448fc0c3..898831d170bc 100644 --- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt +++ b/Documentation/devicetree/bindings/firmware/qcom,scm.txt @@ -15,6 +15,7 @@ Required properties: * "qcom,scm-msm8916" * "qcom,scm-msm8960" * "qcom,scm-msm8974" + * "qcom,scm-msm8994" * "qcom,scm-msm8996" * "qcom,scm-msm8998" * "qcom,scm-sc7180" diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 0e7233a20f34..008b3a08fb15 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1151,6 +1151,7 @@ static const struct of_device_id qcom_scm_dt_match[] = { SCM_HAS_IFACE_CLK | SCM_HAS_BUS_CLK) }, + { .compatible = "qcom,scm-msm8994" }, { .compatible = "qcom,scm-msm8996" }, { .compatible = "qcom,scm" }, {} From patchwork Wed Jun 24 15:01:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623363 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5CAE60D for ; Wed, 24 Jun 2020 15:01:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD94F2076E for ; Wed, 24 Jun 2020 15:01:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p1tnijsZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404039AbgFXPB0 (ORCPT ); Wed, 24 Jun 2020 11:01:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390251AbgFXPBZ (ORCPT ); Wed, 24 Jun 2020 11:01:25 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9E5C061573; Wed, 24 Jun 2020 08:01:24 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id o11so2599265wrv.9; Wed, 24 Jun 2020 08:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yi5HolOAmQ2STI1BdEHxCclM+Uj+oAzfKdWwbWDjM+c=; b=p1tnijsZntvtdYRVo/rIXwkuR3uqTedW6T/LwlvFin5dMoTpOpZG1P5SYfzzx0klmV BxToiZl15lY7qs5lE1B4QWfD+1CfWRO9bdjGyj3j8Qpnpr25rHpmyQvdg+Ol7t5J2VoH 6RJNxW+n8QDXQU7tf5GxAiQLW1OUb4ynONAxAyTxM4K5oG71zTtnM79AQG3eYWMmTfhZ 5tAX5QhkI5NlJOTcqFAdB3EumaZkR8tF8RMBKNL6eui4Iciz9HHrU5nVr9ahIcQXEmZo QXSeeGL+X9IXoVLTCGFRpQ3vT6LugtyYUP+gP9fqck6LAUjXS09t5v92tRdp53YaL84I kY1w== 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=yi5HolOAmQ2STI1BdEHxCclM+Uj+oAzfKdWwbWDjM+c=; b=AbDrpu4UNVWmgTk8gRdGP8veVyrKZuG/LxPZ5C5iBdm7lUCVuAZP72GhivX/GTc1j9 jzwqvt5pV31xlTb0A29E3LXWbjmHiYOL6NMye5YjHUZ0JP/Y4vRtILmSvdCBQvvKlt2o OVICyDdEergDxCq3PjxNXqW1znR4Dd3+rTAh6qSeOwx0hTlm4/aqNUwBJcRELGf0baEr kWAjdM6GLHuzixK0+OJPsubFUpEoEwSIAeZzjYgrwkxMZP/rzvk2Q38eZ0tfFC05MqYt /F+jUSGU0hZ/YwD83Fammz1mQs3ogdCs/gJ5mZEK/BUpvK4p4wALIZm7GII50c72xuQa IFcw== X-Gm-Message-State: AOAM533DUb9vYe86s6nwkF7KyZ5L6GoZ9cFgLR+epGi6rtBbxZ8E1OQx Wn6evVdfMFiPyr6ZkUla2TI= X-Google-Smtp-Source: ABdhPJyyLZJA7Sr1DvZkH+Hte4vFjhDJrIR4AOkzmVWkNbZVtxPXwEx9U6pGzt98yp0wLpjEohtl9Q== X-Received: by 2002:a5d:6a46:: with SMTP id t6mr4538911wrw.374.1593010883714; Wed, 24 Jun 2020 08:01:23 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:23 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/8] arm64: dts: qcom: msm8994: Add SCM node Date: Wed, 24 Jun 2020 17:01:00 +0200 Message-Id: <20200624150107.76234-3-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8994.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index 9ae848442d0b..bf5aa7308b63 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -142,6 +142,12 @@ core3 { }; }; + firmware { + scm { + compatible = "qcom,scm-msm8994", "qcom,scm"; + }; + }; + memory { device_type = "memory"; /* We expect the bootloader to fill in the reg */ From patchwork Wed Jun 24 15:01:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623391 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA69D912 for ; Wed, 24 Jun 2020 15:03:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D148B2082F for ; Wed, 24 Jun 2020 15:03:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nWg10ic5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404081AbgFXPBb (ORCPT ); Wed, 24 Jun 2020 11:01:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404074AbgFXPB3 (ORCPT ); Wed, 24 Jun 2020 11:01:29 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9863FC061573; Wed, 24 Jun 2020 08:01:28 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id a6so4702012wmm.0; Wed, 24 Jun 2020 08:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j5MHiXaY87xhcFzSgoEppWOIw4PI/W2mTXO2EtAtsrk=; b=nWg10ic5Znyqh2nkSm7vMQi6C4s3M9LDGWAXH3OxhJmD6waqTf5Eq+TAh+jRq5WWs3 MLf1e1aNlbwbtjU0rtL0S0YLvXUu0+PoXol/dsa8YFTXthdFwBOt+du9bbxvvI25gPHi SdIx89pOASlb7qzSZRDIsRkxzYH5PSZAomZXUXnii3tTMDWXEniBCN2U9RGGOGaXIkk9 bfRvx98VR1BX1sO9DRKGCgC/pSTSnSpNFR4R+3TeZ2z2NVsJ7S8ERpSZVIo7ruDL3bu4 Q/bI3PcAmaiSh2cCSN+Wu66lv0U60rTtBDquNCa0yeMCO50LzAd2b549ZcBY/sVMriCj +lgA== 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=j5MHiXaY87xhcFzSgoEppWOIw4PI/W2mTXO2EtAtsrk=; b=cedF6Ng/b08jZ7eNwBRupFfI3gOs0F2yDhDmJHwszZTqnU0kgtP9toXkLfSDXrfJpn rjmYwpU0vsrjVTMW9xW03ZCeb1ne6vvSk17JhkM61wpxUL4UgPGtcuaCHmkgWzOl6+Ms 6Wa4Flz3eKwJmyOnTvZAHFAL7Be5bgweElEvuSlId0H88Qeg66Ph/jD4Jtwtdv84w76d m7Vg2bMlhxVd55giXK9KXzD456VePWv2Nj1fmZVg6NlfPTYdysZe+ChK1cCxzQB0x+wB RJ9PaajEtjta75TQIMq21Sk98jG9m2ZM88/rL6t6YH4lqRpFE4JlUpuwKJu7Oorkrc7n bhsg== X-Gm-Message-State: AOAM531wcVckcMdYrQ7PIdY+Sz6yRHiX737/tfj20B6xjLemoq5pqWTX UY+kUr/T4KzDtaTVTGmnrKs= X-Google-Smtp-Source: ABdhPJyTDzQBb99Kqj+gLNwD0kcgxLpUoW49nBppIz1AXz5BV4NPu89aY27trGas2TqrSflMrgq/oQ== X-Received: by 2002:a1c:143:: with SMTP id 64mr31671929wmb.182.1593010887305; Wed, 24 Jun 2020 08:01:27 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:26 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/8] arm64: dts: qcom: msm8992: Add a label to rpm-requests Date: Wed, 24 Jun 2020 17:01:01 +0200 Message-Id: <20200624150107.76234-4-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 This enables the node to be referenced directly from other DTs. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index 2021795c99ad..8e5a3ae79997 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -258,7 +258,7 @@ rpm { qcom,local-pid = <0>; qcom,remote-pid = <6>; - rpm-requests { + rpm_requests: rpm-requests { compatible = "qcom,rpm-msm8994"; qcom,smd-channels = "rpm_requests"; From patchwork Wed Jun 24 15:01:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623365 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94D6060D for ; Wed, 24 Jun 2020 15:01:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7991920781 for ; Wed, 24 Jun 2020 15:01:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cpbMK7h1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404096AbgFXPBd (ORCPT ); Wed, 24 Jun 2020 11:01:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404074AbgFXPBc (ORCPT ); Wed, 24 Jun 2020 11:01:32 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DFBEC061573; Wed, 24 Jun 2020 08:01:31 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id 22so2638008wmg.1; Wed, 24 Jun 2020 08:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HV/zrw1VIDqhLaj55kCUqB97nJTQbmO5R20u1p1Ftgc=; b=cpbMK7h1xPtR45xMiu4FUHsqLxgUajhKT9kCeXE8vMO5uoWF8CpOrsV8jzAEqA/UMo De7zcdl64hz6EPLvfqlsKhDnE4TddY9HAZCwuEiR9I0Xgkbj+cW4UttZYiuwFuBaC0XM KNJ1L1cuG2FH6WvQT+927bJey5KU8XVE27ZoefWSDKvGHB+d6JolCdWO9Tc+GWacCofA ZooZnQvlmEhOPMzI0kWQQGxyXh2qzlNx7JW5xPVQRebJdT5LmkzBsQg6heexcAt3sslQ 0oNOpzIhWhnsKw0FNuy1wgh8VHXPrk1GeHsSMSOwwRr28POqNDNh0WtQk3b+Dkgx+Lz7 oUqQ== 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=HV/zrw1VIDqhLaj55kCUqB97nJTQbmO5R20u1p1Ftgc=; b=RKyBf2v4WfjxhV0CxKt2n8RxIlqQ+wAm/Zzdmtwi/FZAtcgsmkFf68ONSqG2jM3gtn mbcY94N+UVR27aSQzk46Y4qjIOGCgmpElEEvbLRgA/nVBzLMZj/9z0vh1pLIiR34WbjK ufwn6Lc8lNmW5indDNLe1JOs9ISG433+o13gPa9wwcYBVrnnrB529ekkMsJfVcwQYrzh 2mLFPjSi4Fo4qvIFasLjnLUObLgMQH+hdpTloFm9UkHwI2LgY/OuSqeelBb32dahs3J4 qk2991WDn05uHq+Fbw1i4tZUhvv2tNH3dYDRyK5c0ICoRkItQRqcgjRU79xrkC70RlSv AahQ== X-Gm-Message-State: AOAM532RxEQ6Mv1ghK/cWGL3NdFbGV9ZPSAAO8GZgvP1UbY6CgRbDVg6 S+FrLEARVSNgd8aGEqd0PkA= X-Google-Smtp-Source: ABdhPJwsCZyprGeHTg35mbi00uDojA8yyQSajXvRH+O/tzzkvSYSIZoXwYuRGnMHuY7/bT+ncI1ZLw== X-Received: by 2002:a1c:2157:: with SMTP id h84mr28749399wmh.35.1593010890220; Wed, 24 Jun 2020 08:01:30 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:29 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/8] arm64: dts: qcom: msm8992: Remove regulators from SoC DTSI Date: Wed, 24 Jun 2020 17:01:02 +0200 Message-Id: <20200624150107.76234-5-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 This is now considered obsolete practice. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992.dtsi | 46 --------------------------- 1 file changed, 46 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index 8e5a3ae79997..d41ba1ef687a 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -261,52 +261,6 @@ rpm { rpm_requests: rpm-requests { compatible = "qcom,rpm-msm8994"; qcom,smd-channels = "rpm_requests"; - - pm8994-regulators { - compatible = "qcom,rpm-pm8994-regulators"; - - pm8994_s1: s1 {}; - pm8994_s2: s2 {}; - pm8994_s3: s3 {}; - pm8994_s4: s4 {}; - pm8994_s5: s5 {}; - pm8994_s6: s6 {}; - pm8994_s7: s7 {}; - - pm8994_l1: l1 {}; - pm8994_l2: l2 {}; - pm8994_l3: l3 {}; - pm8994_l4: l4 {}; - pm8994_l6: l6 {}; - pm8994_l8: l8 {}; - pm8994_l9: l9 {}; - pm8994_l10: l10 {}; - pm8994_l11: l11 {}; - pm8994_l12: l12 {}; - pm8994_l13: l13 {}; - pm8994_l14: l14 {}; - pm8994_l15: l15 {}; - pm8994_l16: l16 {}; - pm8994_l17: l17 {}; - pm8994_l18: l18 {}; - pm8994_l19: l19 {}; - pm8994_l20: l20 {}; - pm8994_l21: l21 {}; - pm8994_l22: l22 {}; - pm8994_l23: l23 {}; - pm8994_l24: l24 {}; - pm8994_l25: l25 {}; - pm8994_l26: l26 {}; - pm8994_l27: l27 {}; - pm8994_l28: l28 {}; - pm8994_l29: l29 {}; - pm8994_l30: l30 {}; - pm8994_l31: l31 {}; - pm8994_l32: l32 {}; - - pm8994_lvs1: lvs1 {}; - pm8994_lvs2: lvs2 {}; - }; }; }; }; From patchwork Wed Jun 24 15:01:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623385 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B248912 for ; Wed, 24 Jun 2020 15:03:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3238A206EB for ; Wed, 24 Jun 2020 15:03:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="txxQqYan" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404108AbgFXPBk (ORCPT ); Wed, 24 Jun 2020 11:01:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404102AbgFXPBe (ORCPT ); Wed, 24 Jun 2020 11:01:34 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F7EDC061573; Wed, 24 Jun 2020 08:01:34 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id o2so2844109wmh.2; Wed, 24 Jun 2020 08:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bVP8UZ4IHKrL+X8gjnWR8bdS5bGguU8e2dXcySpdCyo=; b=txxQqYanhxjipxL7sbiuRoaplL6XH1yoiMXbPpam3DlZQQQCPEo89KUSvsIwOFnCpE XPgDt3TMKRiGVbqV/ocfa0PtnuQVnA1cXDs+9pKY3Jepyf7g7/vm4WfAB90k+PEYTHJG HquMXSy7G0l0C2YKUuk/CeWWVFNaQcsEPMN3jm7QozCQ6idLmuynOOOgOw5W9ASYbPif UZkPer+wR1Kvblddgq/bVI374V1irJVBciGM8LH7kJl7He2wGxY8mrNX2Vym6T3ycOx4 QVpH+aaA4DIMVOv27o6Rjp57CAzdxnqfyf2KuJ4axu+JK+mpzYo9S2C8dbJDHnvDLSns WJLQ== 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=bVP8UZ4IHKrL+X8gjnWR8bdS5bGguU8e2dXcySpdCyo=; b=EA7IeyJXSAp+6Mb11i8gbKektzurktOpianKn6XFyycUeIKseYyaarvAPInOAatBuY um7XC1R4c13uERH32U0UreU6CDOAqJzGbFuFhuy5HI2lJbWi/cs9lz7Y4ZGxcx7MFkOq sinjoueDP9Rk+Jv1jKYwi2ZVYpXlYWSBMnlPG6NC8WsOTcSljRsi6Ph0L/dsFBfiUoog n9eKbiPGq7gD5D6FPdkhLyw6ionx1s53JMQKgu/VIbvmLIZh8X2Lecz+8Uw2GZ+7ugcI OHiH7NG6joVlvVbuY94RqKdsZljRxVOZ6bAp3DP8kmMS3lWOEgUntWmuJCXGcsy9EZZp xgNg== X-Gm-Message-State: AOAM5332h5/3qUdl0OooBCN10bitKn6pYkQyK50FYL8FmxFDFA13+PPj 41frYcUVfefNySHS1IL44RE= X-Google-Smtp-Source: ABdhPJwsj3r17OahPuQ/1bBpEarwkSDglbOUxSUYkoEdopFSJoCPQHptlXiIXYnlLKwN8GKOtMqQJg== X-Received: by 2002:a05:600c:2dc1:: with SMTP id e1mr17000897wmh.108.1593010893119; Wed, 24 Jun 2020 08:01:33 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:32 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/8] mailbox: qcom: Add msm8994 apcs compatible Date: Wed, 24 Jun 2020 17:01:03 +0200 Message-Id: <20200624150107.76234-6-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 MSM8994 has an APCS block similar to 8916, but with a different clock driver due to the former one having 2 clusters. Signed-off-by: Konrad Dybcio Acked-by: Rob Herring Reviewed-by: Bjorn Andersson --- .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml index 12eff942708d..5125ca3533d2 100644 --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml @@ -18,6 +18,7 @@ properties: enum: - qcom,ipq8074-apcs-apps-global - qcom,msm8916-apcs-kpss-global + - qcom,msm8994-apcs-kpss-global - qcom,msm8996-apcs-hmss-global - qcom,msm8998-apcs-hmss-global - qcom,qcs404-apcs-apps-global diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index cec34f0af6ce..6d892136e0e6 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -41,6 +41,10 @@ static const struct qcom_apcs_ipc_data msm8916_apcs_data = { .offset = 8, .clk_name = "qcom-apcs-msm8916-clk" }; +static const struct qcom_apcs_ipc_data msm8994_apcs_data = { + .offset = 8, .clk_name = NULL +}; + static const struct qcom_apcs_ipc_data msm8996_apcs_data = { .offset = 16, .clk_name = NULL }; @@ -146,6 +150,7 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = { { .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq8074_apcs_data }, { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data }, + { .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data }, { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8998_apcs_data }, { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data }, From patchwork Wed Jun 24 15:01:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623387 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30863912 for ; Wed, 24 Jun 2020 15:03:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 175232076E for ; Wed, 24 Jun 2020 15:03:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nqfRdppQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390829AbgFXPDP (ORCPT ); Wed, 24 Jun 2020 11:03:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404074AbgFXPBi (ORCPT ); Wed, 24 Jun 2020 11:01:38 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55605C061797; Wed, 24 Jun 2020 08:01:37 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id q5so2608300wru.6; Wed, 24 Jun 2020 08:01:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xGorQfVoMZ+iUqaW92DxUbanNK0hY2uxj/Pn+f4/4FY=; b=nqfRdppQ7wb2SmZSudqseQh0laa6ufOSNlKBSb9OMzpdGXRmD0WZjWlfsi7TGU4QvI efw51ziM1lG8+eer2dOg46sExqXuB/+U8xb6bBJLYYpFvVvLScB7o0OCzJMTISt6iPxR 4/TptLjNbDYVifYDFMwnPaKyflHHw5T6znEBcgTyhucemB+hnZOzgRuGEcibK5jAX1Dd Rk7JwxEmyVemkFI9C5mSEnddAK6gBKHh3IVm5Xo/8nZIs+cL/Iza1JU8ztf4Xue9xh/9 KMlgZPRnk4vVO9/QbXfZK624a83Y/PLEaAGZlHIL2vVlEHravG2Lv9pFliPmeXnHKVww xeIg== 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=xGorQfVoMZ+iUqaW92DxUbanNK0hY2uxj/Pn+f4/4FY=; b=fMEP5bsVvUpj6f3HAskuuCYjaXgwadWVImJv/CZr2ja/FWRnL8BSYFWsVZCIWuOuPZ 8Ff6NQLxPwAF2REB8dznVJjOhb6hiuvWHYdFuJVYLljxhR9cU7sG8pXZe+r25SA5Wdgn DVqhtvUuPE3d49kIjWKIcET6ZpmKY7R15Sm5zRQtCB/s1O41usTEZsiSONcJng4LJ10h Sk01/5bcJMtQcKL/VlC3VYNH50LMJfJI/itYI8rputRAQFsP/FoQKRMk0tatPAE5PcoF D5dtVFDiIhDKAdeTNRhkUj2F+ELXgazD5YO0V6Xo6uerG/pgZ+oWGUQWCHgUwaGmG9X9 C4mw== X-Gm-Message-State: AOAM531jL8+DGtVRikHAN+WIX1wAfp5DlLT3AhNBwUBnBOJwLqUk/lL/ dydm+Se4F612dtTrk3semdM= X-Google-Smtp-Source: ABdhPJxNVNapZG5qULGdKNo0tydvp+YoV+TiiJlp1hlDDGxJ52qcRJsAPdNPjn0DTojsRd/qhAIagw== X-Received: by 2002:a5d:60d0:: with SMTP id x16mr1745972wrt.5.1593010896085; Wed, 24 Jun 2020 08:01:36 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:35 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/8] arm64: dts: qcom: msm8994: Add support for SMD RPM Date: Wed, 24 Jun 2020 17:01:04 +0200 Message-Id: <20200624150107.76234-7-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 Add support for SMD RPM, including pm8994 and pmi8994 regulators. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8994.dtsi | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index bf5aa7308b63..cd1476dfeca4 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -175,9 +175,31 @@ smem_mem: smem_region@6a00000 { }; }; + smd { + compatible = "qcom,smd"; + rpm { + interrupts = ; + qcom,ipc = <&apcs 8 0>; + qcom,smd-edge = <15>; + qcom,local-pid = <0>; + qcom,remote-pid = <6>; + + rpm_requests: rpm-requests { + compatible = "qcom,rpm-msm8994"; + qcom,smd-channels = "rpm_requests"; + + rpmcc: rpmcc { + compatible = "qcom,rpmcc-msm8994"; + #clock-cells = <1>; + }; + }; + }; + }; + smem { compatible = "qcom,smem"; memory-region = <&smem_mem>; + qcom,rpm-msg-ram = <&rpm_msg_ram>; hwlocks = <&tcsr_mutex 3>; }; @@ -196,6 +218,12 @@ intc: interrupt-controller@f9000000 { <0xf9002000 0x1000>; }; + apcs: mailbox@f900d000 { + compatible = "qcom,msm8994-apcs-kpss-global", "syscon"; + reg = <0xf900d000 0x2000>; + #mbox-cells = <1>; + }; + timer@f9020000 { #address-cells = <1>; #size-cells = <1>; @@ -451,6 +479,11 @@ gcc: clock-controller@fc400000 { reg = <0xfc400000 0x2000>; }; + rpm_msg_ram: memory@fc428000 { + compatible = "qcom,rpm-msg-ram"; + reg = <0xfc428000 0x4000>; + }; + restart@fc4ab000 { compatible = "qcom,pshold"; reg = <0xfc4ab000 0x4>; @@ -668,5 +701,15 @@ timer { <1 4 0xff08>, <1 1 0xff08>; }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; }; From patchwork Wed Jun 24 15:01:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623381 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1C4B760D for ; Wed, 24 Jun 2020 15:03:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF2B02076E for ; Wed, 24 Jun 2020 15:03:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d/Rv4owG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404137AbgFXPBo (ORCPT ); Wed, 24 Jun 2020 11:01:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404127AbgFXPBl (ORCPT ); Wed, 24 Jun 2020 11:01:41 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A16BFC061573; Wed, 24 Jun 2020 08:01:40 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id v3so2640596wrc.1; Wed, 24 Jun 2020 08:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fWvZOvlYgj/coFGSAGsn1+I2qlc/ybmGUpAsWaUKE1k=; b=d/Rv4owG3Od3+8wp4LGTCqPxMCq5f5D7uwYXahyFtircWW2IgHhWrBsniOeeNm+Y+U nhLt/esAV5+D8kNWsgyEdg0ooMagxjs2XSuT8Of4WRwO3Cm3/IIQdISNyjygSBBa3k+Z qYaCTtTDaBeyC6WoLvD6qWhQHr3FvW8UXkYm8UgIiitek9N9Gtyr2Xd13RGymP0EBFCV 629PkQpDEq6r2dTX91dpNVrrVJFGu7LHRqfmtNVhFxtjx2aPseM7DcxYOTsX42uYUGV9 47JHpCWyNs9FNVa8qYE+atBm7acPVBPChA30QfuMwtHn7iDs3mCyrlsbLUB7f/G5ilE3 63NA== 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=fWvZOvlYgj/coFGSAGsn1+I2qlc/ybmGUpAsWaUKE1k=; b=iB0SGYpe8p+7fxEYMt0AlmxWDcovK+H3u/MOHuzC3W+QTpd5X5MYjKavXNDqWdf9IN apCFwqyZdysrZlJfmzSA5C2o8aFdeVWBQLuHFirctlopLzf17OaFwDE1SfikqoKXAz0q JD/D1sZhnWA6iQ4v25h7ABVjIJ4NTNie9tnaKreIKrsCrBYLLAFDlbOnA2qT+r5h77v6 21b5LxXxgu6YvtPmdEFsE950+PjGHEkP7pbeFFqNPZ00LUt5PwJOmvXEOG83DBp7jf2M jkdvsPuHB9iRb+AfJfhuGHyjkVSoQoYNMAJ93/1CbgFo1sPP4ZbzWhOre3DNm8b/Stuf K7cQ== X-Gm-Message-State: AOAM532X6axDbWHkV3M6hbcHoqtboCaxRUxrUJtRpkQuo5oBvxGzM0H4 vCVih/LYCZeinZrMQeGVL9Q= X-Google-Smtp-Source: ABdhPJxne3UGP/Ze1tGQDTkX5UwUXBiI9qVCaIOpB7P+eQrl7ayulWTjzyJ7GJSp1QOgCyQTiBkymg== X-Received: by 2002:adf:8067:: with SMTP id 94mr30116164wrk.427.1593010899232; Wed, 24 Jun 2020 08:01:39 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:38 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/8] arm64: dts: qcom: Move msm8994-smd-rpm contents to lg-bullhead. Date: Wed, 24 Jun 2020 17:01:05 +0200 Message-Id: <20200624150107.76234-8-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 This was the only device using that dtsi, so no point keeping it separate AND with a confusing name (bullhead is based on msm8992 and the file contains regulator values for that specific board). Signed-off-by: Konrad Dybcio --- .../dts/qcom/msm8992-bullhead-rev-101.dts | 225 ++++++++++++++- arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi | 268 ------------------ 2 files changed, 224 insertions(+), 269 deletions(-) delete mode 100644 arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts index 32670d5afdd6..a2de69292d28 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts @@ -47,4 +47,227 @@ ramoops@1ff00000 { }; }; -#include "msm8994-smd-rpm.dtsi" +&rpm_requests { + pm8994-regulators { + compatible = "qcom,rpm-pm8994-regulators"; + + vdd_l1-supply = <&pm8994_s1>; + vdd_l2_26_28-supply = <&pm8994_s3>; + vdd_l3_11-supply = <&pm8994_s3>; + vdd_l4_27_31-supply = <&pm8994_s3>; + vdd_l5_7-supply = <&pm8994_s3>; + vdd_l6_12_32-supply = <&pm8994_s5>; + vdd_l8_16_30-supply = <&vreg_vph_pwr>; + vdd_l9_10_18_22-supply = <&vreg_vph_pwr>; + vdd_l13_19_23_24-supply = <&vreg_vph_pwr>; + vdd_l14_15-supply = <&pm8994_s5>; + vdd_l17_29-supply = <&vreg_vph_pwr>; + vdd_l20_21-supply = <&vreg_vph_pwr>; + vdd_l25-supply = <&pm8994_s5>; + vdd_lvs1_2 = <&pm8994_s4>; + + pm8994_s1: s1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <800000>; + }; + + pm8994_s2: s2 { + /* TODO */ + }; + + pm8994_s3: s3 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1300000>; + }; + + pm8994_s4: s4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-allow-set-load; + regulator-system-load = <325000>; + }; + + pm8994_s5: s5 { + regulator-min-microvolt = <2150000>; + regulator-max-microvolt = <2150000>; + }; + + pm8994_s7: s7 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + pm8994_l1: l1 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + pm8994_l2: l2 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1250000>; + }; + + pm8994_l3: l3 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + pm8994_l4: l4 { + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; + }; + + pm8994_l5: l5 { + /* TODO */ + }; + + pm8994_l6: l6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l7: l7 { + /* TODO */ + }; + + pm8994_l8: l8 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l9: l9 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l10: l10 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l11: l11 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + pm8994_l12: l12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l13: l13 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + }; + + pm8994_l14: l14 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + pm8994_l15: l15 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l16: l16 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + }; + + pm8994_l17: l17 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + }; + + pm8994_l18: l18 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + pm8994_l19: l19 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l20: l20 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + regulator-always-on; + regulator-boot-on; + regulator-allow-set-load; + regulator-system-load = <570000>; + }; + + pm8994_l21: l21 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + pm8994_l22: l22 { + regulator-min-microvolt = <3100000>; + regulator-max-microvolt = <3100000>; + }; + + pm8994_l23: l23 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + }; + + pm8994_l24: l24 { + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3150000>; + }; + + pm8994_l25: l25 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l26: l26 { + /* TODO: value from downstream + regulator-min-microvolt = <987500>; + fails to apply */ + }; + + pm8994_l27: l27 { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + }; + + pm8994_l28: l28 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + pm8994_l29: l29 { + /* TODO: Unsupported voltage range. + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + qcom,init-voltage = <2800000>; + */ + }; + + pm8994_l30: l30 { + /* TODO: get this verified + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,init-voltage = <1800000>; + */ + }; + + pm8994_l31: l31 { + regulator-min-microvolt = <1262500>; + regulator-max-microvolt = <1262500>; + }; + + pm8994_l32: l32 { + /* TODO: get this verified + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,init-voltage = <1800000>; + */ + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi b/arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi deleted file mode 100644 index 31e3eb6ab515..000000000000 --- a/arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi +++ /dev/null @@ -1,268 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2015, LGE Inc. All rights reserved. - * Copyright (c) 2016, The Linux Foundation. All rights reserved. - */ - -&smd_rpm { - rpm { - rpm_requests { - pm8994-regulators { - - vdd_l1-supply = <&pm8994_s1>; - vdd_l2_26_28-supply = <&pm8994_s3>; - vdd_l3_11-supply = <&pm8994_s3>; - vdd_l4_27_31-supply = <&pm8994_s3>; - vdd_l5_7-supply = <&pm8994_s3>; - vdd_l6_12_32-supply = <&pm8994_s5>; - vdd_l8_16_30-supply = <&vreg_vph_pwr>; - vdd_l9_10_18_22-supply = <&vreg_vph_pwr>; - vdd_l13_19_23_24-supply = <&vreg_vph_pwr>; - vdd_l14_15-supply = <&pm8994_s5>; - vdd_l17_29-supply = <&vreg_vph_pwr>; - vdd_l20_21-supply = <&vreg_vph_pwr>; - vdd_l25-supply = <&pm8994_s5>; - vdd_lvs1_2 = <&pm8994_s4>; - - s1 { - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <800000>; - }; - - s2 { - /* TODO */ - }; - - s3 { - regulator-min-microvolt = <1300000>; - regulator-max-microvolt = <1300000>; - }; - - s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-allow-set-load; - regulator-system-load = <325000>; - }; - - s5 { - regulator-min-microvolt = <2150000>; - regulator-max-microvolt = <2150000>; - }; - - s7 { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - }; - - l1 { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - }; - - l2 { - regulator-min-microvolt = <1250000>; - regulator-max-microvolt = <1250000>; - }; - - l3 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - l4 { - regulator-min-microvolt = <1225000>; - regulator-max-microvolt = <1225000>; - }; - - l5 { - /* TODO */ - }; - - l6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - l7 { - /* TODO */ - }; - - l8 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - l9 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - l10 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,init-voltage = <1800000>; - }; - - l11 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - qcom,init-voltage = <1200000>; - }; - - l12 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,init-voltage = <1800000>; - proxy-supply = <&pm8994_l12>; - qcom,proxy-consumer-enable; - qcom,proxy-consumer-current = <10000>; - status = "okay"; - }; - - l13 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - qcom,init-voltage = <2950000>; - status = "okay"; - }; - - l14 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - qcom,init-voltage = <1200000>; - proxy-supply = <&pm8994_l14>; - qcom,proxy-consumer-enable; - qcom,proxy-consumer-current = <10000>; - status = "okay"; - }; - - l15 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,init-voltage = <1800000>; - status = "okay"; - }; - - l16 { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - qcom,init-voltage = <2700000>; - status = "okay"; - }; - - l17 { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - qcom,init-voltage = <2700000>; - status = "okay"; - }; - - l18 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-always-on; - qcom,init-voltage = <3000000>; - qcom,init-ldo-mode = <1>; - }; - - l19 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,init-voltage = <1800000>; - status = "okay"; - }; - - l20 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - regulator-always-on; - regulator-boot-on; - regulator-allow-set-load; - regulator-system-load = <570000>; - }; - - l21 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - qcom,init-voltage = <1800000>; - }; - - l22 { - regulator-min-microvolt = <3100000>; - regulator-max-microvolt = <3100000>; - qcom,init-voltage = <3100000>; - }; - - l23 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - qcom,init-voltage = <2800000>; - }; - - l24 { - regulator-min-microvolt = <3075000>; - regulator-max-microvolt = <3150000>; - qcom,init-voltage = <3075000>; - }; - - l25 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,init-voltage = <1800000>; - }; - - l26 { - /* TODO: value from downstream - regulator-min-microvolt = <987500>; - fails to apply */ - }; - - l27 { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1050000>; - qcom,init-voltage = <1050000>; - }; - - l28 { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - qcom,init-voltage = <1000000>; - proxy-supply = <&pm8994_l28>; - qcom,proxy-consumer-enable; - qcom,proxy-consumer-current = <10000>; - }; - - l29 { - /* TODO: Unsupported voltage range. - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - qcom,init-voltage = <2800000>; - */ - }; - - l30 { - /* TODO: get this verified - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,init-voltage = <1800000>; - */ - }; - - l31 { - regulator-min-microvolt = <1262500>; - regulator-max-microvolt = <1262500>; - qcom,init-voltage = <1262500>; - }; - - l32 { - /* TODO: get this verified - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,init-voltage = <1800000>; - */ - }; - }; - }; - }; -}; From patchwork Wed Jun 24 15:01:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 11623379 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5282A60D for ; Wed, 24 Jun 2020 15:03:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30A022076E for ; Wed, 24 Jun 2020 15:03:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qvFdjUll" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403814AbgFXPC7 (ORCPT ); Wed, 24 Jun 2020 11:02:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404134AbgFXPBo (ORCPT ); Wed, 24 Jun 2020 11:01:44 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A64CC061573; Wed, 24 Jun 2020 08:01:43 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id o2so2844667wmh.2; Wed, 24 Jun 2020 08:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HvrdsGGU5QETPsz0XtM3uyFsGcnabcIkzEzJv5BB6T8=; b=qvFdjUllSWIAtzl9XjaPQmJxr/HCa7XKhUniXWyPxQzz+Q/YoxMx9coKZ+mmzlKrji GVeyo/ECKf3mXsTQPYBwqB3oAl4lL3Fu2GTqV4e2oXfiB8amtqobJ9GFAK2EGHe72goa wPuYkk8wwY1fdVZfSN1JgTetL9UHF65Nytn08rgGIO7MxW44nbC0y1aS7plAhyX90fIr Mhst/8SYc4/ALgxDD2e9w90m1I3cBGWeVL+httKLv3MMtEZgF1fU+BcIUYYGF09IZnOi Rv6OLgm2/UXsqZbQb8A9u0I6hiGogKU4uAFo09ZUDuQQ04bSsHbMFaOUiGZ7MEbTue+f Ojhw== 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=HvrdsGGU5QETPsz0XtM3uyFsGcnabcIkzEzJv5BB6T8=; b=NayJFIuMXMwn/V/H6HQ893Tk816BFSuk0yBmGmS+ugng5Dcq8ruQ5iFDe05dTC/qLf UCmCSWHzMOd9fzmNEIcInJWHck8g/seblX/1QflZOGHERirKnFXzZTApvoXSJwE8Myjt hmi1I/bJGZYHLKppAt15C+h7GMG9HPOj8G++WsAhUtuoYQH//U2mCiLEk3jDDbgrX+oD 4+kMQPT9rLypRbGxarzTURLDQCuNoixFbmwrq2fIcXo5tWP+cKSnou9YmXtoo3KwlwCR 3VYikfhMPv+mnADqPrElJxS/SXcCoZJISZFojmlneUrWazUvonPvG6SRy9+PAjkfwIiy 9qow== X-Gm-Message-State: AOAM532WMDCPTp/1i+uI8A+KMKB/JLPYetuP9Ut9psc4CYTTvjGj/b8t geO0ob4LhinXoZq7La6OiW4= X-Google-Smtp-Source: ABdhPJwllyvVtZ5u9hdjwkrQ32Hcu1VAr/TsH1w1PYy8uU23l23JByNC/Kj7uZ9hACCuJm7kWgQrSQ== X-Received: by 2002:a7b:cc17:: with SMTP id f23mr29203691wmh.41.1593010902203; Wed, 24 Jun 2020 08:01:42 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id s8sm21339390wru.38.2020.06.24.08.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 08:01:41 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Jassi Brar , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , Sivaprakash Murugesan , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 8/8] arm64: dts: qcom: Add support for Sony Xperia Z5 (SoMC Sumire-RoW) Date: Wed, 24 Jun 2020 17:01:06 +0200 Message-Id: <20200624150107.76234-9-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200624150107.76234-1-konradybcio@gmail.com> References: <20200624150107.76234-1-konradybcio@gmail.com> 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 Add device tree support for the Sony Xperia Z5 smartphone. It's based on Sony Kitakami platform (msm8994) and hence a Kitakami-common DTSI has been created so as to reduce clutter when remaining devices are added. The board currently supports * Serial * SDHCI * I2C * Regulator configuration * pstore log dump * GPIO keys Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../msm8994-sony-xperia-kitakami-sumire.dts | 13 + .../qcom/msm8994-sony-xperia-kitakami.dtsi | 235 ++++++++++++++++++ 3 files changed, 249 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts create mode 100644 arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 0f2c33d611df..01ca9ac9f905 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb +dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-sumire.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8998-asus-novago-tp370ql.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8998-hp-envy-x2.dtb diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts new file mode 100644 index 000000000000..e4ae6600be9d --- /dev/null +++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-sumire.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2020, Konrad Dybcio + */ + +/dts-v1/; + +#include "msm8994-sony-xperia-kitakami.dtsi" + +/ { + model = "Sony Xperia Z5"; + compatible = "somc,sumire-row", "qcom,msm8994"; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi new file mode 100644 index 000000000000..4032b7478f04 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi @@ -0,0 +1,235 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2020, Konrad Dybcio + */ + +#include "msm8994.dtsi" +#include "pm8994.dtsi" +#include "pmi8994.dtsi" +#include +#include + +/ { + /* required for bootloader to select correct board */ + qcom,msm-id = <0xcf 0x20001>; + qcom,pmic-id = <0x10009 0x1000a 0x00 0x00>; + qcom,board-id = <8 0>; + + /* Kitakami firmware doesn't support PSCI */ + /delete-node/ psci; + + gpio_keys { + compatible = "gpio-keys"; + input-name = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + autorepeat; + + button@0 { + label = "Volume Down"; + gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = ; + wakeup-source; + debounce-interval = <15>; + }; + + button@1 { + label = "Volume Up"; + gpios = <&pm8994_gpios 3 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = ; + wakeup-source; + debounce-interval = <15>; + }; + + button@2 { + label = "Camera Snapshot"; + gpios = <&pm8994_gpios 4 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = ; + wakeup-source; + debounce-interval = <15>; + }; + + button@3 { + label = "Camera Focus"; + gpios = <&pm8994_gpios 5 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = ; + wakeup-source; + debounce-interval = <15>; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* This is for getting crash logs using Android downstream kernels */ + ramoops@1fe00000 { + compatible = "ramoops"; + reg = <0x0 0x1fe00000 0x0 0x200000>; + console-size = <0x100000>; + record-size = <0x10000>; + ftrace-size = <0x10000>; + pmsg-size = <0x80000>; + }; + + continuous_splash: framebuffer@3401000{ + reg = <0x0 0x3401000 0x0 0x2200000>; + no-map; + }; + + dfps_data_mem: dfps_data_mem@3400000 { + reg = <0x0 0x3400000 0x0 0x1000>; + no-map; + }; + + peripheral_region: peripheral_region@7400000 { + reg = <0x0 0x7400000 0x0 0x1c00000>; + no-map; + }; + + modem_region: modem_region@9000000 { + reg = <0x0 0x9000000 0x0 0x5a00000>; + no-map; + }; + + tzapp: modem_region@ea00000 { + reg = <0x0 0xea00000 0x0 0x1900000>; + no-map; + }; + + fb_region: fb_region@40000000 { + reg = <0x00 0x40000000 0x00 0x1000000>; + no-map; + }; + }; +}; + +&blsp_spi0 { + status = "okay"; + + /* FPC fingerprint reader */ +}; + +/* I2C1 is disabled on this board */ + +&blsp_i2c2 { + status = "okay"; + + /* NXP NFC */ +}; + +&blsp_i2c4 { + status = "okay"; + + /* Empty but active */ +}; + +&blsp_i2c5 { + status = "okay"; + + /* SMB1357 charger and sii8620 HDMI/MHL bridge */ +}; + +&blsp_i2c6 { + status = "okay"; + + /* Synaptics touchscreen */ +}; + +&blsp1_uart2 { + status = "okay"; +}; + +&blsp2_uart2 { + status = "okay"; +}; + +&rpm_requests { + pm8994_regulators: pm8994-regulators { + compatible = "qcom,rpm-pm8994-regulators"; + vdd_l1-supply = <&pm8994_s1>; + vdd_l2_26_28-supply = <&pm8994_s3>; + vdd_l3_11-supply = <&pm8994_s3>; + vdd_l4_27_31-supply = <&pm8994_s3>; + vdd_l5_7-supply = <&pm8994_s3>; + vdd_l6_12_32-supply = <&pm8994_s5>; + vdd_l8_16_30-supply = <&vreg_vph_pwr>; + vdd_l9_10_18_22-supply = <&vreg_vph_pwr>; + vdd_l13_19_23_24-supply = <&vreg_vph_pwr>; + vdd_l14_15-supply = <&pm8994_s5>; + vdd_l17_29-supply = <&vreg_vph_pwr>; + vdd_l20_21-supply = <&vreg_vph_pwr>; + vdd_l25-supply = <&pm8994_s5>; + vdd_lvs1_2 = <&pm8994_s4>; + + pm8994_s1: s1 {}; + pm8994_s2: s2 {}; + pm8994_s3: s3 {}; + pm8994_s4: s4 {}; + pm8994_s5: s5 {}; + pm8994_s6: s6 {}; + pm8994_s7: s7 {}; + + pm8994_l1: l1 {}; + pm8994_l2: l2 {}; + pm8994_l3: l3 {}; + pm8994_l4: l4 {}; + pm8994_l6: l6 {}; + pm8994_l8: l8 {}; + pm8994_l9: l9 {}; + pm8994_l10: l10 {}; + pm8994_l11: l11 {}; + pm8994_l12: l12 {}; + pm8994_l13: l13 {}; + pm8994_l14: l14 {}; + pm8994_l15: l15 {}; + pm8994_l16: l16 {}; + pm8994_l17: l17 {}; + pm8994_l18: l18 {}; + pm8994_l19: l19 {}; + pm8994_l20: l20 {}; + pm8994_l21: l21 {}; + pm8994_l22: l22 {}; + pm8994_l23: l23 {}; + pm8994_l24: l24 {}; + pm8994_l25: l25 {}; + pm8994_l26: l26 {}; + pm8994_l27: l27 {}; + pm8994_l28: l28 {}; + pm8994_l29: l29 {}; + pm8994_l30: l30 {}; + pm8994_l31: l31 {}; + pm8994_l32: l32 {}; + + pm8994_lvs1: lvs1 {}; + pm8994_lvs2: lvs2 {}; + }; + + pmi8994_regulators: pmi8994-regulators { + compatible = "qcom,rpm-pmi8994-regulators"; + + pmi8994_s1: s1 {}; + pmi8994_s2: s2 {}; + pmi8994_s3: s3 {}; + pmi8994_bby: boost-bypass {}; + }; +}; + +&sdhc1 { + status = "okay"; + + /* Downstream pushes 2.95V to the sdhci device, + * but upstream driver REALLY wants to make vmmc 1.8v + * cause of the hs400-1_8v mode. MMC works fine without + * that regulator, so let's not use it for now. + * vqmmc is also disabled cause driver stll complains. + * + * vmmc-supply = <&pm8994_l20>; + * vqmmc-supply = <&pm8994_s4>; + */ +};