From patchwork Tue Feb 7 10:06:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 651811 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 2BBBCC636CC for ; Tue, 7 Feb 2023 10:07:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231744AbjBGKHG (ORCPT ); Tue, 7 Feb 2023 05:07:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231553AbjBGKHE (ORCPT ); Tue, 7 Feb 2023 05:07:04 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 599E8EC7C for ; Tue, 7 Feb 2023 02:07:01 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id h16so12959800wrz.12 for ; Tue, 07 Feb 2023 02:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=rMohM0qPljFMAwLEW7BFFLytcnDkig++xTWLolqratA=; b=pr5kqicwswyyoq+U+mfWV8zReIWb2wtvilF4WgyFavHapQFfwobqCKibx534VKCZYm qfrqbwM8MB0KZ1oSOCCiftFOC9zbXsv8PrkIzDlF7+BbROuwM7cA6Kxpr8krQI6UVwAm UNGwEJCWCN7ZslMC3gVz3DssgkODn/r28HfwcwuvirGKvyS0Fv0hqlfk1TLY0O2WpTh/ De9ARI62uq5448Vk5UUaPTuz8bjMykRXuPp+rxX0Uj43dj3vvkdRZyOj4eM+Y1ULEhsh nCstHmZkX4g5mhu+2YvK3LkhgW875oxT+gmoBWR4fjBv1H5L0fhgQXaX3RSr6mWRRBbh KueQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rMohM0qPljFMAwLEW7BFFLytcnDkig++xTWLolqratA=; b=vh9tG5rJbGa/PYB11maw0n7Jzj0+RXGaYn0bKY9XaXjALa+YyiERZ0S4bfwWJr1y/w Q7+5BvkamPWCw82W6W1eF7wEGRGBGhC5tHiF+VkwL5PFN6tKyfMNYnO733FhdK5waflB j/QJpFAUBQzdpFPsbU8EsQulPBrGlZu3QFz0yVUxRa0Z/BLPF1kS1hLJpfC77gm7B3on QwIJrWWRsVh/djIAqleH9ugjqezJdY0JbbGCtRcsYvgbauGnmSK5b/wmqgwTqJIDD2xc aqKd9Eto6/4l6+LERFzOn59sMCk7ojVxhtP5yWq1Ze7NpEw6Q2VaNNSxfVhBdN1erBcN 9VlA== X-Gm-Message-State: AO0yUKUnvKiS59sHkHdNSwEkEGsVulEeCKXjqY2K5mOeIYn2pNSAgTZX HGtdxpmkIaP6xqoQONKbyg6L4g== X-Google-Smtp-Source: AK7set/pdF60gEJ8eLCPcR5NCvqXjVEG+5i7wLgdYV8jA1MgSqqYWZ+JWyref5GHKF0trD+zFn+9Ug== X-Received: by 2002:a5d:524b:0:b0:2c3:ea65:cc7d with SMTP id k11-20020a5d524b000000b002c3ea65cc7dmr2362744wrc.55.1675764419804; Tue, 07 Feb 2023 02:06:59 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id l11-20020a05600002ab00b002bfb5ebf8cfsm11428205wry.21.2023.02.07.02.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 02:06:59 -0800 (PST) From: Neil Armstrong Date: Tue, 07 Feb 2023 11:06:57 +0100 Subject: [PATCH 1/2] arm64: dts: qcom: sm8550: fix DSI controller compatible MIME-Version: 1.0 Message-Id: <20230207-topic-sm8550-upstream-sm8550-dt-fix-v1-1-698d132ab285@linaro.org> References: <20230207-topic-sm8550-upstream-sm8550-dt-fix-v1-0-698d132ab285@linaro.org> In-Reply-To: <20230207-topic-sm8550-upstream-sm8550-dt-fix-v1-0-698d132ab285@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add missing sm8550 soc specific compatible before fallback to match the updated bindings. Fixes: d7da51db5b81 ("arm64: dts: qcom: sm8550: add display hardware devices") Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index 6ff135191ee0..43a8e46c6ab7 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -2175,7 +2175,7 @@ opp-514000000 { }; mdss_dsi0: dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8550-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0 0x0ae94000 0 0x400>; reg-names = "dsi_ctrl"; @@ -2269,7 +2269,7 @@ mdss_dsi0_phy: phy@ae95000 { }; mdss_dsi1: dsi@ae96000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,sm8550-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0 0x0ae96000 0 0x400>; reg-names = "dsi_ctrl"; From patchwork Tue Feb 7 10:06:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 651345 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 F1B3CC636CC for ; Tue, 7 Feb 2023 10:07:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231777AbjBGKHL (ORCPT ); Tue, 7 Feb 2023 05:07:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231710AbjBGKHI (ORCPT ); Tue, 7 Feb 2023 05:07:08 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07BE846A1 for ; Tue, 7 Feb 2023 02:07:02 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id i5so5817751wrc.0 for ; Tue, 07 Feb 2023 02:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=KXvmrp1e2c3eR/W4yiRq7uPHVhG6kKlslQK7in15eks=; b=SZENXQmWZzwSmDdoBZMkfIIuLXOBosbfRXHllFc3IGkGARjHWis01z+G+khhySHT4M vGGU5eQguMGnxRX62kiiK4QDV4oI26efdy2XL4XqnLS//vV4InMDsV6mOuife8RU5BB7 KuzCeAJw6XkgqmgENpoFLaE6COpny9sBacOp4/Ry8jYGF2M3ENA9uk0KBE5rZVNbemYj gui97/RJaGky7J5PPYyvFqASMOmVZVHTJXg/gg/VWt1kKFSRaX7YU6RmRe94AH7sskV+ BaEKjlARIMmzc9rj3Qnfi6xyOLEG4OatlHHkiTcF/pUC4Hw0Q8ZO4yN8FZisCs2zHq/I okcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KXvmrp1e2c3eR/W4yiRq7uPHVhG6kKlslQK7in15eks=; b=o5uID0scsJe0XD0i/hey5EtDlTTXLEGqlJTsT0bzwp7f3A14c4bZMW1gB/p3oPDxgu PvELE8kI9oEG1WPKE0/97V9SrUAey6gCFMEw6eR/eH5Bb2xxWOZg2hPAIqFcQ6I6dV+G ioNTUaZZPVRMXIeJ8qqpB1oUyU0wvnjA99Ema+gQtYp8+SkCg24xSaM96ltI0En1qONS b5P5UdJ4GA0C2v47vq5CUjNnjB6UyioNgWkrc8TUB5tpFg5smBhNuJVE988fzHzl5vY3 5i4Ydt6/ZoXlpESN11cRaAGRv8dSkf6ScTRhwDj/vPPtE8FgcyqsBISR0pRBXhA3CkMG Oy2w== X-Gm-Message-State: AO0yUKXSgxcwh9Js2ibBoe1q1aDa4I4GbMd8xKq4QA1Pjq5C/D/8GdP7 mehiVS7aRMoSvOU6Y10ve9iINw== X-Google-Smtp-Source: AK7set9dfLbEeekzy2n6PXv2B0T4vB5k+F+0FH97eNpoNyhtvk6xhs2elqkxhywoPzADVs+g25/QHw== X-Received: by 2002:adf:dd12:0:b0:2c3:f26f:8cca with SMTP id a18-20020adfdd12000000b002c3f26f8ccamr1860104wrm.67.1675764420656; Tue, 07 Feb 2023 02:07:00 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id l11-20020a05600002ab00b002bfb5ebf8cfsm11428205wry.21.2023.02.07.02.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 02:07:00 -0800 (PST) From: Neil Armstrong Date: Tue, 07 Feb 2023 11:06:58 +0100 Subject: [PATCH 2/2] arm64: dts: qcom: pmk8550: fix PON compatible MIME-Version: 1.0 Message-Id: <20230207-topic-sm8550-upstream-sm8550-dt-fix-v1-2-698d132ab285@linaro.org> References: <20230207-topic-sm8550-upstream-sm8550-dt-fix-v1-0-698d132ab285@linaro.org> In-Reply-To: <20230207-topic-sm8550-upstream-sm8550-dt-fix-v1-0-698d132ab285@linaro.org> To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The right compatible is qcom,pmk8350-pon, it matches the reg resources associated to the node and the subnodes compatible properties. Fixes: e9c0a4e48489 ("arm64: dts: qcom: Add PMK8550 pmic dtsi") Signed-off-by: Neil Armstrong Reviewed-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/pmk8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/pmk8550.dtsi b/arch/arm64/boot/dts/qcom/pmk8550.dtsi index 47213d05bf92..201efeda7d2d 100644 --- a/arch/arm64/boot/dts/qcom/pmk8550.dtsi +++ b/arch/arm64/boot/dts/qcom/pmk8550.dtsi @@ -16,7 +16,7 @@ pmk8550: pmic@0 { #size-cells = <0>; pmk8550_pon: pon@1300 { - compatible = "qcom,pm8998-pon"; + compatible = "qcom,pmk8350-pon"; reg = <0x1300>, <0x800>; reg-names = "hlos", "pbs";