From: Samuel Holland <samuel@sholland.org>
To: Maxime Ripard <maxime@cerno.tech>
Cc: Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@siol.net>,
Rob Herring <robh+dt@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Andre Przywara <andre.przywara@arm.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Subject: Re: [PATCH 1/4] clk: sunxi-ng: h6-r: Add R_APB2_RSB clock and reset
Date: Mon, 14 Dec 2020 21:25:40 -0600 [thread overview]
Message-ID: <8de2e0dc-465f-b4a8-bec9-763f1dee06f1@sholland.org> (raw)
In-Reply-To: <20201214145730.iz3tc4nasqwq6tym@gilmour>
On 12/14/20 8:57 AM, Maxime Ripard wrote:
> Hi Samuel,
>
> On Sun, Dec 13, 2020 at 05:55:03PM -0600, Samuel Holland wrote:
>> While no information about the H6 RSB controller is included in the
>> datasheet or manual, the vendor BSP and power management blob both
>> reference the RSB clock parent and register address. These values were
>> verified by experimentation.
>>
>> Since this clock/reset are added late, the specifier is added at the end
>> to maintain the existing DT binding. The code is kept in register order.
>>
>> Signed-off-by: Samuel Holland <samuel@sholland.org>
>> ---
>> drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 5 +++++
>> drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 2 +-
>> include/dt-bindings/clock/sun50i-h6-r-ccu.h | 1 +
>> include/dt-bindings/reset/sun50i-h6-r-ccu.h | 1 +
>> 4 files changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c
>> index 50f8d1bc7046..56e351b513f3 100644
>> --- a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c
>> +++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c
>> @@ -91,6 +91,8 @@ static SUNXI_CCU_GATE(r_apb2_uart_clk, "r-apb2-uart", "r-apb2",
>> 0x18c, BIT(0), 0);
>> static SUNXI_CCU_GATE(r_apb2_i2c_clk, "r-apb2-i2c", "r-apb2",
>> 0x19c, BIT(0), 0);
>> +static SUNXI_CCU_GATE(r_apb2_rsb_clk, "r-apb2-rsb", "r-apb2",
>> + 0x1bc, BIT(0), 0);
>> static SUNXI_CCU_GATE(r_apb1_ir_clk, "r-apb1-ir", "r-apb1",
>> 0x1cc, BIT(0), 0);
>> static SUNXI_CCU_GATE(r_apb1_w1_clk, "r-apb1-w1", "r-apb1",
>> @@ -130,6 +132,7 @@ static struct ccu_common *sun50i_h6_r_ccu_clks[] = {
>> &r_apb1_pwm_clk.common,
>> &r_apb2_uart_clk.common,
>> &r_apb2_i2c_clk.common,
>> + &r_apb2_rsb_clk.common,
>> &r_apb1_ir_clk.common,
>> &r_apb1_w1_clk.common,
>> &ir_clk.common,
>> @@ -147,6 +150,7 @@ static struct clk_hw_onecell_data sun50i_h6_r_hw_clks = {
>> [CLK_R_APB1_PWM] = &r_apb1_pwm_clk.common.hw,
>> [CLK_R_APB2_UART] = &r_apb2_uart_clk.common.hw,
>> [CLK_R_APB2_I2C] = &r_apb2_i2c_clk.common.hw,
>> + [CLK_R_APB2_RSB] = &r_apb2_rsb_clk.common.hw,
>> [CLK_R_APB1_IR] = &r_apb1_ir_clk.common.hw,
>> [CLK_R_APB1_W1] = &r_apb1_w1_clk.common.hw,
>> [CLK_IR] = &ir_clk.common.hw,
>> @@ -161,6 +165,7 @@ static struct ccu_reset_map sun50i_h6_r_ccu_resets[] = {
>> [RST_R_APB1_PWM] = { 0x13c, BIT(16) },
>> [RST_R_APB2_UART] = { 0x18c, BIT(16) },
>> [RST_R_APB2_I2C] = { 0x19c, BIT(16) },
>> + [RST_R_APB2_RSB] = { 0x1bc, BIT(16) },
>> [RST_R_APB1_IR] = { 0x1cc, BIT(16) },
>> [RST_R_APB1_W1] = { 0x1ec, BIT(16) },
>> };
>> diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h
>> index 782117dc0b28..7e290b840803 100644
>> --- a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h
>> +++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h
>> @@ -14,6 +14,6 @@
>>
>> #define CLK_R_APB2 3
>>
>> -#define CLK_NUMBER (CLK_W1 + 1)
>> +#define CLK_NUMBER (CLK_R_APB2_RSB + 1)
>>
>> #endif /* _CCU_SUN50I_H6_R_H */
>> diff --git a/include/dt-bindings/clock/sun50i-h6-r-ccu.h b/include/dt-bindings/clock/sun50i-h6-r-ccu.h
>> index 76136132a13e..f46ec03848ca 100644
>> --- a/include/dt-bindings/clock/sun50i-h6-r-ccu.h
>> +++ b/include/dt-bindings/clock/sun50i-h6-r-ccu.h
>> @@ -15,6 +15,7 @@
>> #define CLK_R_APB1_PWM 6
>> #define CLK_R_APB2_UART 7
>> #define CLK_R_APB2_I2C 8
>> +#define CLK_R_APB2_RSB 13
>> #define CLK_R_APB1_IR 9
>> #define CLK_R_APB1_W1 10
>>
>> diff --git a/include/dt-bindings/reset/sun50i-h6-r-ccu.h b/include/dt-bindings/reset/sun50i-h6-r-ccu.h
>> index 01c84dba49a4..6fe199a7969d 100644
>> --- a/include/dt-bindings/reset/sun50i-h6-r-ccu.h
>> +++ b/include/dt-bindings/reset/sun50i-h6-r-ccu.h
>> @@ -11,6 +11,7 @@
>> #define RST_R_APB1_PWM 2
>> #define RST_R_APB2_UART 3
>> #define RST_R_APB2_I2C 4
>> +#define RST_R_APB2_RSB 7
>> #define RST_R_APB1_IR 5
>> #define RST_R_APB1_W1 6
>
> I think for the clock and reset binding, we'll want to sort by number.
> It's fairly easy to miss otherwise and if we end up adding another one
> it wouldn't be far fetched to assume the same indices would be used
I think GCC would complain about the duplicate array initialization in
the driver, but I can move them for v2.
Cheers,
Samuel
next prev parent reply other threads:[~2020-12-15 3:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-13 23:55 [PATCH 0/4] Allwinner H6 RSB support Samuel Holland
2020-12-13 23:55 ` [PATCH 1/4] clk: sunxi-ng: h6-r: Add R_APB2_RSB clock and reset Samuel Holland
2020-12-14 14:57 ` Maxime Ripard
2020-12-15 3:25 ` Samuel Holland [this message]
2020-12-15 11:29 ` André Przywara
2020-12-13 23:55 ` [PATCH 2/4] pinctrl: sunxi: h6-r: Add s_rsb pin functions Samuel Holland
2020-12-13 23:55 ` [PATCH 3/4] arm64: dts: allwinner: h6: Add RSB controller node Samuel Holland
2020-12-13 23:55 ` [PATCH 4/4] arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection Samuel Holland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8de2e0dc-465f-b4a8-bec9-763f1dee06f1@sholland.org \
--to=samuel@sholland.org \
--cc=andre.przywara@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=jernej.skrabec@siol.net \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime@cerno.tech \
--cc=mturquette@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).