Skip to content

Commit 350d0f0

Browse files
committed
Merge tag 'davinci-updates-for-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into soc/arm
Texas Instruments DaVinci updates for v6.12-rc1 - remove unused cpuidle code - remove unused function prototypes and stubs * tag 'davinci-updates-for-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: ARM: davinci: remove unused cpuidle code ARM: davinci: remove unused davinci_init_ide() declaration ARM: davinci: remove unused davinci_cfg_reg_list() declaration Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents d4c3179 + 973d248 commit 350d0f0

File tree

6 files changed

+0
-122
lines changed

6 files changed

+0
-122
lines changed

arch/arm/mach-davinci/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o pdata-quirks.o
1616
obj-y += da8xx-dt.o
1717

1818
# Power Management
19-
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
2019
obj-$(CONFIG_HAVE_CLK) += pm_domain.o
2120
ifeq ($(CONFIG_SUSPEND),y)
2221
obj-$(CONFIG_ARCH_DAVINCI_DA850) += pm.o sleep.o

arch/arm/mach-davinci/common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ struct davinci_soc_info {
5252
extern struct davinci_soc_info davinci_soc_info;
5353

5454
extern void davinci_common_init(const struct davinci_soc_info *soc_info);
55-
extern void davinci_init_ide(void);
5655
void davinci_init_late(void);
5756

5857
#ifdef CONFIG_SUSPEND

arch/arm/mach-davinci/cpuidle.c

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

arch/arm/mach-davinci/cpuidle.h

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

arch/arm/mach-davinci/devices-da8xx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "common.h"
2222
#include "cputype.h"
2323
#include "da8xx.h"
24-
#include "cpuidle.h"
2524
#include "irqs.h"
2625
#include "sram.h"
2726

arch/arm/mach-davinci/mux.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -654,14 +654,9 @@ enum davinci_da850_index {
654654
#ifdef CONFIG_DAVINCI_MUX
655655
/* setup pin muxing */
656656
extern int davinci_cfg_reg(unsigned long reg_cfg);
657-
extern int davinci_cfg_reg_list(const short pins[]);
658657
#else
659658
/* boot loader does it all (no warnings from CONFIG_DAVINCI_MUX_WARNINGS) */
660659
static inline int davinci_cfg_reg(unsigned long reg_cfg) { return 0; }
661-
static inline int davinci_cfg_reg_list(const short pins[])
662-
{
663-
return 0;
664-
}
665660
#endif
666661

667662

0 commit comments

Comments
 (0)