From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6486C43441 for ; Fri, 16 Nov 2018 12:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A68C02089D for ; Fri, 16 Nov 2018 12:56:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="tlfdTNQq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A68C02089D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-clk-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389805AbeKPXIc (ORCPT ); Fri, 16 Nov 2018 18:08:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:34374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727965AbeKPXIc (ORCPT ); Fri, 16 Nov 2018 18:08:32 -0500 Received: from ziggy.de (unknown [93.176.133.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0865E2251A; Fri, 16 Nov 2018 12:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542372974; bh=gYBMPs+aWjCk9+M58PG/AGP67bFb09qfWcas6aeoHyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tlfdTNQqWN8ogdL86XGWjwb9FD0K+2kb1GwoqilDXqNl3f+xJNaQbCEshsbnHKd58 mZcmysEBbsuTMFzsyNP6QTFPbT/GwHzgyBKbKLWS/6Rfgh9zYqhScJ6BoC61rWWsAR eFYE5ULlnNdoCmnQ5rL7u4ZXSvGool9ZmR9xYpeU= From: matthias.bgg@kernel.org To: robh+dt@kernel.org, mark.rutland@arm.com, ck.hu@mediatek.com, p.zabel@pengutronix.de, airlied@linux.ie, mturquette@baylibre.com, sboyd@codeaurora.org, ulrich.hecht+renesas@gmail.com, laurent.pinchart@ideasonboard.com, matthias.bgg@gmail.com Cc: sean.wang@mediatek.com, sean.wang@kernel.org, rdunlap@infradead.org, wens@csie.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, Matthias Brugger Subject: [PATCH v5 11/12] clk: mediatek: mt2712e: Probe with new compatible Date: Fri, 16 Nov 2018 13:54:48 +0100 Message-Id: <20181116125449.23581-12-matthias.bgg@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181116125449.23581-1-matthias.bgg@kernel.org> References: <20181116125449.23581-1-matthias.bgg@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Matthias Brugger The clock node is now a child of the mmsys node. Update the driver to support this and thenew compatible in the driver. Signed-off-by: Matthias Brugger --- drivers/clk/mediatek/clk-mt2712-mm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt2712-mm.c b/drivers/clk/mediatek/clk-mt2712-mm.c index a8b4b6d42488..5f4ee8f0deaa 100644 --- a/drivers/clk/mediatek/clk-mt2712-mm.c +++ b/drivers/clk/mediatek/clk-mt2712-mm.c @@ -138,14 +138,15 @@ static int clk_mt2712_mm_probe(struct platform_device *pdev) { struct clk_onecell_data *clk_data; int r; - struct device_node *node = pdev->dev.of_node; + struct device parent = pdev->dev.parent; clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK); - mtk_clk_register_gates(node, mm_clks, ARRAY_SIZE(mm_clks), + mtk_clk_register_gates(parent->of_node, mm_clks, ARRAY_SIZE(mm_clks), clk_data); - r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); + r = of_clk_add_provider(parent->of_node, of_clk_src_onecell_get, + clk_data); if (r != 0) pr_err("%s(): could not register clock provider: %d\n", @@ -155,7 +156,7 @@ static int clk_mt2712_mm_probe(struct platform_device *pdev) } static const struct of_device_id of_match_clk_mt2712_mm[] = { - { .compatible = "mediatek,mt2712-mmsys", }, + { .compatible = "mediatek,mt2712-mmsys-clk", }, {} }; -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: matthias.bgg@kernel.org Subject: [PATCH v5 11/12] clk: mediatek: mt2712e: Probe with new compatible Date: Fri, 16 Nov 2018 13:54:48 +0100 Message-ID: <20181116125449.23581-12-matthias.bgg@kernel.org> References: <20181116125449.23581-1-matthias.bgg@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181116125449.23581-1-matthias.bgg@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: robh+dt@kernel.org, mark.rutland@arm.com, ck.hu@mediatek.com, p.zabel@pengutronix.de, airlied@linux.ie, mturquette@baylibre.com, sboyd@codeaurora.org, ulrich.hecht+renesas@gmail.com, laurent.pinchart@ideasonboard.com, matthias.bgg@gmail.com Cc: devicetree@vger.kernel.org, rdunlap@infradead.org, sean.wang@mediatek.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, sean.wang@kernel.org, wens@csie.org, Matthias Brugger , linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org RnJvbTogTWF0dGhpYXMgQnJ1Z2dlciA8bWJydWdnZXJAc3VzZS5jb20+CgpUaGUgY2xvY2sgbm9k ZSBpcyBub3cgYSBjaGlsZCBvZiB0aGUgbW1zeXMgbm9kZS4KVXBkYXRlIHRoZSBkcml2ZXIgdG8g c3VwcG9ydCB0aGlzIGFuZCB0aGVuZXcgY29tcGF0aWJsZQppbiB0aGUgZHJpdmVyLgoKU2lnbmVk LW9mZi1ieTogTWF0dGhpYXMgQnJ1Z2dlciA8bWJydWdnZXJAc3VzZS5jb20+Ci0tLQogZHJpdmVy cy9jbGsvbWVkaWF0ZWsvY2xrLW10MjcxMi1tbS5jIHwgOSArKysrKy0tLS0KIDEgZmlsZSBjaGFu Z2VkLCA1IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9jbGsvbWVkaWF0ZWsvY2xrLW10MjcxMi1tbS5jIGIvZHJpdmVycy9jbGsvbWVkaWF0ZWsvY2xr LW10MjcxMi1tbS5jCmluZGV4IGE4YjRiNmQ0MjQ4OC4uNWY0ZWU4ZjBkZWFhIDEwMDY0NAotLS0g YS9kcml2ZXJzL2Nsay9tZWRpYXRlay9jbGstbXQyNzEyLW1tLmMKKysrIGIvZHJpdmVycy9jbGsv bWVkaWF0ZWsvY2xrLW10MjcxMi1tbS5jCkBAIC0xMzgsMTQgKzEzOCwxNSBAQCBzdGF0aWMgaW50 IGNsa19tdDI3MTJfbW1fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIHsKIAlz dHJ1Y3QgY2xrX29uZWNlbGxfZGF0YSAqY2xrX2RhdGE7CiAJaW50IHI7Ci0Jc3RydWN0IGRldmlj ZV9ub2RlICpub2RlID0gcGRldi0+ZGV2Lm9mX25vZGU7CisJc3RydWN0IGRldmljZQlwYXJlbnQg PSBwZGV2LT5kZXYucGFyZW50OwogCiAJY2xrX2RhdGEgPSBtdGtfYWxsb2NfY2xrX2RhdGEoQ0xL X01NX05SX0NMSyk7CiAKLQltdGtfY2xrX3JlZ2lzdGVyX2dhdGVzKG5vZGUsIG1tX2Nsa3MsIEFS UkFZX1NJWkUobW1fY2xrcyksCisJbXRrX2Nsa19yZWdpc3Rlcl9nYXRlcyhwYXJlbnQtPm9mX25v ZGUsIG1tX2Nsa3MsIEFSUkFZX1NJWkUobW1fY2xrcyksCiAJCQljbGtfZGF0YSk7CiAKLQlyID0g b2ZfY2xrX2FkZF9wcm92aWRlcihub2RlLCBvZl9jbGtfc3JjX29uZWNlbGxfZ2V0LCBjbGtfZGF0 YSk7CisJciA9IG9mX2Nsa19hZGRfcHJvdmlkZXIocGFyZW50LT5vZl9ub2RlLCBvZl9jbGtfc3Jj X29uZWNlbGxfZ2V0LAorCQkJY2xrX2RhdGEpOwogCiAJaWYgKHIgIT0gMCkKIAkJcHJfZXJyKCIl cygpOiBjb3VsZCBub3QgcmVnaXN0ZXIgY2xvY2sgcHJvdmlkZXI6ICVkXG4iLApAQCAtMTU1LDcg KzE1Niw3IEBAIHN0YXRpYyBpbnQgY2xrX210MjcxMl9tbV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICpwZGV2KQogfQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9pZCBvZl9t YXRjaF9jbGtfbXQyNzEyX21tW10gPSB7Ci0JeyAuY29tcGF0aWJsZSA9ICJtZWRpYXRlayxtdDI3 MTItbW1zeXMiLCB9LAorCXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQyNzEyLW1tc3lzLWNs ayIsIH0sCiAJe30KIH07CiAKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: matthias.bgg@kernel.org (matthias.bgg at kernel.org) Date: Fri, 16 Nov 2018 13:54:48 +0100 Subject: [PATCH v5 11/12] clk: mediatek: mt2712e: Probe with new compatible In-Reply-To: <20181116125449.23581-1-matthias.bgg@kernel.org> References: <20181116125449.23581-1-matthias.bgg@kernel.org> Message-ID: <20181116125449.23581-12-matthias.bgg@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Matthias Brugger The clock node is now a child of the mmsys node. Update the driver to support this and thenew compatible in the driver. Signed-off-by: Matthias Brugger --- drivers/clk/mediatek/clk-mt2712-mm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt2712-mm.c b/drivers/clk/mediatek/clk-mt2712-mm.c index a8b4b6d42488..5f4ee8f0deaa 100644 --- a/drivers/clk/mediatek/clk-mt2712-mm.c +++ b/drivers/clk/mediatek/clk-mt2712-mm.c @@ -138,14 +138,15 @@ static int clk_mt2712_mm_probe(struct platform_device *pdev) { struct clk_onecell_data *clk_data; int r; - struct device_node *node = pdev->dev.of_node; + struct device parent = pdev->dev.parent; clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK); - mtk_clk_register_gates(node, mm_clks, ARRAY_SIZE(mm_clks), + mtk_clk_register_gates(parent->of_node, mm_clks, ARRAY_SIZE(mm_clks), clk_data); - r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); + r = of_clk_add_provider(parent->of_node, of_clk_src_onecell_get, + clk_data); if (r != 0) pr_err("%s(): could not register clock provider: %d\n", @@ -155,7 +156,7 @@ static int clk_mt2712_mm_probe(struct platform_device *pdev) } static const struct of_device_id of_match_clk_mt2712_mm[] = { - { .compatible = "mediatek,mt2712-mmsys", }, + { .compatible = "mediatek,mt2712-mmsys-clk", }, {} }; -- 2.19.1