From: Chen-Yu Tsai <wens@kernel.org> To: Maxime Ripard <maxime.ripard@bootlin.com>, Stephen Boyd <sboyd@kernel.org>, Michael Turquette <mturquette@baylibre.com> Cc: Chen-Yu Tsai <wens@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Chen-Yu Tsai <wens@csie.org> Subject: [PATCH v2 24/25] clk: sunxi-ng: a80-usb: Use local parent references for SUNXI_CCU_GATE Date: Tue, 11 Jun 2019 18:16:57 +0800 [thread overview] Message-ID: <20190611101658.23855-25-wens@kernel.org> (raw) In-Reply-To: <20190611101658.23855-1-wens@kernel.org> From: Chen-Yu Tsai <wens@csie.org> With the new clk parenting code and SUNXI_CCU_GATE macros, we can reference parents locally via pointers to struct clk_hw or DT clock-names. Convert existing SUNXI_CCU_GATE definitions to SUNXI_CCU_GATE_DATA to specify the parent clock. Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 32 +++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c b/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c index 1d76f24f7df3..23bc11e65539 100644 --- a/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c +++ b/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c @@ -22,18 +22,26 @@ #include "ccu-sun9i-a80-usb.h" -static SUNXI_CCU_GATE(bus_hci0_clk, "bus-hci0", "bus-usb", 0x0, BIT(1), 0); -static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc24M", 0x0, BIT(2), 0); -static SUNXI_CCU_GATE(bus_hci1_clk, "bus-hci1", "bus-usb", 0x0, BIT(3), 0); -static SUNXI_CCU_GATE(bus_hci2_clk, "bus-hci2", "bus-usb", 0x0, BIT(5), 0); -static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc24M", 0x0, BIT(6), 0); - -static SUNXI_CCU_GATE(usb0_phy_clk, "usb0-phy", "osc24M", 0x4, BIT(1), 0); -static SUNXI_CCU_GATE(usb1_hsic_clk, "usb1-hsic", "osc24M", 0x4, BIT(2), 0); -static SUNXI_CCU_GATE(usb1_phy_clk, "usb1-phy", "osc24M", 0x4, BIT(3), 0); -static SUNXI_CCU_GATE(usb2_hsic_clk, "usb2-hsic", "osc24M", 0x4, BIT(4), 0); -static SUNXI_CCU_GATE(usb2_phy_clk, "usb2-phy", "osc24M", 0x4, BIT(5), 0); -static SUNXI_CCU_GATE(usb_hsic_clk, "usb-hsic", "osc24M", 0x4, BIT(10), 0); +static const struct clk_parent_data clk_parent_hosc[] = { + { .fw_name = "hosc" }, +}; + +static const struct clk_parent_data clk_parent_bus[] = { + { .fw_name = "bus" }, +}; + +static SUNXI_CCU_GATE_DATA(bus_hci0_clk, "bus-hci0", clk_parent_bus, 0x0, BIT(1), 0); +static SUNXI_CCU_GATE_DATA(usb_ohci0_clk, "usb-ohci0", clk_parent_hosc, 0x0, BIT(2), 0); +static SUNXI_CCU_GATE_DATA(bus_hci1_clk, "bus-hci1", clk_parent_bus, 0x0, BIT(3), 0); +static SUNXI_CCU_GATE_DATA(bus_hci2_clk, "bus-hci2", clk_parent_bus, 0x0, BIT(5), 0); +static SUNXI_CCU_GATE_DATA(usb_ohci2_clk, "usb-ohci2", clk_parent_hosc, 0x0, BIT(6), 0); + +static SUNXI_CCU_GATE_DATA(usb0_phy_clk, "usb0-phy", clk_parent_hosc, 0x4, BIT(1), 0); +static SUNXI_CCU_GATE_DATA(usb1_hsic_clk, "usb1-hsic", clk_parent_hosc, 0x4, BIT(2), 0); +static SUNXI_CCU_GATE_DATA(usb1_phy_clk, "usb1-phy", clk_parent_hosc, 0x4, BIT(3), 0); +static SUNXI_CCU_GATE_DATA(usb2_hsic_clk, "usb2-hsic", clk_parent_hosc, 0x4, BIT(4), 0); +static SUNXI_CCU_GATE_DATA(usb2_phy_clk, "usb2-phy", clk_parent_hosc, 0x4, BIT(5), 0); +static SUNXI_CCU_GATE_DATA(usb_hsic_clk, "usb-hsic", clk_parent_hosc, 0x4, BIT(10), 0); static struct ccu_common *sun9i_a80_usb_clks[] = { &bus_hci0_clk.common, -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Chen-Yu Tsai <wens@kernel.org> To: Maxime Ripard <maxime.ripard@bootlin.com>, Stephen Boyd <sboyd@kernel.org>, Michael Turquette <mturquette@baylibre.com> Cc: Chen-Yu Tsai <wens@csie.org>, Chen-Yu Tsai <wens@kernel.org>, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 24/25] clk: sunxi-ng: a80-usb: Use local parent references for SUNXI_CCU_GATE Date: Tue, 11 Jun 2019 18:16:57 +0800 [thread overview] Message-ID: <20190611101658.23855-25-wens@kernel.org> (raw) In-Reply-To: <20190611101658.23855-1-wens@kernel.org> From: Chen-Yu Tsai <wens@csie.org> With the new clk parenting code and SUNXI_CCU_GATE macros, we can reference parents locally via pointers to struct clk_hw or DT clock-names. Convert existing SUNXI_CCU_GATE definitions to SUNXI_CCU_GATE_DATA to specify the parent clock. Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 32 +++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c b/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c index 1d76f24f7df3..23bc11e65539 100644 --- a/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c +++ b/drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c @@ -22,18 +22,26 @@ #include "ccu-sun9i-a80-usb.h" -static SUNXI_CCU_GATE(bus_hci0_clk, "bus-hci0", "bus-usb", 0x0, BIT(1), 0); -static SUNXI_CCU_GATE(usb_ohci0_clk, "usb-ohci0", "osc24M", 0x0, BIT(2), 0); -static SUNXI_CCU_GATE(bus_hci1_clk, "bus-hci1", "bus-usb", 0x0, BIT(3), 0); -static SUNXI_CCU_GATE(bus_hci2_clk, "bus-hci2", "bus-usb", 0x0, BIT(5), 0); -static SUNXI_CCU_GATE(usb_ohci2_clk, "usb-ohci2", "osc24M", 0x0, BIT(6), 0); - -static SUNXI_CCU_GATE(usb0_phy_clk, "usb0-phy", "osc24M", 0x4, BIT(1), 0); -static SUNXI_CCU_GATE(usb1_hsic_clk, "usb1-hsic", "osc24M", 0x4, BIT(2), 0); -static SUNXI_CCU_GATE(usb1_phy_clk, "usb1-phy", "osc24M", 0x4, BIT(3), 0); -static SUNXI_CCU_GATE(usb2_hsic_clk, "usb2-hsic", "osc24M", 0x4, BIT(4), 0); -static SUNXI_CCU_GATE(usb2_phy_clk, "usb2-phy", "osc24M", 0x4, BIT(5), 0); -static SUNXI_CCU_GATE(usb_hsic_clk, "usb-hsic", "osc24M", 0x4, BIT(10), 0); +static const struct clk_parent_data clk_parent_hosc[] = { + { .fw_name = "hosc" }, +}; + +static const struct clk_parent_data clk_parent_bus[] = { + { .fw_name = "bus" }, +}; + +static SUNXI_CCU_GATE_DATA(bus_hci0_clk, "bus-hci0", clk_parent_bus, 0x0, BIT(1), 0); +static SUNXI_CCU_GATE_DATA(usb_ohci0_clk, "usb-ohci0", clk_parent_hosc, 0x0, BIT(2), 0); +static SUNXI_CCU_GATE_DATA(bus_hci1_clk, "bus-hci1", clk_parent_bus, 0x0, BIT(3), 0); +static SUNXI_CCU_GATE_DATA(bus_hci2_clk, "bus-hci2", clk_parent_bus, 0x0, BIT(5), 0); +static SUNXI_CCU_GATE_DATA(usb_ohci2_clk, "usb-ohci2", clk_parent_hosc, 0x0, BIT(6), 0); + +static SUNXI_CCU_GATE_DATA(usb0_phy_clk, "usb0-phy", clk_parent_hosc, 0x4, BIT(1), 0); +static SUNXI_CCU_GATE_DATA(usb1_hsic_clk, "usb1-hsic", clk_parent_hosc, 0x4, BIT(2), 0); +static SUNXI_CCU_GATE_DATA(usb1_phy_clk, "usb1-phy", clk_parent_hosc, 0x4, BIT(3), 0); +static SUNXI_CCU_GATE_DATA(usb2_hsic_clk, "usb2-hsic", clk_parent_hosc, 0x4, BIT(4), 0); +static SUNXI_CCU_GATE_DATA(usb2_phy_clk, "usb2-phy", clk_parent_hosc, 0x4, BIT(5), 0); +static SUNXI_CCU_GATE_DATA(usb_hsic_clk, "usb-hsic", clk_parent_hosc, 0x4, BIT(10), 0); static struct ccu_common *sun9i_a80_usb_clks[] = { &bus_hci0_clk.common, -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-11 10:17 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-11 10:16 [PATCH v2 00/25] clk: sunxi-ng: clk parent rewrite part 1 Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 01/25] clk: Fix debugfs clk_possible_parents for clks without parent string names Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 02/25] clk: Add CLK_HW_INIT_* macros using .parent_hws Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 03/25] clk: Add CLK_HW_INIT_FW_NAME macro using .fw_name in .parent_data Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 04/25] clk: Add CLK_HW_INIT_PARENT_DATA macro using .parent_data Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 05/25] clk: fixed-factor: Add CLK_FIXED_FACTOR_HW which takes clk_hw pointer as parent Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 06/25] clk: fixed-factor: Add CLK_FIXED_FACTOR_HWS which takes list of struct clk_hw * Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 07/25] clk: fixed-factor: Add CLK_FIXED_FACTOR_FW_NAME for DT clock-names parent Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 08/25] clk: sunxi-ng: switch to of_clk_hw_register() for registering clks Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 09/25] clk: sunxi-ng: sun8i-r: Use local parent references for CLK_HW_INIT_* Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 10/25] clk: sunxi-ng: a10: Use local parent references for CLK_FIXED_FACTOR Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 11/25] clk: sunxi-ng: sun5i: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 12/25] clk: sunxi-ng: a31: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 13/25] clk: sunxi-ng: a23: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 14/25] clk: sunxi-ng: a33: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 15/25] clk: sunxi-ng: h3: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 16/25] clk: sunxi-ng: r40: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 17/25] clk: sunxi-ng: v3s: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 18/25] clk: sunxi-ng: sun8i-r: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 19/25] clk: sunxi-ng: f1c100s: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 20/25] clk: sunxi-ng: a64: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 21/25] clk: sunxi-ng: h6: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 22/25] clk: sunxi-ng: h6-r: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 23/25] clk: sunxi-ng: gate: Add macros for referencing local clock parents Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai [this message] 2019-06-11 10:16 ` [PATCH v2 24/25] clk: sunxi-ng: a80-usb: Use local parent references for SUNXI_CCU_GATE Chen-Yu Tsai 2019-06-11 10:16 ` [PATCH v2 25/25] clk: sunxi-ng: sun8i-r: " Chen-Yu Tsai 2019-06-11 10:16 ` Chen-Yu Tsai
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=20190611101658.23855-25-wens@kernel.org \ --to=wens@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maxime.ripard@bootlin.com \ --cc=mturquette@baylibre.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.