From patchwork Fri Nov 16 12:54:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 10686331 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90D9614D6 for ; Fri, 16 Nov 2018 13:06:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78C6A2CD36 for ; Fri, 16 Nov 2018 13:06:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 683912CE23; Fri, 16 Nov 2018 13:06:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5E84C2CD36 for ; Fri, 16 Nov 2018 13:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=f+gv/PIzZuhqrpfShhWkJNS+oCcawvGKvC2mm9I5r1o=; b=lwuQBmk6+QYMeg p5Rm4KHvpxUFP+iI44FDm+wQMGXaPNkfO876Y/D1jvtkp9AXUjhmCUxkwHVs2ORosCg8ONHVc3wND v/2l0urwYyy97bXoMZNYvgFc7JXvT5roWcvywX9YN/UZkbjkWRO6gccMlpLLh5SVzeoE2ibLK6wQ1 M98AF+edixOrDBG7f14geSyvELpA7HcUFOzt7afAwH/KHWpLeNFdd+NehpshjtAoG4W7FTmbGTy3I mDvjQm5m3MSGsnkfRGZ98gM3O7xtZrfXrSPc5K5uzcJkE0yeNmVaI2KFI2iL7Y+A8vDMYI7+xNSny gxL0XJ7MFJCApPfEeJjQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNdpO-0003HS-4A; Fri, 16 Nov 2018 13:06:30 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNdpN-0002zS-2b; Fri, 16 Nov 2018 13:06:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5rssFNyHCYcv+p3Q1nGB+ax0OfRhamK1WIzkq8SjIYc=; b=WKWO+YzFAn1VO4Lc0KsaWNhAXq FZJxWem8QIlvVu5ttXap2dNBfDGZ/CAVSPolm/zhAKqu/KF7EfiAuBNQGxcn/xwLda5qz7xCmF9el RQV/H3xcnLglACl6WK6dEUg5V/Shz+wM/nXqiPbSNlbYHDyUluZtfNGfLCyKuov7aIHuWJypEsUu9 LmiP2yZvMk3R12VeSBDT4xghxhKp7DkkiYLd0uLu0Pbbt+p1vT+BMFwTGLGV0j7ASCycAq3xPcGs+ fXt1gIz/oh8RBs2Rf0xu6JYfi/np//IZ8SzwgoXfAjMRuiM5rQVoMBVdkOKTMyue7n3dvsHHo+Ono 12+uY1mQ==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNdfi-0002Ed-AC; Fri, 16 Nov 2018 12:56:31 +0000 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 4A35E2251C; Fri, 16 Nov 2018 12:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542372979; bh=d2YNHJQkRM6b3oaOr9H1mN3fDwnnlCcgnMLMxrEcyyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cEETgNewVlKfK4+9X5V+MXYsS4cnuCdlJWX1dx6UgbMN7spTQoF9LWZfPxi1fzl47 PC22/86FcQfHJIs2QuQnT/ndA+qho5lNGYZ67f6eBClRpGgHBUffY7xZCNoVsmmWmE Bmtm7RbOMaqKgryTGWNGMbUizoP2hlYJUGoOpZs0= 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 Subject: [PATCH v5 12/12] clk: mediatek: mt6797: Probe with new compatible Date: Fri, 16 Nov 2018 13:54:49 +0100 Message-Id: <20181116125449.23581-13-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181116_125630_598171_F7309EF0 X-CRM114-Status: GOOD ( 14.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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-mt6797-mm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt6797-mm.c b/drivers/clk/mediatek/clk-mt6797-mm.c index c57d3eed270d..051bab99d10f 100644 --- a/drivers/clk/mediatek/clk-mt6797-mm.c +++ b/drivers/clk/mediatek/clk-mt6797-mm.c @@ -101,7 +101,7 @@ static const struct mtk_gate mm_clks[] = { }; static const struct of_device_id of_match_clk_mt6797_mm[] = { - { .compatible = "mediatek,mt6797-mmsys", }, + { .compatible = "mediatek,mt6797-mmsys-clk", }, {} }; @@ -109,14 +109,15 @@ static int clk_mt6797_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); - 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) dev_err(&pdev->dev, "could not register clock provider: %s: %d\n",