From patchwork Thu Dec 8 20:13:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 632583 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 A20B7C4332F for ; Thu, 8 Dec 2022 20:14:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbiLHUOQ (ORCPT ); Thu, 8 Dec 2022 15:14:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229479AbiLHUOP (ORCPT ); Thu, 8 Dec 2022 15:14:15 -0500 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3841978B99 for ; Thu, 8 Dec 2022 12:14:13 -0800 (PST) Received: by mail-lf1-x132.google.com with SMTP id b13so3749128lfo.3 for ; Thu, 08 Dec 2022 12:14:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aozzPFqxRd+oMbTAlLocE9rL6FXuVwfCXNIHq2pDgcY=; b=jDmlVTdDgbZ5hnOclf4N+kR/pg1eGlq3IMik8b8pugkFIeufZ8/JQJMjgZAPVyiXuh AoJI4ceKDkKTlOAQJyrvPvq1oTcB9ajO95h+5JDeLBqEtdcuyjXJAv7SDcL7OBxJYNRE 6A7jc07rcPW4l3Ho0An+uJwlNKj1polmGQbHXZ6Tmwx3egfP0CVtan7eeNwTEfkO9ZTa mrEqA+/HOWK69YyWS1yRyOU+YLaNkaJtDA9dJsBxQL3wDC7SoLBFJOLiLdCJyj5vPaKx de/QA4CnK7taNVzfFkugS4s0EqymnxdhaBwFdgH2SEFUnZim0957z0+vZMCDarO5mswn 367A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aozzPFqxRd+oMbTAlLocE9rL6FXuVwfCXNIHq2pDgcY=; b=wAbOhr2OPySQwY5pUwaVYg5eA2Qyc84MNIWmU4KhVz837yGAictwPeMLQRgusJ284k doMYAANeHX2zmM9UklzEA+6PPU6Sv/+wBwMI4nj6sJrYSGDGfclbI0J5ip5hJMRIKlgV SlevnsbC+C2GxEhj371EDwgeMhADHPSbaR8aP0Zcra7RHdGjFnRGlbOjcYyZdjcQFONL 2/hyjdIiGK679u9jMpHOFZTdJlBhpEagbulV1y5Ecp1CzgQ/EGsidzkWBSe9sYybrl7b fYIYme9bG/FqVVNeqhyGAm4COjNbKvnGw7nH71JOzwZ8tCTDxuhpBRW608gEpNKI+kNe d+tw== X-Gm-Message-State: ANoB5pnB+YsJof7nULAf7r0WgIpqoBLFOdQhc63R1Wzest6aD0yP3wSz 7gVkjcW4C3+oK5inxh0alUWAlQ== X-Google-Smtp-Source: AA0mqf5D7Qg3EYj900Derv/cKhequGAmhDfRRhQ1+xvMnYj/WncUyjBmNq5j4oGNM/T5a1/qb68S0g== X-Received: by 2002:a05:6512:2015:b0:4b5:9dc4:e783 with SMTP id a21-20020a056512201500b004b59dc4e783mr960470lfb.568.1670530451603; Thu, 08 Dec 2022 12:14:11 -0800 (PST) Received: from localhost.localdomain (95.49.125.53.neoplus.adsl.tpnet.pl. [95.49.125.53]) by smtp.gmail.com with ESMTPSA id bi35-20020a0565120ea300b004ac6a444b26sm3466428lfb.141.2022.12.08.12.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:14:11 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: patches@linaro.org, Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Iskren Chernev , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] arm64: dts: qcom: sm6115: Fix UFS node Date: Thu, 8 Dec 2022 21:13:57 +0100 Message-Id: <20221208201401.530555-1-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org In its current form, UFS did not even probe successfully - it failed when trying to set XO (ref_clk) to 300 MHz instead of doing so to the ICE clk. Moreover, the missing reg-names prevented ICE from working or being discovered at all. Fix both of these issues. As a sidenote, the log reveals that this SoC uses UFS ICE v3.1.0. Fixes: 97e563bf5ba1 ("arm64: dts: qcom: sm6115: Add basic soc dtsi") Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm6115.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index 572bf04adf90..3f4017bc667d 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -704,6 +704,7 @@ opp-202000000 { ufs_mem_hc: ufs@4804000 { compatible = "qcom,sm6115-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0x04804000 0x3000>, <0x04810000 0x8000>; + reg-names = "std", "ice"; interrupts = ; phys = <&ufs_mem_phy_lanes>; phy-names = "ufsphy"; @@ -736,10 +737,10 @@ ufs_mem_hc: ufs@4804000 { <0 0>, <0 0>, <37500000 150000000>, - <75000000 300000000>, <0 0>, <0 0>, - <0 0>; + <0 0>, + <75000000 300000000>; status = "disabled"; }; From patchwork Thu Dec 8 20:13:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 632006 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 A885AC10F1B for ; Thu, 8 Dec 2022 20:14:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229825AbiLHUOS (ORCPT ); Thu, 8 Dec 2022 15:14:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbiLHUOQ (ORCPT ); Thu, 8 Dec 2022 15:14:16 -0500 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70D3378B8C for ; Thu, 8 Dec 2022 12:14:15 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id b9so2767454ljr.5 for ; Thu, 08 Dec 2022 12:14:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4naixU0W2mwEQuuHUmas2VUjFasO06w6Uoh0J7hj7Xs=; b=AwwRLN88Q3F6of2YPb1n4Pt/0x6cdbfXZGM2usqWpEqd8ecYsDKwGqfYPEoMzKh7Xg 9NAM31Kgw7fPfVzuO0OMT72VuiCVqDpIQU/6OrxaY6rB6tZuWDACSAibAB1jDGAjcjSE YvBELlIuHGVjwFAQCphZmnfJlhqQ6vVEoLL7DEJA+rEegBNvUs4Bf7b7Tz08JI4CV3nH qgJrAd1n6BHxhBiFNlPy5fCJ8cqo7oWLeagKB14zQscZmK+FKA3MAVr3iqilXxD8vtSh l1RdOnV2+Olyl3wM+ujpcoyxyvnc9G9Ef+YefGpwnrwHA5io+Rn0yMgDO1AuGrtSSMb4 lNhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4naixU0W2mwEQuuHUmas2VUjFasO06w6Uoh0J7hj7Xs=; b=ZT5iPbudJwkyd/uSgoPCPwgq7W/lGDfBSU7aIqo/mTf5GJ8IHM2fm1tmyU/wPch7tE r9HxuF3BdfZtWnwEw/dLzMB5rkhRa1tHGC3azy5Kp7EFR5jHDdQUXhaAGKhHt5RbQSI9 uG1ow6ny9BDedPJtviODeWV2OtxZgjyoXW1/L+EqApAiOyaqSDrHqdC30URygFhWykb9 o2vzp6rQDAwe0JiPH7aZzbf7wlM/BJpRRxWduiyUSkqmrKCUReiwBRifsWtRRSvzPBxu cgtFoy4CJsLvbog5A6Tzv26nT0w3NY6U+a0/ujHQBBwFYaFnX/MpVxV1WTHfzSIU84Xf qVcw== X-Gm-Message-State: ANoB5pmvkq/K9l9RVR8icQjOd68J1R04bxHbQcIbiMXnUMlz6Rxviq2S 1SAZKrjxLFZdh6RBoKKwh0LKJA== X-Google-Smtp-Source: AA0mqf6rw14Z08apamu/Q/ZDI54SJ1rhkCFleFuBj9W5tiRjOr3ulU2QuMc7PDF3xkYm/WagaGnJcQ== X-Received: by 2002:a05:651c:2009:b0:27a:25f:b265 with SMTP id s9-20020a05651c200900b0027a025fb265mr4333701ljo.410.1670530453828; Thu, 08 Dec 2022 12:14:13 -0800 (PST) Received: from localhost.localdomain (95.49.125.53.neoplus.adsl.tpnet.pl. [95.49.125.53]) by smtp.gmail.com with ESMTPSA id bi35-20020a0565120ea300b004ac6a444b26sm3466428lfb.141.2022.12.08.12.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:14:13 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: patches@linaro.org, Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Iskren Chernev , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Adam Skladowski Subject: [PATCH 2/5] arm64: dts: qcom: sm6115: Provide xo clk to rpmcc Date: Thu, 8 Dec 2022 21:13:58 +0100 Message-Id: <20221208201401.530555-2-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208201401.530555-1-konrad.dybcio@linaro.org> References: <20221208201401.530555-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org rpmcc used to rely on global clock lookup (and still does so for backwards compat reasons) of "xo_board", which was common back when we did not care about things like underscores in node names. Nowadays it expects to be fed a reference to the fixed clock. Satisfy that requirement to make sure rpm clock rates are not all stuck at zero. Fixes: 97e563bf5ba1 ("arm64: dts: qcom: sm6115: Add basic soc dtsi") Reported-by: Adam Skladowski Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index 3f4017bc667d..81523ab7ff60 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -296,6 +296,8 @@ rpm_requests: rpm-requests { rpmcc: clock-controller { compatible = "qcom,rpmcc-sm6115", "qcom,rpmcc"; + clocks = <&xo_board>; + clock-names = "xo"; #clock-cells = <1>; }; From patchwork Thu Dec 8 20:13:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 632582 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 8D4D4C4167B for ; Thu, 8 Dec 2022 20:14:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229677AbiLHUOe (ORCPT ); Thu, 8 Dec 2022 15:14:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229885AbiLHUOU (ORCPT ); Thu, 8 Dec 2022 15:14:20 -0500 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F66078BAC for ; Thu, 8 Dec 2022 12:14:18 -0800 (PST) Received: by mail-lj1-x22d.google.com with SMTP id s10so2787086ljg.1 for ; Thu, 08 Dec 2022 12:14:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qU1DfEK+semHpOcnJabZifeAfzgBN5cQVOW2r9R0JGg=; b=ter0SaBgpNrY6YFD7LnMAsLEWhnP7BLiK7QqM45I897FMwGPXgiMjgWDyNlLBhqnvA aHwDyj/BuxSSBxkjBWCY100pvzgfTEhrrM1WcTs0dxPXZQtzJTPd+HI4V9y2kJ+WS+Up JUo6FTmm8WAxYhqz0ReUXFVS0kwJ5BuBkan7TdArU8N527r2AjKkDA+jHOODXOpl0t94 i/T7kJIOjuygga44O0s1erhZZcvYxfJuH8BP9pLz4nQpTSpU8DVHjlKCh/wH7z9TVBQp hjQCUnrQoEYPi90rgDvQXo8e+6wt7eA8yerMQnbnS1Iq4TMV5jFWHjR6cTHF5oXAPXSS C73g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qU1DfEK+semHpOcnJabZifeAfzgBN5cQVOW2r9R0JGg=; b=0561e2pLVv7NZ64XIguvgrVCYI2sBqWn3mnsBDD2EsLUzt5tXVya5hJmVsuonqKCvB DvX1NjT3tfR/CjzvFSWsssd5FEfP0T2CWbzUVSSu4fLR6T+MfmtBiCar0SJK8tU+vhzC NxlWDIWSAoLI3a91W9woSJElORjAb1gjD43rAkb/ufBWsngHSeQ1iJD8vuUAg4hHRfze TNNALNAR647mRvXkdHexbgQZRwWR3KJHm4SmgBcRW+CgZMNbSjgNZfdu5T2/qy7vU7z8 hmvAnqmUF9EFJhKsS7kNdm2ORJHG1uFeqMMTaSVrGsP76aP8rOVTgiE+V6pnDwsLqsWL vhTA== X-Gm-Message-State: ANoB5plot7Sx4/rGlgpwzadJBSJo4cvUBwosYZL8ahGN6jEYFD51PnIJ LrEhZKuSxa19TTJdXTscy7WuPQ== X-Google-Smtp-Source: AA0mqf6VmX7UrSZI+d3CM3uvg6GURIyWxtTHX41MJlKtdrkgRsx/NsTByV8fvxynRNtb/bf2eklZUg== X-Received: by 2002:a2e:b602:0:b0:279:df93:d323 with SMTP id r2-20020a2eb602000000b00279df93d323mr7368072ljn.251.1670530456721; Thu, 08 Dec 2022 12:14:16 -0800 (PST) Received: from localhost.localdomain (95.49.125.53.neoplus.adsl.tpnet.pl. [95.49.125.53]) by smtp.gmail.com with ESMTPSA id bi35-20020a0565120ea300b004ac6a444b26sm3466428lfb.141.2022.12.08.12.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:14:16 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: patches@linaro.org, Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Iskren Chernev , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] arm64: dts: qcom: sm6115: Provide real SMD RPM XO to SDC1/2 Date: Thu, 8 Dec 2022 21:13:59 +0100 Message-Id: <20221208201401.530555-3-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208201401.530555-1-konrad.dybcio@linaro.org> References: <20221208201401.530555-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Since we have a functioning RPM clock driver, let's make use of it and provide the real XO clock to clients, instead of the fixed-clock stub. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm6115.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index 81523ab7ff60..0c6d57a17bfc 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -650,7 +650,7 @@ sdhc_1: mmc@4744000 { clocks = <&gcc GCC_SDCC1_AHB_CLK>, <&gcc GCC_SDCC1_APPS_CLK>, - <&xo_board>, + <&rpmcc RPM_SMD_XO_CLK_SRC>, <&gcc GCC_SDCC1_ICE_CORE_CLK>; clock-names = "iface", "core", "xo", "ice"; @@ -671,7 +671,9 @@ sdhc_2: mmc@4784000 { ; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC2_AHB_CLK>, <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; + clocks = <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, + <&rpmcc RPM_SMD_XO_CLK_SRC>; clock-names = "iface", "core", "xo"; pinctrl-0 = <&sdc2_state_on>; From patchwork Thu Dec 8 20:14:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 632005 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 865DDC4167B for ; Thu, 8 Dec 2022 20:14:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229940AbiLHUOg (ORCPT ); Thu, 8 Dec 2022 15:14:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229912AbiLHUOd (ORCPT ); Thu, 8 Dec 2022 15:14:33 -0500 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36FA778B9C for ; Thu, 8 Dec 2022 12:14:19 -0800 (PST) Received: by mail-lj1-x22d.google.com with SMTP id f16so2763140ljc.8 for ; Thu, 08 Dec 2022 12:14:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tFihLnj80m7OVKSWSB5T98Aozczh+fP/nRP+nyh9qbw=; b=N1vZRVEWp7OiQYpbLVbxQ6MtT0y1iNJ3rWlaLStig87V51jPA6+y/GJN596x2urdS6 5ZhO0hp7S4elMpM360X/O9IsZrGOfn51PmOtNerjgtlKZhKoosHZxi3BsPJu1IJAbsAf mDfu8sjSL2i2Zw7WoBsCzZCV8arnQwHdFDkZjopTlAPND+8WqiDyOEiMKISGakt2nbfG nAI/Vc7ccAdiegSVp9mcij/gOsyBj1Nuf/fuA9w9qyoMu3CJK7mMRL9pXBePqeMKMdcF 0YyRuNp77RrWDBMm88IWZlWwXeqX8MK19ueiGX92G5qM2Q/JpvF8YmqwFuDVK3rjSrgU 9dIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tFihLnj80m7OVKSWSB5T98Aozczh+fP/nRP+nyh9qbw=; b=yoelNTDvxcwody956xLnZ+JsU4HlfiwFk1/7dldxOsvusNOvo7NwT13TPdae9o/1Vz +xjdLO6VYnBWZ0f8WKf6bwyk+PhMhYpUVFikZn7OwBx46uY+1yAWuvZmAkw4QYSLwE6t seXKpdYP1hg2xdF01wBbpFqW29SRryt/E5MvAji6/Eg0uZlEzv/TE8mNxO0iy0+NiOpz Y4MBW1k5osgBTS5ds9aUsQ3JcwPt3FM0dfgYp9BJz5OhQfY8z5CVe9ZJ+wJOMelbf7y2 4wrMy7vcjDSnEriiPm3PqSqqAqTTsSHvp5ww+J1oafymIP+75uBd/jb16/KFSVDnHec8 x0VA== X-Gm-Message-State: ANoB5plAm6OTJPz5742j37Z0FkoJupSJOWZixXh28Hu+yujpXKRmi+ls D82Lo52CA4ObBiNvo597d39DpQ== X-Google-Smtp-Source: AA0mqf5ov88nSuV4nZumDXZBRHYLGXsBPPELYbfgxKn9V7i6FANM0SwUPcScEdQ9W2U9qoCSV9c8fg== X-Received: by 2002:a2e:b5d9:0:b0:279:e30a:d14a with SMTP id g25-20020a2eb5d9000000b00279e30ad14amr7593162ljn.50.1670530458361; Thu, 08 Dec 2022 12:14:18 -0800 (PST) Received: from localhost.localdomain (95.49.125.53.neoplus.adsl.tpnet.pl. [95.49.125.53]) by smtp.gmail.com with ESMTPSA id bi35-20020a0565120ea300b004ac6a444b26sm3466428lfb.141.2022.12.08.12.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:14:18 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: patches@linaro.org, Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Iskren Chernev , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] dt-bindings: arm: qcom: Add SM6115(P) and Lenovo Tab P11 Date: Thu, 8 Dec 2022 21:14:00 +0100 Message-Id: <20221208201401.530555-4-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208201401.530555-1-konrad.dybcio@linaro.org> References: <20221208201401.530555-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Document SM6115P, an APQ version of SM6115, which in turn is more or less a beefier version of SM4250. Document Lenovo Tab P11 (J606F) as a SM6115P device. Add SM6115 to the msm-id list of shame. Signed-off-by: Konrad Dybcio --- Documentation/devicetree/bindings/arm/qcom.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index 27063a045bd0..0c7ad00586fa 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -62,6 +62,7 @@ description: | sdx65 sm4250 sm6115 + sm6115p sm6125 sm6350 sm6375 @@ -790,6 +791,12 @@ properties: - oneplus,billie2 - const: qcom,sm4250 + - items: + - enum: + - lenovo,j606f + - const: qcom,sm6115p + - const: qcom,sm6115 + - items: - enum: - sony,pdx201 @@ -931,6 +938,7 @@ allOf: - qcom,sdm845 - qcom,sdx55 - qcom,sdx65 + - qcom,sm6115 - qcom,sm6125 - qcom,sm6350 - qcom,sm7225 From patchwork Thu Dec 8 20:14:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 632581 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 9B34DC10F1B for ; Thu, 8 Dec 2022 20:14:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229928AbiLHUOi (ORCPT ); Thu, 8 Dec 2022 15:14:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229873AbiLHUOd (ORCPT ); Thu, 8 Dec 2022 15:14:33 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5CB67A18C for ; Thu, 8 Dec 2022 12:14:22 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id j4so3786118lfk.0 for ; Thu, 08 Dec 2022 12:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QE/MPVWrPkQi2tEjQtLjQ0ec0nKxppkiun4hqaN8bS0=; b=VfiUnEVpay226r0SJafv4wdNSH9JKbS4sHULqoggjl1AAPW4hUMbAurBhe+m1U0ZDU 2VP/ecZVjmYFw1ded4AL/o+FhYs1Nb+vzXb2ZcPP1Mt1n0P0WUw8kdVpF1ldUELQpM0x udE8cjVKzBqmwe3I28BuFomBYuGEcQgO4v4cGVCkmftxAQ1wYQ0Pwl4yLe1P/JH3pB6R 7XDe/0GtvGtFrn8h/FYr0BjuxjokwWLBnwOumwZEc0gYKiPlgyStCFj1vVrgZPAT9bJy WiduuTT4MMs9ADylJt6yYex5gWGuxf0c+TPBP345w/cI0dNz1vkdxDc/2v9etuyVK5g6 1S3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QE/MPVWrPkQi2tEjQtLjQ0ec0nKxppkiun4hqaN8bS0=; b=YMxk6JdxKqisSpcNE9LgVQJ3L/EvD7M2UnL+2BgfseA03mxa6VSqtQEUPEpUpeOGw7 paO9x7RAOeCKqlUmDepg+NjATExLROcvmnFYGvQF/iz00f9Gn9A8xxlRf/i29LgaR7uH QYti2xCDUJ6BnLyNfSnK3En30cKwoCi9PmL/n7RPUDU2bsvPC2pl72c4jiH4TJ+bwICb RuY6mjwdlU3FecLD6VhSXboHreGeZ+WgaAqizvGTWZAd8joFDilnW+2ndyKk7VxaOvMU NmzkBDLETToeuFlqZXCLSkQNjmfc8e+ibdjAw+cYhps1bGJHAo81Cb0sVnCvEQTeG8Wr MBwA== X-Gm-Message-State: ANoB5pmyCRDgQfSBgq4h31jYJN6KrBSJg5LC3l5UzJvuFhQBfvxd5e8U xr1lRVI6EXY0dG5QfDwq9AKVbg== X-Google-Smtp-Source: AA0mqf7u2fLlrZWwWyu1RQ9LRZO7MsSM1CuLsoSJ7575yLTWeMcj0C0Ra1OgLU7Lrm2f2Zxmw6Rpbg== X-Received: by 2002:a05:6512:10d3:b0:4b5:830d:12bc with SMTP id k19-20020a05651210d300b004b5830d12bcmr3821909lfg.47.1670530461145; Thu, 08 Dec 2022 12:14:21 -0800 (PST) Received: from localhost.localdomain (95.49.125.53.neoplus.adsl.tpnet.pl. [95.49.125.53]) by smtp.gmail.com with ESMTPSA id bi35-20020a0565120ea300b004ac6a444b26sm3466428lfb.141.2022.12.08.12.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 12:14:20 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: patches@linaro.org, Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Iskren Chernev , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] arm64: dts: qcom: Add Lenovo Tab P11 (J606F/XiaoXin Pad) dts Date: Thu, 8 Dec 2022 21:14:01 +0100 Message-Id: <20221208201401.530555-5-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221208201401.530555-1-konrad.dybcio@linaro.org> References: <20221208201401.530555-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add an initial device tree for the Lenovo Tab P11. Currently it enables: - simplefb - SD Card slot via SDHCI2 - gpio-keys & PON keys - UFS - RPM regulators - USB2 This has been validated with a rev (62) device. You can check yours next to the serial no. on the sticker in the lower portion of the back side of your tablet. To get a successful boot run: cat arch/arm64/boot/Image.gz arch/arm64/boot/dts/qcom/\ sm6115p-lenovo-j606f.dtb > .Image.gz-dtb ~/mkbootimg/mkbootimg.py \ --kernel .Image.gz-dtb \ --ramdisk some/initrd.img \ --pagesize 4096 \ --base 0x0 \ --kernel_offset 0x8000 \ --ramdisk_offset 0x1000000 \ --tags_offset 0x100 \ --cmdline 'SOME_CMDLINE' \ --dtb_offset 0x1f00000 \ --header_version 1 \ --os_version 11 \ --os_patch_level 2022-11 \ -o j606f.img fastboot flash boot j606f.img fastboot flash dtbo empty.img fastboot flash recovery empty.img fastboot reboot Where empty.img is 2 zero-bytes. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../boot/dts/qcom/sm6115p-lenovo-j606f.dts | 290 ++++++++++++++++++ 2 files changed, 291 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 3e79496292e7..5d281436172d 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -156,6 +156,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-shift-axolotl.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb +dtb-$(CONFIG_ARCH_QCOM) += sm6115p-lenovo-j606f.dtb dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb dtb-$(CONFIG_ARCH_QCOM) += sm6350-sony-xperia-lena-pdx213.dtb dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx225.dtb diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts new file mode 100644 index 000000000000..102730dd49a7 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts @@ -0,0 +1,290 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (c) 2022 Linaro Limited + */ + +/dts-v1/; + +#include "sm6115.dtsi" +#include "pm6125.dtsi" + +/ { + model = "Lenovo Tab P11"; + compatible = "lenovo,j606f", "qcom,sm6115p", "qcom,sm6115"; + chassis-type = "tablet"; + + /* required for bootloader to select correct board */ + qcom,msm-id = <445 0x10000>, <420 0x10000>; + qcom,board-id = <34 3>; + + aliases { + mmc0 = &sdhc_2; + }; + + chosen { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + framebuffer0: framebuffer@5c000000 { + compatible = "simple-framebuffer"; + reg = <0 0x5c000000 0 (2000 * 1200 * 4)>; + width = <1200>; + height = <2000>; + stride = <(1200 * 4)>; + format = "a8r8g8b8"; + clocks = <&gcc GCC_DISP_HF_AXI_CLK>; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + label = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&vol_up_n>; + + key-volume-up { + label = "Volume Up"; + linux,code = ; + gpios = <&pm6125_gpio 5 GPIO_ACTIVE_LOW>; + debounce-interval = <15>; + linux,can-disable; + gpio-key,wakeup; + }; + }; +}; + +&dispcc { + /* HACK: disable until a panel driver is ready to retain simplefb */ + status = "disabled"; +}; + +&pm6125_gpio { + vol_up_n: vol-up-n-state { + pins = "gpio5"; + function = "normal"; + power-source = <0>; + bias-pull-up; + input-enable; + }; +}; + +&pon_pwrkey { + status = "okay"; +}; + +&pon_resin { + linux,code = ; + status = "okay"; +}; + +&rpm_requests { + regulators-0 { + compatible = "qcom,rpm-pm6125-regulators"; + + pm6125_s6: s6 { + regulator-min-microvolt = <304000>; + regulator-max-microvolt = <1456000>; + }; + + pm6125_s7: s7 { + regulator-min-microvolt = <1280000>; + regulator-max-microvolt = <2080000>; + }; + + pm6125_s8: s8 { + regulator-min-microvolt = <1064000>; + regulator-max-microvolt = <1304000>; + }; + + pm6125_l1: l1 { + regulator-min-microvolt = <952000>; + regulator-max-microvolt = <1152000>; + }; + + pm6125_l4: l4 { + regulator-min-microvolt = <488000>; + regulator-max-microvolt = <1000000>; + }; + + pm6125_l5: l5 { + regulator-min-microvolt = <1648000>; + /* 3.056V capped to 2.96V for SDHCI */ + regulator-max-microvolt = <2960000>; + regulator-allow-set-load; + /* Broken hw, this one can't be turned off or SDHCI will break! */ + regulator-always-on; + }; + + pm6125_l6: l6 { + regulator-min-microvolt = <576000>; + regulator-max-microvolt = <656000>; + }; + + pm6125_l7: l7 { + /* 1.2V-1.304V fixed at 1.256V for SDHCI bias */ + regulator-min-microvolt = <1256000>; + regulator-max-microvolt = <1256000>; + /* + * TODO: SDHCI seems to also work with this one turned off, however + * there exists a possibility that it may not work with some very + * specific SDCard types, perhaps validating this against a wide + * range of models could rule that out, saving some power would + * certainly be nice.. + */ + regulator-always-on; + }; + + pm6125_l8: l8 { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <728000>; + }; + + pm6125_l9: l9 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2000000>; + }; + + pm6125_l10: l10 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <1904000>; + }; + + pm6125_l11: l11 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <1952000>; + }; + + pm6125_l12: l12 { + regulator-min-microvolt = <1624000>; + regulator-max-microvolt = <1984000>; + }; + + pm6125_l13: l13 { + regulator-min-microvolt = <1504000>; + regulator-max-microvolt = <1952000>; + }; + + pm6125_l14: l14 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <1904000>; + }; + + pm6125_l15: l15 { + regulator-min-microvolt = <2920000>; + regulator-max-microvolt = <3232000>; + }; + + pm6125_l16: l16 { + regulator-min-microvolt = <1704000>; + regulator-max-microvolt = <1904000>; + }; + + pm6125_l17: l17 { + regulator-min-microvolt = <1152000>; + regulator-max-microvolt = <1384000>; + }; + + pm6125_l18: l18 { + regulator-min-microvolt = <1104000>; + regulator-max-microvolt = <1312000>; + }; + + 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 = <2400000>; + regulator-max-microvolt = <3600000>; + }; + + pm6125_l22: l22 { + regulator-min-microvolt = <2952000>; + /* 3.304V capped to 2.96V for SDHCI */ + regulator-max-microvolt = <2960000>; + regulator-allow-set-load; + /* Broken hw, this one can't be turned off or SDHCI will break! */ + regulator-always-on; + }; + + pm6125_l23: l23 { + regulator-min-microvolt = <3200000>; + regulator-max-microvolt = <3400000>; + }; + + pm6125_l24: l24 { + regulator-min-microvolt = <2704000>; + regulator-max-microvolt = <3600000>; + }; + }; +}; + +&sdhc_2 { + cd-gpios = <&tlmm 88 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_state_on &sdc2_gate_pin>; + pinctrl-1 = <&sdc2_state_off>; + vmmc-supply = <&pm6125_l22>; + vqmmc-supply = <&pm6125_l5>; + no-sdio; + no-mmc; + status = "okay"; +}; + +&sleep_clk { + clock-frequency = <32764>; +}; + +&tlmm { + gpio-reserved-ranges = <14 4>; + + /* + * This is a wholly undocumented pin (other than a single vague "pwr-gpios" reference) + * that needs to be toggled for the SD Card slot to work properly.. + */ + sdc2_gate_pin: sdc2-gate-state { + pins = "gpio45"; + function = "gpio"; + drive-strength = <2>; + bias-pull-up; + output-high; + }; +}; + +&ufs_mem_hc { + vcc-supply = <&pm6125_l24>; + vcc-max-microamp = <600000>; + vccq2-supply = <&pm6125_l11>; + vccq2-max-microamp = <600000>; + status = "okay"; +}; + +&ufs_mem_phy { + vdda-phy-supply = <&pm6125_l4>; + vdda-pll-supply = <&pm6125_l12>; + vddp-ref-clk-supply = <&pm6125_l18>; + status = "okay"; +}; + +&usb_1 { + status = "okay"; +}; + +&usb_1_hsphy { + vdd-supply = <&pm6125_l4>; + vdda-pll-supply = <&pm6125_l12>; + vdda-phy-dpdm-supply = <&pm6125_l15>; + status = "okay"; +}; + +&xo_board { + clock-frequency = <19200000>; +};