Skip to content

Commit a96cbb1

Browse files
robherringbebarino
authored andcommitted
clk: Explicitly include correct DT includes
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Acked-by: Dinh Nguyen <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> # samsung Acked-by: Heiko Stuebner <[email protected]> #rockchip Acked-by: Chanwoo Choi <[email protected]> Acked-by: Geert Uytterhoeven <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Reviewed-by: Luca Ceresoli <[email protected]> # versaclock5 Signed-off-by: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Abel Vesa <[email protected]> #imx Signed-off-by: Stephen Boyd <[email protected]>
1 parent 06c2afb commit a96cbb1

File tree

205 files changed

+162
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+162
-277
lines changed

drivers/clk/actions/owl-common.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// Copyright (c) 2018 Linaro Ltd.
99
// Author: Manivannan Sadhasivam <[email protected]>
1010

11-
#include <linux/of_address.h>
12-
#include <linux/of_platform.h>
1311
#include <linux/platform_device.h>
1412
#include <linux/regmap.h>
1513

drivers/clk/actions/owl-common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#define _OWL_COMMON_H_
1313

1414
#include <linux/clk-provider.h>
15-
#include <linux/of_platform.h>
1615
#include <linux/regmap.h>
1716

1817
struct device_node;
18+
struct platform_device;
1919

2020
struct owl_clk_common {
2121
struct regmap *regmap;

drivers/clk/axs10x/pll_clock.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
#include <linux/err.h>
1313
#include <linux/device.h>
1414
#include <linux/io.h>
15+
#include <linux/of.h>
1516
#include <linux/of_address.h>
16-
#include <linux/of_device.h>
1717
#include <linux/slab.h>
18-
#include <linux/of.h>
1918

2019
/* PLL registers addresses */
2120
#define PLL_REG_IDIV 0x0

drivers/clk/baikal-t1/clk-ccu-div.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <linux/mfd/syscon.h>
2121
#include <linux/of.h>
2222
#include <linux/of_address.h>
23-
#include <linux/of_platform.h>
2423
#include <linux/ioport.h>
2524
#include <linux/regmap.h>
2625

drivers/clk/bcm/clk-bcm2835.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <linux/io.h>
3333
#include <linux/math.h>
3434
#include <linux/module.h>
35-
#include <linux/of_device.h>
35+
#include <linux/of.h>
3636
#include <linux/platform_device.h>
3737
#include <linux/slab.h>
3838
#include <dt-bindings/clock/bcm2835.h>

drivers/clk/bcm/clk-bcm63xx-gate.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <linux/clk-provider.h>
44
#include <linux/init.h>
55
#include <linux/of.h>
6-
#include <linux/of_device.h>
76
#include <linux/platform_device.h>
87

98
#include <dt-bindings/clock/bcm3368-clock.h>

drivers/clk/bcm/clk-sr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <linux/err.h>
77
#include <linux/clk-provider.h>
8-
#include <linux/of_device.h>
8+
#include <linux/of.h>
99
#include <linux/platform_device.h>
1010

1111
#include <dt-bindings/clock/bcm-sr.h>

drivers/clk/clk-aspeed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#define pr_fmt(fmt) "clk-aspeed: " fmt
55

66
#include <linux/mfd/syscon.h>
7+
#include <linux/of.h>
78
#include <linux/of_address.h>
8-
#include <linux/of_device.h>
99
#include <linux/platform_device.h>
1010
#include <linux/regmap.h>
1111
#include <linux/slab.h>

drivers/clk/clk-ast2600.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#define pr_fmt(fmt) "clk-ast2600: " fmt
66

77
#include <linux/mfd/syscon.h>
8+
#include <linux/mod_devicetable.h>
89
#include <linux/of_address.h>
9-
#include <linux/of_device.h>
1010
#include <linux/platform_device.h>
1111
#include <linux/regmap.h>
1212
#include <linux/slab.h>

drivers/clk/clk-bm1880.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88

99
#include <linux/clk-provider.h>
10+
#include <linux/io.h>
1011
#include <linux/kernel.h>
12+
#include <linux/mod_devicetable.h>
1113
#include <linux/module.h>
12-
#include <linux/of_address.h>
13-
#include <linux/of_device.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/slab.h>
1616

0 commit comments

Comments
 (0)