Skip to content

Commit a31b4dc

Browse files
Bartosz Golaszewskibebarino
authored andcommitted
clk: davinci: remove support for da830
This SoC has some leftover code all over the kernel but no boards are supported anymore. Remove support for da830 from the davinci clock driver. With it: remove the ifdefs around the data structures as the da850 remains the only davinci SoC supported and the only user of this driver. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Link: https://lore.kernel.org/r/20250304133423.100884-1-brgl@bgdev.pl Acked-by: David Lechner <david@lechnology.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 944b074 commit a31b4dc

File tree

7 files changed

+1
-220
lines changed

7 files changed

+1
-220
lines changed

drivers/clk/davinci/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ ifeq ($(CONFIG_COMMON_CLK), y)
44
obj-$(CONFIG_ARCH_DAVINCI_DA8XX) += da8xx-cfgchip.o
55

66
obj-y += pll.o
7-
obj-$(CONFIG_ARCH_DAVINCI_DA830) += pll-da830.o
87
obj-$(CONFIG_ARCH_DAVINCI_DA850) += pll-da850.o
98

109
obj-y += psc.o
11-
obj-$(CONFIG_ARCH_DAVINCI_DA830) += psc-da830.o
1210
obj-$(CONFIG_ARCH_DAVINCI_DA850) += psc-da850.o
1311
endif

drivers/clk/davinci/pll-da830.c

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

drivers/clk/davinci/pll.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -840,25 +840,16 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
840840
}
841841

842842
/* needed in early boot for clocksource/clockevent */
843-
#ifdef CONFIG_ARCH_DAVINCI_DA850
844843
CLK_OF_DECLARE(da850_pll0, "ti,da850-pll0", of_da850_pll0_init);
845-
#endif
846844

847845
static const struct of_device_id davinci_pll_of_match[] = {
848-
#ifdef CONFIG_ARCH_DAVINCI_DA850
849846
{ .compatible = "ti,da850-pll1", .data = of_da850_pll1_init },
850-
#endif
851847
{ }
852848
};
853849

854850
static const struct platform_device_id davinci_pll_id_table[] = {
855-
#ifdef CONFIG_ARCH_DAVINCI_DA830
856-
{ .name = "da830-pll", .driver_data = (kernel_ulong_t)da830_pll_init },
857-
#endif
858-
#ifdef CONFIG_ARCH_DAVINCI_DA850
859851
{ .name = "da850-pll0", .driver_data = (kernel_ulong_t)da850_pll0_init },
860852
{ .name = "da850-pll1", .driver_data = (kernel_ulong_t)da850_pll1_init },
861-
#endif
862853
{ }
863854
};
864855

drivers/clk/davinci/psc-da830.c

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

drivers/clk/davinci/psc.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -494,22 +494,14 @@ int of_davinci_psc_clk_init(struct device *dev,
494494
}
495495

496496
static const struct of_device_id davinci_psc_of_match[] = {
497-
#ifdef CONFIG_ARCH_DAVINCI_DA850
498497
{ .compatible = "ti,da850-psc0", .data = &of_da850_psc0_init_data },
499498
{ .compatible = "ti,da850-psc1", .data = &of_da850_psc1_init_data },
500-
#endif
501499
{ }
502500
};
503501

504502
static const struct platform_device_id davinci_psc_id_table[] = {
505-
#ifdef CONFIG_ARCH_DAVINCI_DA830
506-
{ .name = "da830-psc0", .driver_data = (kernel_ulong_t)&da830_psc0_init_data },
507-
{ .name = "da830-psc1", .driver_data = (kernel_ulong_t)&da830_psc1_init_data },
508-
#endif
509-
#ifdef CONFIG_ARCH_DAVINCI_DA850
510503
{ .name = "da850-psc0", .driver_data = (kernel_ulong_t)&da850_psc0_init_data },
511504
{ .name = "da850-psc1", .driver_data = (kernel_ulong_t)&da850_psc1_init_data },
512-
#endif
513505
{ }
514506
};
515507

drivers/clk/davinci/psc.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,9 @@ struct davinci_psc_init_data {
9494
int (*psc_init)(struct device *dev, void __iomem *base);
9595
};
9696

97-
#ifdef CONFIG_ARCH_DAVINCI_DA830
98-
extern const struct davinci_psc_init_data da830_psc0_init_data;
99-
extern const struct davinci_psc_init_data da830_psc1_init_data;
100-
#endif
101-
#ifdef CONFIG_ARCH_DAVINCI_DA850
10297
extern const struct davinci_psc_init_data da850_psc0_init_data;
10398
extern const struct davinci_psc_init_data da850_psc1_init_data;
10499
extern const struct davinci_psc_init_data of_da850_psc0_init_data;
105100
extern const struct davinci_psc_init_data of_da850_psc1_init_data;
106-
#endif
101+
107102
#endif /* __CLK_DAVINCI_PSC_H__ */

include/linux/clk/davinci.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
#include <linux/regmap.h>
1313

1414
/* function for registering clocks in early boot */
15-
16-
#ifdef CONFIG_ARCH_DAVINCI_DA830
17-
int da830_pll_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
18-
#endif
19-
#ifdef CONFIG_ARCH_DAVINCI_DA850
2015
int da850_pll0_init(struct device *dev, void __iomem *base, struct regmap *cfgchip);
21-
#endif
2216

2317
#endif /* __LINUX_CLK_DAVINCI_PLL_H___ */

0 commit comments

Comments
 (0)