From patchwork Mon Jul 11 12:25:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12913452 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3F83C433EF for ; Mon, 11 Jul 2022 12:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2tKkxdLsvqcPSOhH/jLVB1HKYRU1dxzE0US7mvAun18=; b=0LDeJFPMSW46OG vLaioouqu+qnhUtyN2brP4xfKE5rK87rA18aGynsx0Du8FrnXBZX3Hx/HHRiF3CCSmai5gi+5j0XA qwfRTXsHvMfB7pwgciYjBBU6JSpoC/TF7gYlaEsdydVWrlIZTFwxRB50z3n/DcT38CAf8uZoWiySC kVdyPxWZk7crzBEm6Jf1fnH5U3wNvmqhgC8HqE3FTkCZmAVc91K0327Mq8xFBZMaRvSN2KOWvMaFz auisZjXSiQiW+0JwyYdnaPnIlErjVesd4ZVkv9cEwTn85ksOa/LkXt2ZSE4AoLXzscirBZoQ/H44v RfJDdUBquxfMCzHVks2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsTn-001OFO-Ll; Mon, 11 Jul 2022 12:25:35 +0000 Received: from madras.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e5ab]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsTQ-001O30-H1; Mon, 11 Jul 2022 12:25:16 +0000 Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id E5AE366019FD; Mon, 11 Jul 2022 13:25:07 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1657542308; bh=ubXAnOjRMe3Pb/tsTo7f8wxsG7B1OS2/1BE23DQJYdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VYX3Z6lPDzkT6PllDgjFsxECGU8NYPw3L64OVYrYZQaG9AW8r13syjK00gbuL+9dG TZhKggimY+DoNIThs2H7+m5pnWDAtN2q35kJ69TCqzIrlmsAgU1Y0CIqXLZBbFX8Gk NrzHDPwd3a7ic6m8Vq2LZ92G2oj3oqVru+iFn0OqCmLUYOQ4NnBrvFTXf7acTxwJRw EaNBpdqsj9U5lccdQ9rrjSSZox++vhD6FTfc6WvJyIarKb5lSOqA0c7W2UMw0yszOx VBGvJsmXqNAoQrZQAWkEA/Z/HUJ+D0qsfgRsL8/B2ApiYRhstf5Eapu7V2mJFM5EnA M82cFU/4tT8yA== From: AngeloGioacchino Del Regno To: robh+dt@kernel.org Cc: krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, chun-jie.chen@mediatek.com, weiyi.lu@mediatek.com, mbrugger@suse.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, nfraprado@collabora.com Subject: [PATCH 1/3] dt-bindings: power: mediatek: Document phandle to SCPSYS syscon node Date: Mon, 11 Jul 2022 14:25:01 +0200 Message-Id: <20220711122503.286743-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220711122503.286743-1-angelogioacchino.delregno@collabora.com> References: <20220711122503.286743-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220711_052512_720089_E6E2B053 X-CRM114-Status: UNSURE ( 8.80 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a phandle to the syscon block providing access to SCPSYS registers: this allows us to avoid using simple-mfd for the SCPSYS node and nesting the System Power Manager node inside. Signed-off-by: AngeloGioacchino Del Regno --- .../devicetree/bindings/power/mediatek,power-controller.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml b/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml index 135c6f722091..848fdff7c9d8 100644 --- a/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml +++ b/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml @@ -39,6 +39,11 @@ properties: '#size-cells': const: 0 + syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the syscon block providing access to SCPSYS registers + patternProperties: "^power-domain@[0-9a-f]+$": type: object From patchwork Mon Jul 11 12:25:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12913450 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F1963C43334 for ; Mon, 11 Jul 2022 12:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gaCdOnqt6ei+lKijxt8T8grerax9ke2omR3+zzwVHcU=; b=K9JRIRkCT/13Vm +HhMU3VuGLVUXrWiY4W+az8gmJbZdrepQO4pyT6cDj5axYKsFSwGWilMxYNj4Z+p89KSdkUk1TyMs RtzuHUbWUm8ZYkbPJiIrcIHc/y/9mpzzD+4BFMuQujj7dcX9Q9CpxXJDxyLzChPPrBmR6RWRy2wEl ZE1nwqjSI4yaccfeu9bTdnzPI40CTl2B9XXBFEkqnQhhNWJtxaFROsGo0/WR8KSBrM2BVSUNsZrCW 5/gkByO4Ix7khRUWBgukzDXo/t9OgwxcMZ1ZHZc/bIYXblamaq9aGqAOeqCIXEBB4SGJvn8WLbE+F +d9Vq8ejeAzx6MZmOQ8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsTd-001OAh-6M; Mon, 11 Jul 2022 12:25:25 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsTP-001O34-OK; Mon, 11 Jul 2022 12:25:15 +0000 Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id ADF4366019FE; Mon, 11 Jul 2022 13:25:08 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1657542309; bh=WNj+Fngrs3bQ3s4zywv4THTLiM1Sc7weFg7rQrZYyA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ceyCqKo7TRKXqpMJLLjVVVxkeX7NFgcmBVwiHVgHiBdWcrBW4wXbasuam2Zv3o1Gq Etiy5WNb/pI0J2BHtC9mAvQo/cSHGBdpmV3t6zR4UELoDyyo5Bn4GKVzCHcAD2u+V0 6w2dBWmD8VEM6WdDolQBqFiGgmxPIgUNiNPoTA6VkkCdI6TZbi5JviazImVZ7JCX7G IeOY9F692AZPeAhqbSGzEuzgeP185qP1hdaDmgaegDAN8MZ5M8j5MiwA/++YH6jDVy UxEj155zUjI9vKvxhe4Hw37V5WBTOUIr/ZzPvNsNkibx5JYwHb3EjpzZnIgW7HOkXU e5Fgt1Cg8qqQg== From: AngeloGioacchino Del Regno To: robh+dt@kernel.org Cc: krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, chun-jie.chen@mediatek.com, weiyi.lu@mediatek.com, mbrugger@suse.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, nfraprado@collabora.com Subject: [PATCH 2/3] dt-bindings: power: mediatek: Update example to use phandle to syscon Date: Mon, 11 Jul 2022 14:25:02 +0200 Message-Id: <20220711122503.286743-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220711122503.286743-1-angelogioacchino.delregno@collabora.com> References: <20220711122503.286743-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220711_052512_085935_C030FEE1 X-CRM114-Status: GOOD ( 10.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The preferred way of declaring this node is by using a phandle to syscon: update the example to reflect that. Signed-off-by: AngeloGioacchino Del Regno --- .../power/mediatek,power-controller.yaml | 125 +++++++++--------- 1 file changed, 63 insertions(+), 62 deletions(-) diff --git a/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml b/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml index 848fdff7c9d8..bed059e4401d 100644 --- a/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml +++ b/Documentation/devicetree/bindings/power/mediatek,power-controller.yaml @@ -237,76 +237,77 @@ examples: scpsys: syscon@10006000 { compatible = "syscon", "simple-mfd"; reg = <0 0x10006000 0 0x1000>; + }; + }; - spm: power-controller { - compatible = "mediatek,mt8173-power-controller"; + spm: power-controller { + compatible = "mediatek,mt8173-power-controller"; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <1>; + syscon = <&scpsys>; + + /* power domains of the SoC */ + power-domain@MT8173_POWER_DOMAIN_VDEC { + reg = ; + clocks = <&topckgen CLK_TOP_MM_SEL>; + clock-names = "mm"; + #power-domain-cells = <0>; + }; + power-domain@MT8173_POWER_DOMAIN_VENC { + reg = ; + clocks = <&topckgen CLK_TOP_MM_SEL>, + <&topckgen CLK_TOP_VENC_SEL>; + clock-names = "mm", "venc"; + #power-domain-cells = <0>; + }; + power-domain@MT8173_POWER_DOMAIN_ISP { + reg = ; + clocks = <&topckgen CLK_TOP_MM_SEL>; + clock-names = "mm"; + #power-domain-cells = <0>; + }; + power-domain@MT8173_POWER_DOMAIN_MM { + reg = ; + clocks = <&topckgen CLK_TOP_MM_SEL>; + clock-names = "mm"; + #power-domain-cells = <0>; + mediatek,infracfg = <&infracfg>; + }; + power-domain@MT8173_POWER_DOMAIN_VENC_LT { + reg = ; + clocks = <&topckgen CLK_TOP_MM_SEL>, + <&topckgen CLK_TOP_VENC_LT_SEL>; + clock-names = "mm", "venclt"; + #power-domain-cells = <0>; + }; + power-domain@MT8173_POWER_DOMAIN_AUDIO { + reg = ; + #power-domain-cells = <0>; + }; + power-domain@MT8173_POWER_DOMAIN_USB { + reg = ; + #power-domain-cells = <0>; + }; + power-domain@MT8173_POWER_DOMAIN_MFG_ASYNC { + reg = ; + clocks = <&clk26m>; + clock-names = "mfg"; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <1>; + + power-domain@MT8173_POWER_DOMAIN_MFG_2D { + reg = ; #address-cells = <1>; #size-cells = <0>; #power-domain-cells = <1>; - /* power domains of the SoC */ - power-domain@MT8173_POWER_DOMAIN_VDEC { - reg = ; - clocks = <&topckgen CLK_TOP_MM_SEL>; - clock-names = "mm"; - #power-domain-cells = <0>; - }; - power-domain@MT8173_POWER_DOMAIN_VENC { - reg = ; - clocks = <&topckgen CLK_TOP_MM_SEL>, - <&topckgen CLK_TOP_VENC_SEL>; - clock-names = "mm", "venc"; - #power-domain-cells = <0>; - }; - power-domain@MT8173_POWER_DOMAIN_ISP { - reg = ; - clocks = <&topckgen CLK_TOP_MM_SEL>; - clock-names = "mm"; - #power-domain-cells = <0>; - }; - power-domain@MT8173_POWER_DOMAIN_MM { - reg = ; - clocks = <&topckgen CLK_TOP_MM_SEL>; - clock-names = "mm"; + power-domain@MT8173_POWER_DOMAIN_MFG { + reg = ; #power-domain-cells = <0>; mediatek,infracfg = <&infracfg>; }; - power-domain@MT8173_POWER_DOMAIN_VENC_LT { - reg = ; - clocks = <&topckgen CLK_TOP_MM_SEL>, - <&topckgen CLK_TOP_VENC_LT_SEL>; - clock-names = "mm", "venclt"; - #power-domain-cells = <0>; - }; - power-domain@MT8173_POWER_DOMAIN_AUDIO { - reg = ; - #power-domain-cells = <0>; - }; - power-domain@MT8173_POWER_DOMAIN_USB { - reg = ; - #power-domain-cells = <0>; - }; - power-domain@MT8173_POWER_DOMAIN_MFG_ASYNC { - reg = ; - clocks = <&clk26m>; - clock-names = "mfg"; - #address-cells = <1>; - #size-cells = <0>; - #power-domain-cells = <1>; - - power-domain@MT8173_POWER_DOMAIN_MFG_2D { - reg = ; - #address-cells = <1>; - #size-cells = <0>; - #power-domain-cells = <1>; - - power-domain@MT8173_POWER_DOMAIN_MFG { - reg = ; - #power-domain-cells = <0>; - mediatek,infracfg = <&infracfg>; - }; - }; - }; }; }; }; From patchwork Mon Jul 11 12:25:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12913453 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B55D8C43334 for ; Mon, 11 Jul 2022 12:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ebps0I41iAAhmrLgBgieUDv2xgH56LC3jGI488s+Yzg=; b=Vtr0YHeVApchBG PlSFYaoP7EP5f8c4GNPKpiFn4FYpRYH5kxzOjWFwxvvs1ifXQV9AaQsfDq5xp2wdWQcMK3DH7NTO6 7lHvgpXJZ+QUfuzacoRByoCrgRLeb/z/3udwvUnRcuBpNWWpl+2bGBKZKaZJzsh11pUOlRp5UEg3r fCQQwx938iFwkE/nP8zjxlab1YdK/rVAa2IaqrZb2g2Abe63htKlIRyLToiE+acPRkgqKybzbvxk5 h59Hv9Wk0CHs4Hv2KogXAw8RDKj2uqA+t8WkrAqBo9QT6UmRmSmZGDHKJqC3fj1ETvutQIe0iMliu LScV+iw+uFs8ngVrZtIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsTw-001OKO-Jk; Mon, 11 Jul 2022 12:25:44 +0000 Received: from madras.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e5ab]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAsTQ-001O3C-H0; Mon, 11 Jul 2022 12:25:16 +0000 Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 7589D6601A00; Mon, 11 Jul 2022 13:25:09 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1657542310; bh=exs3pbqQsoOqcfyKmAZDPS7dHDfSgn805ug/IQkbTTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J7Blw7mb+6iWeJXSpyTg5gsPCpZ/oX4nhA4AdPgZAyw+awSwz0ET4Ll4cPtJZpDIo Lv7oKYFzUH9IE4ju3x8FOMqVXoObiVHatljFjJZSRxl0NZjq7iQ1kU/TIyUXL90cNG HbzlewoWSCRBGTtqLlCAs+ysD0f8333Le6a97nMuvgIAaCL2zIW47oy9pqY+qH5e4L G8gg4OhCdmOvX1pcHsNcio6NEAvfX825BxFN2oGVuPnpJfcpzvbPUVU0NlzrE2UQtE Hk5elY06tC9y5w1tHfhrmLTcgojqTvqjre6uMuKKkmFPNgmrV+O06LApMeR+48V9nT 50JUVuRTaPIIw== From: AngeloGioacchino Del Regno To: robh+dt@kernel.org Cc: krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, chun-jie.chen@mediatek.com, weiyi.lu@mediatek.com, mbrugger@suse.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, nfraprado@collabora.com Subject: [PATCH 3/3] soc: mediatek: pm-domains: Grab SCPSYS registers from phandle to syscon Date: Mon, 11 Jul 2022 14:25:03 +0200 Message-Id: <20220711122503.286743-4-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220711122503.286743-1-angelogioacchino.delregno@collabora.com> References: <20220711122503.286743-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220711_052512_727595_255C79B9 X-CRM114-Status: GOOD ( 12.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Instead of requiring nesting of the power-controller inside of a "syscon", "simple-mfd" node, look for a phandle to SCPSYS in the "syscon" property of the power controller node. Compatibility with older devicetrees is retained by falling back to looking for a parent node if no syscon phandle is found. Signed-off-by: AngeloGioacchino Del Regno --- drivers/soc/mediatek/mtk-pm-domains.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c index a3dae391a38a..c5a1c766cd50 100644 --- a/drivers/soc/mediatek/mtk-pm-domains.c +++ b/drivers/soc/mediatek/mtk-pm-domains.c @@ -590,8 +590,7 @@ static int scpsys_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; const struct scpsys_soc_data *soc; - struct device_node *node; - struct device *parent; + struct device_node *node, *syscon; struct scpsys *scpsys; int ret; @@ -611,13 +610,16 @@ static int scpsys_probe(struct platform_device *pdev) scpsys->pd_data.domains = scpsys->domains; scpsys->pd_data.num_domains = soc->num_domains; - parent = dev->parent; - if (!parent) { - dev_err(dev, "no parent for syscon devices\n"); - return -ENODEV; + syscon = of_parse_phandle(dev->of_node, "syscon", 0); + if (!syscon) { + if (!dev->parent) + return -ENODEV; + scpsys->base = syscon_node_to_regmap(dev->parent->of_node); + } else { + scpsys->base = syscon_node_to_regmap(syscon); + of_node_put(syscon); } - scpsys->base = syscon_node_to_regmap(parent->of_node); if (IS_ERR(scpsys->base)) { dev_err(dev, "no regmap available\n"); return PTR_ERR(scpsys->base);