diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-12-14 13:35:08 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-01-10 15:43:46 +0100 |
commit | e70b9d7a74698f1374244b2251216428db920aed (patch) | |
tree | b8091531241075d04501751b5236ab54afbe48c2 /drivers/clk | |
parent | 12763d0fe56899d3729d0e6755446ed7c740a88a (diff) | |
download | barebox-e70b9d7a74698f1374244b2251216428db920aed.tar.gz barebox-e70b9d7a74698f1374244b2251216428db920aed.tar.xz |
Rename device_d::device_node to device_d::of_node
Linux struct device has the member of_node for the device_node pointer.
Rename this in barebox accordingly to minimize the necessary changes
when porting Linux code. This was done with the semantic patch:
@@ struct device_d E; @@
- E.device_node
+ E.of_node
@@ struct device_d *E; @@
- E->device_node
+ E->of_node
Plus some manual adjustments.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.barebox.org/20221214123512.189688-2-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clk')
27 files changed, 44 insertions, 42 deletions
diff --git a/drivers/clk/bcm/clk-bcm2835-aux.c b/drivers/clk/bcm/clk-bcm2835-aux.c index 385cfd5d3f..b4636b850e 100644 --- a/drivers/clk/bcm/clk-bcm2835-aux.c +++ b/drivers/clk/bcm/clk-bcm2835-aux.c @@ -25,7 +25,7 @@ static int bcm2835_aux_clk_probe(struct device_d *dev) return PTR_ERR(parent_clk); parent = __clk_get_name(parent_clk); - reg = of_iomap(dev->device_node, 0); + reg = of_iomap(dev->of_node, 0); if (!reg) return -ENOMEM; @@ -45,7 +45,7 @@ static int bcm2835_aux_clk_probe(struct device_d *dev) onecell->hws[BCM2835_AUX_CLOCK_SPI2] = clk_hw_register_gate(dev, "aux_spi2", parent, 0, gate, 2, 0, NULL); - return of_clk_add_hw_provider(dev->device_node, of_clk_hw_onecell_get, + return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, onecell); } diff --git a/drivers/clk/clk-ar933x.c b/drivers/clk/clk-ar933x.c index c5e57f41ec..372a9e7457 100644 --- a/drivers/clk/clk-ar933x.c +++ b/drivers/clk/clk-ar933x.c @@ -118,7 +118,7 @@ static int ar933x_clk_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; diff --git a/drivers/clk/clk-ar9344.c b/drivers/clk/clk-ar9344.c index d2f63f2608..5bb55d2227 100644 --- a/drivers/clk/clk-ar9344.c +++ b/drivers/clk/clk-ar9344.c @@ -113,7 +113,7 @@ static int ar9344_clk_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c index 4510283962..f6fe07a0bf 100644 --- a/drivers/clk/clk-bulk.c +++ b/drivers/clk/clk-bulk.c @@ -143,7 +143,7 @@ EXPORT_SYMBOL(clk_bulk_put_all); int __must_check clk_bulk_get_all(struct device_d *dev, struct clk_bulk_data **clks) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; if (!np) return 0; diff --git a/drivers/clk/clk-rpi.c b/drivers/clk/clk-rpi.c index 71badc04c0..1eae4540bb 100644 --- a/drivers/clk/clk-rpi.c +++ b/drivers/clk/clk-rpi.c @@ -86,7 +86,7 @@ static int rpi_cprman_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = BCM2711_CLOCK_END; - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; } diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index 9170dba393..fcffe6a438 100644 --- a/drivers/clk/clk-scmi.c +++ b/drivers/clk/clk-scmi.c @@ -120,7 +120,7 @@ static int scmi_clocks_probe(struct scmi_device *sdev) struct clk **clks; struct clk_onecell_data *clk_data; struct device_d *dev = &sdev->dev; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const struct scmi_handle *handle = sdev->handle; struct scmi_protocol_handle *ph; @@ -172,7 +172,8 @@ static int scmi_clocks_probe(struct scmi_device *sdev) } } - return of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, clk_data); + return of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, + clk_data); } static const struct scmi_device_id scmi_id_table[] = { diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 462a7e16ef..d7d0103bdc 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -177,7 +177,7 @@ struct clk *clk_get(struct device_d *dev, const char *con_id) return clk; if (dev) { - clk = of_clk_get_by_name(dev->device_node, con_id); + clk = of_clk_get_by_name(dev->of_node, con_id); if (!IS_ERR(clk) || PTR_ERR(clk) != -ENOENT) return clk; } diff --git a/drivers/clk/imx/clk-imx5.c b/drivers/clk/imx/clk-imx5.c index 81af9a9c88..d96aa81358 100644 --- a/drivers/clk/imx/clk-imx5.c +++ b/drivers/clk/imx/clk-imx5.c @@ -207,7 +207,7 @@ static void __init mx5_clocks_common_init(struct device_d *dev, void __iomem *ba clks[IMX5_CLK_DUMMY] = clk_fixed("dummy", 0); - if (!IS_ENABLED(CONFIG_COMMON_CLK_OF_PROVIDER) || !dev->device_node) { + if (!IS_ENABLED(CONFIG_COMMON_CLK_OF_PROVIDER) || !dev->of_node) { clks[IMX5_CLK_CKIL] = clk_fixed("ckil", 32768); clks[IMX5_CLK_OSC] = clk_fixed("osc", 24000000); } @@ -418,7 +418,7 @@ static int imx51_ccm_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = IMX5_CLK_END; - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; } @@ -516,7 +516,7 @@ static int imx53_ccm_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = IMX5_CLK_END; - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; } diff --git a/drivers/clk/imx/clk-imx6.c b/drivers/clk/imx/clk-imx6.c index 06cc992b72..692bbd4e0a 100644 --- a/drivers/clk/imx/clk-imx6.c +++ b/drivers/clk/imx/clk-imx6.c @@ -808,7 +808,7 @@ static int imx6_ccm_probe(struct device_d *dev) imx6q_mmdc_ch1_mask_handshake(ccm_base); if (IS_ENABLED(CONFIG_DRIVER_VIDEO_IMX_IPUV3)) - imx6_add_video_clks(anatop_base, ccm_base, dev->device_node); + imx6_add_video_clks(anatop_base, ccm_base, dev->of_node); writel(0xffffffff, ccm_base + CCGR0); writel(0xf0ffffff, ccm_base + CCGR1); /* gate GPU3D, GPU2D */ @@ -824,7 +824,7 @@ static int imx6_ccm_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = IMX6QDL_CLK_END; - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); clk_enable(clks[IMX6QDL_CLK_MMDC_CH0_AXI_PODF]); clk_enable(clks[IMX6QDL_CLK_PLL6_ENET]); diff --git a/drivers/clk/imx/clk-imx6sl.c b/drivers/clk/imx/clk-imx6sl.c index 466893f82f..3e6a8c58d0 100644 --- a/drivers/clk/imx/clk-imx6sl.c +++ b/drivers/clk/imx/clk-imx6sl.c @@ -85,7 +85,7 @@ static int imx6sl_ccm_probe(struct device_d *dev) { struct resource *iores; void __iomem *base, *anatop_base, *ccm_base; - struct device_node *ccm_node = dev->device_node; + struct device_node *ccm_node = dev->of_node; clks[IMX6SL_CLK_DUMMY] = clk_fixed("dummy", 0); diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index c11829259e..ae61c138fd 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -113,7 +113,7 @@ static int imx6sx_ccm_probe(struct device_d *dev) { struct resource *iores; void __iomem *base, *anatop_base, *ccm_base; - struct device_node *ccm_node = dev->device_node; + struct device_node *ccm_node = dev->of_node; clks[IMX6SX_CLK_DUMMY] = clk_fixed("dummy", 0); diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index af5d582ffc..24350d63fa 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -97,7 +97,7 @@ static int imx6_ccm_probe(struct device_d *dev) struct resource *iores; void __iomem *base, *anatop_base, *ccm_base; int i; - struct device_node *ccm_node = dev->device_node; + struct device_node *ccm_node = dev->of_node; struct clk_hw *hw; anatop_base = IOMEM(MX6_ANATOP_BASE_ADDR); diff --git a/drivers/clk/imx/clk-imx7.c b/drivers/clk/imx/clk-imx7.c index 588e9cbe5c..b75928d59e 100644 --- a/drivers/clk/imx/clk-imx7.c +++ b/drivers/clk/imx/clk-imx7.c @@ -807,9 +807,9 @@ static int imx7_ccm_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); - ccm_np = dev->device_node; + ccm_np = dev->of_node; /* * imx7_clk_setup() requires both the CCM and fixed-clock osc devices diff --git a/drivers/clk/loongson/clk-ls1b200.c b/drivers/clk/loongson/clk-ls1b200.c index 6ac545224f..096768c7a1 100644 --- a/drivers/clk/loongson/clk-ls1b200.c +++ b/drivers/clk/loongson/clk-ls1b200.c @@ -129,7 +129,7 @@ static int ls1b200_clk_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; } diff --git a/drivers/clk/mvebu/common.c b/drivers/clk/mvebu/common.c index 3d924ccf4d..17cbc77690 100644 --- a/drivers/clk/mvebu/common.c +++ b/drivers/clk/mvebu/common.c @@ -42,7 +42,7 @@ static struct of_device_id mvebu_coreclk_ids[] = { static int mvebu_coreclk_probe(struct device_d *dev) { struct resource *iores; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const struct of_device_id *match; const struct coreclk_soc_desc *desc; const char *tclk_name = "tclk"; @@ -151,7 +151,7 @@ static struct of_device_id mvebu_clk_gating_ids[] = { static int mvebu_clk_gating_probe(struct device_d *dev) { struct resource *iores; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const struct of_device_id *match; const struct clk_gating_soc_desc *desc; struct clk_gating_ctrl *ctrl; diff --git a/drivers/clk/mvebu/corediv.c b/drivers/clk/mvebu/corediv.c index 1b7fa12701..7b85bd01d3 100644 --- a/drivers/clk/mvebu/corediv.c +++ b/drivers/clk/mvebu/corediv.c @@ -197,7 +197,7 @@ static struct of_device_id mvebu_corediv_clk_ids[] = { static int mvebu_corediv_clk_probe(struct device_d *dev) { struct resource *iores; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const struct of_device_id *match; const struct clk_corediv_soc_desc *soc_desc; struct clk_corediv *corediv; diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 382021e49c..a10571237f 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -147,10 +147,11 @@ static int __init mx28_clocks_init(struct device_d *dev, void __iomem *regs) clk_set_parent(clks[lcdif_sel], clks[ref_pix]); clk_set_parent(clks[gpmi_sel], clks[ref_gpmi]); - if (dev->device_node) { + if (dev->of_node) { clk_data.clks = clks; clk_data.clk_num = clk_max; - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, + &clk_data); } else { clkdev_add_physbase(clks[ssp0], IMX_SSP0_BASE, NULL); clkdev_add_physbase(clks[ssp1], IMX_SSP1_BASE, NULL); diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 399d6006c6..1f2430e521 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -1629,7 +1629,7 @@ static const struct of_device_id clk_rk3399_match_table[] = { static int __init clk_rk3399_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const struct of_device_id *match; const struct clk_rk3399_inits *init_data; diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c index 7f9c29316a..3e788f2c5a 100644 --- a/drivers/clk/rockchip/clk-rk3568.c +++ b/drivers/clk/rockchip/clk-rk3568.c @@ -1721,7 +1721,7 @@ static const struct of_device_id clk_rk3568_match_table[] = { static int __init clk_rk3568_probe(struct device_d *dev) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; const struct clk_rk3568_inits *init_data; init_data = of_device_get_match_data(dev); diff --git a/drivers/clk/sifive/sifive-prci.c b/drivers/clk/sifive/sifive-prci.c index 2ef10f9693..010ccb92af 100644 --- a/drivers/clk/sifive/sifive-prci.c +++ b/drivers/clk/sifive/sifive-prci.c @@ -477,7 +477,7 @@ static int __prci_register_clocks(struct device_d *dev, struct __prci_data *pd, struct __prci_clock *pic; int parent_count, i, r; - parent_count = of_clk_get_parent_count(dev->device_node); + parent_count = of_clk_get_parent_count(dev->of_node); if (parent_count != EXPECTED_CLK_PARENT_COUNT) { dev_err(dev, "expected only two parent clocks, found %d\n", parent_count); @@ -520,7 +520,7 @@ static int __prci_register_clocks(struct device_d *dev, struct __prci_data *pd, pd->hw_clks.clk_num = i; - r = of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + r = of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &pd->hw_clks); if (r) { dev_err(dev, "could not add hw_provider: %d\n", r); diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c index 8ee405c6c6..6691403843 100644 --- a/drivers/clk/socfpga/clk.c +++ b/drivers/clk/socfpga/clk.c @@ -407,7 +407,7 @@ static int socfpga_ccm_probe(struct device_d *dev) clk_mgr_base_addr = regs; - clknode = of_get_child_by_name(dev->device_node, "clocks"); + clknode = of_get_child_by_name(dev->of_node, "clocks"); if (!clknode) return -EINVAL; diff --git a/drivers/clk/starfive/jh7100-clkgen.c b/drivers/clk/starfive/jh7100-clkgen.c index 36dc91991e..29095aa991 100644 --- a/drivers/clk/starfive/jh7100-clkgen.c +++ b/drivers/clk/starfive/jh7100-clkgen.c @@ -340,11 +340,11 @@ static int starfive_clkgen_clk_probe(struct device_d *dev) if (IS_ERR(iores)) return PTR_ERR(iores); - starfive_clkgen_init(dev->device_node, IOMEM(iores->start)); + starfive_clkgen_init(dev->of_node, IOMEM(iores->start)); clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; diff --git a/drivers/clk/tegra/clk-tegra124.c b/drivers/clk/tegra/clk-tegra124.c index bdd822e296..c7644361f3 100644 --- a/drivers/clk/tegra/clk-tegra124.c +++ b/drivers/clk/tegra/clk-tegra124.c @@ -345,10 +345,10 @@ static int tegra124_car_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); - tegra_clk_init_rst_controller(car_base, dev->device_node, 6 * 32); + tegra_clk_init_rst_controller(car_base, dev->of_node, 6 * 32); tegra_clk_reset_uarts(); return 0; diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c index 6e5fa144e4..04bcec1f25 100644 --- a/drivers/clk/tegra/clk-tegra20.c +++ b/drivers/clk/tegra/clk-tegra20.c @@ -348,10 +348,10 @@ static int tegra20_car_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); - tegra_clk_init_rst_controller(car_base, dev->device_node, 3 * 32); + tegra_clk_init_rst_controller(car_base, dev->of_node, 3 * 32); tegra_clk_reset_uarts(); return 0; diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 505851f8f5..cbb3b959b4 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c @@ -376,10 +376,10 @@ static int tegra30_car_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); - tegra_clk_init_rst_controller(car_base, dev->device_node, 6 * 32); + tegra_clk_init_rst_controller(car_base, dev->of_node, 6 * 32); tegra_clk_reset_uarts(); return 0; diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c index e4ce102d6e..a6916bf448 100644 --- a/drivers/clk/zynq/clkc.c +++ b/drivers/clk/zynq/clkc.c @@ -380,7 +380,7 @@ static int zynq_clock_probe(struct device_d *dev) * in the SCLR region. So we can't directly map the address we get from * the DT, but need to add the SCLR base offset. */ - if (dev->device_node) { + if (dev->of_node) { struct resource *parent_res; parent_res = dev_get_resource(dev->parent, IORESOURCE_MEM, 0); @@ -470,7 +470,7 @@ static int zynq_clock_probe(struct device_d *dev) clk_data.clks = clks; clk_data.clk_num = ARRAY_SIZE(clks); - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, &clk_data); return 0; diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c index d7ac0bdb36..a5cb99ba8d 100644 --- a/drivers/clk/zynqmp/clkc.c +++ b/drivers/clk/zynqmp/clkc.c @@ -452,7 +452,7 @@ static int zynqmp_register_clocks(struct device_d *dev, unsigned int i; const char *parent_names[MAX_PARENT]; char *name; - struct device_node *node = dev->device_node; + struct device_node *node = dev->of_node; int num_parents; for (i = 0; i < num_clocks; i++) { @@ -558,7 +558,7 @@ static int zynqmp_clock_probe(struct device_d *dev) zynqmp_register_clocks(dev, clk_data->clks, num_clocks); clk_data->clk_num = num_clocks; - of_clk_add_provider(dev->device_node, of_clk_src_onecell_get, clk_data); + of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, clk_data); /* * We can free clock_info now, as is only used to store clock info |