Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp880792pxu; Wed, 2 Dec 2020 05:57:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzblA+IQdV6Km/3nXRN+T+yfLakhxfccBwzo4PZM1sp6QC2Pws/qgi6tv/vnzZO+emQkFbH X-Received: by 2002:a05:6402:1701:: with SMTP id y1mr2657290edu.209.1606917472157; Wed, 02 Dec 2020 05:57:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606917472; cv=none; d=google.com; s=arc-20160816; b=lFjT4FuKTJem8NhqK/EZeQ3MPCdRJzaos0a8MSapKa8ZtzJx/GDzlj9m8baPTV1brH Qgd074WfvzRZTtOmfV+TQkiR0/WQAy40j4NQhbK4hB67m8d9HMBCCN8+OzMbPr70bB3a nf1vhOeMLLsrSRzG2Uy8pnGNG7vYDXVO6BJpgkmCwdrhC7UUN8ntPD5AWAssz6V3dBk0 bWxeVeWt6vaH087LVa+/Xvv8jcKIuhhkEbqDxvJTEvXYgCe23UI567CBKRir3kwsS9Uu vBr+ZzVWdD6JYJf3eNc6hr4wgFTMpbDn8pspqDuTRYnJO6HTxJZo2SH+k3F9xT7Wik60 lFHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=jx25SWDZaTaS/NTqtDGvh0hevwYsx6EKVQLgQFt7QbM=; b=a1TnEou4m++DB0u1CN8takEhcHQ+QmWUsSlhLLW6cKBN89Cn0Rp7K57zgX02BoCoBG wIsBaJzrBHn+YEBR7iOVVuA7WogQ25m3TG74X0Eq215BfxJUxav5x+HqVjkdcyh+E84o ao/eRYaHznTOn3S8jD+Pcl5fHNCu+xffgRW0p8v+JWWJ6jXyGRObUG5jnkdgD3yqdwuM R+atX7KOAVx+D3klDLClFsmnqjk732RsKbzKMpa3K/nwyLIofutiYKjVU+/pPW3kGzvh T0F3uBjzw/TviDbYUIXdgpUOHfB3CUhdSba7RxhukrUVgqL+A1pm2U7SXx+EX0/6J7Sx fHlA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k7si856554ejg.677.2020.12.02.05.57.28; Wed, 02 Dec 2020 05:57:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388872AbgLBNzc (ORCPT + 99 others); Wed, 2 Dec 2020 08:55:32 -0500 Received: from foss.arm.com ([217.140.110.172]:40344 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388862AbgLBNzb (ORCPT ); Wed, 2 Dec 2020 08:55:31 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2745812FC; Wed, 2 Dec 2020 05:54:45 -0800 (PST) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 274273F718; Wed, 2 Dec 2020 05:54:43 -0800 (PST) From: Andre Przywara To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec Cc: Icenowy Zheng , linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com, Linus Walleij , Rob Herring , Yangtao Li , linux-kernel@vger.kernel.org, Michael Turquette , Stephen Boyd , Philipp Zabel , linux-clk@vger.kernel.org, Andre Przywara Subject: [PATCH 4/8] clk: sunxi-ng: Add support for the Allwinner H616 R-CCU Date: Wed, 2 Dec 2020 13:54:05 +0000 Message-Id: <20201202135409.13683-5-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20201202135409.13683-1-andre.przywara@arm.com> References: <20201202135409.13683-1-andre.przywara@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The clocks itself are identical to the H6 R-CCU, it's just that the H616 has not all of them implemented (or connected). Signed-off-by: Andre Przywara --- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 47 +++++++++++++++++++++++++- drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 3 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c index 50f8d1bc7046..119d1797f501 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c +++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c @@ -136,6 +136,15 @@ static struct ccu_common *sun50i_h6_r_ccu_clks[] = { &w1_clk.common, }; +static struct ccu_common *sun50i_h616_r_ccu_clks[] = { + &r_apb1_clk.common, + &r_apb2_clk.common, + &r_apb1_twd_clk.common, + &r_apb2_i2c_clk.common, + &r_apb1_ir_clk.common, + &ir_clk.common, +}; + static struct clk_hw_onecell_data sun50i_h6_r_hw_clks = { .hws = { [CLK_AR100] = &ar100_clk.common.hw, @@ -152,7 +161,20 @@ static struct clk_hw_onecell_data sun50i_h6_r_hw_clks = { [CLK_IR] = &ir_clk.common.hw, [CLK_W1] = &w1_clk.common.hw, }, - .num = CLK_NUMBER, + .num = CLK_NUMBER_H616, +}; + +static struct clk_hw_onecell_data sun50i_h616_r_hw_clks = { + .hws = { + [CLK_R_AHB] = &r_ahb_clk.hw, + [CLK_R_APB1] = &r_apb1_clk.common.hw, + [CLK_R_APB2] = &r_apb2_clk.common.hw, + [CLK_R_APB1_TWD] = &r_apb1_twd_clk.common.hw, + [CLK_R_APB2_I2C] = &r_apb2_i2c_clk.common.hw, + [CLK_R_APB1_IR] = &r_apb1_ir_clk.common.hw, + [CLK_IR] = &ir_clk.common.hw, + }, + .num = CLK_NUMBER_H616, }; static struct ccu_reset_map sun50i_h6_r_ccu_resets[] = { @@ -165,6 +187,12 @@ static struct ccu_reset_map sun50i_h6_r_ccu_resets[] = { [RST_R_APB1_W1] = { 0x1ec, BIT(16) }, }; +static struct ccu_reset_map sun50i_h616_r_ccu_resets[] = { + [RST_R_APB1_TWD] = { 0x12c, BIT(16) }, + [RST_R_APB2_I2C] = { 0x19c, BIT(16) }, + [RST_R_APB1_IR] = { 0x1cc, BIT(16) }, +}; + static const struct sunxi_ccu_desc sun50i_h6_r_ccu_desc = { .ccu_clks = sun50i_h6_r_ccu_clks, .num_ccu_clks = ARRAY_SIZE(sun50i_h6_r_ccu_clks), @@ -175,6 +203,16 @@ static const struct sunxi_ccu_desc sun50i_h6_r_ccu_desc = { .num_resets = ARRAY_SIZE(sun50i_h6_r_ccu_resets), }; +static const struct sunxi_ccu_desc sun50i_h616_r_ccu_desc = { + .ccu_clks = sun50i_h616_r_ccu_clks, + .num_ccu_clks = ARRAY_SIZE(sun50i_h616_r_ccu_clks), + + .hw_clks = &sun50i_h616_r_hw_clks, + + .resets = sun50i_h616_r_ccu_resets, + .num_resets = ARRAY_SIZE(sun50i_h616_r_ccu_resets), +}; + static void __init sunxi_r_ccu_init(struct device_node *node, const struct sunxi_ccu_desc *desc) { @@ -195,3 +233,10 @@ static void __init sun50i_h6_r_ccu_setup(struct device_node *node) } CLK_OF_DECLARE(sun50i_h6_r_ccu, "allwinner,sun50i-h6-r-ccu", sun50i_h6_r_ccu_setup); + +static void __init sun50i_h616_r_ccu_setup(struct device_node *node) +{ + sunxi_r_ccu_init(node, &sun50i_h616_r_ccu_desc); +} +CLK_OF_DECLARE(sun50i_h616_r_ccu, "allwinner,sun50i-h616-r-ccu", + sun50i_h616_r_ccu_setup); diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h index 782117dc0b28..128302696ca1 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h +++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h @@ -14,6 +14,7 @@ #define CLK_R_APB2 3 -#define CLK_NUMBER (CLK_W1 + 1) +#define CLK_NUMBER_H6 (CLK_W1 + 1) +#define CLK_NUMBER_H616 (CLK_IR + 1) #endif /* _CCU_SUN50I_H6_R_H */ -- 2.17.5