Skip to content

Commit 12198d9

Browse files
bulwahnbebarino
authored andcommitted
clk: davinci: remove PLL and PSC clocks for DaVinci DM644x and DM646x
Commit 7dd3376 ("ARM: davinci: Delete DM644x board files") and commit b4aed01 ("ARM: davinci: Delete DM646x board files") removes the support for DaVinci DM644x and DM646x boards. Hence, remove the PLL and PSC clock descriptions for those boards as well. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Link: https://lore.kernel.org/r/20220720082934.17741-1-lukas.bulwahn@gmail.com Reviewed-by: David Lechner <david@lechnology.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 568035b commit 12198d9

File tree

10 files changed

+0
-371
lines changed

10 files changed

+0
-371
lines changed

drivers/clk/davinci/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,10 @@ obj-$(CONFIG_ARCH_DAVINCI_DA830) += pll-da830.o
88
obj-$(CONFIG_ARCH_DAVINCI_DA850) += pll-da850.o
99
obj-$(CONFIG_ARCH_DAVINCI_DM355) += pll-dm355.o
1010
obj-$(CONFIG_ARCH_DAVINCI_DM365) += pll-dm365.o
11-
obj-$(CONFIG_ARCH_DAVINCI_DM644x) += pll-dm644x.o
12-
obj-$(CONFIG_ARCH_DAVINCI_DM646x) += pll-dm646x.o
1311

1412
obj-y += psc.o
1513
obj-$(CONFIG_ARCH_DAVINCI_DA830) += psc-da830.o
1614
obj-$(CONFIG_ARCH_DAVINCI_DA850) += psc-da850.o
1715
obj-$(CONFIG_ARCH_DAVINCI_DM355) += psc-dm355.o
1816
obj-$(CONFIG_ARCH_DAVINCI_DM365) += psc-dm365.o
19-
obj-$(CONFIG_ARCH_DAVINCI_DM644x) += psc-dm644x.o
20-
obj-$(CONFIG_ARCH_DAVINCI_DM646x) += psc-dm646x.o
2117
endif

drivers/clk/davinci/pll-dm644x.c

Lines changed: 0 additions & 81 deletions
This file was deleted.

drivers/clk/davinci/pll-dm646x.c

Lines changed: 0 additions & 85 deletions
This file was deleted.

drivers/clk/davinci/pll.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -889,14 +889,6 @@ static const struct platform_device_id davinci_pll_id_table[] = {
889889
#ifdef CONFIG_ARCH_DAVINCI_DM365
890890
{ .name = "dm365-pll1", .driver_data = (kernel_ulong_t)dm365_pll1_init },
891891
{ .name = "dm365-pll2", .driver_data = (kernel_ulong_t)dm365_pll2_init },
892-
#endif
893-
#ifdef CONFIG_ARCH_DAVINCI_DM644x
894-
{ .name = "dm644x-pll1", .driver_data = (kernel_ulong_t)dm644x_pll1_init },
895-
{ .name = "dm644x-pll2", .driver_data = (kernel_ulong_t)dm644x_pll2_init },
896-
#endif
897-
#ifdef CONFIG_ARCH_DAVINCI_DM646x
898-
{ .name = "dm646x-pll1", .driver_data = (kernel_ulong_t)dm646x_pll1_init },
899-
{ .name = "dm646x-pll2", .driver_data = (kernel_ulong_t)dm646x_pll2_init },
900892
#endif
901893
{ }
902894
};

drivers/clk/davinci/pll.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,5 @@ int of_da850_pll1_init(struct device *dev, void __iomem *base, struct regmap *cf
130130
#ifdef CONFIG_ARCH_DAVINCI_DM355
131131
int dm355_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
132132
#endif
133-
#ifdef CONFIG_ARCH_DAVINCI_DM644x
134-
int dm644x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
135-
#endif
136-
#ifdef CONFIG_ARCH_DAVINCI_DM646x
137-
int dm646x_pll2_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
138-
#endif
139133

140134
#endif /* __CLK_DAVINCI_PLL_H___ */

drivers/clk/davinci/psc-dm644x.c

Lines changed: 0 additions & 85 deletions
This file was deleted.

drivers/clk/davinci/psc-dm646x.c

Lines changed: 0 additions & 82 deletions
This file was deleted.

drivers/clk/davinci/psc.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -516,12 +516,6 @@ static const struct platform_device_id davinci_psc_id_table[] = {
516516
#endif
517517
#ifdef CONFIG_ARCH_DAVINCI_DM365
518518
{ .name = "dm365-psc", .driver_data = (kernel_ulong_t)&dm365_psc_init_data },
519-
#endif
520-
#ifdef CONFIG_ARCH_DAVINCI_DM644x
521-
{ .name = "dm644x-psc", .driver_data = (kernel_ulong_t)&dm644x_psc_init_data },
522-
#endif
523-
#ifdef CONFIG_ARCH_DAVINCI_DM646x
524-
{ .name = "dm646x-psc", .driver_data = (kernel_ulong_t)&dm646x_psc_init_data },
525519
#endif
526520
{ }
527521
};

0 commit comments

Comments
 (0)