From patchwork Fri Aug 18 15:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13357942 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 32327C77B7A for ; Fri, 18 Aug 2023 15:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378121AbjHRPX5 (ORCPT ); Fri, 18 Aug 2023 11:23:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378094AbjHRPXw (ORCPT ); Fri, 18 Aug 2023 11:23:52 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B96DA3C31 for ; Fri, 18 Aug 2023 08:23:50 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-4ff93a7f230so1197850e87.1 for ; Fri, 18 Aug 2023 08:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692372229; x=1692977029; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=iJQqDdGPVUJfoRvKnSM80n8RczWSHnCto7QTsJZiqtk=; b=C8uQDGLm7z++sx4Hg3NyuOfpIVB4wpbI+ED7CNVawWP0Wx7CZ/W3uMMt0+81hGbcjf SwqTa0A7HafS0UIaX52ysPqC26xwzt8rhw9RlxqPzD4VxYhikOahtQ+AusgK0XW32Uh+ HP3HzoNyuTKC7dMM+bTs0rbpYmon1d4h1/YqsMC1/pdkSOTW+1jSoBUm81Uouqc/gelh rfZv3p5i5nHtr01kYLtpeFu0bG5ni4XZllMvwYvOCUIJiRx3IT9KKSpCOBGbpBF+YgmE CdWny4e3CTLa9eJR0dln9VUpjrMUkKJEIHkQL1KXigeqBsWPi05xgP6OZ4QssjdrVzaY k82w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692372229; x=1692977029; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iJQqDdGPVUJfoRvKnSM80n8RczWSHnCto7QTsJZiqtk=; b=ECq+y0Q/uQHcdnKoEC7SH6RCBhjMz/vYqzPcrvSrd0vS8MDdfduMECgoGCwQLSP9mS BJbM56YhcKY4W5cbRQpg6Wzh4O6qKOXd6bpJ0DOgANWJNU/aL6DGl3lzBZPlv6gnCP9N 7f7lgWgYvwQpDfLAearrWi+BtDsBif/Y6MbaYfojakkcYwGdk2RBiK4wZNlqAxoBvVML AI5KcPR7KyQohjgJnx1hKLqbKl9T9DSwFIGtWOZUQgD+jTv9UighAcCdpaDnoAcFLO7r JIOTtD8P3BcBG6rUISjutb+ijjTMkR17WH3mm1Ol+bCObr3LRUFcQyR4VzVkdgVvy548 jpCQ== X-Gm-Message-State: AOJu0Ywp0gCGEYsZZ2LWToIHlmbool7boL2z+vX3tk+5E6G63i44Po++ BlAza1lKBcqyK7eEBXy1g/X4UQ== X-Google-Smtp-Source: AGHT+IG/mI9Nx9tmlh0+qzTSHFdmpOBxSp41fxQHkMQkMitajAbKXFDtQrjdgsIPZDldqTcGTH9MzA== X-Received: by 2002:a05:6512:159e:b0:4fe:8ba8:1a8b with SMTP id bp30-20020a056512159e00b004fe8ba81a8bmr1248198lfb.7.1692372229014; Fri, 18 Aug 2023 08:23:49 -0700 (PDT) Received: from [192.168.1.101] (abxh52.neoplus.adsl.tpnet.pl. [83.9.1.52]) by smtp.gmail.com with ESMTPSA id y2-20020ac24202000000b004fe4d122a66sm383715lfh.187.2023.08.18.08.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 08:23:48 -0700 (PDT) From: Konrad Dybcio Date: Fri, 18 Aug 2023 17:23:24 +0200 Subject: [PATCH 1/5] dt-bindings: qcom: Add Sony Xperia 10 V MIME-Version: 1.0 Message-Id: <20230818-topic-10v-v1-1-dbb6464223c6@linaro.org> References: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> In-Reply-To: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kees Cook , Tony Luck , "Guilherme G. Piccoli" Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , linux-hardening@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1692372226; l=1130; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=w7EHpX3DR/QuWoxAiVHalOk3V0ZK5fAKJ3KAsW4H5mY=; b=lHLWdy5rSa9EJVMoNNo2AhDQGBBQupAMkbkz0AwJi3IxNrlw87hCpZ1yD7tXa9v94pNyJMihx ftzTNs+0vyIAfqE4y6NmuKzDsXwtk/jvIoFJG4pxkE9R61XO0N8wDru X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org The SM6375-based Xperia 10 V is veeery similar to the previous year 10 IV, sharing a common base motherboard design. The software configuration however is somewhat different, which requires us to allow using qcom,msm/board-id on sm6375. Sad. Document the device. Signed-off-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/arm/qcom.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index adbfaea32343..766d7e1c9db3 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -941,6 +941,7 @@ properties: - items: - enum: - sony,pdx225 + - sony,pdx235 - const: qcom,sm6375 - items: @@ -1086,6 +1087,7 @@ allOf: - qcom,sm6115 - qcom,sm6125 - qcom,sm6350 + - qcom,sm6375 - qcom,sm7225 - qcom,sm8150 - qcom,sm8250 From patchwork Fri Aug 18 15:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13357944 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 D8CCBC7EE2E for ; Fri, 18 Aug 2023 15:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378110AbjHRPX6 (ORCPT ); Fri, 18 Aug 2023 11:23:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378113AbjHRPXx (ORCPT ); Fri, 18 Aug 2023 11:23:53 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04CE83C3D for ; Fri, 18 Aug 2023 08:23:52 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b9c0391749so16764901fa.0 for ; Fri, 18 Aug 2023 08:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692372230; x=1692977030; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=c6CtJZa/AQu9J0Kld480ZWxBu5BwWXbF9kOTOoaJUEo=; b=hNvMKcE9iXe4JChLBzvJ/TaIGp18ypRKvWNxEQsIeQZPzQ8L0Zk4ZbX3MNfYS0zj0e uPAL/8E6VDs6wx8JkK02+KwZRQHXezCWQF+Af1T6NJ1d9VmscZM0tz3oYMEn7ncrwFaz 6e4sHu7bhwFyljtEDHJ3kW2M7N3nzjUMm9yVgGDh3MINFBMitLSRnFSRoVMQFgLVZfbi EXYgYP0CfIYPjYp7aiRC41Opp/BPOpGYLO5gNtbdRItuIkZkYF9lV1FqlBsW0cNx3xpW oerwV0RYk9f1buhztqmHeJVgdp/9McPRFYZ7RgNNAbRTWtO4k6AhRCnlQm48v+mkih1d IXSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692372230; x=1692977030; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c6CtJZa/AQu9J0Kld480ZWxBu5BwWXbF9kOTOoaJUEo=; b=lSmcaa7fdR/MNtzSYXH3SL/GBeBRGwscUdBy/1kmMMyMygEgloG9CXM1EYvuPt9yXR z+Mc5qMgN1/0IK8pzSjc3ZIZpMNa72OhaM9S5WI5dNy9elFHgOawuYlAcMxJhKIC/zkN 8/DgceRGFMqQNzd2tkV1gOKhyytFMjhWqMaLg8vTm8jL1xU13Hl7j17YwlAGZgJ9qcP8 HjrngmqcIKAjc6RsdFjuOLEcsTyfvbS85cpKVKNirlYbpfIdaSnjRjWM+Jk4cloR0uUz TL6E8sFIdqXFZu/vuE1xVZusYGtZafQxAKVf/xEVfHTFU5nA9xMzUrsbxLgOi8BGR+P+ +uzw== X-Gm-Message-State: AOJu0YySsANXrU0dsstUfSJ5CfW62MjU306ilWpWxn/IowVR98NUG5PB 2q3ItYkOv5587vdYtgOAh6S25g== X-Google-Smtp-Source: AGHT+IFIgOf5qG7QIjlRFlsPGcVULHL0fPWgMWpi7fEWFqlQiCmr1iT80HFjOPrt1+NQQogpae0Sfg== X-Received: by 2002:a05:6512:3b28:b0:4fb:89b3:3374 with SMTP id f40-20020a0565123b2800b004fb89b33374mr2405957lfv.54.1692372230288; Fri, 18 Aug 2023 08:23:50 -0700 (PDT) Received: from [192.168.1.101] (abxh52.neoplus.adsl.tpnet.pl. [83.9.1.52]) by smtp.gmail.com with ESMTPSA id y2-20020ac24202000000b004fe4d122a66sm383715lfh.187.2023.08.18.08.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 08:23:50 -0700 (PDT) From: Konrad Dybcio Date: Fri, 18 Aug 2023 17:23:25 +0200 Subject: [PATCH 2/5] arm64: dts: qcom: sm6375: Fix I2C10 GPIO function MIME-Version: 1.0 Message-Id: <20230818-topic-10v-v1-2-dbb6464223c6@linaro.org> References: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> In-Reply-To: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kees Cook , Tony Luck , "Guilherme G. Piccoli" Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , linux-hardening@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1692372226; l=947; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=MIwq+pDyGnrHjet8pcjzzvliK2BSL87L5F0gT3kHAkY=; b=0ZKUlIALmo4upl+QkKnlQDx0/mWzWhG/TFD67I6/V/bIThOq7IphrZaSAkZ00LsxJXOLX/EMt l/HBWSlH0p5Bm0KmdeIO+oHFdGhQbcPWAuFikP+uvDyLJqecOTPnr+3 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org Unfortunately, as mentioned in a comment under a different node in the device tree, the pinctrl driver's naming doesn't really match up with actual QUP indices.. Assign the correct one for I2C10. Fixes: 704edf03c022 ("arm64: dts: qcom: sm6375: Add pin configs for some QUP configurations") Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm6375.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sm6375.dtsi b/arch/arm64/boot/dts/qcom/sm6375.dtsi index e7ff55443da7..4364b144eb93 100644 --- a/arch/arm64/boot/dts/qcom/sm6375.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6375.dtsi @@ -885,7 +885,7 @@ qup_i2c8_default: qup-i2c8-default-state { qup_i2c10_default: qup-i2c10-default-state { pins = "gpio4", "gpio5"; - function = "qup10"; + function = "qup14"; drive-strength = <2>; bias-pull-up; }; From patchwork Fri Aug 18 15:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13357943 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 64F8BC7EE2A for ; Fri, 18 Aug 2023 15:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378113AbjHRPX7 (ORCPT ); Fri, 18 Aug 2023 11:23:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378119AbjHRPXz (ORCPT ); Fri, 18 Aug 2023 11:23:55 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0CB43C31 for ; Fri, 18 Aug 2023 08:23:53 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4ff9121fd29so1502333e87.3 for ; Fri, 18 Aug 2023 08:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692372232; x=1692977032; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pKuNDT3ozn5yu4XZDwLRBbbhrL0YjdwUNB++YlEavBU=; b=vaHynN3rl1OCp5jP73OUEMGqdiKZOdTcj5FzUPeYMNX5aMd1794XPQFmgUzRbiZnxl XvLAp+px+aR4h/q6mbrMtXXR92AbOrezTmVN/bzAUy34uM/1Uix3r0+bivnSfefofOnZ 7KZ3xX/GNM7RmgaRElVrPHbD/Dfin5zet5DyEjx0lnUHEj1pIMpKwI+zblfaGhjFTvVp djp8Hfdb7qI01QebxHvlMILlwX8BmNxwsyOQXSWcJa0E/0yXii1a1aUjvsC5BMdCIW+c cGzdKYk1JgVoTB2kn03Wbiks6/UCy2EVsTPKz17wSs142VjrviF+sLPdBjyH18rZbetU ag9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692372232; x=1692977032; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pKuNDT3ozn5yu4XZDwLRBbbhrL0YjdwUNB++YlEavBU=; b=S9Q3ANtKp2+JMvVUtWWXQopBTB6RDlILp2T8HZ9Zu+mO39mGYyuU4VHj4qZ08q7ddq lJpXJCZyIak1VchltdK2TGNVTQqNrxKWtKhyKVwE0HQnY7Fp08fdnqWdxoqicBA1Qypi jjW3G5p2XY8Nd2U/SeCuap48iNpPyJ71XMYB0D30Cj9o7i970xKU8QmYvoUl7rVa4XYg gvsuSbtobTCK7RnvZ/OyNvDi5W5Q2XApJNZKBjMcV+IiqS4vkxIPHbTzTQNNBAtNrI9B qDTBvbKOGwgc5gR9nGNk/gIDNsv1+vfW10sPq/d/JQwz4s30wkX4N8/eRqh0VZfYzc3I Nerw== X-Gm-Message-State: AOJu0YxcWjY7mglrwsNdpUeGkMmdaj1AKebCy9g8cgOawcVF/5L+a0Sj fS5Yd547DImvxQyDYaHHc+cVAw== X-Google-Smtp-Source: AGHT+IHjAGZdIBGvR96SvrKqgepbLo4FofyQopD/9llMZUKYV2cPMfdq+9VMOfu4VD4SleJwXtOacQ== X-Received: by 2002:a05:6512:2309:b0:4f8:5635:2cd8 with SMTP id o9-20020a056512230900b004f856352cd8mr2727252lfu.32.1692372231991; Fri, 18 Aug 2023 08:23:51 -0700 (PDT) Received: from [192.168.1.101] (abxh52.neoplus.adsl.tpnet.pl. [83.9.1.52]) by smtp.gmail.com with ESMTPSA id y2-20020ac24202000000b004fe4d122a66sm383715lfh.187.2023.08.18.08.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 08:23:51 -0700 (PDT) From: Konrad Dybcio Date: Fri, 18 Aug 2023 17:23:26 +0200 Subject: [PATCH 3/5] arm64: dts: qcom: sm6375: Hook up I2C7 GPIOs MIME-Version: 1.0 Message-Id: <20230818-topic-10v-v1-3-dbb6464223c6@linaro.org> References: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> In-Reply-To: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kees Cook , Tony Luck , "Guilherme G. Piccoli" Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , linux-hardening@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1692372226; l=1311; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=7pwAxQ89b609N+91Ei3/CUuL4YiJwIEnELBA4MpGvCI=; b=7wn65upp5DABUi+sBI8DHVsh9zu7rABI4hUp+7QKuPdyWzePy3XyRoaheS4lThoxcmmbMRVMe VnZDV+pn2f/DeBrx1hMhqUCRmJKPjYrp0uBV5JPx4EiJbqTVziy34xn X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org It's required to mux the GPIOs to a correct function to make sure the I2C host can communicate with the devices on the other end. Ensure that happens. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm6375.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6375.dtsi b/arch/arm64/boot/dts/qcom/sm6375.dtsi index 4364b144eb93..b79908d969c7 100644 --- a/arch/arm64/boot/dts/qcom/sm6375.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6375.dtsi @@ -875,6 +875,13 @@ qup_i2c2_default: qup-i2c2-default-state { bias-pull-up; }; + qup_i2c7_default: qup-i2c7-default-state { + pins = "gpio27", "gpio28"; + function = "qup11_f1"; + drive-strength = <2>; + bias-pull-up; + }; + qup_i2c8_default: qup-i2c8-default-state { pins = "gpio19", "gpio20"; /* TLMM, GCC and vendor DT all have different indices.. */ @@ -1220,6 +1227,8 @@ i2c7: i2c@4c84000 { clock-names = "se"; clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>; interrupts = ; + pinctrl-0 = <&qup_i2c7_default>; + pinctrl-names = "default"; dmas = <&gpi_dma1 0 1 QCOM_GPI_I2C>, <&gpi_dma1 1 1 QCOM_GPI_I2C>; dma-names = "tx", "rx"; From patchwork Fri Aug 18 15:23:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13357945 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 DDBC4C71155 for ; Fri, 18 Aug 2023 15:25:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378127AbjHRPYb (ORCPT ); Fri, 18 Aug 2023 11:24:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378117AbjHRPX5 (ORCPT ); Fri, 18 Aug 2023 11:23:57 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BE4E3C38 for ; Fri, 18 Aug 2023 08:23:55 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4fe28f92d8eso1394333e87.1 for ; Fri, 18 Aug 2023 08:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692372233; x=1692977033; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1C0vCDTaaUlQQOaP+aUyo87dt8SzTy/fVmI6KNG6Qfg=; b=wx9p9RSXvwziATlMwVYVVrbpx2Z9ABqklNhv/UuFDKnTWuxJqVrVQesIlZlG3rmqEr gctgW1zDC1tib5AhcVcao2DJ6dlNn5lUlZQ9v4i1NCKeaNJfv91d/aFBEM1zQb4NvgFn Bsvmz9yDgo1jknBdhFmLnboozdHWSAgxVQ7uzfZaHGWBnaysoq/OcBHiYHri39idW9Cs s/dJjYhjN1YwB8peBF97w+gTXr0VsqY31IV/42GXC6zk2y5c4QbdTDPC1hX2bg2zWtHV cNRZTGaGfhlNw+Fq77tSD+OYLGoeORSPeKyEvFxVm//dXxJ43xZa1WtBE4l3jgWHfyD6 FN0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692372233; x=1692977033; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1C0vCDTaaUlQQOaP+aUyo87dt8SzTy/fVmI6KNG6Qfg=; b=Wxgxnk5Ztwy/uIzQbukxzlqnPMYiNt2n+vKK0x2sN52xAPIthz9togJaM0FvZ2zYBP JNyBzc834zMbQLO+aCC1mVe9/m0eyba0bviNWMqY50sP5XgeED4aejhEZD4t2BTT1j7L BIthJhJVZNL3Sv1CBIHmAIELKx1qwUWXeas9A0pYwvTCWPgHZhAB9ILLccaK4CW8kGzv WbwKAuSiJuBWMn4D2E5WCFoLUkNzCJtGlWELkXxjwPFUkj0s4T9FxQJ2WREOIi4vjdUR LhGjXlcOiOeL3eMphWAHoThabr/ukQ6jKrr36ndxXG9/IpdALxEx8zaVbTaGnBiCrIcq VavA== X-Gm-Message-State: AOJu0YxmrJoIulQEKmPBk3Zdmo7qxW++G9SlafZASaXZE40wMZjRX6wJ GuE4SlxhJIMaHnt/yk56a4IkxQ== X-Google-Smtp-Source: AGHT+IHYRePZMnnp6MM60liWo6ROE9kW+vSENW75nQbCW8CoaiZiXyLXxcof3BJkVQM0RoAXa5gL3g== X-Received: by 2002:a19:7616:0:b0:4fe:1e69:c37b with SMTP id c22-20020a197616000000b004fe1e69c37bmr1828659lff.10.1692372233316; Fri, 18 Aug 2023 08:23:53 -0700 (PDT) Received: from [192.168.1.101] (abxh52.neoplus.adsl.tpnet.pl. [83.9.1.52]) by smtp.gmail.com with ESMTPSA id y2-20020ac24202000000b004fe4d122a66sm383715lfh.187.2023.08.18.08.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 08:23:53 -0700 (PDT) From: Konrad Dybcio Date: Fri, 18 Aug 2023 17:23:27 +0200 Subject: [PATCH 4/5] arm64: dts: qcom: sm6375-murray: Separate out common parts MIME-Version: 1.0 Message-Id: <20230818-topic-10v-v1-4-dbb6464223c6@linaro.org> References: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> In-Reply-To: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kees Cook , Tony Luck , "Guilherme G. Piccoli" Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , linux-hardening@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1692372226; l=18160; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=N8+JyTSCBYvOorQ+CdiyBuRQvt/vFE9GwEbDEamdj/U=; b=DoY727hXHG4qQyuaodsCRofdFlP0La/wHB1AoFDAfuZmQVXXqKasGc7sc6FgmWf+b0rwj/t/3 Z8Cgbsg6vliC6h6c+FndkZAKlfvz5L8EZ+5DQUcfxPT3zVPpVDjbq33 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org There's a new kid in the Murray family, let's make space for it! Signed-off-by: Konrad Dybcio --- .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 421 +------------------- .../boot/dts/qcom/sm6375-sony-xperia-murray.dtsi | 427 +++++++++++++++++++++ 2 files changed, 428 insertions(+), 420 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts index b2f1bb1d58e9..bcbef6ed7006 100644 --- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts @@ -5,429 +5,10 @@ /dts-v1/; -/* PMK8350 is configured to use SID6 instead of 0 */ -#define PMK8350_SID 6 - -#include -#include "sm6375.dtsi" -#include "pm6125.dtsi" -#include "pmk8350.dtsi" -#include "pmr735a.dtsi" - -/* PM6125 PON is used and we can't have duplicate labels */ -/delete-node/ &pmk8350_pon; +#include "sm6375-sony-xperia-murray.dtsi" / { model = "Sony Xperia 10 IV"; compatible = "sony,pdx225", "qcom,sm6375"; chassis-type = "handset"; - - chosen { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - framebuffer: framebuffer@85200000 { - compatible = "simple-framebuffer"; - reg = <0 0x85200000 0 0xc00000>; - - width = <1080>; - height = <2520>; - stride = <(1080 * 4)>; - format = "a8r8g8b8"; - /* - * That's (going to be) a lot of clocks, but it's necessary due - * to unused clk cleanup & no panel driver yet - */ - clocks = <&gcc GCC_DISP_AHB_CLK>, - <&gcc GCC_DISP_HF_AXI_CLK>, - <&gcc GCC_DISP_THROTTLE_CORE_CLK>, - <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>; - }; - }; - - gpio-keys { - compatible = "gpio-keys"; - label = "gpio-keys"; - - pinctrl-0 = <&vol_down_n>; - pinctrl-names = "default"; - - key-volume-down { - label = "Volume Down"; - linux,code = ; - gpios = <&pmr735a_gpios 1 GPIO_ACTIVE_LOW>; - debounce-interval = <15>; - linux,can-disable; - wakeup-source; - }; - }; - - reserved-memory { - cont_splash_mem: memory@85200000 { - reg = <0 0x85200000 0 0xc00000>; - no-map; - }; - - ramoops@ffc40000 { - compatible = "ramoops"; - reg = <0 0xffc40000 0 0xb0000>; - record-size = <0x10000>; - console-size = <0x60000>; - ftrace-size = <0x10000>; - pmsg-size = <0x20000>; - ecc-size = <16>; - }; - }; - - vph_pwr: vph-pwr-regulator { - compatible = "regulator-fixed"; - regulator-name = "vph_pwr"; - regulator-min-microvolt = <3700000>; - regulator-max-microvolt = <3700000>; - regulator-always-on; - regulator-boot-on; - }; -}; - -&sdc2_off_state { - sd-cd-pins { - pins = "gpio94"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; -}; - -&sdc2_on_state { - sd-cd-pins { - pins = "gpio94"; - function = "gpio"; - drive-strength = <2>; - bias-pull-up; - }; -}; - -&sdhc_2 { - status = "okay"; - - vmmc-supply = <&pm6125_l22>; - vqmmc-supply = <&pm6125_l5>; - - cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>; -}; - -&gpi_dma0 { - status = "okay"; -}; - -&gpi_dma1 { - status = "okay"; -}; - -&i2c8 { - clock-frequency = <400000>; - status = "okay"; - - touchscreen@48 { - compatible = "samsung,s6sy761"; - reg = <0x48>; - interrupt-parent = <&tlmm>; - interrupts = <22 0x2008>; - - vdd-supply = <&pm6125_l13>; - - pinctrl-names = "default"; - pinctrl-0 = <&ts_int_default &ts_avdd_default>; - }; -}; - -&pmk8350_adc_tm { - status = "okay"; -}; - -&pmk8350_rtc { - status = "okay"; -}; - -&pmr735a_gpios { - vol_down_n: vol-down-n-state { - pins = "gpio1"; - function = "normal"; - power-source = <1>; - bias-pull-up; - input-enable; - }; -}; - -&pon_pwrkey { - status = "okay"; -}; - -&pon_resin { - linux,code = ; - status = "okay"; -}; - -&qupv3_id_0 { - status = "okay"; -}; - -&qupv3_id_1 { - status = "okay"; -}; - -&remoteproc_adsp { - firmware-name = "qcom/sm6375/Sony/murray/adsp.mbn"; - status = "okay"; -}; - -&remoteproc_cdsp { - firmware-name = "qcom/sm6375/Sony/murray/cdsp.mbn"; - status = "okay"; -}; - -&rpm_requests { - regulators-0 { - compatible = "qcom,rpm-pm6125-regulators"; - - pm6125_s5: s5 { - regulator-min-microvolt = <382000>; - regulator-max-microvolt = <1120000>; - }; - - pm6125_s6: s6 { - regulator-min-microvolt = <320000>; - regulator-max-microvolt = <1374000>; - }; - - pm6125_s7: s7 { - regulator-min-microvolt = <1574000>; - regulator-max-microvolt = <2040000>; - }; - - /* - * S8 is VDD_GFX - * L1 is VDD_LPI_CX - */ - - pm6125_l2: l2 { - regulator-min-microvolt = <1170000>; - regulator-max-microvolt = <1304000>; - }; - - pm6125_l3: l3 { - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1300000>; - }; - - pm6125_l4: l4 { - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1300000>; - }; - - pm6125_l5: l5 { - regulator-min-microvolt = <1650000>; - regulator-max-microvolt = <2960000>; - regulator-allow-set-load; - }; - - pm6125_l6: l6 { - regulator-min-microvolt = <1080000>; - regulator-max-microvolt = <1304000>; - }; - - pm6125_l7: l7 { - regulator-min-microvolt = <720000>; - regulator-max-microvolt = <1050000>; - }; - - pm6125_l8: l8 { - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1304000>; - }; - - pm6125_l9: l9 { - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <2000000>; - }; - - pm6125_l10: l10 { - regulator-min-microvolt = <1620000>; - regulator-max-microvolt = <1980000>; - }; - - pm6125_l11: l11 { - regulator-min-microvolt = <1620000>; - regulator-max-microvolt = <1980000>; - }; - - pm6125_l12: l12 { - regulator-min-microvolt = <1620000>; - regulator-max-microvolt = <2000000>; - }; - - pm6125_l13: l13 { - regulator-min-microvolt = <1650000>; - regulator-max-microvolt = <1980000>; - }; - - pm6125_l14: l14 { - regulator-min-microvolt = <1700000>; - regulator-max-microvolt = <1900000>; - }; - - pm6125_l15: l15 { - regulator-min-microvolt = <1650000>; - regulator-max-microvolt = <3544000>; - }; - - pm6125_l16: l16 { - regulator-min-microvolt = <1620000>; - regulator-max-microvolt = <1980000>; - }; - - /* L17 is VDD_LPI_MX */ - - pm6125_l18: l18 { - regulator-min-microvolt = <830000>; - regulator-max-microvolt = <920000>; - }; - - pm6125_l19: l19 { - regulator-min-microvolt = <1624000>; - regulator-max-microvolt = <3304000>; - }; - - pm6125_l20: l20 { - regulator-min-microvolt = <1624000>; - regulator-max-microvolt = <3304000>; - }; - - pm6125_l21: l21 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3400000>; - }; - - pm6125_l22: l22 { - regulator-min-microvolt = <2704000>; - regulator-max-microvolt = <2960000>; - regulator-allow-set-load; - }; - - pm6125_l23: l23 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3400000>; - }; - - pm6125_l24: l24 { - regulator-min-microvolt = <2704000>; - regulator-max-microvolt = <3544000>; - }; - }; - - regulators-1 { - compatible = "qcom,rpm-pmr735a-regulators"; - - /* - * S1 is VDD_MX - * S2 is VDD_CX - */ - - pmr735a_l1: l1 { - regulator-min-microvolt = <570000>; - regulator-max-microvolt = <650000>; - }; - - pmr735a_l2: l2 { - regulator-min-microvolt = <352000>; - regulator-max-microvolt = <796000>; - }; - - pmr735a_l3: l3 { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1200000>; - }; - - pmr735a_l4: l4 { - regulator-min-microvolt = <1504000>; - regulator-max-microvolt = <2000000>; - }; - - pmr735a_l5: l5 { - regulator-min-microvolt = <751000>; - regulator-max-microvolt = <824000>; - }; - - pmr735a_l6: l6 { - regulator-min-microvolt = <504000>; - regulator-max-microvolt = <868000>; - }; - - pmr735a_l7: l7 { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <3544000>; - }; - }; -}; - -&sdc2_off_state { - sd-cd-pins { - pins = "gpio94"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; -}; - -&sdc2_on_state { - sd-cd-pins { - pins = "gpio94"; - function = "gpio"; - drive-strength = <2>; - bias-pull-up; - }; -}; - -&sdhc_2 { - status = "okay"; - - vmmc-supply = <&pm6125_l22>; - vqmmc-supply = <&pm6125_l5>; - - cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>; -}; - -&tlmm { - gpio-reserved-ranges = <13 4>; - - ts_int_default: ts-int-default-state { - pins = "gpio22"; - function = "gpio"; - drive-strength = <8>; - bias-pull-up; - }; - - ts_avdd_default: ts-avdd-default-state { - pins = "gpio59"; - function = "gpio"; - drive-strength = <8>; - output-high; - }; -}; - -&usb_1 { - status = "okay"; -}; - -&usb_1_dwc3 { - dr_mode = "peripheral"; -}; - -&usb_1_hsphy { - status = "okay"; -}; - -&xo_board_clk { - clock-frequency = <19200000>; }; diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi new file mode 100644 index 000000000000..072f7ce2a7f6 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi @@ -0,0 +1,427 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2022, Konrad Dybcio + */ + +/* PMK8350 is configured to use SID6 instead of 0 */ +#define PMK8350_SID 6 + +#include +#include "sm6375.dtsi" +#include "pm6125.dtsi" +#include "pmk8350.dtsi" +#include "pmr735a.dtsi" + +/* PM6125 PON is used and we can't have duplicate labels */ +/delete-node/ &pmk8350_pon; + +/ { + chosen { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + framebuffer: framebuffer@85200000 { + compatible = "simple-framebuffer"; + reg = <0 0x85200000 0 0xc00000>; + + width = <1080>; + height = <2520>; + stride = <(1080 * 4)>; + format = "a8r8g8b8"; + /* + * That's (going to be) a lot of clocks, but it's necessary due + * to unused clk cleanup & no panel driver yet + */ + clocks = <&gcc GCC_DISP_AHB_CLK>, + <&gcc GCC_DISP_HF_AXI_CLK>, + <&gcc GCC_DISP_THROTTLE_CORE_CLK>, + <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + label = "gpio-keys"; + + pinctrl-0 = <&vol_down_n>; + pinctrl-names = "default"; + + key-volume-down { + label = "Volume Down"; + linux,code = ; + gpios = <&pmr735a_gpios 1 GPIO_ACTIVE_LOW>; + debounce-interval = <15>; + linux,can-disable; + wakeup-source; + }; + }; + + reserved-memory { + cont_splash_mem: memory@85200000 { + reg = <0 0x85200000 0 0xc00000>; + no-map; + }; + + ramoops@ffc40000 { + compatible = "ramoops"; + reg = <0 0xffc40000 0 0xb0000>; + record-size = <0x10000>; + console-size = <0x60000>; + ftrace-size = <0x10000>; + pmsg-size = <0x20000>; + ecc-size = <16>; + }; + }; + + vph_pwr: vph-pwr-regulator { + compatible = "regulator-fixed"; + regulator-name = "vph_pwr"; + regulator-min-microvolt = <3700000>; + regulator-max-microvolt = <3700000>; + regulator-always-on; + regulator-boot-on; + }; +}; + +&sdc2_off_state { + sd-cd-pins { + pins = "gpio94"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; +}; + +&sdc2_on_state { + sd-cd-pins { + pins = "gpio94"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; +}; + +&sdhc_2 { + status = "okay"; + + vmmc-supply = <&pm6125_l22>; + vqmmc-supply = <&pm6125_l5>; + + cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>; +}; + +&gpi_dma0 { + status = "okay"; +}; + +&gpi_dma1 { + status = "okay"; +}; + +&i2c8 { + clock-frequency = <400000>; + status = "okay"; + + touchscreen@48 { + compatible = "samsung,s6sy761"; + reg = <0x48>; + interrupt-parent = <&tlmm>; + interrupts = <22 0x2008>; + + vdd-supply = <&pm6125_l13>; + + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_default &ts_avdd_default>; + }; +}; + +&pmk8350_adc_tm { + status = "okay"; +}; + +&pmk8350_rtc { + status = "okay"; +}; + +&pmr735a_gpios { + vol_down_n: vol-down-n-state { + pins = "gpio1"; + function = "normal"; + power-source = <1>; + bias-pull-up; + input-enable; + }; +}; + +&pon_pwrkey { + status = "okay"; +}; + +&pon_resin { + linux,code = ; + status = "okay"; +}; + +&qupv3_id_0 { + status = "okay"; +}; + +&qupv3_id_1 { + status = "okay"; +}; + +&remoteproc_adsp { + firmware-name = "qcom/sm6375/Sony/murray/adsp.mbn"; + status = "okay"; +}; + +&remoteproc_cdsp { + firmware-name = "qcom/sm6375/Sony/murray/cdsp.mbn"; + status = "okay"; +}; + +&rpm_requests { + regulators-0 { + compatible = "qcom,rpm-pm6125-regulators"; + + pm6125_s5: s5 { + regulator-min-microvolt = <382000>; + regulator-max-microvolt = <1120000>; + }; + + pm6125_s6: s6 { + regulator-min-microvolt = <320000>; + regulator-max-microvolt = <1374000>; + }; + + pm6125_s7: s7 { + regulator-min-microvolt = <1574000>; + regulator-max-microvolt = <2040000>; + }; + + /* + * S8 is VDD_GFX + * L1 is VDD_LPI_CX + */ + + pm6125_l2: l2 { + regulator-min-microvolt = <1170000>; + regulator-max-microvolt = <1304000>; + }; + + pm6125_l3: l3 { + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1300000>; + }; + + pm6125_l4: l4 { + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1300000>; + }; + + pm6125_l5: l5 { + regulator-min-microvolt = <1650000>; + regulator-max-microvolt = <2960000>; + regulator-allow-set-load; + }; + + pm6125_l6: l6 { + regulator-min-microvolt = <1080000>; + regulator-max-microvolt = <1304000>; + }; + + pm6125_l7: l7 { + regulator-min-microvolt = <720000>; + regulator-max-microvolt = <1050000>; + }; + + pm6125_l8: l8 { + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1304000>; + }; + + pm6125_l9: l9 { + regulator-min-microvolt = <1504000>; + regulator-max-microvolt = <2000000>; + }; + + pm6125_l10: l10 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <1980000>; + }; + + pm6125_l11: l11 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <1980000>; + }; + + pm6125_l12: l12 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <2000000>; + }; + + pm6125_l13: l13 { + regulator-min-microvolt = <1650000>; + regulator-max-microvolt = <1980000>; + }; + + pm6125_l14: l14 { + regulator-min-microvolt = <1700000>; + regulator-max-microvolt = <1900000>; + }; + + pm6125_l15: l15 { + regulator-min-microvolt = <1650000>; + regulator-max-microvolt = <3544000>; + }; + + pm6125_l16: l16 { + regulator-min-microvolt = <1620000>; + regulator-max-microvolt = <1980000>; + }; + + /* L17 is VDD_LPI_MX */ + + pm6125_l18: l18 { + regulator-min-microvolt = <830000>; + regulator-max-microvolt = <920000>; + }; + + pm6125_l19: l19 { + regulator-min-microvolt = <1624000>; + regulator-max-microvolt = <3304000>; + }; + + pm6125_l20: l20 { + regulator-min-microvolt = <1624000>; + regulator-max-microvolt = <3304000>; + }; + + pm6125_l21: l21 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3400000>; + }; + + pm6125_l22: l22 { + regulator-min-microvolt = <2704000>; + regulator-max-microvolt = <2960000>; + regulator-allow-set-load; + }; + + pm6125_l23: l23 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3400000>; + }; + + pm6125_l24: l24 { + regulator-min-microvolt = <2704000>; + regulator-max-microvolt = <3544000>; + }; + }; + + regulators-1 { + compatible = "qcom,rpm-pmr735a-regulators"; + + /* + * S1 is VDD_MX + * S2 is VDD_CX + */ + + pmr735a_l1: l1 { + regulator-min-microvolt = <570000>; + regulator-max-microvolt = <650000>; + }; + + pmr735a_l2: l2 { + regulator-min-microvolt = <352000>; + regulator-max-microvolt = <796000>; + }; + + pmr735a_l3: l3 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1200000>; + }; + + pmr735a_l4: l4 { + regulator-min-microvolt = <1504000>; + regulator-max-microvolt = <2000000>; + }; + + pmr735a_l5: l5 { + regulator-min-microvolt = <751000>; + regulator-max-microvolt = <824000>; + }; + + pmr735a_l6: l6 { + regulator-min-microvolt = <504000>; + regulator-max-microvolt = <868000>; + }; + + pmr735a_l7: l7 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <3544000>; + }; + }; +}; + +&sdc2_off_state { + sd-cd-pins { + pins = "gpio94"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; +}; + +&sdc2_on_state { + sd-cd-pins { + pins = "gpio94"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + }; +}; + +&sdhc_2 { + status = "okay"; + + vmmc-supply = <&pm6125_l22>; + vqmmc-supply = <&pm6125_l5>; + + cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>; +}; + +&tlmm { + gpio-reserved-ranges = <13 4>; + + ts_int_default: ts-int-default-state { + pins = "gpio22"; + function = "gpio"; + drive-strength = <8>; + bias-pull-up; + }; + + ts_avdd_default: ts-avdd-default-state { + pins = "gpio59"; + function = "gpio"; + drive-strength = <8>; + output-high; + }; +}; + +&usb_1 { + status = "okay"; +}; + +&usb_1_dwc3 { + dr_mode = "peripheral"; +}; + +&usb_1_hsphy { + status = "okay"; +}; + +&xo_board_clk { + clock-frequency = <19200000>; +}; From patchwork Fri Aug 18 15:23:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13357946 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 14240C7115C for ; Fri, 18 Aug 2023 15:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378149AbjHRPYa (ORCPT ); Fri, 18 Aug 2023 11:24:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378127AbjHRPX6 (ORCPT ); Fri, 18 Aug 2023 11:23:58 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B53A26BB for ; Fri, 18 Aug 2023 08:23:56 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4ff975a9318so1496945e87.2 for ; Fri, 18 Aug 2023 08:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692372234; x=1692977034; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=y1xzZ0W874SEOTWXH4StKneqaFG4tNGn8zR8JVsBtJY=; b=K7hWwjPjF3NXbtwTMofTwi/l9EVUmi7Qff+2+TwRxiwXOSJBkuIu8+g0btD3BB/Z+C 3VXB1WX6k20LzuAatijJZngb5+KhQ6fENe2r21nYWtu3LWLmKY3hdJ7jeUmbgvMVY1lp bKRj7ZMM2MdTsAjr4F4tbGOQOQxtI7rDYLvxqyI//aKJhbD2QeBJnJuHjGcorMVj/KNj 6M/xMyqS6KQ2ygw/ZJ0wyE0HGcu3aaXO2hgQPwHWs7VLBWsZZjgP9K9ds7CfDPG1tkyp c7h/GhDXIe8MXJ1ST4L0R7m4IoTgxVN3odamSWzZxhAnfjhuMZ5em8ukCXavAob4Qj7+ o9eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692372234; x=1692977034; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y1xzZ0W874SEOTWXH4StKneqaFG4tNGn8zR8JVsBtJY=; b=TbmDHT9NV48XlenoxIrVuKTT2PcExDfpWj491ewrixRRoedkNEnlXF0GlxomDmO9WG casHEHLmK/Q3PEvPfvWnxH+S6catGJS2NwhYSeLrYfI0MZgH0Dbt+5rAOdrIFBdGG/QS IsTDCQTpmFDvhp1Brgz7CKJqa1r3+AWltUEMENET6V7+IK6qzJ3xJLFO5l0xQkHHZhvb sj1h5Kb1+ZSA337OCNVC6xV1MRnqCy7PdlkCpM3Wky+oK8B5L3MBdrauv34S9q3sKCM0 bhdWtnJ19w5dt9fBO6bXmialLQjm7wZs2mjzgqCeG+wo8OT8+Ty5e3KKQ97Ke0fONp/n fX4w== X-Gm-Message-State: AOJu0YySBvKYnFnfGSnrgkjoSjbeMkcgMudUJqWDJZ09qSv178MWao5E jNaI4wnj7qjCIWfMlDd8szXBrA== X-Google-Smtp-Source: AGHT+IFF4rnawnb53u4vrk4XB2bVsn7nH1espPZcaE6YHG2waURr1kzdZm48bHSY6Murfiq0BVDv8w== X-Received: by 2002:a05:6512:3f08:b0:4fb:7626:31a8 with SMTP id y8-20020a0565123f0800b004fb762631a8mr2430283lfa.27.1692372234600; Fri, 18 Aug 2023 08:23:54 -0700 (PDT) Received: from [192.168.1.101] (abxh52.neoplus.adsl.tpnet.pl. [83.9.1.52]) by smtp.gmail.com with ESMTPSA id y2-20020ac24202000000b004fe4d122a66sm383715lfh.187.2023.08.18.08.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 08:23:54 -0700 (PDT) From: Konrad Dybcio Date: Fri, 18 Aug 2023 17:23:28 +0200 Subject: [PATCH 5/5] arm64: dts: qcom: Add Sony Xperia 10 V (PDX235) support MIME-Version: 1.0 Message-Id: <20230818-topic-10v-v1-5-dbb6464223c6@linaro.org> References: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> In-Reply-To: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org> To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kees Cook , Tony Luck , "Guilherme G. Piccoli" Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , linux-hardening@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1692372226; l=3712; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Z35ZpUbsrhhBdyuWtuCpz49GDxm3TdMr+tz0YwDoIqY=; b=bTRX/Ls1me+ATmFgcrzQ918R7yguBLKDzXbR/R+jEKiQxFn89aa3Fu9LPRsW2jNwQmyj+27Ey d9EClFPwV2qBFYmclPhLXPRDpu/YyQI3hqKBGzVKIOBR7hdDEF9hE0J X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org 10 V is a carbon copy of the 10 IV, sans: - camera setup (V obviously has a new, better one) - the phone's body and SIM/sdcard tray changed a bit - SM5038 is gone, PMIC QGauge is used for battery monitoring - some wires may be routed differently (e.g. i2c devices are routed to different hosts) - possibly some small other differences that we're about to discover Introduce support for PDX235, currently requiring zero changes other than adding msm-id and board-id, which seems to be the result of Sony (or their chinese ODM) fusing in a non-zero value in there.. All of the flashing and prepwork shenanigans described in Commit 4420e60416cb ("arm64: dts: qcom: Add device tree for Sony Xperia 10 IV") are also necessary on this device :/ Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../dts/qcom/sm6375-sony-xperia-murray-pdx235.dts | 54 ++++++++++++++++++++++ .../boot/dts/qcom/sm6375-sony-xperia-murray.dtsi | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 2cca20563a1d..832b4acb20dd 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -196,6 +196,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-laurel-sprout.dtb dtb-$(CONFIG_ARCH_QCOM) += sm6350-sony-xperia-lena-pdx213.dtb dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx225.dtb +dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx235.dtb dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb dtb-$(CONFIG_ARCH_QCOM) += sm8150-microsoft-surface-duo.dtb diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx235.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx235.dts new file mode 100644 index 000000000000..80a61961e5c5 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx235.dts @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023, Konrad Dybcio + */ + +/dts-v1/; + +#include + +#include "sm6375-sony-xperia-murray.dtsi" + +/ { + model = "Sony Xperia 10 V"; + compatible = "sony,pdx235", "qcom,sm6375"; + chassis-type = "handset"; + qcom,msm-id = ; + qcom,board-id = ; + + aliases { + i2c0 = &i2c0; + i2c1 = &i2c7; + i2c2 = &i2c10; + i2c3 = &i2c8; + }; +}; + +&i2c0 { + clock-frequency = <400000>; + status = "okay"; + + /* NXP SN2x0 NFC @ 28. (or on &spi2.. TBD!) */ +}; + +&i2c7 { + clock-frequency = <400000>; + status = "okay"; + + /* Awinic AW882xx audio amplifier ("channel 0") @ 34 */ +}; + +/* I2C8 inherited from common DTSI */ + +&i2c10 { + clock-frequency = <400000>; + status = "okay"; + + /* Awinic AW882xx audio amplifier ("channel 1") @ 34 */ + /* PM8008 @ 8, 9 */ +}; + +/* For reasons yet unknown, it's broken on the mark V.. */ +&touchscreen { + status = "fail"; +}; diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi index 072f7ce2a7f6..243e60d9bbb5 100644 --- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi @@ -123,7 +123,7 @@ &i2c8 { clock-frequency = <400000>; status = "okay"; - touchscreen@48 { + touchscreen: touchscreen@48 { compatible = "samsung,s6sy761"; reg = <0x48>; interrupt-parent = <&tlmm>;