From patchwork Sun Jul 2 13:42:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698507 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 5658CEB64DD for ; Sun, 2 Jul 2023 13:43:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbjGBNn1 (ORCPT ); Sun, 2 Jul 2023 09:43:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229965AbjGBNnZ (ORCPT ); Sun, 2 Jul 2023 09:43:25 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E9ABE6D for ; Sun, 2 Jul 2023 06:43:24 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b63e5f94f1so44506191fa.1 for ; Sun, 02 Jul 2023 06:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305402; x=1690897402; 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=k1Y1IRv5D7qP29mdVFTxcgI7R6hEH2Hd2mk1Wr0MsVw=; b=av9JgTf++Zf0rCKhgeyx9PWm3edwO/gYGPyGUE256aXocB/SGFU0zrHbd0YswRfQde JQb4Bxb3jsd1J05m63yb1L7pMd8nWbuTCGdMdA4hsR5OCJHUdcNrmiLGMjAe5ucI04MB HdO80jlLwH0TR8dSlCqgk/kLHqHSesg3ZAXa6ZskSh+rAK5SLmFyRfVnRVgx2JtpUE+p j5DOyiczVFA1pjAkYUiZRjdDBNc5Gazg60A0cvnaQInBKi1LrwgUfRLUC8WmKFcrPGE/ oh3LVvem9A1tMISC9SzMF8ySRzm+MsHINg4Xg1aY3bQse7aZbgc/yMd0blicd4DDkWOg SmnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305402; x=1690897402; 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=k1Y1IRv5D7qP29mdVFTxcgI7R6hEH2Hd2mk1Wr0MsVw=; b=ZFM9/nXNsQVw60nsiYCqSbYmR8HsZ8idOk6cfFQSRMtwRHtTb079DUSRZ/Vbh9D9Im v7uzDDnc4Hw8t11dxD69BIBpi9neUNY9RpwLufJZo1kcMGUj7C5C9HlpsdoEovnC1X9a onSIRiBvgGPegve0xphzPW2bgc66P8ITB3NacnoN7L9/KFJGI/nn8j6alv2BvhTUXvXD W5GH7eZSQwlruHOgqrSKS9Du4Yv2NelsSj6622SS2wfgLQAtzM3MYFqFEzWR0XwENVYc rX6+R3cpZO0RJOaPYHOSpwWoc29ye9+bAIdDt76kOhuSzsMlMFwvFcn8fMdlJ7hYRQIh +pXg== X-Gm-Message-State: AC+VfDzmqNkgnJu1lUrXAkDNJER+Uxn3PSuDoSmm4I0DO8KwDjhunvfm +Vt/gVVAdfLT3KD46NUqy3r+kQ== X-Google-Smtp-Source: ACHHUZ7yFgN53fhYd006uVcCUlfQ8NSOgxKTzf5Zu5N1Zm4vjB22HbzPiKgXF0CSuKVaO29geQWqAA== X-Received: by 2002:a05:651c:10b0:b0:2b6:9e1d:cd0f with SMTP id k16-20020a05651c10b000b002b69e1dcd0fmr4205067ljn.12.1688305402380; Sun, 02 Jul 2023 06:43:22 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:21 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 01/27] ARM: dts: qcom: apq8064: correct XOADC register address Date: Sun, 2 Jul 2023 16:42:54 +0300 Message-Id: <20230702134320.98831-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The XOADC is present at the address 0x197 rather than just 197. It doesn't change a lot (since the driver hardcodes all register addresses), but the DT should present correct address anyway. Fixes: c4b70883ee33 ("ARM: dts: add XOADC and IIO HWMON to APQ8064") Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi index d2289205ff81..4f4393e11580 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi @@ -766,7 +766,7 @@ pwrkey@1c { xoadc: xoadc@197 { compatible = "qcom,pm8921-adc"; - reg = <197>; + reg = <0x197>; interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>; #address-cells = <2>; #size-cells = <0>; From patchwork Sun Jul 2 13:42:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699815 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 CD65FC001DE for ; Sun, 2 Jul 2023 13:43:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229976AbjGBNn1 (ORCPT ); Sun, 2 Jul 2023 09:43:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229969AbjGBNn0 (ORCPT ); Sun, 2 Jul 2023 09:43:26 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F9AEE70 for ; Sun, 2 Jul 2023 06:43:25 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b6c3921c8bso56452961fa.3 for ; Sun, 02 Jul 2023 06:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305403; x=1690897403; 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=YXzP32qCaTwfy8d8tbSEIpFNXV74/ZqsIG5KtR4zvko=; b=Uo/x4mja7WuImTweh78Ppq3d/axSf0J0kn1VKi3h6zIC3b9RKkM01I9BxF7jVPNNRk 3Txy6Q4ng9S/j/aETW4lw5hMiC8+o0VKetfC01eE01x0KBd8JBPK7f3YtZxf2K63uI1H BTFVgR4RRR7EYsVqxV/oyNz/j5IBx3YCVFgWfEidG8Hyw488B6eE3mHd+IPt23XC8Hwj lcl+F2A2BO3UpRcOlE1ic4ZfI1Y+xDbpBsssiNfsvDK99xrRy++61llF2OIDd3VRj7GM OWrAUsaIVgNI5OvoliJyiao3vz7Sxov6mkVEFRlflS9WJ465VAEqRYZYvj37OHWc+ofu HsAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305403; x=1690897403; 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=YXzP32qCaTwfy8d8tbSEIpFNXV74/ZqsIG5KtR4zvko=; b=jOWO4xwFE+niqvOJrCHHrGfVDU6IFzUBh8oDCx5Npo30s4fjuZ+k39q/yiFpcb166o +bIWKEkpVjwoYYhNsU0eGEc9u7E1Be9HExtvnFDZ2Q0kPfHI3F8HGASgRH5oDlLnZleg 8XMVTSEzP3eq4K2eq9Js0KZX9x/eJxOzcKSg0fCW+VE8lnIGjreQxi4HI1dHgo67xf76 uPbx/HoW9C5ILdiVGVLMVxQX7JQ7coUdfJlro629ho8kL5Clz7Xt1C31WnmCVQJ/76mI bx0JKvIcuUXTaTcfDzbVOiufBHvVA3OSbzb9rHv//6eE/u12iKWYMSwadN29FlTM2Sl9 uC9Q== X-Gm-Message-State: ABy/qLbF7qhhkOjp+oXgMZunELQDovdXjIYUehkgfpdAdGN2U3p/4upB V+xGsq5PT0+eg08n4XFsCWA2tw== X-Google-Smtp-Source: APBJJlHmwJ1eZW/qtrSXk3PLXzwEGWQekfWM+enD6Nrs678L5I9SmrBbKtSQQa1aFuvPUMXVx8Ww6A== X-Received: by 2002:a2e:9258:0:b0:2b5:9d2a:ab51 with SMTP id v24-20020a2e9258000000b002b59d2aab51mr4964982ljg.5.1688305403180; Sun, 02 Jul 2023 06:43:23 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:22 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 02/27] ARM: dts: qcom: msm8960: introduce label for PMIC keypad Date: Sun, 2 Jul 2023 16:42:55 +0300 Message-Id: <20230702134320.98831-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org To simplify MSM8960 CDP board file, add label to PMIC keypad node. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 20 +++++++++----------- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts index 6c1bc3818883..4641b4f2195d 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts @@ -88,17 +88,15 @@ clk-pins { }; }; -&pmicintc { - keypad@148 { - linux,keymap = < - MATRIX_KEY(0, 0, KEY_VOLUMEUP) - MATRIX_KEY(0, 1, KEY_VOLUMEDOWN) - MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS) - MATRIX_KEY(0, 3, KEY_CAMERA) - >; - keypad,num-rows = <1>; - keypad,num-columns = <5>; - }; +&pm8921_keypad { + linux,keymap = < + MATRIX_KEY(0, 0, KEY_VOLUMEUP) + MATRIX_KEY(0, 1, KEY_VOLUMEDOWN) + MATRIX_KEY(0, 2, KEY_CAMERA_FOCUS) + MATRIX_KEY(0, 3, KEY_CAMERA) + >; + keypad,num-rows = <1>; + keypad,num-columns = <5>; }; &rpm { diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi index fa2013388d99..913bc6afd0a1 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi @@ -283,7 +283,7 @@ pwrkey@1c { pull-up; }; - keypad@148 { + pm8921_keypad: keypad@148 { compatible = "qcom,pm8921-keypad"; reg = <0x148>; interrupt-parent = <&pmicintc>; From patchwork Sun Jul 2 13:42:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699814 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 3294CC001DD for ; Sun, 2 Jul 2023 13:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229941AbjGBNn2 (ORCPT ); Sun, 2 Jul 2023 09:43:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjGBNn0 (ORCPT ); Sun, 2 Jul 2023 09:43:26 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD616E6A for ; Sun, 2 Jul 2023 06:43:25 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b6a084a34cso52501781fa.1 for ; Sun, 02 Jul 2023 06:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305404; x=1690897404; 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=u1RH0IG0rrFXei9V7mpYpuNzaTfiQ9cfBSSJRkGF8B0=; b=BoNDvRdu9IY8E9pNnBP/tGPN90GSNWelhBq9rt0cJXiZVl/pl++UChepPZ5BqpF4RU FIGeot41krKEnW8Q6xqp925kgAplBooFBQ7R78piZPmVBRyKOT5ZRO/PDgLXK3PEDjnV Wwnvi9rPBeEUcP7Ddia2KOekD7zHPF4P7PCHDJwX4FvkQVeUfLJ2nVY9Xo+fFWAE2o8Q Hgg7pb5AP5w70Qj5OoVaPmWkkG9R8mzPqFS2qUm9ggyYAAts9ArFYQVg1L9w2mULpEYW cglbVUOaWsw6h3sEZIp9WCvL/e2QTSHtEyZDRclKuw7EiWX+/xo4tXUANCcek1BcWdIi T8cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305404; x=1690897404; 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=u1RH0IG0rrFXei9V7mpYpuNzaTfiQ9cfBSSJRkGF8B0=; b=XadA28+upAfbADwBbOQ7fzSZiE6Osn9Ew1Glt8F1vrnr5HUo2hQPLN7nOk1yrKNmih 0fWOXoRfi59B+K8FDBTRaOvH7fDHx8rNOjNefyM3H7mJp9Tu+EFoMuFSTVxjsm8G0HAw Iq5kDaZ1UWyRtLKA41boT/FLI7mvtD9f4QosM41WCWa/AbrzD2NKNMLqqkwyMG2NKjCj eNF+rwZnCP+e+TeGmarqKUA26xRJVCICzGnsAoZdQZ6jQYBmw0p+CKBg7zMg6OMmFucp AR7jnmJFF+sjCn24jjrPOGzpjC3pR9tvm8TUCwWNHd0l7LzwD21eEXZvfu8MBirTueUA A3Pw== X-Gm-Message-State: ABy/qLaVhiNCgFdLP535LPfKsRpxYRs4TEcHULz37+/UP+EAoBORs19s k0VnX9ZHfmZYdSkd96tJdaTYbg== X-Google-Smtp-Source: APBJJlGISzdsd/pdopGpISupSIjd+YTTrGRW8QE9GUCda++zvs6IL/HN1bLc8xL1s4yEqgwO6BnULA== X-Received: by 2002:a2e:9c87:0:b0:2b6:bc30:7254 with SMTP id x7-20020a2e9c87000000b002b6bc307254mr4750546lji.13.1688305404020; Sun, 02 Jul 2023 06:43:24 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:23 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 03/27] ARM: dts: qcom: msm8660-surf: use keypad label directly Date: Sun, 2 Jul 2023 16:42:56 +0300 Message-Id: <20230702134320.98831-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Directly use pm8058_keypad to declare keypad properties instead of referencing pm8058 top-level node. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 50 ++++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts index be18f1be29a1..86fbb6dfdc2a 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts @@ -34,32 +34,30 @@ &gsbi12_serial { status = "okay"; }; -&pm8058 { - keypad@148 { - linux,keymap = < - MATRIX_KEY(0, 0, KEY_FN_F1) - MATRIX_KEY(0, 1, KEY_UP) - MATRIX_KEY(0, 2, KEY_LEFT) - MATRIX_KEY(0, 3, KEY_VOLUMEUP) - MATRIX_KEY(1, 0, KEY_FN_F2) - MATRIX_KEY(1, 1, KEY_RIGHT) - MATRIX_KEY(1, 2, KEY_DOWN) - MATRIX_KEY(1, 3, KEY_VOLUMEDOWN) - MATRIX_KEY(2, 3, KEY_ENTER) - MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS) - MATRIX_KEY(4, 1, KEY_UP) - MATRIX_KEY(4, 2, KEY_LEFT) - MATRIX_KEY(4, 3, KEY_HOME) - MATRIX_KEY(4, 4, KEY_FN_F3) - MATRIX_KEY(5, 0, KEY_CAMERA) - MATRIX_KEY(5, 1, KEY_RIGHT) - MATRIX_KEY(5, 2, KEY_DOWN) - MATRIX_KEY(5, 3, KEY_BACK) - MATRIX_KEY(5, 4, KEY_MENU) - >; - keypad,num-rows = <6>; - keypad,num-columns = <5>; - }; +&pm8058_keypad { + linux,keymap = < + MATRIX_KEY(0, 0, KEY_FN_F1) + MATRIX_KEY(0, 1, KEY_UP) + MATRIX_KEY(0, 2, KEY_LEFT) + MATRIX_KEY(0, 3, KEY_VOLUMEUP) + MATRIX_KEY(1, 0, KEY_FN_F2) + MATRIX_KEY(1, 1, KEY_RIGHT) + MATRIX_KEY(1, 2, KEY_DOWN) + MATRIX_KEY(1, 3, KEY_VOLUMEDOWN) + MATRIX_KEY(2, 3, KEY_ENTER) + MATRIX_KEY(4, 0, KEY_CAMERA_FOCUS) + MATRIX_KEY(4, 1, KEY_UP) + MATRIX_KEY(4, 2, KEY_LEFT) + MATRIX_KEY(4, 3, KEY_HOME) + MATRIX_KEY(4, 4, KEY_FN_F3) + MATRIX_KEY(5, 0, KEY_CAMERA) + MATRIX_KEY(5, 1, KEY_RIGHT) + MATRIX_KEY(5, 2, KEY_DOWN) + MATRIX_KEY(5, 3, KEY_BACK) + MATRIX_KEY(5, 4, KEY_MENU) + >; + keypad,num-rows = <6>; + keypad,num-columns = <5>; }; /* eMMC */ From patchwork Sun Jul 2 13:42:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698506 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 9ED93EB64D9 for ; Sun, 2 Jul 2023 13:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229460AbjGBNn2 (ORCPT ); Sun, 2 Jul 2023 09:43:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229966AbjGBNn1 (ORCPT ); Sun, 2 Jul 2023 09:43:27 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C499E6B for ; Sun, 2 Jul 2023 06:43:26 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b69ea3b29fso55977811fa.3 for ; Sun, 02 Jul 2023 06:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305404; x=1690897404; 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=YcbEnFCtTA9UEjtUWN7yvDCOIDS8kBLNF+kymOo1R3w=; b=ljiETbURdG4sMCxFQn9lg3uh9cmxFBVOTMn9Ivm6pRr/vtL/7KOptRovREONbOpkFi 88ijnMzyWZ4SYeAFvQyzqjsdPtOy+Fx7s+EF1KxQMglZ5f1cnnxrOJBFLwwZwM7rZPzO ifPDhJr/X7h6gz2KI8qvpgwaofnthK4y6+DNKLetLX4dzkDcDT7kccoiufViutWyrP9b cl9i4A7vzAgjkhJQpLhy3dBj4HCXhYxeeGj5/NL5x7bhywdCDYnZdvU1wGy3wMxTWz75 xVgRH+3+LrpF1PhxS2NTedPjDbWIgaCYHKuSPEKCFYh31xz/NLECFAU6Uoo+XYO9Ybss v+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305404; x=1690897404; 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=YcbEnFCtTA9UEjtUWN7yvDCOIDS8kBLNF+kymOo1R3w=; b=gNxFkStdMbokyiRnDCNrdmoc03fOu48rU9HRhYG8tqEBYuu8diDpQtFOvYTU8qWljK sG8x3W7sj44B8TV1oRq8rLJsrb1lwWwUxQEWUOeF2FMB8YQEZa9Ni5+IbaB25DuBPNk1 k+paXYQkdrqUbXH3R2ZHu98hsWPxsGztJWaeKBoB/BnknLj0M1YK+Zmd5Z8DC8zVuz3d ipFVqONvWU8HL8NrWTV55QdxTcsSgOc3tdD8hRv8SwmUjQrLZNgBmPqGT5MZ1WNHlto0 mKwB1R9aBoaYDjdBj5aKq/juNmpZcDBeHxr+Sz/KX04Tl7gHm/mSnWuw6F4wy3kf5zMr YrBA== X-Gm-Message-State: ABy/qLYmjvT0q1qom9RfB1lUn6sJvLzjh8VFxJ3bDuGLRVywiyueHUsE 0kAg4ZFtF7vpk9mH9tNaO2Nk1Q== X-Google-Smtp-Source: APBJJlHAmJeMjdGms8FlJxqAcm2dvIa2heyuVtPlB5zstLwg820xZbETa7IZg65i9rOPH1QVb/J4zA== X-Received: by 2002:a2e:8095:0:b0:2b6:a344:29cf with SMTP id i21-20020a2e8095000000b002b6a34429cfmr4778918ljg.17.1688305404791; Sun, 02 Jul 2023 06:43:24 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:24 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 04/27] ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place Date: Sun, 2 Jul 2023 16:42:57 +0300 Message-Id: <20230702134320.98831-5-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move sdcc1 device node to follow the alphanumberic sorting order. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- .../boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts index c57c27cd8a20..0e80a5a8e3c6 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts @@ -181,13 +181,6 @@ &mdp { status = "okay"; }; -/* eMMC */ -&sdcc1 { - vmmc-supply = <&pm8921_l5>; - vqmmc-supply = <&pm8921_s4>; - status = "okay"; -}; - &mdp_dsi1_out { remote-endpoint = <&dsi0_in>; }; @@ -336,6 +329,13 @@ lvs7 { }; }; +/* eMMC */ +&sdcc1 { + vmmc-supply = <&pm8921_l5>; + vqmmc-supply = <&pm8921_s4>; + status = "okay"; +}; + &usb_hs1_phy { v3p3-supply = <&pm8921_l3>; v1p8-supply = <&pm8921_l4>; From patchwork Sun Jul 2 13:42:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698505 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 57817C00528 for ; Sun, 2 Jul 2023 13:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229638AbjGBNn3 (ORCPT ); Sun, 2 Jul 2023 09:43:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229988AbjGBNn2 (ORCPT ); Sun, 2 Jul 2023 09:43:28 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20C59E69 for ; Sun, 2 Jul 2023 06:43:27 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b6e7d7952eso2535971fa.3 for ; Sun, 02 Jul 2023 06:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305405; x=1690897405; 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=FS4tS46Wt2bF/A6aYMT37LuXJaPlC2jK1TxmIfbaIXc=; b=X30ZYndFhc8pFjbfI5fFep2k4+vIdwN0xfExy+bcOxdxInGFwOcrq2Zc6f1fh5DIeO 1Gu1TIue3N1mkERyEIPq0Wv81dLrOEdQ6rdUCgRTZBiNpzcOAn0TuaoMhec9/ucDn4Tc nv96MU+bhdGN5yr3T38H38pkEjEZs7E3C15aP2To1IhyWXkuATLygz7fubeKcxFaFE4m WdbJrzjux9xxfQlxcqTrNub3WFVpEEcjIr4GHfEIrw9TCi45KW6CGjrSht0njYd7RnHk U59Si7hUOe0bLBm+b46ayeJ7oVHS7kNjHtyF5oJXhiUNncvfmCmHcL8FJd3KLEseX3fg Dfnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305405; x=1690897405; 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=FS4tS46Wt2bF/A6aYMT37LuXJaPlC2jK1TxmIfbaIXc=; b=kN5oovRpwmzIWt0pHqi5Krz4zj+x3N48zOgAW+b91LvoyeUu5fTwQkC2xELrYPt++o OQYYq44J3boQFBDOnV6WsLWGRQ6z64Zz4+K2X9fgykthw3xid8I/pqU8BPZ+7KemgRH5 NK83F6/+dgw/oasFI6bYLF5GZWnKXe/BIO6lJ/KjWw5HuzFvtbp6L8PF8KOR+aoo/8GA Vj/NXDiCJiT6Re5ArnlGCQIvCuCXr2M8RHmFURyztmDMKKSTBhB2/vEPX/p1fFlBZeQB Bjo9GBX1Q8zF9wHj4m2y2DYs0/CHDnDfWKRWDy+TKTtil62k7oLZCswS+oR1oZW4yrGz KObw== X-Gm-Message-State: ABy/qLZiXPnyxE0JW+tAFKZUm4J/z3y+Lz6adtJaTxp7hFbtMI2TsBtE IcbCqXR4XOmAYO6OUARyo/McHg== X-Google-Smtp-Source: APBJJlHocc5hEVIqBsA0reFFT+YMlohkXM+fyWObkzVPmZLjG1MLa/tzIB9LSp6ssDp8gYYDtBWMqQ== X-Received: by 2002:a2e:7a0e:0:b0:2b6:ad79:a4fb with SMTP id v14-20020a2e7a0e000000b002b6ad79a4fbmr4170016ljc.1.1688305405477; Sun, 02 Jul 2023 06:43:25 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:25 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 05/27] ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses Date: Sun, 2 Jul 2023 16:42:58 +0300 Message-Id: <20230702134320.98831-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Group file inclusion to follow contemporary practice. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts index b269fdca1460..e3b4b93c3d38 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548-mangoh-green.dts @@ -6,11 +6,11 @@ * Author : Neil Armstrong */ +#include #include +#include #include "qcom-mdm9615-wp8548.dtsi" -#include -#include / { model = "MangOH Green with WP8548 Module"; From patchwork Sun Jul 2 13:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699813 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 8EB6BEB64DD for ; Sun, 2 Jul 2023 13:43:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229973AbjGBNna (ORCPT ); Sun, 2 Jul 2023 09:43:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229754AbjGBNn3 (ORCPT ); Sun, 2 Jul 2023 09:43:29 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9D12E6B for ; Sun, 2 Jul 2023 06:43:27 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2b6a5fd1f46so54323641fa.1 for ; Sun, 02 Jul 2023 06:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305406; x=1690897406; 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=l2bnyU4A7hpbNeoqLFTqKpyQywpJ7wVix66MbcJ5QFU=; b=A9XROO5Cu9+AAFJSjbEwF1Fo8nqwpH50LUTZU0fFLp3UQ8lrhfIGauLuJ8zOntg7hX WaT7DnE88SqvEYckFd0YpQ4bEc72yNQKgjrI1Zz2wh4Emetvbv0snJ3Huy1sjOW7FeRh 5qegXvodYThbgrvb+qbMZcM9ykqZwo18r0Vn/8U3j7X8jK3UeuCZ7J6b8FXnTMKs9j43 ksvg7PUESK8oUjcO90mkFvQN9nAFwF2zbwM7JHT+jGZfaLLAH1zSUB8zeXoTegp3Icus FX5Tl79nhO0bprd5/TR236jNCWDOoIAKd2tfkfAWPU8SXTqdn88qbvwfMkkJq9f4//q3 ddHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305406; x=1690897406; 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=l2bnyU4A7hpbNeoqLFTqKpyQywpJ7wVix66MbcJ5QFU=; b=eQv1Q3SLEvf676pgJ+V38WYvThTHlOcsKSeGZp9/+IC8u0v1jLPwTOkZfBQjAwKlGz /vQJBmtJJ1KACHNTZpj18F+1GbN+HUdE9lv8RT7XLEp320BmjkLVvFGIXWq3O68tKb6D HCLs8j2vJiMRjs/rM4izA+56s+34CSAMWnkAbiYs/OJQ2Qlg5WyVk4wQ2RyyaaEW85cH mSfiLbmBNqyk2/SJ0wEHuvKHkOmc27SNMQEcQD8B+vZxkB9EvjcbWFk405ku1+zHLmRO DtV3o9q/Bghu8tok/hsE2gURMI0b8rbrrI59g/U2w4X9r9x9a/9b+IbRoEkmt9/MUJR4 Tv8w== X-Gm-Message-State: ABy/qLZzRldppYBbkLGna4/9yKhgtU9IOIX/K7EdPHpBb+TazxDlU5GG lb64UItQh54lsQzQmfsSsSkCHg== X-Google-Smtp-Source: APBJJlHjt9ahZFn/mpNA6ia0mnLtFkakpT15biH9xhsaiCdcb4sJ8Qh/jlNjzdJmxeSEsRYASExgHg== X-Received: by 2002:a2e:8416:0:b0:2b6:e3e2:5045 with SMTP id z22-20020a2e8416000000b002b6e3e25045mr1161880ljg.18.1688305406251; Sun, 02 Jul 2023 06:43:26 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:25 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 06/27] ARM: dts: qcom: strip prefix from PMIC files Date: Sun, 2 Jul 2023 16:42:59 +0300 Message-Id: <20230702134320.98831-7-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org As the vendor DTS files were moved to per-vendor subdirs, there no need to use common prefixes. Drop the `qcom-' prefix from PMIC dtsi file. This makes 32-bit qcom/ dts files closer to arm64 ones. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} | 0 arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} | 0 arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} | 0 arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} | 0 arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} | 0 arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} | 0 arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts | 2 +- arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 2 +- arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 2 +- arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 2 +- arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts | 2 +- arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts | 2 +- arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts | 2 +- .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts | 2 +- arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 +- arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 +- arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) rename arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} (100%) diff --git a/arch/arm/boot/dts/qcom/qcom-pm8226.dtsi b/arch/arm/boot/dts/qcom/pm8226.dtsi similarity index 100% rename from arch/arm/boot/dts/qcom/qcom-pm8226.dtsi rename to arch/arm/boot/dts/qcom/pm8226.dtsi diff --git a/arch/arm/boot/dts/qcom/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom/pm8841.dtsi similarity index 100% rename from arch/arm/boot/dts/qcom/qcom-pm8841.dtsi rename to arch/arm/boot/dts/qcom/pm8841.dtsi diff --git a/arch/arm/boot/dts/qcom/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom/pm8941.dtsi similarity index 100% rename from arch/arm/boot/dts/qcom/qcom-pm8941.dtsi rename to arch/arm/boot/dts/qcom/pm8941.dtsi diff --git a/arch/arm/boot/dts/qcom/qcom-pma8084.dtsi b/arch/arm/boot/dts/qcom/pma8084.dtsi similarity index 100% rename from arch/arm/boot/dts/qcom/qcom-pma8084.dtsi rename to arch/arm/boot/dts/qcom/pma8084.dtsi diff --git a/arch/arm/boot/dts/qcom/qcom-pmx55.dtsi b/arch/arm/boot/dts/qcom/pmx55.dtsi similarity index 100% rename from arch/arm/boot/dts/qcom/qcom-pmx55.dtsi rename to arch/arm/boot/dts/qcom/pmx55.dtsi diff --git a/arch/arm/boot/dts/qcom/qcom-pmx65.dtsi b/arch/arm/boot/dts/qcom/pmx65.dtsi similarity index 100% rename from arch/arm/boot/dts/qcom/qcom-pmx65.dtsi rename to arch/arm/boot/dts/qcom/pmx65.dtsi diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts index aa0e0e8d2a97..a39f5a161b03 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-asus-sparrow.dts @@ -6,7 +6,7 @@ /dts-v1/; #include "qcom-msm8226.dtsi" -#include "qcom-pm8226.dtsi" +#include "pm8226.dtsi" /delete-node/ &adsp_region; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts index de19640efe55..59b218042d32 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-huawei-sturgeon.dts @@ -6,7 +6,7 @@ /dts-v1/; #include "qcom-msm8226.dtsi" -#include "qcom-pm8226.dtsi" +#include "pm8226.dtsi" #include /delete-node/ &adsp_region; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts index b887e5361ec3..feb78afef3a6 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-lg-lenok.dts @@ -6,7 +6,7 @@ /dts-v1/; #include "qcom-msm8226.dtsi" -#include "qcom-pm8226.dtsi" +#include "pm8226.dtsi" /delete-node/ &adsp_region; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts index 884d99297d4c..42d3867dca42 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts @@ -7,7 +7,7 @@ #include #include "qcom-msm8226.dtsi" -#include "qcom-pm8226.dtsi" +#include "pm8226.dtsi" /delete-node/ &adsp_region; /delete-node/ &smem_region; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts index e0679436000b..5a8af16bf02d 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts @@ -4,8 +4,8 @@ #include #include #include "qcom-msm8974.dtsi" -#include "qcom-pm8841.dtsi" -#include "qcom-pm8941.dtsi" +#include "pm8841.dtsi" +#include "pm8941.dtsi" /delete-node/ &mpss_region; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts index 116e59a3b76d..1df24c922be9 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-apq8084.dtsi" -#include "qcom-pma8084.dtsi" +#include "pma8084.dtsi" / { model = "Qualcomm APQ8084/IFC6540"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts index c6b6680248a6..d4e6aee034af 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-apq8084.dtsi" -#include "qcom-pma8084.dtsi" +#include "pma8084.dtsi" / { model = "Qualcomm APQ 8084-MTP"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts index 60bdfddeae69..da99f770d4f5 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974.dtsi" -#include "qcom-pm8841.dtsi" -#include "qcom-pm8941.dtsi" +#include "pm8841.dtsi" +#include "pm8941.dtsi" #include #include #include diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi index 68a2f9094e53..23ae474698aa 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974.dtsi" -#include "qcom-pm8841.dtsi" -#include "qcom-pm8941.dtsi" +#include "pm8841.dtsi" +#include "pm8941.dtsi" #include #include #include diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts index f531d2679f6c..24f9521a0be6 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" -#include "qcom-pm8841.dtsi" -#include "qcom-pm8941.dtsi" +#include "pm8841.dtsi" +#include "pm8941.dtsi" #include #include #include diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts index 8230d0e1d95d..c0ca264d8140 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" -#include "qcom-pm8841.dtsi" -#include "qcom-pm8941.dtsi" +#include "pm8841.dtsi" +#include "pm8941.dtsi" #include #include diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts index 3e2c86591ee2..325feb89b343 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" -#include "qcom-pma8084.dtsi" +#include "pma8084.dtsi" #include #include #include diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 154639d56f35..efe21289c9fe 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "qcom-msm8974pro.dtsi" -#include "qcom-pm8841.dtsi" -#include "qcom-pm8941.dtsi" +#include "pm8841.dtsi" +#include "pm8941.dtsi" #include #include #include diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts index 7e97ad5803d8..247069361909 100644 --- a/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts @@ -9,7 +9,7 @@ #include "qcom-sdx55.dtsi" #include #include -#include "qcom-pmx55.dtsi" +#include "pmx55.dtsi" / { model = "Qualcomm Technologies, Inc. SDX55 MTP"; diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts index 51058b065279..082f7ed1a01f 100644 --- a/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts @@ -8,7 +8,7 @@ #include #include #include "qcom-sdx55.dtsi" -#include "qcom-pmx55.dtsi" +#include "pmx55.dtsi" / { model = "Thundercomm T55 Development Kit"; diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts index 8fadc6e70692..e336a15b45c4 100644 --- a/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts +++ b/arch/arm/boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts @@ -8,7 +8,7 @@ #include #include #include "qcom-sdx55.dtsi" -#include "qcom-pmx55.dtsi" +#include "pmx55.dtsi" / { model = "Telit FN980 TLB"; diff --git a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts index 02d8d6e241ae..5385d9782f8e 100644 --- a/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts +++ b/arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts @@ -8,7 +8,7 @@ #include #include #include -#include "qcom-pmx65.dtsi" +#include "pmx65.dtsi" / { model = "Qualcomm Technologies, Inc. SDX65 MTP"; From patchwork Sun Jul 2 13:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698504 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 AD5E2EB64D9 for ; Sun, 2 Jul 2023 13:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229990AbjGBNnc (ORCPT ); Sun, 2 Jul 2023 09:43:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229981AbjGBNnb (ORCPT ); Sun, 2 Jul 2023 09:43:31 -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 9A75CE55 for ; Sun, 2 Jul 2023 06:43:28 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b69f1570b2so58449401fa.0 for ; Sun, 02 Jul 2023 06:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305407; x=1690897407; 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=Ln6L/vHcWTV14oQdypcRlQSAyNKGvMJzR40sasCVs78=; b=IavMO9JO0JHSyzaFS8weEhseQdfmKG2P2ykAtnLToAnVHclithjD4uOBIUMopUiub4 69+cz05HHvmhTFLhi/b2QiAf56Wt/27ZJyjeu6AJZciYwnMe9pWKzGQ/Gx1kMhaGE00r 4UltAfn+JxVtmdjdo3ppEHPLPI0Dmu7vm4qcDFwzaEU8wnAlxc1Qlkr8r7JYD8s+eqqs hiQRCjhcxQC2cYjXmlm8Je8TrkI0klB8DZNr4Tkx6KthTWaqfI8yE5sA8kcX/2VmTIaW ctH+73AAfTHefsLLTAWuNic8X7GFgAoCvfneqm7lV3mczeVM644odFFg/hAE8g0jBRKb kUpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305407; x=1690897407; 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=Ln6L/vHcWTV14oQdypcRlQSAyNKGvMJzR40sasCVs78=; b=X88LG/6sOi11+aPNom5L82VWRg6m8mgMrRe4jSATBMzXDEnbpmNpn8lVO3a3fapF90 cC0EV7Ij/0Fv/r4L4xUadUIqS1HjGI1Ad+aJZEyhg9dL+tN+syXv0UaPnTwn32SRM3I6 7aHYeaurY7/g4zjW6A4rdKFvaR9O3xHT31qszDJ7NvyPAwEHgVFCuKwhQtNjxgg7KDoV DWBfpyuhM58+H/cn/dC0rd2MOqPqksB2lktsbGyY2i2BQnwmp+SBBZkqfs21Pt84eREN QOdrMBV+2NupcWdSWhw0eOiLU3pP6wFZwMmcKbIS6+5XmO4q4WXK/vc2CL9tTQprkSqC gFTg== X-Gm-Message-State: ABy/qLa/3dKXwhetFja/fa+mNuDPbE66PI75icw/F2dfsKasoo49M6VO gEVRQJLmjQwBKanF1KAE8BdacQ== X-Google-Smtp-Source: APBJJlG2tvgx/dL36Cib1ByWTuYkw+bbkktmEjvh5eg9EeOOzpkqUlqwPq4dgEmsgiLmt912dD0vMw== X-Received: by 2002:a2e:94d7:0:b0:2b6:dd78:2a8e with SMTP id r23-20020a2e94d7000000b002b6dd782a8emr2046031ljh.50.1688305407002; Sun, 02 Jul 2023 06:43:27 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:26 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 07/27] ARM: dts: qcom: apq8064: fix PMIC node labels Date: Sun, 2 Jul 2023 16:43:00 +0300 Message-Id: <20230702134320.98831-8-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change PM8921 node labels to start with pm8921_ prefix, following other Qualcomm PMIC device nodes. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi index 4f4393e11580..5ffb960d09b4 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi @@ -332,13 +332,13 @@ scm { */ iio-hwmon { compatible = "iio-hwmon"; - io-channels = <&xoadc 0x00 0x01>, /* Battery */ - <&xoadc 0x00 0x02>, /* DC in (charger) */ - <&xoadc 0x00 0x04>, /* VPH the main system voltage */ - <&xoadc 0x00 0x0b>, /* Die temperature */ - <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ - <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ - <&xoadc 0x00 0x0e>; /* Charger temperature */ + io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */ + <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */ + <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */ + <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */ + <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ + <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ + <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */ }; soc: soc { @@ -714,7 +714,7 @@ ssbi@500000 { reg = <0x00500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pmicintc: pmic { + pm8921: pmic { compatible = "qcom,pm8921"; interrupt-parent = <&tlmm_pinmux>; interrupts = <74 8>; @@ -749,7 +749,7 @@ pm8921_mpps: mpps@50 { rtc@11d { compatible = "qcom,pm8921-rtc"; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8921>; interrupts = <39 1>; reg = <0x11d>; allow-set-time; @@ -758,16 +758,16 @@ rtc@11d { pwrkey@1c { compatible = "qcom,pm8921-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8921>; interrupts = <50 1>, <51 1>; debounce = <15625>; pull-up; }; - xoadc: xoadc@197 { + pm8921_xoadc: xoadc@197 { compatible = "qcom,pm8921-adc"; reg = <0x197>; - interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>; #address-cells = <2>; #size-cells = <0>; #io-channel-cells = <2>; From patchwork Sun Jul 2 13:43:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699812 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 5C751C001B3 for ; Sun, 2 Jul 2023 13:43:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230000AbjGBNnd (ORCPT ); Sun, 2 Jul 2023 09:43:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229988AbjGBNnc (ORCPT ); Sun, 2 Jul 2023 09:43:32 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E258E72 for ; Sun, 2 Jul 2023 06:43:29 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b69f958ef3so56474901fa.1 for ; Sun, 02 Jul 2023 06:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305408; x=1690897408; 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=guEFeklfny/NCsCpyy3HLCjH1KNLTP704aTP3hyZMTI=; b=PPhbDtsXeOS3q46gvbD1W2i17+Fw8aF+lSJLvGlzc7M8u0Mje49R/U1Tso7MS8V44S U9DoPSGHrX5SPZBGdQgWUjgBdwTV7zTb7azmxp7sFaaNQ+F+G6sM1OPvHO2XdrsBoFls wve1OQoB9jWdaH0zqBqtLNN9UvwAJywvLVboll/3QHbCSh3lMpDvHVzn15/UkH0hLKX2 DRuHTQYxVvPZUTAS+sWa+qvI4UGCcfUZBMd6cgPXpZErzQ5UXnIMs4Nhgzqs6XjReLC0 oq4uyc/sqTfRFRqijCAhwALoh35yB9IYfP5aUnXHHWB6toctKxevx91mr03zlJ8SntZn nGZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305408; x=1690897408; 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=guEFeklfny/NCsCpyy3HLCjH1KNLTP704aTP3hyZMTI=; b=HR08cIS5xSkdR2ybDsy5M2rBM7KYc3KWJvR1e+F1xNkFeyWnKtDoCAJ0XKaTsnPaNf e2owB5p35GOFfefsSEYLUkW/ikBnR9GZiEOBl2Wm+dlWlaRm1PT0YPd/t56Kn4EAhnNr BhnP260IkclE7VOkdpLHow0BanRVdVtaIlx3sJ5TLq9yI9qyLK0mhpYto2c3omY/bzav 1Ux6KpY9raD+ZjYRDv5VdCFSfxtWjrsBRtnzZqVVm0wo2DtVPK/uhfHYG8JbO1KECY8K ET+qqzso4erVA8L6pZq7p1FNDM8BT88VRgPNEnxjpxwOAQEIB3iCAD3xz0QfKHRJTRlO dBIA== X-Gm-Message-State: ABy/qLa23ff/c/p2SBnMMF9PsaBXY3y3pMdZAhc/5s/fOLC9PfW1BysL l33N5y4MzP8EN7F1h8e+RKfYKZzKXwKqxNwywPI= X-Google-Smtp-Source: APBJJlFoDSI1n7APMJG1P01Azbor7Fw9shAGNShsKco4VqEMAMgI83yFssivJYhoKtwvl6P0NJ5knQ== X-Received: by 2002:a05:651c:454:b0:2b6:e618:b593 with SMTP id g20-20020a05651c045400b002b6e618b593mr708176ljg.31.1688305407810; Sun, 02 Jul 2023 06:43:27 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:27 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 08/27] ARM: dts: qcom: mdm9615: fix PMIC node labels Date: Sun, 2 Jul 2023 16:43:01 +0300 Message-Id: <20230702134320.98831-9-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change PM8018 node labels to start with pm8018_ prefix, following other Qualcomm PMIC device nodes. Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 2 +- arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi index 92c8003dac25..dac3aa793f71 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi @@ -76,7 +76,7 @@ reset-out-pins { }; }; -&pmicgpio { +&pm8018_gpio { usb_vbus_5v_pins: usb-vbus-5v-state { pins = "gpio4"; function = "normal"; diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi index b40c52ddf9b4..e79582c6220b 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi @@ -246,7 +246,7 @@ qcom,ssbi@500000 { reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pmicintc: pmic { + pm8018: pmic { compatible = "qcom,pm8018", "qcom,pm8921"; interrupts = ; #interrupt-cells = <2>; @@ -257,38 +257,38 @@ pmicintc: pmic { pwrkey@1c { compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8018>; interrupts = <50 IRQ_TYPE_EDGE_RISING>, <51 IRQ_TYPE_EDGE_RISING>; debounce = <15625>; pull-up; }; - pmicmpp: mpps@50 { + pm8018_mpps: mpps@50 { compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp"; interrupt-controller; #interrupt-cells = <2>; reg = <0x50>; gpio-controller; #gpio-cells = <2>; - gpio-ranges = <&pmicmpp 0 0 6>; + gpio-ranges = <&pm8018_mpps 0 0 6>; }; rtc@11d { compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc"; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8018>; interrupts = <39 IRQ_TYPE_EDGE_RISING>; reg = <0x11d>; allow-set-time; }; - pmicgpio: gpio@150 { + pm8018_gpio: gpio@150 { compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio"; reg = <0x150>; interrupt-controller; #interrupt-cells = <2>; gpio-controller; - gpio-ranges = <&pmicgpio 0 0 6>; + gpio-ranges = <&pm8018_gpio 0 0 6>; #gpio-cells = <2>; }; }; From patchwork Sun Jul 2 13:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698503 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 D6177C001DE for ; Sun, 2 Jul 2023 13:43:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229984AbjGBNnd (ORCPT ); Sun, 2 Jul 2023 09:43:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbjGBNnc (ORCPT ); Sun, 2 Jul 2023 09:43:32 -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 6AD4CE6B for ; Sun, 2 Jul 2023 06:43:30 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b5c2433134so44699351fa.0 for ; Sun, 02 Jul 2023 06:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305408; x=1690897408; 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=ARk0sav3kUERt7qMqi0BE+pFNDzIzWnv5NChxXa+bqQ=; b=LSsgr28d+qRVzGIZ4pRO3aYbu5zZMfYEahRw3+A3InrD3M/ELEJTBXLmAKQEpEQFxx N2lMS/wthWvr5v+hDyl904+gG4xBLti4jTj6x9Ksb0wugp9Estf52vIIRqFrcwR5csN2 jWyluZeljse/jBYyt9k3mEsv5V1EgV2IG8117MW8DWoFRcHxrgl3m+UXa/GMMMWVKS2U hMOMUaDD8jDRqFpppwdixxKbpX//rJjH9RTRSxg6jBgkZXe7YXs/e/v88K9bw5LIysO2 tGckA0xUADhLhzWxUzIUffzLNuBhZpOK1S/oVImI4sOzrfV6eHJR0Ia8ZHbb7bBBRBSv 3aFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305408; x=1690897408; 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=ARk0sav3kUERt7qMqi0BE+pFNDzIzWnv5NChxXa+bqQ=; b=eCoV9W9xb9nLO8duhq8BrOHbYrIp35dwcy2F1YPWLuNQ8egGj4JS0eRDZvOf2L2fuA KxpqPMyBKU1rx1bZ0Sai0eHkiEvbsDwq8sKLNdjIUAZnFQl5Q8SxMTSik4oK2HWhL97i sUpG8DEGQq2nfrFZiO3Tf2iBqJGxjEZX/0y/yqbYHeYsPnbnhpPnIaa12fKRQZ2+iEph rRmD2zufdpViaYl/+pdXdf3YgZ247Pkubrlf13dczNSWh8hd9g7kvgAaMd8Lez90bLns B787oCEYna9dt4fpVyDovdUbZQ2qn3a/3b2Cch8m+9uHWqjjxlgdA90WM4AYQRseeRLw 7vtg== X-Gm-Message-State: ABy/qLZswXfN9Dso1k40pSkCG4rgysdceKlj4aBvBWxKiDUNHYVUbM27 IcRUkW8+73/mJ0otuzKJiJubNA== X-Google-Smtp-Source: APBJJlH0baeE9/QvY/I40Skgpz17C867z46oonr+k2oO9BssatSQGi4nEDoTwpr0oNMHLhkdniRHLQ== X-Received: by 2002:a2e:3c19:0:b0:2b6:d0c1:7cd0 with SMTP id j25-20020a2e3c19000000b002b6d0c17cd0mr2078273lja.22.1688305408617; Sun, 02 Jul 2023 06:43:28 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:28 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 09/27] ARM: dts: qcom: msm8660: fix PMIC node labels Date: Sun, 2 Jul 2023 16:43:02 +0300 Message-Id: <20230702134320.98831-10-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change PM8058 node labels to start with pm8058_ prefix, following other Qualcomm PMIC device nodes. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- .../boot/dts/qcom/qcom-apq8060-dragonboard.dts | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts index db4c791b2e2f..48fd1a1feea3 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts @@ -72,7 +72,7 @@ cm3605 { /* Trig on both edges - getting close or far away */ interrupts-extended = <&pm8058_gpio 34 IRQ_TYPE_EDGE_BOTH>; /* MPP05 analog input to the XOADC */ - io-channels = <&xoadc 0x00 0x05>; + io-channels = <&pm8058_xoadc 0x00 0x05>; io-channel-names = "aout"; pinctrl-names = "default"; pinctrl-0 = <&dragon_cm3605_gpios>, <&dragon_cm3605_mpps>; @@ -945,7 +945,7 @@ irq-pins { }; }; -&xoadc { +&pm8058_xoadc { /* Reference voltage 2.2 V */ xoadc-ref-supply = <&pm8058_l18>; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi index 78023ed2fdf7..9217ced108c4 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi @@ -80,13 +80,13 @@ sleep-clk { */ iio-hwmon { compatible = "iio-hwmon"; - io-channels = <&xoadc 0x00 0x01>, /* Battery */ - <&xoadc 0x00 0x02>, /* DC in (charger) */ - <&xoadc 0x00 0x04>, /* VPH the main system voltage */ - <&xoadc 0x00 0x0b>, /* Die temperature */ - <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ - <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ - <&xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ + io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */ + <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */ + <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */ + <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */ + <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ + <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ + <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ }; soc: soc { @@ -390,7 +390,7 @@ pm8058_keypad: keypad@148 { row-hold = <91500>; }; - xoadc: xoadc@197 { + pm8058_xoadc: xoadc@197 { compatible = "qcom,pm8058-adc"; reg = <0x197>; interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>; From patchwork Sun Jul 2 13:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699811 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 321B5C0015E for ; Sun, 2 Jul 2023 13:43:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230011AbjGBNne (ORCPT ); Sun, 2 Jul 2023 09:43:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229754AbjGBNnd (ORCPT ); Sun, 2 Jul 2023 09:43:33 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2574BE6D for ; Sun, 2 Jul 2023 06:43:31 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b6c3921c8bso56453351fa.3 for ; Sun, 02 Jul 2023 06:43:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305409; x=1690897409; 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=0IT0WSZL5NfAjkx38HXtQq+fDnbve0LjJXQvD/mMilM=; b=W+QYgs3tfkTQDcilkfC4aFAmOvq7ACA+jMzoEF2b8ng6jQGmNLuUjRqvKASFveL/bC Z/oMsBdswQeS7DxT7JmfGD3ozITUHZGJNLnL7FmeH1swuTRKr+hUeNT4Rj7o8k64znot jhjZtDcqgydnWWZ8ssODBqJFvYQTCiRoh5U7TKUP3aAyJt2zS6prbW0ne5cEw9mLT9gk j1Wjn4v17crRwPRKzdhHF3cD887ahMGldij4nxUfeqtkGYKdY/y6fit+bvZ5sXdVGG6o OoQOisqAm+0Eg2oZJWSJZYhPI69b3H3dqmo/+PyPvGbepBUYOee+LthQRpPX+gJJvhcH qnRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305409; x=1690897409; 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=0IT0WSZL5NfAjkx38HXtQq+fDnbve0LjJXQvD/mMilM=; b=H/+8MjBLXrCOSLqXIHYlJ/pdoANL4hnDXfjYuhC6A6YgHnNAl9a9Si9FndxJGmOmwt Ixyqh7C8sa/I4SUCJg8JkBtvKDFV757XIrau+wINGshkl0jLFns/049zA7NLbhInLWcn prpdwSpHNhbJJiskG19sMA3ED7+q+zATX+OXhvv3oe/EUtB7i3iyGUuBFuKcFIJRZVSL GsZ9bV/2tdnQixf3EfEihoVwV3WERX9dihaV0QDaNixHj/pvSIsomVes1JO4+irMVoyE BnkSNMNHG3XfQ73e3xuCDLELIw+Nrijtog2Pwh46U0jnw3sjClX9Hqs/IeDbQ0gtop4K z8aQ== X-Gm-Message-State: ABy/qLa+BhN9vBfR/14Ms288N9aSEL+qn8lLIZAMEZ0HnLWgR1CGpAtu eaiPBGmZhmOov5lBZrnizdc+4A== X-Google-Smtp-Source: APBJJlHfyUQhaZjoXG6GUR51cyku5tSH0b1FlawbEdLi46p4EaI7twJMGejBtkvekf63X/uhwuaBww== X-Received: by 2002:a05:651c:20c:b0:2b6:d63d:cc1e with SMTP id y12-20020a05651c020c00b002b6d63dcc1emr3918204ljn.51.1688305409360; Sun, 02 Jul 2023 06:43:29 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:28 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 10/27] ARM: dts: qcom: msm8960: fix PMIC node labels Date: Sun, 2 Jul 2023 16:43:03 +0300 Message-Id: <20230702134320.98831-11-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Change PM8921 node labels to start with pm8921_ prefix, following other Qualcomm PMIC device nodes. Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi index 913bc6afd0a1..6b8d90d02146 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi @@ -264,7 +264,7 @@ ssbi@500000 { reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pmicintc: pmic { + pm8921: pmic { compatible = "qcom,pm8921"; interrupt-parent = <&msmgpio>; interrupts = <104 IRQ_TYPE_LEVEL_LOW>; @@ -276,7 +276,7 @@ pmicintc: pmic { pwrkey@1c { compatible = "qcom,pm8921-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8921>; interrupts = <50 IRQ_TYPE_EDGE_RISING>, <51 IRQ_TYPE_EDGE_RISING>; debounce = <15625>; @@ -286,7 +286,7 @@ pwrkey@1c { pm8921_keypad: keypad@148 { compatible = "qcom,pm8921-keypad"; reg = <0x148>; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8921>; interrupts = <74 IRQ_TYPE_EDGE_RISING>, <75 IRQ_TYPE_EDGE_RISING>; debounce = <15>; @@ -296,7 +296,7 @@ pm8921_keypad: keypad@148 { rtc@11d { compatible = "qcom,pm8921-rtc"; - interrupt-parent = <&pmicintc>; + interrupt-parent = <&pm8921>; interrupts = <39 IRQ_TYPE_EDGE_RISING>; reg = <0x11d>; allow-set-time; From patchwork Sun Jul 2 13:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698502 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 3AA71C04A6A for ; Sun, 2 Jul 2023 13:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229981AbjGBNnf (ORCPT ); Sun, 2 Jul 2023 09:43:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229988AbjGBNne (ORCPT ); Sun, 2 Jul 2023 09:43:34 -0400 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 C140CE7C for ; Sun, 2 Jul 2023 06:43:31 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b6a0e36d42so43135271fa.0 for ; Sun, 02 Jul 2023 06:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305410; x=1690897410; 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=c0qCZwLqED1KD83RQ3+5MlLPWlcDEfGkMx29AWINmec=; b=aA4MlwIVd/706wJAR2kI3wQX6HJlOjLf4k4nXgOVwU7BCO34nF0O5VkdKRnLB9XZ1K ZY6VJqPJ9I8u7l5EGICbqvFoZR0ZKfveAlTv3thIaOiDYyrhlAJ7mHt8JWr+aHf+qQ/n jMRotwD6qqPB455Mf8KOMqLOGrxp4sK9nBI9H5p3meOg9x1bKpWohimCDwLcM7Ac9tcx 0LaF5aIXfDG//7cfI8b9UuthO10zaBtH6RI1NdU7iZIfKNrW9WscKwDBvZbUFb4OR91n cO7E6XghJd7MtxJ0EpXmeVOGwUjcWh9pmsbXL2yfmOXzTj7tSAoT5hEnv67K+GLgxfBD B0wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305410; x=1690897410; 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=c0qCZwLqED1KD83RQ3+5MlLPWlcDEfGkMx29AWINmec=; b=BNvkPm5cnt2GLeoXfRvju/vu7/jt5kWYAcya0EoX3YxGcRWPmFW9pMq3ZFFLtiKvvE i1zJxkxS7fkbKgS4P7h/RDOGq21IMqTNhZpXB2+KqeEA5hyJVrfAO66ctZjcgkcxzCkK hLy49N6ywJ73LOCgDR3ohxB0bOGk2u+1fDTTJROM6DLpLhv5O7CEHNh7KW2iIiKr0HyR kBeB8haTPBRjGk3G1sEY83sngwCzGIWslxjteXEIv0c5LXXhh1btMhpJN1PICw6hDCVq 1pVsAmHO+Q8bY3CmOd4ij6M8w0qVvX3sW37dkocOF1ZYEmyB/Bf8ZhMA6eQkMRD+9pKk DVJQ== X-Gm-Message-State: AC+VfDx4iH+fxZciJZiD9o5M6Ze08LAjHIkotjDBY90yFcqorck7mOWQ RMb68qcG0RVojasOaqr93tuYSw== X-Google-Smtp-Source: ACHHUZ5QKOq3RdjYSkqxvrVOXjhXMMbjmXxHPGfN8TATTg8if5lRO0Mz26ko234TZN64JLShAPQcGA== X-Received: by 2002:a05:651c:10b0:b0:2b6:9e1d:cd0f with SMTP id k16-20020a05651c10b000b002b69e1dcd0fmr4205118ljn.12.1688305410165; Sun, 02 Jul 2023 06:43:30 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:29 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 11/27] ARM: dts: qcom: msm8960: split PMIC to separate dtsi files Date: Sun, 2 Jul 2023 16:43:04 +0300 Message-Id: <20230702134320.98831-12-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The PMIC is not a part of the SoC, so move PMIC to a separate file and include it from the board files. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8921.dtsi | 40 +++++++++++++++++++ arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 1 + .../qcom/qcom-msm8960-samsung-expressatt.dts | 3 +- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 38 +----------------- 4 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 arch/arm/boot/dts/qcom/pm8921.dtsi diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi new file mode 100644 index 000000000000..414941f7a42f --- /dev/null +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 + +&ssbi { + pm8921: pmic { + compatible = "qcom,pm8921"; + #interrupt-cells = <2>; + interrupt-controller; + #address-cells = <1>; + #size-cells = <0>; + + pwrkey@1c { + compatible = "qcom,pm8921-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pm8921>; + interrupts = <50 IRQ_TYPE_EDGE_RISING>, + <51 IRQ_TYPE_EDGE_RISING>; + debounce = <15625>; + pull-up; + }; + + pm8921_keypad: keypad@148 { + compatible = "qcom,pm8921-keypad"; + reg = <0x148>; + interrupt-parent = <&pm8921>; + interrupts = <74 IRQ_TYPE_EDGE_RISING>, + <75 IRQ_TYPE_EDGE_RISING>; + debounce = <15>; + scan-delay = <32>; + row-hold = <91500>; + }; + + rtc@11d { + compatible = "qcom,pm8921-rtc"; + interrupt-parent = <&pm8921>; + interrupts = <39 IRQ_TYPE_EDGE_RISING>; + reg = <0x11d>; + allow-set-time; + }; + }; +}; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts index 4641b4f2195d..414881d34c60 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts @@ -2,6 +2,7 @@ #include #include "qcom-msm8960.dtsi" +#include "pm8921.dtsi" / { model = "Qualcomm MSM8960 CDP"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts index 13e85c287498..2e7d98e132be 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts @@ -1,8 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include "qcom-msm8960.dtsi" -#include +#include "pm8921.dtsi" / { model = "Samsung Galaxy Express SGH-I437"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi index 6b8d90d02146..8157236f249d 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi @@ -259,48 +259,14 @@ gsbi5_serial: serial@16440000 { }; }; - ssbi@500000 { + ssbi: ssbi@500000 { compatible = "qcom,ssbi"; reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pm8921: pmic { - compatible = "qcom,pm8921"; + pmic { interrupt-parent = <&msmgpio>; interrupts = <104 IRQ_TYPE_LEVEL_LOW>; - #interrupt-cells = <2>; - interrupt-controller; - #address-cells = <1>; - #size-cells = <0>; - - pwrkey@1c { - compatible = "qcom,pm8921-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pm8921>; - interrupts = <50 IRQ_TYPE_EDGE_RISING>, - <51 IRQ_TYPE_EDGE_RISING>; - debounce = <15625>; - pull-up; - }; - - pm8921_keypad: keypad@148 { - compatible = "qcom,pm8921-keypad"; - reg = <0x148>; - interrupt-parent = <&pm8921>; - interrupts = <74 IRQ_TYPE_EDGE_RISING>, - <75 IRQ_TYPE_EDGE_RISING>; - debounce = <15>; - scan-delay = <32>; - row-hold = <91500>; - }; - - rtc@11d { - compatible = "qcom,pm8921-rtc"; - interrupt-parent = <&pm8921>; - interrupts = <39 IRQ_TYPE_EDGE_RISING>; - reg = <0x11d>; - allow-set-time; - }; }; }; From patchwork Sun Jul 2 13:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698501 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 97C0BC001B3 for ; Sun, 2 Jul 2023 13:43:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229754AbjGBNng (ORCPT ); Sun, 2 Jul 2023 09:43:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjGBNnf (ORCPT ); Sun, 2 Jul 2023 09:43:35 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A872BE72 for ; Sun, 2 Jul 2023 06:43:32 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2b69e6d324aso56170771fa.0 for ; Sun, 02 Jul 2023 06:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305411; x=1690897411; 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=wxqLUHNHLdJvvqMJgestVX6rYi36iQjneQUWKOWyQHM=; b=wL8iCjYUNE3NXhGGnzb/OEat8/vyEqjam+gulbH749MMnbaWl2lK10XfvvJyuHrwq/ nvcXz5tBiqHX+DaWHwtX+yXJ91ymygd3eAsNKgNUxacEQFDA+jDxD8PcBpIQH77lKq3x i8u+1PzUuoDm/RyPpyirabqo6qhSiI2SLiIoRcIPAET/WgbdSGc9K6biWyczwp5VzdGf IHX4VhmFWZU+qn0+nP64VcKc+Dxid1+Q98q3VbjHTTk3TlFYJ304ca3WVMM7P6p+MDOc uEUAVUAuR9Ti5XnFmsH7bGzwYWrbeAcjIqjI4/XffVUVmomtSphMnfJj/OdlzknZk+nb Ce4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305411; x=1690897411; 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=wxqLUHNHLdJvvqMJgestVX6rYi36iQjneQUWKOWyQHM=; b=CY9AY/mBJy2OGePPhmF5AnDqK3xwNK2ImOijKQ25pvgrxtAQLZJez0qHD8TDCK1a+D z1xfI4M9+Gxt5P0nQrEWjEvBHSBXtPDHYa26hWLlY7dlLKnlpH/xGz5lLO+4YfZqULS5 tkHi777ETQX6T4oZL7PXKYOcgPQigIl0idiUMTiHkEFr9Yd8Nb2Rg9wT72vqOThKn00i /xeIX1Ixq1pnASWM0tH2+JiALkFMWezgpoZVWfKoNdEy8LDuNzXb/MxFYL7EKiEY2ypW C/kP6Bw0eSFsDHncCQnNNSRMQFPXgLrbbow/Dw8nezkK3By2ik0fVF7Qy9dtj9AO/S25 UOSg== X-Gm-Message-State: ABy/qLb7C460ElceyNoMW499yNxQr/OQcHevgMQate7XdSGrujwbIsIc bLb0xHCcgWDs7Wm068D5abVrKQ== X-Google-Smtp-Source: APBJJlH11wsMM5xlcXlDFOdOQgNqBdjXEe2fZ9CaP5delyBqJyQO14V8WoMMe7+/Ki1JjUUznKJYZQ== X-Received: by 2002:a2e:9608:0:b0:2b6:a22b:42dc with SMTP id v8-20020a2e9608000000b002b6a22b42dcmr4328177ljh.16.1688305410901; Sun, 02 Jul 2023 06:43:30 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:30 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 12/27] ARM: dts: qcom: apq8064: split PMICs to separate dtsi files Date: Sun, 2 Jul 2023 16:43:05 +0300 Message-Id: <20230702134320.98831-13-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The PMICs are not a part of the SoC, so move PMICs to separate files and include them from the board files. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8821.dtsi | 22 +++ arch/arm/boot/dts/qcom/pm8921.dtsi | 99 +++++++++++++ .../dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 6 +- .../boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 5 +- .../boot/dts/qcom/qcom-apq8064-ifc6410.dts | 5 +- .../qcom-apq8064-sony-xperia-lagan-yuga.dts | 5 +- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 132 +----------------- 7 files changed, 142 insertions(+), 132 deletions(-) create mode 100644 arch/arm/boot/dts/qcom/pm8821.dtsi diff --git a/arch/arm/boot/dts/qcom/pm8821.dtsi b/arch/arm/boot/dts/qcom/pm8821.dtsi new file mode 100644 index 000000000000..064e3ba54e18 --- /dev/null +++ b/arch/arm/boot/dts/qcom/pm8821.dtsi @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* This PMIC is used on a secondary SSBI bus */ +&ssbi2 { + pm8821: pmic { + compatible = "qcom,pm8821"; + interrupt-controller; + #interrupt-cells = <2>; + #address-cells = <1>; + #size-cells = <0>; + + pm8821_mpps: mpps@50 { + compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp"; + reg = <0x50>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pm8821_mpps 0 0 4>; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; +}; diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi index 414941f7a42f..ad41d99ab265 100644 --- a/arch/arm/boot/dts/qcom/pm8921.dtsi +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi @@ -8,6 +8,30 @@ pm8921: pmic { #address-cells = <1>; #size-cells = <0>; + pm8921_gpio: gpio@150 { + + compatible = "qcom,pm8921-gpio", + "qcom,ssbi-gpio"; + reg = <0x150>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + gpio-ranges = <&pm8921_gpio 0 0 44>; + #gpio-cells = <2>; + + }; + + pm8921_mpps: mpps@50 { + compatible = "qcom,pm8921-mpp", + "qcom,ssbi-mpp"; + reg = <0x50>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pm8921_mpps 0 0 12>; + interrupt-controller; + #interrupt-cells = <2>; + }; + pwrkey@1c { compatible = "qcom,pm8921-pwrkey"; reg = <0x1c>; @@ -36,5 +60,80 @@ rtc@11d { reg = <0x11d>; allow-set-time; }; + + pm8921_xoadc: xoadc@197 { + compatible = "qcom,pm8921-adc"; + reg = <0x197>; + interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>; + #address-cells = <2>; + #size-cells = <0>; + #io-channel-cells = <2>; + + vcoin: adc-channel@0 { + reg = <0x00 0x00>; + }; + + vbat: adc-channel@1 { + reg = <0x00 0x01>; + }; + + dcin: adc-channel@2 { + reg = <0x00 0x02>; + }; + + vph_pwr: adc-channel@4 { + reg = <0x00 0x04>; + }; + + batt_therm: adc-channel@8 { + reg = <0x00 0x08>; + }; + + batt_id: adc-channel@9 { + reg = <0x00 0x09>; + }; + + usb_vbus: adc-channel@a { + reg = <0x00 0x0a>; + }; + + die_temp: adc-channel@b { + reg = <0x00 0x0b>; + }; + + ref_625mv: adc-channel@c { + reg = <0x00 0x0c>; + }; + + ref_1250mv: adc-channel@d { + reg = <0x00 0x0d>; + }; + + chg_temp: adc-channel@e { + reg = <0x00 0x0e>; + }; + + ref_muxoff: adc-channel@f { + reg = <0x00 0x0f>; + }; + }; + }; +}; + +/ { + /* + * These channels from the ADC are simply hardware monitors. + * That is why the ADC is referred to as "HKADC" - HouseKeeping + * ADC. + */ + iio-hwmon { + compatible = "iio-hwmon"; + io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */ + <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */ + <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */ + <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */ + <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ + <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ + <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */ }; }; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts index 0e80a5a8e3c6..d5dee70620c2 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts @@ -1,8 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 -#include "qcom-apq8064-v2.0.dtsi" #include #include #include + +#include "qcom-apq8064-v2.0.dtsi" +#include "pm8821.dtsi" +#include "pm8921.dtsi" + / { model = "Asus Nexus7(flo)"; compatible = "asus,nexus7-flo", "qcom,apq8064"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts index d6ecfd8addb7..ffd654ab0b57 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts @@ -1,8 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 -#include "qcom-apq8064-v2.0.dtsi" #include #include +#include "qcom-apq8064-v2.0.dtsi" +#include "pm8821.dtsi" +#include "pm8921.dtsi" + / { model = "CompuLab CM-QS600"; compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts index 96307550523a..12bf8ea3fb93 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts @@ -1,9 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 -#include "qcom-apq8064-v2.0.dtsi" #include #include #include +#include "qcom-apq8064-v2.0.dtsi" +#include "pm8821.dtsi" +#include "pm8921.dtsi" + / { model = "Qualcomm APQ8064/IFC6410"; compatible = "qcom,apq8064-ifc6410", "qcom,apq8064"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts index 9244512b74d1..53dd9d79556f 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts @@ -1,10 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 -#include "qcom-apq8064-v2.0.dtsi" #include #include #include #include +#include "qcom-apq8064-v2.0.dtsi" +#include "pm8821.dtsi" +#include "pm8921.dtsi" + / { model = "Sony Xperia Z"; compatible = "sony,xperia-yuga", "qcom,apq8064"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi index 5ffb960d09b4..2a5a3b2fb8e9 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi @@ -324,23 +324,6 @@ scm { }; }; - - /* - * These channels from the ADC are simply hardware monitors. - * That is why the ADC is referred to as "HKADC" - HouseKeeping - * ADC. - */ - iio-hwmon { - compatible = "iio-hwmon"; - io-channels = <&pm8921_xoadc 0x00 0x01>, /* Battery */ - <&pm8921_xoadc 0x00 0x02>, /* DC in (charger) */ - <&pm8921_xoadc 0x00 0x04>, /* VPH the main system voltage */ - <&pm8921_xoadc 0x00 0x0b>, /* Die temperature */ - <&pm8921_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ - <&pm8921_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ - <&pm8921_xoadc 0x00 0x0e>; /* Charger temperature */ - }; - soc: soc { #address-cells = <1>; #size-cells = <1>; @@ -683,132 +666,25 @@ rng@1a500000 { clock-names = "core"; }; - ssbi@c00000 { + ssbi2: ssbi@c00000 { compatible = "qcom,ssbi"; reg = <0x00c00000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pm8821: pmic { - compatible = "qcom,pm8821"; + pmic { interrupt-parent = <&tlmm_pinmux>; interrupts = <76 IRQ_TYPE_LEVEL_LOW>; - #interrupt-cells = <2>; - interrupt-controller; - #address-cells = <1>; - #size-cells = <0>; - - pm8821_mpps: mpps@50 { - compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp"; - reg = <0x50>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&pm8821_mpps 0 0 4>; - }; }; }; - ssbi@500000 { + ssbi: ssbi@500000 { compatible = "qcom,ssbi"; reg = <0x00500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pm8921: pmic { - compatible = "qcom,pm8921"; + pmic { interrupt-parent = <&tlmm_pinmux>; interrupts = <74 8>; - #interrupt-cells = <2>; - interrupt-controller; - #address-cells = <1>; - #size-cells = <0>; - - pm8921_gpio: gpio@150 { - - compatible = "qcom,pm8921-gpio", - "qcom,ssbi-gpio"; - reg = <0x150>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - gpio-ranges = <&pm8921_gpio 0 0 44>; - #gpio-cells = <2>; - - }; - - pm8921_mpps: mpps@50 { - compatible = "qcom,pm8921-mpp", - "qcom,ssbi-mpp"; - reg = <0x50>; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&pm8921_mpps 0 0 12>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - rtc@11d { - compatible = "qcom,pm8921-rtc"; - interrupt-parent = <&pm8921>; - interrupts = <39 1>; - reg = <0x11d>; - allow-set-time; - }; - - pwrkey@1c { - compatible = "qcom,pm8921-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pm8921>; - interrupts = <50 1>, <51 1>; - debounce = <15625>; - pull-up; - }; - - pm8921_xoadc: xoadc@197 { - compatible = "qcom,pm8921-adc"; - reg = <0x197>; - interrupts-extended = <&pm8921 78 IRQ_TYPE_EDGE_RISING>; - #address-cells = <2>; - #size-cells = <0>; - #io-channel-cells = <2>; - - vcoin: adc-channel@0 { - reg = <0x00 0x00>; - }; - vbat: adc-channel@1 { - reg = <0x00 0x01>; - }; - dcin: adc-channel@2 { - reg = <0x00 0x02>; - }; - vph_pwr: adc-channel@4 { - reg = <0x00 0x04>; - }; - batt_therm: adc-channel@8 { - reg = <0x00 0x08>; - }; - batt_id: adc-channel@9 { - reg = <0x00 0x09>; - }; - usb_vbus: adc-channel@a { - reg = <0x00 0x0a>; - }; - die_temp: adc-channel@b { - reg = <0x00 0x0b>; - }; - ref_625mv: adc-channel@c { - reg = <0x00 0x0c>; - }; - ref_1250mv: adc-channel@d { - reg = <0x00 0x0d>; - }; - chg_temp: adc-channel@e { - reg = <0x00 0x0e>; - }; - ref_muxoff: adc-channel@f { - reg = <0x00 0x0f>; - }; - }; }; }; From patchwork Sun Jul 2 13:43:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699810 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 8967EC001DD for ; Sun, 2 Jul 2023 13:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229995AbjGBNnf (ORCPT ); Sun, 2 Jul 2023 09:43:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbjGBNnf (ORCPT ); Sun, 2 Jul 2023 09:43:35 -0400 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 43A1EE6A for ; Sun, 2 Jul 2023 06:43:33 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2b69f71a7easo56670081fa.1 for ; Sun, 02 Jul 2023 06:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305411; x=1690897411; 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=Bf9QCanAOnO0h/sSuLMAlM/Qzcix5mepmTGV806FG/4=; b=J3aH3NG31KmSoPTAxRgJIaksua7gWU4qqF748MFeaRjHmUsV4YEMGGCz2eYfH2Qgw8 SyR+JQ++mQMrp9/HqBB3AEvZ9phds1ioIxy9UaWg0wTqVase8LZyStCUYCxONlSqNfNs maOcU7iPkZgeumubJukuT4E1HGcgPV7Y8Dl4weH/8IwUO3ZJJqN4dIolACteemWGr+XS LtzsXDB0Hui8l9agZcOVjtxEH1NPw/Hw1MYrepSmQskenC+KAraqV8sLXoGKoNNQaz2k ZmLgKUKExlDOnbEwRDjgbIx/zBwCInVOutI97y62bpUF0Cy5uNCVSnHSgtzD9omlh/Ls 2RFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305411; x=1690897411; 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=Bf9QCanAOnO0h/sSuLMAlM/Qzcix5mepmTGV806FG/4=; b=W44eUCXpnLf/9u30XYTektShzxy42lsxh/SkiE301iK+SXY/ZQcP6FHSD8Ymituraz rlLEDaRkdJ2vpKwbeckSS7ipHxa0Oy29oeJ3DNM22V8bJiegmR21oPwH19SYk+oBeyM7 DAPQ/MggHQH6Q1LajQg2ED/J7+3PnMuMny/z3UxZ7O/bNnh0x3L6WXrlXdVL3HyjlER6 UqBPL8xIityVcvW2ntS8lCdN+5Jree5qDKtQe0jLXGH9hAOvhspyx1vZfm6DlCABkwWZ DEtlGp/QEKXwVspYlQfGhEgwCxiE0VYnov4iAg/DVNb8ldDhOqpglBwTs1DntWTMbUvz bbgg== X-Gm-Message-State: ABy/qLY2YrV/pO3+YyVtgBvJtQKRgS0BiQ6oYHxJibkHqT0kzsl+xAMY 0+/hV9G6+JDxunu+7cInR2OW3w== X-Google-Smtp-Source: APBJJlHrdYlQxj+rkuW24KtmPVcLxvBxGhgrl/9er1wV4lGQMH7yMH5vLVK7YHmt9/aNUV0LKXxI7A== X-Received: by 2002:a2e:b165:0:b0:2b6:dfef:d523 with SMTP id a5-20020a2eb165000000b002b6dfefd523mr1603991ljm.50.1688305411628; Sun, 02 Jul 2023 06:43:31 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:31 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Neil Armstrong Subject: [PATCH v2 13/27] ARM: dts: qcom: mdm9615: split PMIC to separate dtsi files Date: Sun, 2 Jul 2023 16:43:06 +0300 Message-Id: <20230702134320.98831-14-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The PMIC is not a part of the SoC, so move PMIC to a separate file and include it from the board files. Suggested-by: Konrad Dybcio Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8018.dtsi | 57 +++++++++++++++++++ .../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 1 + arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 47 +-------------- 3 files changed, 60 insertions(+), 45 deletions(-) create mode 100644 arch/arm/boot/dts/qcom/pm8018.dtsi diff --git a/arch/arm/boot/dts/qcom/pm8018.dtsi b/arch/arm/boot/dts/qcom/pm8018.dtsi new file mode 100644 index 000000000000..c602544900b2 --- /dev/null +++ b/arch/arm/boot/dts/qcom/pm8018.dtsi @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Device Tree Source for Qualcomm PM8018 + * + * Copyright (C) 2016 BayLibre, SAS. + * Author : Neil Armstrong + */ + +&ssbi { + pm8018: pmic { + compatible = "qcom,pm8018", "qcom,pm8921"; + #interrupt-cells = <2>; + interrupt-controller; + #address-cells = <1>; + #size-cells = <0>; + + pwrkey@1c { + compatible = "qcom,pm8018-pwrkey", + "qcom,pm8921-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pm8018>; + interrupts = <50 IRQ_TYPE_EDGE_RISING>, + <51 IRQ_TYPE_EDGE_RISING>; + debounce = <15625>; + pull-up; + }; + + pm8018_mpps: mpps@50 { + compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp"; + interrupt-controller; + #interrupt-cells = <2>; + reg = <0x50>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pm8018_mpps 0 0 6>; + }; + + rtc@11d { + compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc"; + interrupt-parent = <&pm8018>; + interrupts = <39 IRQ_TYPE_EDGE_RISING>; + reg = <0x11d>; + allow-set-time; + }; + + pm8018_gpio: gpio@150 { + compatible = "qcom,pm8058-gpio", + "qcom,ssbi-gpio"; + reg = <0x150>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + gpio-ranges = <&pm8018_gpio 0 0 6>; + #gpio-cells = <2>; + }; + }; +}; diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi index dac3aa793f71..cc264861afe5 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi @@ -7,6 +7,7 @@ */ #include "qcom-mdm9615.dtsi" +#include "pm8018.dtsi" / { model = "Sierra Wireless WP8548 Module"; diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi index e79582c6220b..c08c6252f3b7 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi @@ -241,56 +241,13 @@ gsbi5_serial: serial@16440000 { }; }; - qcom,ssbi@500000 { + ssbi: qcom,ssbi@500000 { compatible = "qcom,ssbi"; reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pm8018: pmic { - compatible = "qcom,pm8018", "qcom,pm8921"; + pmic { interrupts = ; - #interrupt-cells = <2>; - interrupt-controller; - #address-cells = <1>; - #size-cells = <0>; - - pwrkey@1c { - compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pm8018>; - interrupts = <50 IRQ_TYPE_EDGE_RISING>, - <51 IRQ_TYPE_EDGE_RISING>; - debounce = <15625>; - pull-up; - }; - - pm8018_mpps: mpps@50 { - compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp"; - interrupt-controller; - #interrupt-cells = <2>; - reg = <0x50>; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&pm8018_mpps 0 0 6>; - }; - - rtc@11d { - compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc"; - interrupt-parent = <&pm8018>; - interrupts = <39 IRQ_TYPE_EDGE_RISING>; - reg = <0x11d>; - allow-set-time; - }; - - pm8018_gpio: gpio@150 { - compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio"; - reg = <0x150>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - gpio-ranges = <&pm8018_gpio 0 0 6>; - #gpio-cells = <2>; - }; }; }; From patchwork Sun Jul 2 13:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699809 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 6B853C001DE for ; Sun, 2 Jul 2023 13:43:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229874AbjGBNnh (ORCPT ); Sun, 2 Jul 2023 09:43:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229758AbjGBNng (ORCPT ); Sun, 2 Jul 2023 09:43:36 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3353F10C0 for ; Sun, 2 Jul 2023 06:43:34 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b6985de215so56511701fa.2 for ; Sun, 02 Jul 2023 06:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305412; x=1690897412; 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=GGqUl+V6ajHw+vi4bRAr9wvwArFyTatD3jkjVgGFbtI=; b=VoOZhpeSUa5GQudFOd5PrJrO2ABJNHzsF6hfqYUqcJxxS/pEPfAqPS5fIJ3X4fb9lI hCC4FvHYwE/xuC+0FbQP92z+MLw+AUXUqg0LpVKdiZpRZ0OKESU6j4+p+/w77ewq40vS uu41FiDasGsPwyjXdNJPtwiV5pHwBAzhaEtIUwZl69fjUb/rnyRwyuhXnQXCnDEGhHEZ 0mwrH5RdPSSUSPbSqBvMwJzGphipSgxkg5/44z0YG4NtEfcqL0Wknh50mtWLIgqQFcqd bZMdYacM0a+QA1S0MDOX2sA814mj9pCG6+FtKbj7lCYrYnvY5Tar3YrJ6j6xP6cfjE7T s9dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305412; x=1690897412; 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=GGqUl+V6ajHw+vi4bRAr9wvwArFyTatD3jkjVgGFbtI=; b=kW6L0ai+JwQi6BYKcxEoT4+FiqZCoJk9YQC3dDRDRne/k3GqpR8Er/F/TyhUppTCld 3uXFI6cXcOVBtmU1X8oIXT28ebnt+DRULtWqd4XyKo9bScfmrUVgK7yI6HI9PwYc4Zp/ 8LHsOamPLLPwTSJ6ckzfwAipSxM0AWYZKHQpJCeZIMqMmy3GsaUYxFY8DWdX5/uHlkbG +TDriKhmWPqHxPPuzwVbWL+X5gwAWM/dg3s21aByFJNeE7yopFbVuQH10jGaSd5uYXPX hnqxFG52p6WhVepGrSyWX+WKggf3jIexqufdlxFmyVWT4a+vW4uuq84KBaJrbRbpI55w o1IQ== X-Gm-Message-State: ABy/qLZlRCs7i1VB8SLea0EwKV2wdOtdymlKu0DgltgHjAtnqe15JdMo 6TPs8XPeBUWRs3JXWSCDlHP7bQ== X-Google-Smtp-Source: APBJJlH96JaQQJMTd/H86TTn0Wz9Rrl4Y7DcWIGakZ/64eDEYjaSMHZgZKz0Vak/ZJ/GiGGoDb19Mg== X-Received: by 2002:a2e:91ce:0:b0:2af:25cf:92ae with SMTP id u14-20020a2e91ce000000b002af25cf92aemr5883216ljg.22.1688305412395; Sun, 02 Jul 2023 06:43:32 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:31 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 14/27] ARM: dts: qcom: msm8660: split PMIC to separate dtsi files Date: Sun, 2 Jul 2023 16:43:07 +0300 Message-Id: <20230702134320.98831-15-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The PMIC is not a part of the SoC, so move PMIC to a separate file and include it from the board files. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8058.dtsi | 160 ++++++++++++++++++ .../dts/qcom/qcom-apq8060-dragonboard.dts | 1 + arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 1 + arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 148 +--------------- 4 files changed, 164 insertions(+), 146 deletions(-) create mode 100644 arch/arm/boot/dts/qcom/pm8058.dtsi diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi new file mode 100644 index 000000000000..ad581c3bcbd2 --- /dev/null +++ b/arch/arm/boot/dts/qcom/pm8058.dtsi @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0 + +&ssbi { + pm8058: pmic { + compatible = "qcom,pm8058"; + #interrupt-cells = <2>; + interrupt-controller; + #address-cells = <1>; + #size-cells = <0>; + + pm8058_gpio: gpio@150 { + compatible = "qcom,pm8058-gpio", + "qcom,ssbi-gpio"; + reg = <0x150>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + gpio-ranges = <&pm8058_gpio 0 0 44>; + #gpio-cells = <2>; + }; + + pm8058_mpps: mpps@50 { + compatible = "qcom,pm8058-mpp", + "qcom,ssbi-mpp"; + reg = <0x50>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&pm8058_mpps 0 0 12>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + pwrkey@1c { + compatible = "qcom,pm8058-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pm8058>; + interrupts = <50 1>, <51 1>; + debounce = <15625>; + pull-up; + }; + + pm8058_keypad: keypad@148 { + compatible = "qcom,pm8058-keypad"; + reg = <0x148>; + interrupt-parent = <&pm8058>; + interrupts = <74 1>, <75 1>; + debounce = <15>; + scan-delay = <32>; + row-hold = <91500>; + }; + + pm8058_xoadc: xoadc@197 { + compatible = "qcom,pm8058-adc"; + reg = <0x197>; + interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>; + #address-cells = <2>; + #size-cells = <0>; + #io-channel-cells = <2>; + + vcoin: adc-channel@0 { + reg = <0x00 0x00>; + }; + + vbat: adc-channel@1 { + reg = <0x00 0x01>; + }; + + dcin: adc-channel@2 { + reg = <0x00 0x02>; + }; + + ichg: adc-channel@3 { + reg = <0x00 0x03>; + }; + + vph_pwr: adc-channel@4 { + reg = <0x00 0x04>; + }; + + usb_vbus: adc-channel@a { + reg = <0x00 0x0a>; + }; + + die_temp: adc-channel@b { + reg = <0x00 0x0b>; + }; + + ref_625mv: adc-channel@c { + reg = <0x00 0x0c>; + }; + + ref_1250mv: adc-channel@d { + reg = <0x00 0x0d>; + }; + + ref_325mv: adc-channel@e { + reg = <0x00 0x0e>; + }; + + ref_muxoff: adc-channel@f { + reg = <0x00 0x0f>; + }; + }; + + rtc@1e8 { + compatible = "qcom,pm8058-rtc"; + reg = <0x1e8>; + interrupt-parent = <&pm8058>; + interrupts = <39 1>; + allow-set-time; + }; + + vibrator@4a { + compatible = "qcom,pm8058-vib"; + reg = <0x4a>; + }; + + pm8058_led48: led@48 { + compatible = "qcom,pm8058-keypad-led"; + reg = <0x48>; + status = "disabled"; + }; + + pm8058_led131: led@131 { + compatible = "qcom,pm8058-led"; + reg = <0x131>; + status = "disabled"; + }; + + pm8058_led132: led@132 { + compatible = "qcom,pm8058-led"; + reg = <0x132>; + status = "disabled"; + }; + + pm8058_led133: led@133 { + compatible = "qcom,pm8058-led"; + reg = <0x133>; + status = "disabled"; + }; + }; +}; + +/ { + /* + * These channels from the ADC are simply hardware monitors. + * That is why the ADC is referred to as "HKADC" - HouseKeeping + * ADC. + */ + iio-hwmon { + compatible = "iio-hwmon"; + io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */ + <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */ + <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */ + <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */ + <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ + <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ + <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ + }; +}; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts index 48fd1a1feea3..20de516a8deb 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts @@ -5,6 +5,7 @@ #include #include #include "qcom-msm8660.dtsi" +#include "pm8058.dtsi" / { model = "Qualcomm APQ8060 Dragonboard"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts index 86fbb6dfdc2a..04dca0c93971 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts @@ -2,6 +2,7 @@ #include #include "qcom-msm8660.dtsi" +#include "pm8058.dtsi" / { model = "Qualcomm MSM8660 SURF"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi index 9217ced108c4..b8094b7c09fc 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi @@ -73,22 +73,6 @@ sleep-clk { }; }; - /* - * These channels from the ADC are simply hardware monitors. - * That is why the ADC is referred to as "HKADC" - HouseKeeping - * ADC. - */ - iio-hwmon { - compatible = "iio-hwmon"; - io-channels = <&pm8058_xoadc 0x00 0x01>, /* Battery */ - <&pm8058_xoadc 0x00 0x02>, /* DC in (charger) */ - <&pm8058_xoadc 0x00 0x04>, /* VPH the main system voltage */ - <&pm8058_xoadc 0x00 0x0b>, /* Die temperature */ - <&pm8058_xoadc 0x00 0x0c>, /* Reference voltage 1.25V */ - <&pm8058_xoadc 0x00 0x0d>, /* Reference voltage 0.625V */ - <&pm8058_xoadc 0x00 0x0e>; /* Reference voltage 0.325V */ - }; - soc: soc { #address-cells = <1>; #size-cells = <1>; @@ -334,142 +318,14 @@ ebi2: external-bus@1a100000 { status = "disabled"; }; - ssbi@500000 { + ssbi: ssbi@500000 { compatible = "qcom,ssbi"; reg = <0x500000 0x1000>; qcom,controller-type = "pmic-arbiter"; - pm8058: pmic { - compatible = "qcom,pm8058"; + pmic { interrupt-parent = <&tlmm>; interrupts = <88 8>; - #interrupt-cells = <2>; - interrupt-controller; - #address-cells = <1>; - #size-cells = <0>; - - pm8058_gpio: gpio@150 { - compatible = "qcom,pm8058-gpio", - "qcom,ssbi-gpio"; - reg = <0x150>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - gpio-ranges = <&pm8058_gpio 0 0 44>; - #gpio-cells = <2>; - - }; - - pm8058_mpps: mpps@50 { - compatible = "qcom,pm8058-mpp", - "qcom,ssbi-mpp"; - reg = <0x50>; - gpio-controller; - #gpio-cells = <2>; - gpio-ranges = <&pm8058_mpps 0 0 12>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - pwrkey@1c { - compatible = "qcom,pm8058-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pm8058>; - interrupts = <50 1>, <51 1>; - debounce = <15625>; - pull-up; - }; - - pm8058_keypad: keypad@148 { - compatible = "qcom,pm8058-keypad"; - reg = <0x148>; - interrupt-parent = <&pm8058>; - interrupts = <74 1>, <75 1>; - debounce = <15>; - scan-delay = <32>; - row-hold = <91500>; - }; - - pm8058_xoadc: xoadc@197 { - compatible = "qcom,pm8058-adc"; - reg = <0x197>; - interrupts-extended = <&pm8058 76 IRQ_TYPE_EDGE_RISING>; - #address-cells = <2>; - #size-cells = <0>; - #io-channel-cells = <2>; - - vcoin: adc-channel@0 { - reg = <0x00 0x00>; - }; - vbat: adc-channel@1 { - reg = <0x00 0x01>; - }; - dcin: adc-channel@2 { - reg = <0x00 0x02>; - }; - ichg: adc-channel@3 { - reg = <0x00 0x03>; - }; - vph_pwr: adc-channel@4 { - reg = <0x00 0x04>; - }; - usb_vbus: adc-channel@a { - reg = <0x00 0x0a>; - }; - die_temp: adc-channel@b { - reg = <0x00 0x0b>; - }; - ref_625mv: adc-channel@c { - reg = <0x00 0x0c>; - }; - ref_1250mv: adc-channel@d { - reg = <0x00 0x0d>; - }; - ref_325mv: adc-channel@e { - reg = <0x00 0x0e>; - }; - ref_muxoff: adc-channel@f { - reg = <0x00 0x0f>; - }; - }; - - rtc@1e8 { - compatible = "qcom,pm8058-rtc"; - reg = <0x1e8>; - interrupt-parent = <&pm8058>; - interrupts = <39 1>; - allow-set-time; - }; - - vibrator@4a { - compatible = "qcom,pm8058-vib"; - reg = <0x4a>; - }; - - pm8058_led48: led@48 { - compatible = "qcom,pm8058-keypad-led"; - reg = <0x48>; - status = "disabled"; - }; - - pm8058_led131: led@131 { - compatible = "qcom,pm8058-led"; - reg = <0x131>; - status = "disabled"; - }; - - pm8058_led132: led@132 { - compatible = "qcom,pm8058-led"; - reg = <0x132>; - status = "disabled"; - }; - - pm8058_led133: led@133 { - compatible = "qcom,pm8058-led"; - reg = <0x133>; - status = "disabled"; - }; - }; }; From patchwork Sun Jul 2 13:43:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698500 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 09918C001DF for ; Sun, 2 Jul 2023 13:43:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230017AbjGBNnj (ORCPT ); Sun, 2 Jul 2023 09:43:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229758AbjGBNni (ORCPT ); Sun, 2 Jul 2023 09:43:38 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4CF910C1 for ; Sun, 2 Jul 2023 06:43:34 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4fb73ba3b5dso5564893e87.1 for ; Sun, 02 Jul 2023 06:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305413; x=1690897413; 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=UW1BeXnsj8l9AeP5Db+RRqvuFucuzqoNlT2iWDmh6Z0=; b=SyPTBtBTtKggNTTUZieK5jER74YxyPodDb/YMlLpt6kl9KqqQ7B9cXABTkRGOT/LOf 944X1VY6gP1f0bJGd7mJ38wSQv9wwanhOrIugB6cRpvkEfYpe9TnX/HoBq9pODCelinP 9K3uYVBcQBwT3TFW6nZa99UtqLeJpOhGyEfTFfyI/ufFjkzBiix84w8ax1Rs7SPMUQfV ou5Vlwvfj84jKEBuddJnYBx8++iKWiRsUJUge9ZfEzACheJ/+TC6eoDPR10qOQEwxChj d6hQ1oRM5b9EQ6KQjxUKEhnG7w/8vPdd1gFY5SXpPEdiXoY4Sc0DZ3KkDsgXZdQ0PKAK aITA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305413; x=1690897413; 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=UW1BeXnsj8l9AeP5Db+RRqvuFucuzqoNlT2iWDmh6Z0=; b=hVB+JOdyf2rgV/kbJUbSi1gMg2cwuCM635Nl1ilokwVcW4/w4+TIqh5oa0ovFBhDrv E8eDMuvX/cCCtZYG+h+tobYPXTuqCOBR/MXspuy8mgEF4SMiizmpdJ/uT3Ve4nS/THDp xeQGr098hIzghO3D1vUCmMSV8AaZsr9DG5kSs2veeF7NH0Q84L+rxtdiqU/AWaYiF74y BI8y0vbAKnLgRv5B20gK2zPVucyCrioCIBWjgTX1KSjcFZP4MjexrPlFyzAl/rjLazW1 57+BVV6Qoz6fsYF2Wt607RFUWZTZD6MXF1d5A43Weew/hu1NnX7yZHPFt7HPE1WBb70M w+ew== X-Gm-Message-State: ABy/qLaplrOiEVFp4uU3EHAw4lL71y8W+5wVDIn+h0hD0jZJTSb5m6bv ZIs/6ppZ9FTP+3mGKVhWPw4yXA== X-Google-Smtp-Source: APBJJlHe3+FLkah8357K96/hn/SD46f78uqxflqke3rVj3VPfvBctd2g04KvOp0Q1NAj0Fjfac9pQg== X-Received: by 2002:ac2:58e6:0:b0:4f8:4719:1f4a with SMTP id v6-20020ac258e6000000b004f847191f4amr4735360lfo.7.1688305413055; Sun, 02 Jul 2023 06:43:33 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:32 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 15/27] ARM: dts: qcom: pm8058: reorder nodes Date: Sun, 2 Jul 2023 16:43:08 +0300 Message-Id: <20230702134320.98831-16-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move pm8058 device nodes to follow the alphanumberic sorting order. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/pm8058.dtsi | 90 +++++++++++++++--------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi index ad581c3bcbd2..913a511719fa 100644 --- a/arch/arm/boot/dts/qcom/pm8058.dtsi +++ b/arch/arm/boot/dts/qcom/pm8058.dtsi @@ -8,15 +8,24 @@ pm8058: pmic { #address-cells = <1>; #size-cells = <0>; - pm8058_gpio: gpio@150 { - compatible = "qcom,pm8058-gpio", - "qcom,ssbi-gpio"; - reg = <0x150>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - gpio-ranges = <&pm8058_gpio 0 0 44>; - #gpio-cells = <2>; + pwrkey@1c { + compatible = "qcom,pm8058-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pm8058>; + interrupts = <50 1>, <51 1>; + debounce = <15625>; + pull-up; + }; + + pm8058_led48: led@48 { + compatible = "qcom,pm8058-keypad-led"; + reg = <0x48>; + status = "disabled"; + }; + + vibrator@4a { + compatible = "qcom,pm8058-vib"; + reg = <0x4a>; }; pm8058_mpps: mpps@50 { @@ -30,13 +39,22 @@ pm8058_mpps: mpps@50 { #interrupt-cells = <2>; }; - pwrkey@1c { - compatible = "qcom,pm8058-pwrkey"; - reg = <0x1c>; - interrupt-parent = <&pm8058>; - interrupts = <50 1>, <51 1>; - debounce = <15625>; - pull-up; + pm8058_led131: led@131 { + compatible = "qcom,pm8058-led"; + reg = <0x131>; + status = "disabled"; + }; + + pm8058_led132: led@132 { + compatible = "qcom,pm8058-led"; + reg = <0x132>; + status = "disabled"; + }; + + pm8058_led133: led@133 { + compatible = "qcom,pm8058-led"; + reg = <0x133>; + status = "disabled"; }; pm8058_keypad: keypad@148 { @@ -49,6 +67,17 @@ pm8058_keypad: keypad@148 { row-hold = <91500>; }; + pm8058_gpio: gpio@150 { + compatible = "qcom,pm8058-gpio", + "qcom,ssbi-gpio"; + reg = <0x150>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + gpio-ranges = <&pm8058_gpio 0 0 44>; + #gpio-cells = <2>; + }; + pm8058_xoadc: xoadc@197 { compatible = "qcom,pm8058-adc"; reg = <0x197>; @@ -109,35 +138,6 @@ rtc@1e8 { interrupts = <39 1>; allow-set-time; }; - - vibrator@4a { - compatible = "qcom,pm8058-vib"; - reg = <0x4a>; - }; - - pm8058_led48: led@48 { - compatible = "qcom,pm8058-keypad-led"; - reg = <0x48>; - status = "disabled"; - }; - - pm8058_led131: led@131 { - compatible = "qcom,pm8058-led"; - reg = <0x131>; - status = "disabled"; - }; - - pm8058_led132: led@132 { - compatible = "qcom,pm8058-led"; - reg = <0x132>; - status = "disabled"; - }; - - pm8058_led133: led@133 { - compatible = "qcom,pm8058-led"; - reg = <0x133>; - status = "disabled"; - }; }; }; From patchwork Sun Jul 2 13:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699808 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 D91CEEB64DD for ; Sun, 2 Jul 2023 13:43:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230018AbjGBNnk (ORCPT ); Sun, 2 Jul 2023 09:43:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjGBNnj (ORCPT ); Sun, 2 Jul 2023 09:43:39 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BBBEE55 for ; Sun, 2 Jul 2023 06:43:35 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b69f958ef3so56475291fa.1 for ; Sun, 02 Jul 2023 06:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305413; x=1690897413; 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=XekRfkcT6z5xG4nHPEwX9QKj0KBdkUaREwMz45PY2ck=; b=OrayinCtlIzm5qjGqMRQ8j1pvGy5xqfTL+0yKLWhKr6wXBZz1HesI5y/Xo7/XXI6hy EbF4JWjzBGCvzD5CUIc6djfkrnVr8imKxiVFgBo+hwFeug5H6YWq+I5yTzgMD2Gm2doY JilmJjAQg9lltIN3zZiNQ1y83clqg+NbQ+VNFeEdfxdQUGJELtTwtACZfKNa+dqCKLyT 4A0X/1Y09GD2xFV0FCr475UT6JMUsT+bvggdg8kqB92xO0PXHJmMaMpaphGVNtOR5V5H 7j0LYslMc1EpNzgTVQLBVtB2LVSfvEVkWtPYU9I8fppZ79htQWcfHrlDZOa89Z7mzybx FqRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305413; x=1690897413; 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=XekRfkcT6z5xG4nHPEwX9QKj0KBdkUaREwMz45PY2ck=; b=cXjXxkwx64CH80M8BewqYstUDnWxRMAWeIAdcotrqzLNnhWcR8wKrDQWrbW5ihNPnZ RJkHPvRpztCLeqgq/a66BmgIf3Qm/hSgTu8vTnf7nlZGaOHXx4+M+thUWcgHw3suYKzs vPUjeKIjYb/PeHyqQuf1+V31jANLPzCGsKwr/u9Q9Tj4rnpKMmoVVRXFZ5BOhdMYr5+W GDZoFiKeGxJSBUPm9+5RLcCYlQ9Rh4RQP8FVatqelUlgsln6lWOMLzrcH36HOPq6IsOS Eznn3d9pmOR5C4ARCvS5ljVhw2SkrkDQsOeo0C4TFJL1nmwxkf85AbioFVappA+OYG6j zciQ== X-Gm-Message-State: ABy/qLbfZWZdDhi58beqPSPvixMsPDm8KvLYuiiPxeL8+kjPM62rdeYr mOgEGMSGKaqJrmohMTwmYPLCsA== X-Google-Smtp-Source: APBJJlEr6aNBFLDR9O5yWfF2MvurwTlTa0KQaPsiQRDvpn1jAXMg+ICa+c5zZB7RXBHRpQAKwHmaFA== X-Received: by 2002:a2e:a172:0:b0:2b4:6f70:c390 with SMTP id u18-20020a2ea172000000b002b46f70c390mr4484309ljl.15.1688305413725; Sun, 02 Jul 2023 06:43:33 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:33 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 16/27] ARM: dts: qcom: pm8921: reorder nodes Date: Sun, 2 Jul 2023 16:43:09 +0300 Message-Id: <20230702134320.98831-17-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move pm8921 device nodes to follow the alphanumberic sorting order. Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8921.dtsi | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi index ad41d99ab265..4697ca33666f 100644 --- a/arch/arm/boot/dts/qcom/pm8921.dtsi +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi @@ -8,17 +8,14 @@ pm8921: pmic { #address-cells = <1>; #size-cells = <0>; - pm8921_gpio: gpio@150 { - - compatible = "qcom,pm8921-gpio", - "qcom,ssbi-gpio"; - reg = <0x150>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - gpio-ranges = <&pm8921_gpio 0 0 44>; - #gpio-cells = <2>; - + pwrkey@1c { + compatible = "qcom,pm8921-pwrkey"; + reg = <0x1c>; + interrupt-parent = <&pm8921>; + interrupts = <50 IRQ_TYPE_EDGE_RISING>, + <51 IRQ_TYPE_EDGE_RISING>; + debounce = <15625>; + pull-up; }; pm8921_mpps: mpps@50 { @@ -32,14 +29,12 @@ pm8921_mpps: mpps@50 { #interrupt-cells = <2>; }; - pwrkey@1c { - compatible = "qcom,pm8921-pwrkey"; - reg = <0x1c>; + rtc@11d { + compatible = "qcom,pm8921-rtc"; interrupt-parent = <&pm8921>; - interrupts = <50 IRQ_TYPE_EDGE_RISING>, - <51 IRQ_TYPE_EDGE_RISING>; - debounce = <15625>; - pull-up; + interrupts = <39 IRQ_TYPE_EDGE_RISING>; + reg = <0x11d>; + allow-set-time; }; pm8921_keypad: keypad@148 { @@ -53,12 +48,17 @@ pm8921_keypad: keypad@148 { row-hold = <91500>; }; - rtc@11d { - compatible = "qcom,pm8921-rtc"; - interrupt-parent = <&pm8921>; - interrupts = <39 IRQ_TYPE_EDGE_RISING>; - reg = <0x11d>; - allow-set-time; + pm8921_gpio: gpio@150 { + + compatible = "qcom,pm8921-gpio", + "qcom,ssbi-gpio"; + reg = <0x150>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + gpio-ranges = <&pm8921_gpio 0 0 44>; + #gpio-cells = <2>; + }; pm8921_xoadc: xoadc@197 { From patchwork Sun Jul 2 13:43:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698499 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 90093C001B3 for ; Sun, 2 Jul 2023 13:43:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230020AbjGBNnk (ORCPT ); Sun, 2 Jul 2023 09:43:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbjGBNnk (ORCPT ); Sun, 2 Jul 2023 09:43:40 -0400 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 2421DE6E for ; Sun, 2 Jul 2023 06:43:36 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b6a6f224a1so57197311fa.1 for ; Sun, 02 Jul 2023 06:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305414; x=1690897414; 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=/+Cyc6iyJgi1jIYR2SdUySI+dkCNcLYZsYejiaDMvPE=; b=zSCrmjUlSnbnsOIN2azeZHVUEa/pKRqVg6qp5d1QZKtiflqu8sbmrQdLIy7ou7f7ac ly6zNCoXwoP90lcu5m8TXdngs5kje1U2GkpA6tQuGSazW2pxifS6a17EtpyhkTZSWFPE z89rVbgIxlg68OpJOqfzaH6wcro9UW3OhY2wtbm/xHs4Y8F4T4tbzSJoa0x0g37CHvap lPfDSg/U0Y7vKJZ/M+HCOfTYR4qIn5IhYIFXYnfh7gjUfuPvYVOAzXqalMjDHTiHPDef ZEGbVMLXt0mUcc2I5Bt1GXdjpeYNEXcAMUYUmprZxkTUo+22hzr4W4/euHpDBSrovRjF p5bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305414; x=1690897414; 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=/+Cyc6iyJgi1jIYR2SdUySI+dkCNcLYZsYejiaDMvPE=; b=A4R5QZhchmaLHTnT2TSAH8B+fCJFKO4gGLwU/g2egPn+e1pg/B+YSgRV4Xyds5xxjd d3bo5E2X2xW5dZ73HLM+0OeJqipikpscYp2gnc1+QExYViIBX406JEEz9HwMtj3rEsOh jVIPf5IqBvUWLLUPC7yeXb7sXoMOytZUJx3XCeksyUj1C6gV7ZyJ74TfYCh1nhSJAK79 nrNufHDGyaY/MBCphmr2QCY/PgRu88mr/p+MpkdSY4KDqczmB8tX2gwGQmRgau2Ufxjy EznNlIslqvFH90d5zaJpjoakQjkT2FAVmz4jmSQF7X6EGwEbD2vrIBILeS9lZeekUOgT hSiw== X-Gm-Message-State: ABy/qLYZ8IW8n80Tqq1VZkGWuGHwM3CMGlhZteROypm+50YI/8CSM2q2 jEy/nPKA8vD2yCD/RRfoq/7pBw== X-Google-Smtp-Source: APBJJlEJXPhv+mL3PSks2p+M8n2QILPW3Jsv3cBKHJYDJ/vkUbRx4Mrr0iK4DvSGGTxYA6cr7K44YQ== X-Received: by 2002:a2e:9844:0:b0:2b5:86e4:558e with SMTP id e4-20020a2e9844000000b002b586e4558emr5043278ljj.38.1688305414502; Sun, 02 Jul 2023 06:43:34 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:34 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 17/27] ARM: dts: qcom: pm8018: move reg property Date: Sun, 2 Jul 2023 16:43:10 +0300 Message-Id: <20230702134320.98831-18-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move reg property to come after compatible. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/pm8018.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8018.dtsi b/arch/arm/boot/dts/qcom/pm8018.dtsi index c602544900b2..85ab36b6d006 100644 --- a/arch/arm/boot/dts/qcom/pm8018.dtsi +++ b/arch/arm/boot/dts/qcom/pm8018.dtsi @@ -27,9 +27,9 @@ pwrkey@1c { pm8018_mpps: mpps@50 { compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp"; + reg = <0x50>; interrupt-controller; #interrupt-cells = <2>; - reg = <0x50>; gpio-controller; #gpio-cells = <2>; gpio-ranges = <&pm8018_mpps 0 0 6>; @@ -37,9 +37,9 @@ pm8018_mpps: mpps@50 { rtc@11d { compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc"; + reg = <0x11d>; interrupt-parent = <&pm8018>; interrupts = <39 IRQ_TYPE_EDGE_RISING>; - reg = <0x11d>; allow-set-time; }; From patchwork Sun Jul 2 13:43:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699807 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 61826EB64D9 for ; Sun, 2 Jul 2023 13:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230025AbjGBNnm (ORCPT ); Sun, 2 Jul 2023 09:43:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbjGBNnl (ORCPT ); Sun, 2 Jul 2023 09:43:41 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFDEFE72 for ; Sun, 2 Jul 2023 06:43:36 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31434226a2eso789533f8f.1 for ; Sun, 02 Jul 2023 06:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305415; x=1690897415; 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=UH4lxIyJZ/66UDj2KyoTn9M7j7BtBKPALuXyhhsx3zY=; b=rTTs+dvFPBvLv56c2PzoZXwMLUNAwux8KQpWZOH202fmf8iQHlr6vk6Gm+F97yCDhw x82RBU6MrO0479H9ZkorZzCT5A1a+Dcp7SptrlBqdkbSw4GRoeqW0vMVRId52jrRXMHM MNXkLeBg0ePy3V2gkIbNViv9Lba0cdvcLP14sNIHyFer47Mae9CcRZFdD7OQbi6cEniZ vZywLp/vMHllsNU8yhZbev3iAUSO4o7fs5ATUlocGA+nBKpEQS/755kySin1gaU/+wCz e1al+o0BQ63NTx0X9BEBuyWJwoQLEdhccBkGlpt4B3yQQxrbUOUpfrVAwaKb5UcsemDr ETYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305415; x=1690897415; 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=UH4lxIyJZ/66UDj2KyoTn9M7j7BtBKPALuXyhhsx3zY=; b=hAAgfrwI1kaxHTJ9r0muSWybmW7MLACJ/gz2B+ZaoF8dPbbgUx8CKdOUATvvmXTU4n Ag54EtEhOzKkGNiDgIBliG43c2ONf19r9u43IRCagMPxhxadkx9mvAyJzEhxKB4U5I/n WfemyKw/ULcK3IdH/MRtnPa7DH8mzb7hwR+bF40fOmhvkO8XANJgR7/4mJpGRBeRjpFT igcG1DnjlsS43F0SPwBE+LH+qthgFVoRWiDcPZQ26w/uetq6JwxZXdoYmoTrY5pfPDwL GqIRMkC9GWIFOcozE1nvenM8g90kvWB1kwRkhjyDsZ5aQhtjNAKUu/Acbd7z+2DLgnN5 DzKw== X-Gm-Message-State: ABy/qLYYlOzfdGtXrKCd5TlxTAU7ixOWz8XuMVc7+etXsqYLbLeyvthK PdfQDkgDLFNpho41hEsQ4VspL80C14E+UrQCDy4= X-Google-Smtp-Source: APBJJlEprJQwnNOP499rvOpiD0JT0fgh3HWSvF0MPaaTU+L8HceuepV/nX+bUwmlbrAFwP7KkAn8kg== X-Received: by 2002:adf:ee51:0:b0:313:e520:936f with SMTP id w17-20020adfee51000000b00313e520936fmr10220681wro.17.1688305415272; Sun, 02 Jul 2023 06:43:35 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:34 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 18/27] ARM: dts: qcom: pm8921: move reg property Date: Sun, 2 Jul 2023 16:43:11 +0300 Message-Id: <20230702134320.98831-19-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move reg property to come after compatible. Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8921.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi index 4697ca33666f..fa00b57e28b9 100644 --- a/arch/arm/boot/dts/qcom/pm8921.dtsi +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi @@ -31,9 +31,9 @@ pm8921_mpps: mpps@50 { rtc@11d { compatible = "qcom,pm8921-rtc"; + reg = <0x11d>; interrupt-parent = <&pm8921>; interrupts = <39 IRQ_TYPE_EDGE_RISING>; - reg = <0x11d>; allow-set-time; }; From patchwork Sun Jul 2 13:43:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698498 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 0F87DEB64DA for ; Sun, 2 Jul 2023 13:43:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229966AbjGBNnn (ORCPT ); Sun, 2 Jul 2023 09:43:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229753AbjGBNnm (ORCPT ); Sun, 2 Jul 2023 09:43:42 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B49A410C0 for ; Sun, 2 Jul 2023 06:43:37 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b699a2fe86so58134671fa.3 for ; Sun, 02 Jul 2023 06:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305416; x=1690897416; 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=623T1YaDMVcPpLyGUimPTZEZnF+8YGwn8ANHFMuY4mY=; b=g3ClD081YSRI5g1DTaouymuXIui1d48PJv/wS/1P5UGpGmtdzyEyl/v8Ztuuk3PVzD fHNGAQLgY5u/k8r3dGA6XENsVx6whWZdkAOUcijva+PVSmS4CyIiGuUcPqB1g70u7+Je wuQQTzNhz4eyaNPpD7MoenhWU1RDmOgw4QBa6BrOShceQ2yENiuzXBQDuNwf0LzhyErR vwM6GRvZq1Y3hBKMKSMu1koyB426GVH8J9Z0ZljrlKfxSFAfn2fuWKZKcAPAHS63Bbts JHYK4gBrxVWHCYAP/m8ibLcmca4uZzmTs0ibvINDSwLB0dld/qSb/b2unTROb+HYYak7 f6GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305416; x=1690897416; 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=623T1YaDMVcPpLyGUimPTZEZnF+8YGwn8ANHFMuY4mY=; b=DR/EHmqO9rDscXjljMaEE7k9vjYKzGs1O5KL2/vkSTkXsKTaPzksm3jAzOMRLGgOQl 6M4/NGJCN0igS0WpdbLIHl1ZSjDuAUZljACWB9jWnWbjl0o5XE3XiSd41/U8KdjbfPql Q793oZ4z3yOBuiv2woi1tFpAAl7ZXo9Tg6tqKPFNik/bFa1W2o8p1lR3o+U9Oi6s4rND wwlujTLoHkUEcIN5ADo+sLjHgUu2dd3b0arGZV0s+urgY3Rb1hhN+trrGEAChGzB9EXC GpEbSijFytiEHTd7HFbJSXpPt5h/tiRTzVPB4UnXzQsi32BXWWgkeW7aN8OzMLa5OaEb hVzw== X-Gm-Message-State: ABy/qLYz3896PpNjG0Vmvstc0oKnlg+0+azMrIxPgjiW5gZHT9sBOHYe 5LlihEjpNCvfuFFL6qLfK89lqw== X-Google-Smtp-Source: APBJJlETQHkLvUAgh+XTwbMHkg3SwDyT0JauQ160nafzCe1fOYJOzZdyF13EU+eFV+ZuQgYMeS/sKA== X-Received: by 2002:a2e:8556:0:b0:2b5:80e0:f190 with SMTP id u22-20020a2e8556000000b002b580e0f190mr5079573ljj.37.1688305416004; Sun, 02 Jul 2023 06:43:36 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:35 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 19/27] ARM: dts: qcom: pm8058: use defined IRQ flags Date: Sun, 2 Jul 2023 16:43:12 +0300 Message-Id: <20230702134320.98831-20-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Use symbolic names for IRQ flags instead of using the numeric values. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/pm8058.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi index 913a511719fa..3683d7b60918 100644 --- a/arch/arm/boot/dts/qcom/pm8058.dtsi +++ b/arch/arm/boot/dts/qcom/pm8058.dtsi @@ -12,7 +12,8 @@ pwrkey@1c { compatible = "qcom,pm8058-pwrkey"; reg = <0x1c>; interrupt-parent = <&pm8058>; - interrupts = <50 1>, <51 1>; + interrupts = <50 IRQ_TYPE_EDGE_RISING>, + <51 IRQ_TYPE_EDGE_RISING>; debounce = <15625>; pull-up; }; @@ -61,7 +62,8 @@ pm8058_keypad: keypad@148 { compatible = "qcom,pm8058-keypad"; reg = <0x148>; interrupt-parent = <&pm8058>; - interrupts = <74 1>, <75 1>; + interrupts = <74 IRQ_TYPE_EDGE_RISING>, + <75 IRQ_TYPE_EDGE_RISING>; debounce = <15>; scan-delay = <32>; row-hold = <91500>; @@ -135,7 +137,7 @@ rtc@1e8 { compatible = "qcom,pm8058-rtc"; reg = <0x1e8>; interrupt-parent = <&pm8058>; - interrupts = <39 1>; + interrupts = <39 IRQ_TYPE_EDGE_RISING>; allow-set-time; }; }; From patchwork Sun Jul 2 13:43:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699806 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 33A89C001DD for ; Sun, 2 Jul 2023 13:43:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229738AbjGBNno (ORCPT ); Sun, 2 Jul 2023 09:43:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229753AbjGBNnn (ORCPT ); Sun, 2 Jul 2023 09:43:43 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B09BE6C for ; Sun, 2 Jul 2023 06:43:38 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b6c5ede714so42944441fa.1 for ; Sun, 02 Jul 2023 06:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305416; x=1690897416; 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=IPTMLMDP3qi8FUIpipjx2Ww6NVhPh5E2iKLf2ZieppU=; b=xiYdkjwdbtUalNEW6fE/6BBLQCgXlhY2zFDp92MC4G+Gb2eb/grJs/HAGVNNGzR0zC bNaCgLn08Bf82oGbHSXCEtzAmL/JhW/mFSDt+KHSawdzyLKUGGf/vYFclNjKD/3A2j84 qyNeXWytfDWD9dkccNng3ieUUgkDcIW0UEMO46UmWJGaHS8608KiJoRs7RnCItAyVgL5 uOYNO+aQHC87mcpRFg7/gcBkqPfgAm0nWlrKqPUaeS99LtOAfTHD8/CcxPODsG7AixZi 8jJbc/nb8DOWqlTvo1jnXqMwmw7gpQQW1N25Hvs+0XMbyY0MGYvYl4Qx26/kzXucFKXD NdtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305416; x=1690897416; 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=IPTMLMDP3qi8FUIpipjx2Ww6NVhPh5E2iKLf2ZieppU=; b=EJFw08jXFEIhtqXbWQRs9fGNLutd/k9rgwNSD/5n+6zIuYQsR9FA7UEJCQUG2BaIwJ sjPzLmAQFO+IXw0FfCZEx8Pg6yzmDs5RpMlZ/A4JZYFC6+T7D6vbCfJUiqOzOZuKMVmq zuB32/elAnTiYp5XGMxACTRIGL8hGDlb71T7HnAWzVpIPxU2CG9IFQvgxwCX2k+EmUbT YxxotypsEdNfx/p+TvEyKZvunoENmUBna53qdSgUADjCjUJiaj7LUwg8idlt2p0CEiPm hkR002fjPiVLRnA4bDB/YDg0gb7nEbVrt3kXgkYPcJyFEKXGxbG95Ou5AyCdYTNoEQUN r6ng== X-Gm-Message-State: ABy/qLaeW7XgzNc7kARnK50c4/aXuVoC63y+HF9vvUiyizZTGAbPSZZg UJ5RCrspKCz1j9UrrqSk8+KX8/t6kaRmPLAGhBQ= X-Google-Smtp-Source: APBJJlEuKSB96ern6+3w5/KIhElI83YEtXwsfqNDzRMYBY8I1BfsD6f1oETAiwfUUfKEIpbtyeEHLA== X-Received: by 2002:a05:651c:231:b0:2b4:50b8:5d3b with SMTP id z17-20020a05651c023100b002b450b85d3bmr2637540ljn.0.1688305416665; Sun, 02 Jul 2023 06:43:36 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:36 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 20/27] ARM: dts: qcom: pm8921: switch to interrupts-extended Date: Sun, 2 Jul 2023 16:43:13 +0300 Message-Id: <20230702134320.98831-21-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Merge interrups and interrupt-parent properties into a single interrupts-extended property. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8921.dtsi | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi index fa00b57e28b9..360a179670c5 100644 --- a/arch/arm/boot/dts/qcom/pm8921.dtsi +++ b/arch/arm/boot/dts/qcom/pm8921.dtsi @@ -11,9 +11,8 @@ pm8921: pmic { pwrkey@1c { compatible = "qcom,pm8921-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pm8921>; - interrupts = <50 IRQ_TYPE_EDGE_RISING>, - <51 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8921 50 IRQ_TYPE_EDGE_RISING>, + <&pm8921 51 IRQ_TYPE_EDGE_RISING>; debounce = <15625>; pull-up; }; @@ -32,17 +31,15 @@ pm8921_mpps: mpps@50 { rtc@11d { compatible = "qcom,pm8921-rtc"; reg = <0x11d>; - interrupt-parent = <&pm8921>; - interrupts = <39 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8921 39 IRQ_TYPE_EDGE_RISING>; allow-set-time; }; pm8921_keypad: keypad@148 { compatible = "qcom,pm8921-keypad"; reg = <0x148>; - interrupt-parent = <&pm8921>; - interrupts = <74 IRQ_TYPE_EDGE_RISING>, - <75 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8921 74 IRQ_TYPE_EDGE_RISING>, + <&pm8921 75 IRQ_TYPE_EDGE_RISING>; debounce = <15>; scan-delay = <32>; row-hold = <91500>; From patchwork Sun Jul 2 13:43:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698497 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 34DBCC0015E for ; Sun, 2 Jul 2023 13:43:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229635AbjGBNnp (ORCPT ); Sun, 2 Jul 2023 09:43:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbjGBNno (ORCPT ); Sun, 2 Jul 2023 09:43:44 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F60910C2 for ; Sun, 2 Jul 2023 06:43:39 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b6a084a34cso52502861fa.1 for ; Sun, 02 Jul 2023 06:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305417; x=1690897417; 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=tBdDFNajtkBJBPBKaf5wof3PQ51TKlUtVousRlstpzg=; b=H06HmHcru7KdRIAZA0ZZqwI1610XgYllQ7mowD1rlssmF7k9t9GZN1vVp673FmQRLL sfHZzoZHa0YN+XgU0U7HbD+ExK8WVP8CXA68REGx90ENS0pQfZagz65U3oxffOFChuti 4TbZW42Q7Plrw8ycz6iHT5xBKcICkv9F3l/PyUvXfdl4oL5gfeWqRpUjmxbXP4DGUOl+ 9BTfaSYHQX7izsgH/gdKVPj+CEEFvQATithM/+iW6IXmFO9C1KDFZ+G1FpfQel2qBF6X rFSwf5xw09pHyb5aWf011ny90iBWNGD/p5gmZCx0Z7ZfPZFW/S//moC1cfmDH+nueisx mVVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305417; x=1690897417; 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=tBdDFNajtkBJBPBKaf5wof3PQ51TKlUtVousRlstpzg=; b=Lm8H5+UdC0HtvnsIFMDE2A27LikjxWw42lolMg0FaHS5cPVS7Ms1eQgEQB+I98W0vF 8QVkFfqWm+mYoF2tNrwGYFTrqAOhYrq9IitIyFIGEsn/TWomMsp2VV6S2VQNauvEXfHV DpFAfHWh1f0zcc13Eoctw8Kn3S3/5W1iBA0ZXpLDspLetBO99J6KOlgAQGQA/xSawQD0 31twsnc5pzBFwG7AQM2zMZXB3HmyUUu8Wg2PsRdJuiyy4j69J4kP0HDN9ZRfaSAfr+h7 WL/dNJ0lSfBBekH3ntLIUfRVpBu857kALkzWw8bJpskIzZV0xt2vvTxy2bJ8N9u5JRmw pd3Q== X-Gm-Message-State: ABy/qLZo+1InllytrPQwc0kT7U08KD6Ua2Z3lcl3+yV4FWNXvQ/N2uoN AxB+pULoLAGHy64m5/IQhExKFg== X-Google-Smtp-Source: APBJJlH8YKfuiY5eKlgArB+vfmaTOB2VuI3jsr4vGQfbFjA1gq2V2SDvDUS81ov1LRolG29Z//sXWQ== X-Received: by 2002:a2e:965a:0:b0:2b6:d495:9467 with SMTP id z26-20020a2e965a000000b002b6d4959467mr3785913ljh.6.1688305417375; Sun, 02 Jul 2023 06:43:37 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:36 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 21/27] ARM: dts: qcom: pm8018: switch to interrupts-extended Date: Sun, 2 Jul 2023 16:43:14 +0300 Message-Id: <20230702134320.98831-22-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Merge interrups and interrupt-parent properties into a single interrupts-extended property. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom/pm8018.dtsi | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8018.dtsi b/arch/arm/boot/dts/qcom/pm8018.dtsi index 85ab36b6d006..22f3c7bac522 100644 --- a/arch/arm/boot/dts/qcom/pm8018.dtsi +++ b/arch/arm/boot/dts/qcom/pm8018.dtsi @@ -18,9 +18,8 @@ pwrkey@1c { compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pm8018>; - interrupts = <50 IRQ_TYPE_EDGE_RISING>, - <51 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8018 50 IRQ_TYPE_EDGE_RISING>, + <&pm8018 51 IRQ_TYPE_EDGE_RISING>; debounce = <15625>; pull-up; }; @@ -38,8 +37,7 @@ pm8018_mpps: mpps@50 { rtc@11d { compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc"; reg = <0x11d>; - interrupt-parent = <&pm8018>; - interrupts = <39 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8018 39 IRQ_TYPE_EDGE_RISING>; allow-set-time; }; From patchwork Sun Jul 2 13:43:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699805 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 520DDC001DE for ; Sun, 2 Jul 2023 13:43:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230028AbjGBNnq (ORCPT ); Sun, 2 Jul 2023 09:43:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230033AbjGBNnp (ORCPT ); Sun, 2 Jul 2023 09:43:45 -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 BD276E7A for ; Sun, 2 Jul 2023 06:43:39 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b698937f85so58139871fa.2 for ; Sun, 02 Jul 2023 06:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305418; x=1690897418; 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=y1dgeXcAqpu2CEATEFRRE2xKFcKdVTADZyCZndc4P68=; b=qAL35phty+DRz5+XyfwjQ4mlPG8q9YUofnxpXHtAFNnR3vphavHeyeM0IdYgB7llFu YJ5McAyC8Q/yHTSGd5GZ2VnUDT3MHZRlXkOjlrFug1jNSCnUM/WC3PklZ18lYtA7U/OE JJxliGpK658Z0PKZB+96YBwePxgEXsT2buYCFX4CQkUXBXbCdf2zImqGR/3oWHp5FC2S G625DKOnhxayUurswUq/A9sNMUvJ15O9tVVsUURnLQbsR7UFSfkSI8OSoujgTmgh4Dz1 jL9WIuhgu1jNUL2PS2D69fMkqn1Elata6EOaigpXwlT1yTAnj0ef0RzHXl3Alr/2ZgzG V4NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305418; x=1690897418; 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=y1dgeXcAqpu2CEATEFRRE2xKFcKdVTADZyCZndc4P68=; b=gyA2S1pcVxOIM2bdQk6A1LzV3Y+47VMC9I00dyEOqymRNOcmplm2ejFdWSfyLNq6bf Fb53Wt+2BRUyIt2CWnSsPFPmxGlYIETT2w+uSUb9Bx6yhjprdzKov0knO+WKhvjJki2n r/zg43Reszn4JDhP1GTZb0z/nKTjCLduikF1a0L2A9GLrZ7Xlo3TTz/NNdrhfb6iL2I7 0uBjnJhezisvM87R9YKiYS/iSw9dTYGLZXb+ZAqEIcjg5qA+rKR/u+Lvi21x3hEigA6Y wbhwiue3cpaVm3+ZqJXF81/J4UQsYP+U2CIdnG/S9TjrZEx/HagKw4N1S6IOLdIK4Kdw BgRg== X-Gm-Message-State: ABy/qLaGKtsZtymtzjkFk7f6J5cxbbRX8qeYi9rA/1mCZeMqumxFMc2A mK+fkB/jjlq4cDNZ/PrTey22zQ== X-Google-Smtp-Source: APBJJlFo1bhD4eh3qYPC7hJY/S4UU2Bdx1NYqFp/zgYpv8BqWPsp2Xpb5L7jjGm/0oeNV7V8dZov7w== X-Received: by 2002:a2e:97d2:0:b0:2b4:79c3:ce03 with SMTP id m18-20020a2e97d2000000b002b479c3ce03mr4613174ljj.53.1688305418116; Sun, 02 Jul 2023 06:43:38 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:37 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 22/27] ARM: dts: qcom: pm8058: switch to interrupts-extended Date: Sun, 2 Jul 2023 16:43:15 +0300 Message-Id: <20230702134320.98831-23-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Merge interrups and interrupt-parent properties into a single interrupts-extended property. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/pm8058.dtsi | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/qcom/pm8058.dtsi b/arch/arm/boot/dts/qcom/pm8058.dtsi index 3683d7b60918..984b79777984 100644 --- a/arch/arm/boot/dts/qcom/pm8058.dtsi +++ b/arch/arm/boot/dts/qcom/pm8058.dtsi @@ -11,9 +11,8 @@ pm8058: pmic { pwrkey@1c { compatible = "qcom,pm8058-pwrkey"; reg = <0x1c>; - interrupt-parent = <&pm8058>; - interrupts = <50 IRQ_TYPE_EDGE_RISING>, - <51 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8058 50 IRQ_TYPE_EDGE_RISING>, + <&pm8058 51 IRQ_TYPE_EDGE_RISING>; debounce = <15625>; pull-up; }; @@ -61,9 +60,8 @@ pm8058_led133: led@133 { pm8058_keypad: keypad@148 { compatible = "qcom,pm8058-keypad"; reg = <0x148>; - interrupt-parent = <&pm8058>; - interrupts = <74 IRQ_TYPE_EDGE_RISING>, - <75 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8058 74 IRQ_TYPE_EDGE_RISING>, + <&pm8058 75 IRQ_TYPE_EDGE_RISING>; debounce = <15>; scan-delay = <32>; row-hold = <91500>; @@ -136,8 +134,7 @@ ref_muxoff: adc-channel@f { rtc@1e8 { compatible = "qcom,pm8058-rtc"; reg = <0x1e8>; - interrupt-parent = <&pm8058>; - interrupts = <39 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&pm8058 39 IRQ_TYPE_EDGE_RISING>; allow-set-time; }; }; From patchwork Sun Jul 2 13:43:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698496 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 D2BDAEB64DA for ; Sun, 2 Jul 2023 13:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229849AbjGBNns (ORCPT ); Sun, 2 Jul 2023 09:43:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbjGBNnr (ORCPT ); Sun, 2 Jul 2023 09:43:47 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A47A910D3 for ; Sun, 2 Jul 2023 06:43:40 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b6a1245542so58155851fa.1 for ; Sun, 02 Jul 2023 06:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305419; x=1690897419; 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=e/KYOqVE4rasMmgwuLwymYN6um2x1TIWM0dv02TGpq0=; b=rGvKyiJC6RbyR49tX42HkxMVw0t6t0FPo4Hf6HKaC36Fb4wErZ5dCNtH2yS8+o3A2g br4iXmyFVSh1zN8BbgpPatx7ETvJuvMwFg4N+UNT1d3LZqrTl/BPOFOYBW4O4MhgcDSt f0iJ3GVL5qCE2xD7af7TEIHm1Svj81EjUtgUZF6LxxIdwVhPnMVHGSIlxqbrM0PONeMq VqswuNpfN6K3nJGgV2+QcrAnugOXqBANXTzqPY5gcG1cy0z+c5mURomxcDH4CEQaagPi 8qTgRFigG2Q3M//DX5m41lyafaoQQvufX7s9fZmIu8cfviI0xugib1/39H2rgGEH98my aN1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305419; x=1690897419; 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=e/KYOqVE4rasMmgwuLwymYN6um2x1TIWM0dv02TGpq0=; b=PpGDd/T2RR7WoajeEPTOYqxdnoHEpQtU3Med+ESCIc6Qa8GoJ0ceh+LfvU96HSJLNQ MRnA80KwbQeIjUbInnqB3SdhDigjmkdRKsOr+16gYIHwr1PfRPecUcHiCPTmC+QyVmTN owfjQhM1Qd1eXZ/sSIwS9/kRxrpSvNdVuURB1w5W15+bh/mKJoAFzv/tSr9OxoVhL27m EoienHV80LvypZ9GIwpufUCtoOcAEk+ocmGKZOWPYTGayegiIr10Q2FFBburLDP4OrXS FoeQAl0pD+LHezjUcG1X3JveEEx+Idj6NZCEwDNGcNNISxDaxfo9Z2DU33yEGgyBunCY KANg== X-Gm-Message-State: ABy/qLZGqYcFbI8hjF5Ia4z1669gXNg1kQObkSB4XfPOwakO/UlcoJTj b0Jn0tgYE+wesd1eUnL/aqbq+A== X-Google-Smtp-Source: APBJJlHDFMb74KYR2tn3ZA80DY/yaM+tkllA0+zl/cxq0XOp8IbyP/cwqbVM3LUe0V3dLbxGiH6Frw== X-Received: by 2002:a2e:9b06:0:b0:2b4:7559:32b0 with SMTP id u6-20020a2e9b06000000b002b4755932b0mr5294057lji.19.1688305418871; Sun, 02 Jul 2023 06:43:38 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:38 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 23/27] ARM: dts: qcom: apq8064: move RPM regulators to board files Date: Sun, 2 Jul 2023 16:43:16 +0300 Message-Id: <20230702134320.98831-24-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The set of regulators available over the RPM requests is not a property of the SoC. Move them to board files. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- .../dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 49 ++++---- .../boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 26 ++--- .../boot/dts/qcom/qcom-apq8064-ifc6410.dts | 33 +++--- .../qcom-apq8064-sony-xperia-lagan-yuga.dts | 105 ++++++++++-------- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 63 ----------- 5 files changed, 115 insertions(+), 161 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts index d5dee70620c2..1caa73e20bc9 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts @@ -192,22 +192,20 @@ &mdp_dsi1_out { &rpm { regulators { vdd_l1_l2_l12_l18-supply = <&pm8921_s4>; - vin_lvs1_3_6-supply = <&pm8921_s4>; - vin_lvs4_5_7-supply = <&pm8921_s4>; - - vdd_l24-supply = <&pm8921_s1>; vdd_l25-supply = <&pm8921_s1>; - vin_lvs2-supply = <&pm8921_s1>; - vdd_l26-supply = <&pm8921_s7>; vdd_l27-supply = <&pm8921_s7>; vdd_l28-supply = <&pm8921_s7>; + vin_lvs1_3_6-supply = <&pm8921_s4>; + vin_lvs2-supply = <&pm8921_s1>; + vin_lvs4_5_7-supply = <&pm8921_s4>; + vdd_ncp-supply = <&pm8921_l6>; /* Buck SMPS */ - s1 { + pm8921_s1: s1 { regulator-always-on; regulator-min-microvolt = <1225000>; regulator-max-microvolt = <1225000>; @@ -216,7 +214,7 @@ s1 { }; /* msm otg HSUSB_VDDCX */ - s3 { + pm8921_s3: s3 { regulator-min-microvolt = <500000>; regulator-max-microvolt = <1150000>; qcom,switch-mode-frequency = <4800000>; @@ -229,55 +227,58 @@ s3 { * tabla2x-slim-CDC_VDD_CP * tabla2x-slim-VDDIO_CDC */ - s4 { + pm8921_s4: s4 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; qcom,switch-mode-frequency = <3200000>; regulator-always-on; }; - s7 { + pm8921_s7: s7 { regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; qcom,switch-mode-frequency = <3200000>; }; /* mipi_dsi.1-dsi1_pll_vdda */ - l2 { + pm8921_l2: l2 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; /* msm_otg-HSUSB_3p3 */ - l3 { + pm8921_l3: l3 { regulator-min-microvolt = <3075000>; regulator-max-microvolt = <3075000>; bias-pull-down; }; /* msm_otg-HSUSB_1p8 */ - l4 { + pm8921_l4: l4 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; /* msm_sdcc.1-sdc_vdd */ - l5 { + pm8921_l5: l5 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; regulator-always-on; bias-pull-down; }; - l6 { + pm8921_l6: l6 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; }; + pm8921_l8: l8 { + }; + /* mipi_dsi.1-dsi1_avdd */ - l11 { + pm8921_l11: l11 { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; bias-pull-down; @@ -285,14 +286,14 @@ l11 { }; /* pwm_power for backlight */ - l17 { + pm8921_l17: l17 { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; regulator-always-on; }; /* camera, qdsp6 */ - l23 { + pm8921_l23: l23 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; @@ -302,32 +303,32 @@ l23 { * tabla2x-slim-CDC_VDDA_A_1P2V * tabla2x-slim-VDDD_CDC_D */ - l25 { + pm8921_l25: l25 { regulator-min-microvolt = <1250000>; regulator-max-microvolt = <1250000>; bias-pull-down; }; - lvs1 { + pm8921_lvs1: lvs1 { bias-pull-down; }; - lvs4 { + pm8921_lvs4: lvs4 { bias-pull-down; }; - lvs5 { + pm8921_lvs5: lvs5 { bias-pull-down; }; - lvs6 { + pm8921_lvs6: lvs6 { bias-pull-down; }; /* * mipi_dsi.1-dsi1_vddio * pil_riva-pll_vdd */ - lvs7 { + pm8921_lvs7: lvs7 { bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts index ffd654ab0b57..6472277d1c6d 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts @@ -85,10 +85,6 @@ pinconf { &rpm { regulators { - vin_lvs1_3_6-supply = <&pm8921_s4>; - vin_lvs2-supply = <&pm8921_s1>; - vin_lvs4_5_7-supply = <&pm8921_s4>; - vdd_l1_l2_l12_l18-supply = <&pm8921_s4>; vdd_l24-supply = <&pm8921_s1>; vdd_l25-supply = <&pm8921_s1>; @@ -96,9 +92,12 @@ regulators { vdd_l27-supply = <&pm8921_s7>; vdd_l28-supply = <&pm8921_s7>; + vin_lvs1_3_6-supply = <&pm8921_s4>; + vin_lvs2-supply = <&pm8921_s1>; + vin_lvs4_5_7-supply = <&pm8921_s4>; /* Buck SMPS */ - s1 { + pm8921_s1: s1 { regulator-always-on; regulator-min-microvolt = <1225000>; regulator-max-microvolt = <1225000>; @@ -106,52 +105,51 @@ s1 { bias-pull-down; }; - s3 { + pm8921_s3: s3 { regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1400000>; qcom,switch-mode-frequency = <4800000>; }; - s4 { + pm8921_s4: s4 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; qcom,switch-mode-frequency = <3200000>; }; - s7 { + pm8921_s7: s7 { regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; qcom,switch-mode-frequency = <3200000>; }; - l3 { + pm8921_l3: l3 { regulator-min-microvolt = <3050000>; regulator-max-microvolt = <3300000>; bias-pull-down; }; - l4 { + pm8921_l4: l4 { regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l5 { + pm8921_l5: l5 { regulator-min-microvolt = <2750000>; regulator-max-microvolt = <3000000>; bias-pull-down; }; - l23 { + pm8921_l23: l23 { regulator-min-microvolt = <1700000>; regulator-max-microvolt = <1900000>; bias-pull-down; }; - lvs6 { + pm8921_lvs6: lvs6 { bias-pull-down; }; - }; }; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts index 12bf8ea3fb93..39c44fae9d14 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts @@ -196,10 +196,6 @@ pinconf { &rpm { regulators { - vin_lvs1_3_6-supply = <&pm8921_s4>; - vin_lvs2-supply = <&pm8921_s1>; - vin_lvs4_5_7-supply = <&pm8921_s4>; - vdd_l1_l2_l12_l18-supply = <&pm8921_s4>; vdd_l24-supply = <&pm8921_s1>; vdd_l25-supply = <&pm8921_s1>; @@ -207,9 +203,12 @@ regulators { vdd_l27-supply = <&pm8921_s7>; vdd_l28-supply = <&pm8921_s7>; + vin_lvs1_3_6-supply = <&pm8921_s4>; + vin_lvs2-supply = <&pm8921_s1>; + vin_lvs4_5_7-supply = <&pm8921_s4>; /* Buck SMPS */ - s1 { + pm8921_s1: s1 { regulator-always-on; regulator-min-microvolt = <1225000>; regulator-max-microvolt = <1225000>; @@ -217,59 +216,63 @@ s1 { bias-pull-down; }; - s3 { + pm8921_s3: s3 { regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1400000>; qcom,switch-mode-frequency = <4800000>; }; - s4 { + pm8921_s4: s4 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; qcom,switch-mode-frequency = <3200000>; }; - s7 { + pm8921_s7: s7 { regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; qcom,switch-mode-frequency = <3200000>; }; - l3 { + pm8921_l3: l3 { regulator-min-microvolt = <3050000>; regulator-max-microvolt = <3300000>; bias-pull-down; }; - l4 { + pm8921_l4: l4 { regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l5 { + pm8921_l5: l5 { regulator-min-microvolt = <2750000>; regulator-max-microvolt = <3000000>; bias-pull-down; }; - l6 { + pm8921_l6: l6 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; bias-pull-down; }; - l23 { + pm8921_l23: l23 { regulator-min-microvolt = <1700000>; regulator-max-microvolt = <1900000>; bias-pull-down; }; - lvs1 { + pm8921_lvs1: lvs1 { + bias-pull-down; + }; + + pm8921_lvs6: lvs6 { bias-pull-down; }; - lvs6 { + pm8921_hdmi_switch: hdmi-switch { bias-pull-down; }; }; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts index 53dd9d79556f..6988bd212924 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts @@ -85,23 +85,36 @@ gpio_keys_pin_a: gpio-keys-active-state { &riva { pinctrl-names = "default"; pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>; + + vddcx-supply = <&pm8921_s3>; + vddmx-supply = <&pm8921_l24>; + vddpx-supply = <&pm8921_s4>; + status = "okay"; + + iris { + vddxo-supply = <&pm8921_l4>; + vddrfa-supply = <&pm8921_s2>; + vddpa-supply = <&pm8921_l10>; + vdddig-supply = <&pm8921_lvs2>; + }; }; &rpm { regulators { vin_l1_l2_l12_l18-supply = <&pm8921_s4>; - vin_lvs_1_3_6-supply = <&pm8921_s4>; - vin_lvs_4_5_7-supply = <&pm8921_s4>; - vin_ncp-supply = <&pm8921_l6>; - vin_lvs2-supply = <&pm8921_s4>; vin_l24-supply = <&pm8921_s1>; vin_l25-supply = <&pm8921_s1>; vin_l27-supply = <&pm8921_s7>; vin_l28-supply = <&pm8921_s7>; + vin_lvs_1_3_6-supply = <&pm8921_s4>; + vin_lvs2-supply = <&pm8921_s4>; + vin_lvs_4_5_7-supply = <&pm8921_s4>; + vin_ncp-supply = <&pm8921_l6>; + /* Buck SMPS */ - s1 { + pm8921_s1: s1 { regulator-always-on; regulator-min-microvolt = <1225000>; regulator-max-microvolt = <1225000>; @@ -109,21 +122,21 @@ s1 { bias-pull-down; }; - s2 { + pm8921_s2: s2 { regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; qcom,switch-mode-frequency = <1600000>; bias-pull-down; }; - s3 { + pm8921_s3: s3 { regulator-min-microvolt = <500000>; regulator-max-microvolt = <1150000>; qcom,switch-mode-frequency = <4800000>; bias-pull-down; }; - s4 { + pm8921_s4: s4 { regulator-always-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -132,205 +145,207 @@ s4 { qcom,force-mode = ; }; - s7 { + pm8921_s7: s7 { regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; qcom,switch-mode-frequency = <3200000>; }; - s8 { + pm8921_s8: s8 { regulator-min-microvolt = <2200000>; regulator-max-microvolt = <2200000>; qcom,switch-mode-frequency = <1600000>; }; /* PMOS LDO */ - l1 { + pm8921_l1: l1 { regulator-always-on; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; bias-pull-down; }; - l2 { + pm8921_l2: l2 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l3 { + pm8921_l3: l3 { regulator-min-microvolt = <3075000>; regulator-max-microvolt = <3075000>; bias-pull-down; }; - l4 { + pm8921_l4: l4 { regulator-always-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l5 { + pm8921_l5: l5 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; bias-pull-down; }; - l6 { + pm8921_l6: l6 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; bias-pull-down; }; - l7 { + pm8921_l7: l7 { regulator-min-microvolt = <1850000>; regulator-max-microvolt = <2950000>; bias-pull-down; }; - l8 { + pm8921_l8: l8 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; bias-pull-down; }; - l9 { + pm8921_l9: l9 { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; bias-pull-down; }; - l10 { + pm8921_l10: l10 { regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; bias-pull-down; }; - l11 { + pm8921_l11: l11 { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; bias-pull-down; }; - l12 { + pm8921_l12: l12 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l14 { + pm8921_l14: l14 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l15 { + pm8921_l15: l15 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <2950000>; bias-pull-down; }; - l16 { + pm8921_l16: l16 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; bias-pull-down; }; - l17 { + pm8921_l17: l17 { regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; bias-pull-down; }; - l18 { + pm8921_l18: l18 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l21 { + pm8921_l21: l21 { regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; bias-pull-down; }; - l22 { + pm8921_l22: l22 { regulator-min-microvolt = <2600000>; regulator-max-microvolt = <2600000>; bias-pull-down; }; - l23 { + pm8921_l23: l23 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l24 { + pm8921_l24: l24 { regulator-min-microvolt = <750000>; regulator-max-microvolt = <1150000>; bias-pull-down; }; - l25 { + pm8921_l25: l25 { regulator-always-on; regulator-min-microvolt = <1250000>; regulator-max-microvolt = <1250000>; bias-pull-down; }; - l27 { + pm8921_l27: l27 { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; }; - l28 { + pm8921_l28: l28 { regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; bias-pull-down; }; - l29 { + pm8921_l29: l29 { regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; bias-pull-down; }; /* Low Voltage Switch */ - lvs1 { + pm8921_lvs1: lvs1 { bias-pull-down; }; - lvs2 { + pm8921_lvs2: lvs2 { bias-pull-down; }; - lvs3 { + pm8921_lvs3: lvs3 { bias-pull-down; }; - lvs4 { + pm8921_lvs4: lvs4 { bias-pull-down; }; - lvs5 { + pm8921_lvs5: lvs5 { bias-pull-down; }; - lvs6 { + pm8921_lvs6: lvs6 { bias-pull-down; }; - lvs7 { + pm8921_lvs7: lvs7 { bias-pull-down; }; - usb-switch {}; + pm8921_usb_switch: usb-switch {}; - hdmi-switch {}; + pm8921_hdmi_switch: hdmi-switch { + bias-pull-down; + }; - ncp { + pm8921_ncp: ncp { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; qcom,switch-mode-frequency = <1600000>; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi index 2a5a3b2fb8e9..36c68ee5be65 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi @@ -795,60 +795,6 @@ rpmcc: clock-controller { clocks = <&pxo_board>, <&cxo_board>; clock-names = "pxo", "cxo"; }; - - regulators { - compatible = "qcom,rpm-pm8921-regulators"; - - pm8921_s1: s1 {}; - pm8921_s2: s2 {}; - pm8921_s3: s3 {}; - pm8921_s4: s4 {}; - pm8921_s7: s7 {}; - pm8921_s8: s8 {}; - - pm8921_l1: l1 {}; - pm8921_l2: l2 {}; - pm8921_l3: l3 {}; - pm8921_l4: l4 {}; - pm8921_l5: l5 {}; - pm8921_l6: l6 {}; - pm8921_l7: l7 {}; - pm8921_l8: l8 {}; - pm8921_l9: l9 {}; - pm8921_l10: l10 {}; - pm8921_l11: l11 {}; - pm8921_l12: l12 {}; - pm8921_l14: l14 {}; - pm8921_l15: l15 {}; - pm8921_l16: l16 {}; - pm8921_l17: l17 {}; - pm8921_l18: l18 {}; - pm8921_l21: l21 {}; - pm8921_l22: l22 {}; - pm8921_l23: l23 {}; - pm8921_l24: l24 {}; - pm8921_l25: l25 {}; - pm8921_l26: l26 {}; - pm8921_l27: l27 {}; - pm8921_l28: l28 {}; - pm8921_l29: l29 {}; - - pm8921_lvs1: lvs1 {}; - pm8921_lvs2: lvs2 {}; - pm8921_lvs3: lvs3 {}; - pm8921_lvs4: lvs4 {}; - pm8921_lvs5: lvs5 {}; - pm8921_lvs6: lvs6 {}; - pm8921_lvs7: lvs7 {}; - - pm8921_usb_switch: usb-switch {}; - - pm8921_hdmi_switch: hdmi-switch { - bias-pull-down; - }; - - pm8921_ncp: ncp {}; - }; }; usb1: usb@12500000 { @@ -1528,10 +1474,6 @@ riva: riva-pil@3200800 { memory-region = <&wcnss_mem>; - vddcx-supply = <&pm8921_s3>; - vddmx-supply = <&pm8921_l24>; - vddpx-supply = <&pm8921_s4>; - status = "disabled"; iris { @@ -1539,11 +1481,6 @@ iris { clocks = <&cxo_board>; clock-names = "xo"; - - vddxo-supply = <&pm8921_l4>; - vddrfa-supply = <&pm8921_s2>; - vddpa-supply = <&pm8921_l10>; - vdddig-supply = <&pm8921_lvs2>; }; smd-edge { From patchwork Sun Jul 2 13:43:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699804 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 21097EB64DD for ; Sun, 2 Jul 2023 13:43:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229554AbjGBNnv (ORCPT ); Sun, 2 Jul 2023 09:43:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230027AbjGBNnt (ORCPT ); Sun, 2 Jul 2023 09:43:49 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DC1AE79 for ; Sun, 2 Jul 2023 06:43:41 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b699284ff4so57195771fa.2 for ; Sun, 02 Jul 2023 06:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305419; x=1690897419; 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=SZ02KobYwMvMjeE2j8U/3skaNjEK7kHzXnVchCUSxj4=; b=GGrIrnN5Sw9XrUKpHcyjKQd/fi1bf1knnGHRUhIX/RGXpXBDGrLpmKYc55kKL/mE02 8CENrbruy1KI92/u5sD6ydDbGhCzfeVcT3PKY9jjY7vEwFbqcTjEhxZdpr88i+wIQY7y eVCti+M9JGSTrzU85AshD957hlKubWapgQO8bodMz2jlfNWwL3i+jZIdzJOyLwz9SK6K DyMOeZ/MOLC4/nlHKEg+PjWAlPlKgklUsB71rmhkgbbs7bih1fEWyCm9ivbAU96FNvYl XzG5J1yFekrAqnHiHlaZC0ROjMWNEkwMbfDpF6ggrUMbKp+s1FRoFqMwJPrRj9uYG8EQ vD5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305419; x=1690897419; 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=SZ02KobYwMvMjeE2j8U/3skaNjEK7kHzXnVchCUSxj4=; b=I7dHHDL4uW3ErcZdESl7ljG3zZmCC8cXNx2w4P808aiEsLcADjqqYcyHXZQRG8Odv7 GRw2+oIcZfW0QmPl8+FrprZLmoZLalMI1Oh2PrbuZIFKfv2fkVnlcQRs1D+q0Du7dJMW n28tyKQ76X5pn6YzGIe8Y9bJ92yjQsRBQ5VlErwQM8OxnDEhpN2/wwEf/jKL/95U3b1v Qdf8cAmrZlbpCuZ+7T8PMCJ/otdWuIdSr00TuPwtRh2tu/ocSIfn1lV6nMfLmI7IwXfC xvNnELByXQvFWdpbQ0LhFwlYOOzR1+54R0BZUPidVmZI8CFgQQuqe+D0JNMiDgwAScQ0 cYqw== X-Gm-Message-State: ABy/qLYfLGkHM2A4E8nXhnHrYM7fm4OseqRMMideN6LMLPcWKJwV/zZM DnG5zfbp2l7O+83cUtPVniUrzg== X-Google-Smtp-Source: APBJJlFnFuX8WvsVZ3YxTgIHBVuy8cLecQuafqH2FR2zbOkR6mK8AvXAp0UC6GXwceopnxNkwUdB+w== X-Received: by 2002:a2e:9659:0:b0:2b6:c16a:db06 with SMTP id z25-20020a2e9659000000b002b6c16adb06mr4875404ljh.39.1688305419671; Sun, 02 Jul 2023 06:43:39 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:39 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 24/27] ARM: dts: qcom: mdm9615: move RPM regulators to board files Date: Sun, 2 Jul 2023 16:43:17 +0300 Message-Id: <20230702134320.98831-25-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The set of regulators available over the RPM requests is not a property of the SoC. Move them to board files. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- .../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 136 ++++++++++++++++++ arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 134 ----------------- 2 files changed, 136 insertions(+), 134 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi index cc264861afe5..1e1c66c7f9d2 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi @@ -130,6 +130,142 @@ &gsbi5_serial { pinctrl-names = "default"; }; +&rpm { + regulators { + compatible = "qcom,rpm-pm8018-regulators"; + + vin_lvs1-supply = <&pm8018_s3>; + + vdd_l7-supply = <&pm8018_s4>; + vdd_l8-supply = <&pm8018_s3>; + vdd_l9_l10_l11_l12-supply = <&pm8018_s5>; + + /* Buck SMPS */ + pm8018_s1: s1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1150000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + }; + + pm8018_s2: s2 { + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1300000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + }; + + pm8018_s3: s3 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + }; + + pm8018_s4: s4 { + regulator-min-microvolt = <2100000>; + regulator-max-microvolt = <2200000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + }; + + pm8018_s5: s5 { + regulator-always-on; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + }; + + /* PMOS LDO */ + pm8018_l2: l2 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + bias-pull-down; + }; + + pm8018_l3: l3 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + bias-pull-down; + }; + + pm8018_l4: l4 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + bias-pull-down; + }; + + pm8018_l5: l5 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + bias-pull-down; + }; + + pm8018_l6: l6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2850000>; + bias-pull-down; + }; + + pm8018_l7: l7 { + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <1900000>; + bias-pull-down; + }; + + pm8018_l8: l8 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + bias-pull-down; + }; + + pm8018_l9: l9 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1150000>; + bias-pull-down; + }; + + pm8018_l10: l10 { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + bias-pull-down; + }; + + pm8018_l11: l11 { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + bias-pull-down; + }; + + pm8018_l12: l12 { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + bias-pull-down; + }; + + pm8018_l13: l13 { + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2950000>; + bias-pull-down; + }; + + pm8018_l14: l14 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + bias-pull-down; + }; + + /* Low Voltage Switch */ + pm8018_lvs1: lvs1 { + bias-pull-down; + }; + }; +}; + &sdcc1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi index c08c6252f3b7..fecf0960ee98 100644 --- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi @@ -325,140 +325,6 @@ rpm: rpm@108000 { , ; interrupt-names = "ack", "err", "wakeup"; - - regulators { - compatible = "qcom,rpm-pm8018-regulators"; - - vin_lvs1-supply = <&pm8018_s3>; - - vdd_l7-supply = <&pm8018_s4>; - vdd_l8-supply = <&pm8018_s3>; - vdd_l9_l10_l11_l12-supply = <&pm8018_s5>; - - /* Buck SMPS */ - pm8018_s1: s1 { - regulator-min-microvolt = <500000>; - regulator-max-microvolt = <1150000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - }; - - pm8018_s2: s2 { - regulator-min-microvolt = <1225000>; - regulator-max-microvolt = <1300000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - }; - - pm8018_s3: s3 { - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - }; - - pm8018_s4: s4 { - regulator-min-microvolt = <2100000>; - regulator-max-microvolt = <2200000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - }; - - pm8018_s5: s5 { - regulator-always-on; - regulator-min-microvolt = <1350000>; - regulator-max-microvolt = <1350000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - }; - - /* PMOS LDO */ - pm8018_l2: l2 { - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - bias-pull-down; - }; - - pm8018_l3: l3 { - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - bias-pull-down; - }; - - pm8018_l4: l4 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - bias-pull-down; - }; - - pm8018_l5: l5 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - bias-pull-down; - }; - - pm8018_l6: l6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2850000>; - bias-pull-down; - }; - - pm8018_l7: l7 { - regulator-min-microvolt = <1850000>; - regulator-max-microvolt = <1900000>; - bias-pull-down; - }; - - pm8018_l8: l8 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - bias-pull-down; - }; - - pm8018_l9: l9 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <1150000>; - bias-pull-down; - }; - - pm8018_l10: l10 { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1050000>; - bias-pull-down; - }; - - pm8018_l11: l11 { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1050000>; - bias-pull-down; - }; - - pm8018_l12: l12 { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1050000>; - bias-pull-down; - }; - - pm8018_l13: l13 { - regulator-min-microvolt = <1850000>; - regulator-max-microvolt = <2950000>; - bias-pull-down; - }; - - pm8018_l14: l14 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - bias-pull-down; - }; - - /* Low Voltage Switch */ - pm8018_lvs1: lvs1 { - bias-pull-down; - }; - }; }; }; }; From patchwork Sun Jul 2 13:43:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698495 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 C3A8AC001B3 for ; Sun, 2 Jul 2023 13:43:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbjGBNnw (ORCPT ); Sun, 2 Jul 2023 09:43:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229569AbjGBNnv (ORCPT ); Sun, 2 Jul 2023 09:43:51 -0400 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 69C53E6A for ; Sun, 2 Jul 2023 06:43:42 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b69f1570b2so58450851fa.0 for ; Sun, 02 Jul 2023 06:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305420; x=1690897420; 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=AJM6CyTYSM08II7zRgc1m+LUZJTk+XfRpZI/zESTTZw=; b=ZUxIVfOsX2GUO/alyOrcQGzK5qWuq/zmn1yUuJFCM/hP0Uztao91ILeMbACydeBr4X qlLTAA/G9uI2p+D8Ch2D7VE5duHeJ17GDmI5jeH/ER8XFqDhQexOapY53xsckwV2n4ID CVCZdweoDz8bKot778LQfhQNhK91H+/Tsy91zVXtC4rLJ1RQahkSklSL9iJC3da3O6yH MvfKHJP5vTq0jmiuNOc+ZEyOSv4EAVguMOyCZhxke9UsWF2QX8MG9LJGwNN8roTIsXve yXZtYl6Qi+9sWTJFvMMCP9xtRXbaM91QiJ0bcgIBhIDcvpoHV39bZOwCd/AN9D++eY6q QpvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305420; x=1690897420; 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=AJM6CyTYSM08II7zRgc1m+LUZJTk+XfRpZI/zESTTZw=; b=K1pyp9nKBIaMEtKjA8PtafT/0mjN8XgGecbTSPqV4Y4VGTNAmZHRyzflI6ti1I9oJQ zXK874ODqemqY3Hk9GsbtJusK4v3pIhTXfl6H3+j0gKBMxXuKm8ZWbDx4nHTa6sK+G/U 0Zpk9bm6s2ikepbvidyw4fGkmh/qT2LMDFl3lpUOCohn4ISFw/iMqA1DS8MJW8vRVslW b+9G2xL3k03NmNIKHb7HdzGkw5TXw7x1n68tEQNJ6AKDdouhwT9HzVEGOjX3xE5gBFyV K+tEYczd9U+XZFNMKJFKLcLCsPSVcwwpZhZ1nW2PgtigR2A7Sn0NP2gUQP8kNswIBNWR sLwg== X-Gm-Message-State: ABy/qLb6J366FC6mYoP7SXLCZK5UxGMt0HW+TMe6vV9qEsH4bru0SFIs rH9uOGkd6b50uUGrojGF60vBiQ== X-Google-Smtp-Source: APBJJlG0CnKgp/nFFlOeBMXLnfPpXSaBK4yKAtWr+7fh6Co05p8wTjGKKXNjEgTxILkm5nIubGeklg== X-Received: by 2002:a2e:9bd7:0:b0:2a7:adf7:1781 with SMTP id w23-20020a2e9bd7000000b002a7adf71781mr5627961ljj.2.1688305420520; Sun, 02 Jul 2023 06:43:40 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:40 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 25/27] ARM: dts: qcom: msm8660: move RPM regulators to board files Date: Sun, 2 Jul 2023 16:43:18 +0300 Message-Id: <20230702134320.98831-26-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The set of regulators available over the RPM requests is not a property of the SoC. Move them to board files. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- .../dts/qcom/qcom-apq8060-dragonboard.dts | 141 ++++++++++++------ arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 10 ++ arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 66 -------- 3 files changed, 102 insertions(+), 115 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts index 20de516a8deb..8a511f69d800 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts @@ -449,6 +449,8 @@ &rpm { * that means */ regulators-0 { + compatible = "qcom,rpm-pm8901-regulators"; + vdd_l0-supply = <&pm8901_s4>; vdd_l1-supply = <&vph>; vdd_l2-supply = <&vph>; @@ -466,57 +468,63 @@ regulators-0 { lvs3_in-supply = <&pm8058_s2>; mvs_in-supply = <&pm8058_s3>; - l0 { + pm8901_l0: l0 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l1 { + + pm8901_l1: l1 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; bias-pull-down; }; - l2 { + + pm8901_l2: l2 { /* TMA340 requires strictly 3.3V */ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; bias-pull-down; }; - l3 { + + pm8901_l3: l3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; bias-pull-down; }; - l4 { + + pm8901_l4: l4 { regulator-min-microvolt = <2600000>; regulator-max-microvolt = <2600000>; bias-pull-down; }; - l5 { + + pm8901_l5: l5 { regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; bias-pull-down; }; - l6 { + + pm8901_l6: l6 { regulator-min-microvolt = <2200000>; regulator-max-microvolt = <2200000>; bias-pull-down; }; /* s0 and s1 are SAW regulators controlled over SPM */ - s2 { + pm8901_s2: s2 { regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; qcom,switch-mode-frequency = <1600000>; bias-pull-down; }; - s3 { + pm8901_s3: s3 { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; qcom,switch-mode-frequency = <1600000>; bias-pull-down; }; - s4 { + pm8901_s4: s4 { regulator-min-microvolt = <1225000>; regulator-max-microvolt = <1225000>; qcom,switch-mode-frequency = <1600000>; @@ -524,17 +532,22 @@ s4 { }; /* LVS0 thru 3 and mvs are just switches */ - lvs0 { + pm8901_lvs0: lvs0 { regulator-always-on; }; - lvs1 { }; - lvs2 { }; - lvs3 { }; - mvs { }; + pm8901_lvs1: lvs1 { }; + + pm8901_lvs2: lvs2 { }; + + pm8901_lvs3: lvs3 { }; + + pm8901_mvs: mvs { }; }; regulators-1 { + compatible = "qcom,rpm-pm8058-regulators"; + vdd_l0_l1_lvs-supply = <&pm8058_s3>; vdd_l2_l11_l12-supply = <&vph>; vdd_l3_l4_l5-supply = <&vph>; @@ -556,144 +569,169 @@ regulators-1 { vdd_s4-supply = <&vph>; vdd_ncp-supply = <&vph>; - l0 { + pm8058_l0: l0 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l1 { + + pm8058_l1: l1 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l2 { + + pm8058_l2: l2 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <2600000>; bias-pull-down; }; - l3 { + + pm8058_l3: l3 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l4 { + + pm8058_l4: l4 { regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; bias-pull-down; }; - l5 { + + pm8058_l5: l5 { regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; bias-pull-down; }; - l6 { + + pm8058_l6: l6 { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3600000>; bias-pull-down; }; - l7 { + + pm8058_l7: l7 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l8 { + + pm8058_l8: l8 { regulator-min-microvolt = <2900000>; regulator-max-microvolt = <3050000>; bias-pull-down; }; - l9 { + + pm8058_l9: l9 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l10 { + + pm8058_l10: l10 { regulator-min-microvolt = <2600000>; regulator-max-microvolt = <2600000>; bias-pull-down; }; - l11 { + + pm8058_l11: l11 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; bias-pull-down; }; - l12 { + + pm8058_l12: l12 { regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; bias-pull-down; }; - l13 { + + pm8058_l13: l13 { regulator-min-microvolt = <2050000>; regulator-max-microvolt = <2050000>; bias-pull-down; }; - l14 { + + pm8058_l14: l14 { regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; }; - l15 { + + pm8058_l15: l15 { regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; bias-pull-down; }; - l16 { + + pm8058_l16: l16 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; regulator-always-on; }; - l17 { + + pm8058_l17: l17 { // 1.5V according to schematic regulator-min-microvolt = <2600000>; regulator-max-microvolt = <2600000>; bias-pull-down; }; - l18 { + + pm8058_l18: l18 { regulator-min-microvolt = <2200000>; regulator-max-microvolt = <2200000>; bias-pull-down; }; - l19 { + + pm8058_l19: l19 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; bias-pull-down; }; - l20 { + + pm8058_l20: l20 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; bias-pull-down; }; - l21 { + + pm8058_l21: l21 { // 1.1 V according to schematic regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; regulator-always-on; }; - l22 { + + pm8058_l22: l22 { // 1.2 V according to schematic regulator-min-microvolt = <1150000>; regulator-max-microvolt = <1150000>; bias-pull-down; }; - l23 { + + pm8058_l23: l23 { // Unused regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l24 { + + pm8058_l24: l24 { // Unused regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - l25 { + + pm8058_l25: l25 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; bias-pull-down; }; - s0 { + pm8058_s0: s0 { // regulator-min-microvolt = <500000>; // regulator-max-microvolt = <1325000>; regulator-min-microvolt = <1100000>; @@ -701,7 +739,8 @@ s0 { qcom,switch-mode-frequency = <1600000>; bias-pull-down; }; - s1 { + + pm8058_s1: s1 { // regulator-min-microvolt = <500000>; // regulator-max-microvolt = <1250000>; regulator-min-microvolt = <1100000>; @@ -709,21 +748,24 @@ s1 { qcom,switch-mode-frequency = <1600000>; bias-pull-down; }; - s2 { + + pm8058_s2: s2 { // 1.3 V according to schematic regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1400000>; qcom,switch-mode-frequency = <1600000>; bias-pull-down; }; - s3 { + + pm8058_s3: s3 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; qcom,switch-mode-frequency = <1600000>; regulator-always-on; bias-pull-down; }; - s4 { + + pm8058_s4: s4 { regulator-min-microvolt = <2200000>; regulator-max-microvolt = <2200000>; qcom,switch-mode-frequency = <1600000>; @@ -732,14 +774,15 @@ s4 { }; /* LVS0 and LVS1 are just switches */ - lvs0 { + pm8058_lvs0: lvs0 { bias-pull-down; }; - lvs1 { + + pm8058_lvs1: lvs1 { bias-pull-down; }; - ncp { + pm8058_ncp: ncp { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; qcom,switch-mode-frequency = <1600000>; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts index 04dca0c93971..43e646ded7bd 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts @@ -61,6 +61,16 @@ MATRIX_KEY(5, 4, KEY_MENU) keypad,num-columns = <5>; }; +&rpm { + regulators-0 { + compatible = "qcom,rpm-pm8901-regulators"; + }; + + regulators-1 { + compatible = "qcom,rpm-pm8058-regulators"; + }; +}; + /* eMMC */ &sdcc1 { vmmc-supply = <&vsdcc_fixed>; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi index b8094b7c09fc..c2cb3abd5177 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8660.dtsi @@ -352,72 +352,6 @@ rpmcc: clock-controller { clocks = <&pxo_board>; clock-names = "pxo"; }; - - regulators-0 { - compatible = "qcom,rpm-pm8901-regulators"; - - pm8901_l0: l0 {}; - pm8901_l1: l1 {}; - pm8901_l2: l2 {}; - pm8901_l3: l3 {}; - pm8901_l4: l4 {}; - pm8901_l5: l5 {}; - pm8901_l6: l6 {}; - - /* S0 and S1 Handled as SAW regulators by SPM */ - pm8901_s2: s2 {}; - pm8901_s3: s3 {}; - pm8901_s4: s4 {}; - - pm8901_lvs0: lvs0 {}; - pm8901_lvs1: lvs1 {}; - pm8901_lvs2: lvs2 {}; - pm8901_lvs3: lvs3 {}; - - pm8901_mvs: mvs {}; - }; - - regulators-1 { - compatible = "qcom,rpm-pm8058-regulators"; - - pm8058_l0: l0 {}; - pm8058_l1: l1 {}; - pm8058_l2: l2 {}; - pm8058_l3: l3 {}; - pm8058_l4: l4 {}; - pm8058_l5: l5 {}; - pm8058_l6: l6 {}; - pm8058_l7: l7 {}; - pm8058_l8: l8 {}; - pm8058_l9: l9 {}; - pm8058_l10: l10 {}; - pm8058_l11: l11 {}; - pm8058_l12: l12 {}; - pm8058_l13: l13 {}; - pm8058_l14: l14 {}; - pm8058_l15: l15 {}; - pm8058_l16: l16 {}; - pm8058_l17: l17 {}; - pm8058_l18: l18 {}; - pm8058_l19: l19 {}; - pm8058_l20: l20 {}; - pm8058_l21: l21 {}; - pm8058_l22: l22 {}; - pm8058_l23: l23 {}; - pm8058_l24: l24 {}; - pm8058_l25: l25 {}; - - pm8058_s0: s0 {}; - pm8058_s1: s1 {}; - pm8058_s2: s2 {}; - pm8058_s3: s3 {}; - pm8058_s4: s4 {}; - - pm8058_lvs0: lvs0 {}; - pm8058_lvs1: lvs1 {}; - - pm8058_ncp: ncp {}; - }; }; amba { From patchwork Sun Jul 2 13:43:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 699803 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 364E7EB64DA for ; Sun, 2 Jul 2023 13:43:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230047AbjGBNnx (ORCPT ); Sun, 2 Jul 2023 09:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229569AbjGBNnw (ORCPT ); Sun, 2 Jul 2023 09:43:52 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 967CA10DE for ; Sun, 2 Jul 2023 06:43:43 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2b6a0e36d42so43136441fa.0 for ; Sun, 02 Jul 2023 06:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305421; x=1690897421; 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=j3Lvzan3D8CllrgXI2W1/onOF86lUlT8hKXUQ2Bchqc=; b=IW8YVQ2cHksGjRVYlp3tSjhqB84oPcmB03e3YYEzOv+NEK2WLZ4Z1ftFqIBa0TFIAz xlLzvlXvHfKRXdM6QgW/E1Xvf9T7V6EonrcxioQuXoEELziTGlnDjuum0dkvhglwfxbO QXCn1wwL/Tc4z+SMlCtv6spbJlru39WAF4f8PzAHEaMBosl9E0LK5aQ659SuOrF2PR0v y9+mNHhSsbrrTyofIhSgicfU8tMaL/1U2LYZGRF4CCLqYMLH/10/QETIWZDAKC09I+aQ vqnx7MVQhe/tY7JHiSb3VPDMW84TOxFtfLO8Duw/K0aq4Q9+YZTGrbt9HYuOeskkJLpn F1OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305421; x=1690897421; 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=j3Lvzan3D8CllrgXI2W1/onOF86lUlT8hKXUQ2Bchqc=; b=euqDKALFT9HfyTCxYCwnjNhVjK0o8QrhPSLJ0IsOKz+ssfAioLhmj0BekG9171SKci 8qmC9eM2/CC9/un87uPnK7i7o+/q23rnKIT9mINesGeRy5lOu6iWrwDFKS7lgzAbkbCm DdtT2KX3v815b50sRkc2iSZbm8Y5MzL3rJERO/U0uusE5jV8rccpjb1S1Cu618esc/7C aIND3zCe2RaPhF56x6o0/LxnT5TjKhTbFeVSGzh7YENAojloalW7AaCQKIX6l8EI9s/a CIS9ueN+E5Jn+TnDPvcqZD6wLwF8koLMcDsdbAXOHQ0k62/H8xWJEyy/h7OdHvpPHKmk BHwg== X-Gm-Message-State: ABy/qLbBWMqKEvJfZ2qWPOx9U0edY4IoNsRR5noxkncljcVesiG6EXHp Efxa/l3/0xEduz6rzzsDMK5QWlV1/mCPY3NhJ0o= X-Google-Smtp-Source: APBJJlESn6XMCQtRlcl2Ldba8dvYt/Dmdc4D2Z0W6CP1OexqQUnIr/WKrsENy0O7LJZHDLUz2jw5XQ== X-Received: by 2002:a2e:9ac4:0:b0:2b6:98c2:635f with SMTP id p4-20020a2e9ac4000000b002b698c2635fmr2522786ljj.11.1688305421237; Sun, 02 Jul 2023 06:43:41 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:40 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 26/27] ARM: dts: qcom: msm8960: drop useless rpm regulators node Date: Sun, 2 Jul 2023 16:43:19 +0300 Message-Id: <20230702134320.98831-27-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The set of regulators available over the RPM requests is not a property of the SoC. The only msm8960 board file (qcom-msm8960-cdp) also defines this node together with the compatible string. Drop the useless device node. Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi index 8157236f249d..b25cd58003e2 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi @@ -200,10 +200,6 @@ rpm: rpm@108000 { , ; interrupt-names = "ack", "err", "wakeup"; - - regulators { - compatible = "qcom,rpm-pm8921-regulators"; - }; }; acc0: clock-controller@2088000 { From patchwork Sun Jul 2 13:43:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 698494 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 BCC4BEB64D9 for ; Sun, 2 Jul 2023 13:43:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230052AbjGBNn6 (ORCPT ); Sun, 2 Jul 2023 09:43:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230027AbjGBNnx (ORCPT ); Sun, 2 Jul 2023 09:43:53 -0400 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 AE45C10E3 for ; Sun, 2 Jul 2023 06:43:43 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b5c2433134so44700441fa.0 for ; Sun, 02 Jul 2023 06:43:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688305422; x=1690897422; 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=lYK7jyDPhdkvFKyhVvnwQ7HbIDbOuUQGXBtxnQGSLEk=; b=Y0SWxhrHLFr3dJ2orUPnxSxejwivvE6IwyioIWbB+dpSUrvO9edNFaKJGBnHcUKoQv +4FybETbZinpM+n4eNSoDTN0sNbk73r3evRXenuZzLxIrMdvO3oQiJAENcIyhY0+TBYu 954cFvrRt9ptFj8zIOdAbHAzFrvzww+oCDrRoAWgO2WqkO3BNacKT3wz4GnDW82UXh2T /PjpKdQ+k0lCIE7vo2vnjcy7o7O3lg2D0wqzLjUnMlQFZ7R7D6+Du8279YvlrsSb1aeK g/sn1BByR5qZupTpJ0lMgQxidrWk/urDEGLjEB8Q/Yqe/OKqihEkyeadegjcVokyN8OQ L1kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688305422; x=1690897422; 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=lYK7jyDPhdkvFKyhVvnwQ7HbIDbOuUQGXBtxnQGSLEk=; b=c9Vq0/Xh6fo/C99o7jMih+0gMECxM7gukTUat+WrfTuKhB//K9wIxB/7gD8HHx05as pE6+im8/2vC68uOpFvjgOj0xpVCPRhGmxl+m7uVgf8IZ/B59uyZZgts/4R/VWVMDhlUy 0ozLQQuUdB1SLuj4z2XanEtI6tttA/gDRVE5C0LiCc3RCzVjv5wtWhQ1G9w6ft4bmO3a l4BFjvZLAQnyTn2W8KDwblwas+nwFImg679C/SLCEEV56Cyyo7buBLPvgPBzC1FkUwZi 7o7R/NeRedvMCTihC4HBUnpNPSAt7jpOocAUii5/OuRjTUQ63qKb6JwuD5/ZO6isFAPJ KT7g== X-Gm-Message-State: ABy/qLaeKhJDNe2nWDHeny9EM1OWCJPnsAB9cjjAly2iY+1JCAKcDk7x kzoxmHtuLnzg5MMqE3SRiCDqyg== X-Google-Smtp-Source: APBJJlE3rDN2VekRnBE2h3G/JDjsV29YSwHVyMLZsMT4TkhLSfd01Use9FaA+uqEghQsRThRMT9nhg== X-Received: by 2002:a2e:9893:0:b0:2b6:da61:d5b9 with SMTP id b19-20020a2e9893000000b002b6da61d5b9mr1353902ljj.14.1688305421944; Sun, 02 Jul 2023 06:43:41 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id d9-20020a2e96c9000000b002b6988ca476sm4310650ljj.101.2023.07.02.06.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:43:41 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 27/27] ARM: dts: qcom: msm8974: move regulators to board files Date: Sun, 2 Jul 2023 16:43:20 +0300 Message-Id: <20230702134320.98831-28-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> References: <20230702134320.98831-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The vph-pwr and boost regulators (even if they are unified by design) are not a property of SoC, so move them to board files. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- .../dts/qcom/qcom-apq8074-dragonboard.dts | 27 +++++++++++++++++++ .../qcom-msm8974-lge-nexus5-hammerhead.dts | 27 +++++++++++++++++++ .../qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 27 +++++++++++++++++++ arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 27 ------------------- .../qcom/qcom-msm8974pro-fairphone-fp2.dts | 27 +++++++++++++++++++ .../qcom/qcom-msm8974pro-oneplus-bacon.dts | 27 +++++++++++++++++++ .../dts/qcom/qcom-msm8974pro-samsung-klte.dts | 10 ++++++- ...-msm8974pro-sony-xperia-shinano-castor.dts | 27 +++++++++++++++++++ 8 files changed, 171 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts index 5a8af16bf02d..3e5311e7196e 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts @@ -49,6 +49,33 @@ mpss_region: mpss@ac00000 { no-map; }; }; + + vreg_boost: vreg-boost { + compatible = "regulator-fixed"; + + regulator-name = "vreg-boost"; + regulator-min-microvolt = <3150000>; + regulator-max-microvolt = <3150000>; + + regulator-always-on; + regulator-boot-on; + + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&boost_bypass_n_pin>; + }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; }; &blsp1_uart2 { diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts index da99f770d4f5..ca402b4a68bd 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -60,6 +60,33 @@ vibrator { enable-gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>; }; + vreg_boost: vreg-boost { + compatible = "regulator-fixed"; + + regulator-name = "vreg-boost"; + regulator-min-microvolt = <3150000>; + regulator-max-microvolt = <3150000>; + + regulator-always-on; + regulator-boot-on; + + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&boost_bypass_n_pin>; + }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; + vreg_wlan: wlan-regulator { compatible = "regulator-fixed"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi index 23ae474698aa..a43341ae4495 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi @@ -65,6 +65,33 @@ ramoops@3e8e0000 { pmsg-size = <0x80000>; }; }; + + vreg_boost: vreg-boost { + compatible = "regulator-fixed"; + + regulator-name = "vreg-boost"; + regulator-min-microvolt = <3150000>; + regulator-max-microvolt = <3150000>; + + regulator-always-on; + regulator-boot-on; + + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&boost_bypass_n_pin>; + }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; }; &blsp1_i2c2 { diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi index aeca504918a0..a4ff1fe63903 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi @@ -2376,31 +2376,4 @@ timer { ; clock-frequency = <19200000>; }; - - vreg_boost: vreg-boost { - compatible = "regulator-fixed"; - - regulator-name = "vreg-boost"; - regulator-min-microvolt = <3150000>; - regulator-max-microvolt = <3150000>; - - regulator-always-on; - regulator-boot-on; - - gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names = "default"; - pinctrl-0 = <&boost_bypass_n_pin>; - }; - - vreg_vph_pwr: vreg-vph-pwr { - compatible = "regulator-fixed"; - regulator-name = "vph-pwr"; - - regulator-min-microvolt = <3600000>; - regulator-max-microvolt = <3600000>; - - regulator-always-on; - }; }; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts index 24f9521a0be6..9cbdfe62051e 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dts @@ -57,6 +57,33 @@ vibrator { enable-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>; vcc-supply = <&pm8941_l18>; }; + + vreg_boost: vreg-boost { + compatible = "regulator-fixed"; + + regulator-name = "vreg-boost"; + regulator-min-microvolt = <3150000>; + regulator-max-microvolt = <3150000>; + + regulator-always-on; + regulator-boot-on; + + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&boost_bypass_n_pin>; + }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; }; &blsp1_i2c2 { diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts index c0ca264d8140..6d1412aec45a 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts @@ -51,6 +51,33 @@ event-hall-sensor { debounce-interval = <150>; }; }; + + vreg_boost: vreg-boost { + compatible = "regulator-fixed"; + + regulator-name = "vreg-boost"; + regulator-min-microvolt = <3150000>; + regulator-max-microvolt = <3150000>; + + regulator-always-on; + regulator-boot-on; + + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&boost_bypass_n_pin>; + }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; }; &blsp1_i2c1 { diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts index 325feb89b343..ca3aa16b4b10 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts @@ -155,7 +155,15 @@ vreg_panel: panel-regulator { enable-active-high; }; - /delete-node/ vreg-boost; + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; }; &blsp1_i2c2 { diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index efe21289c9fe..b76d51b1b667 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -84,6 +84,33 @@ vreg_vsp: lcd-dcdc-regulator { pinctrl-0 = <&lcd_dcdc_en_pin_a>; }; + vreg_boost: vreg-boost { + compatible = "regulator-fixed"; + + regulator-name = "vreg-boost"; + regulator-min-microvolt = <3150000>; + regulator-max-microvolt = <3150000>; + + regulator-always-on; + regulator-boot-on; + + gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&boost_bypass_n_pin>; + }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; + vreg_wlan: wlan-regulator { compatible = "regulator-fixed";