Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-08 14:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Texas Instruments DaVinci updates for v6.12-rc1

Browse Source 
- remove unused cpuidle code
 - remove unused function prototypes and stubs
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmbVtMAACgkQEacuoBRx
 13ISbhAAufsanJ/4LpEiBpZflqVG47yv0m7t0syYsq3ezebQlgzlAOi4K13mj/vL
 vnyFjSSuBWG40ETU1sjpb3kVXj62MfF6FXXxtAM0rwHUu/e/mZHEEZPDt/sYkDhH
 GwatEdGTzrmE37Ua54pBRETtllGtt4Q6AIaMsI1YEKy2kTwOtzZXArg1jKr6w4ZN
 4tJjhpCq+iGrEreZXu/FqNdh7DT9VEewsMjWWuXCKNLIuyGtFtiz9l9N7TOixSxS
 9VeRa8yPbOV9GEhp6rrBBSOwySwb7oeJQ4HNAuTXgWZ8CYR28OgSGGDt8azaexzD
 RFj6xeYOnO1/Qq4pEfyjJh1izufLHlvYvBp6dy2GWIYVKmM9c2uY3z5fJn4wJNEk
 Ltn/xyp7NF5qnvlBiQhomqdYimHvFTyikro0cKe+BXKIZ7b0+vU+vaeeCntDhywD
 fABe6Cn3nsT5Bwk2P9qSA5dcuweK1vu/j/8+SIaJ44j1lD0BjjlwTwcwNEepCvwz
 R86tSCMhZlWZhn1wY9+rS/qafmfz6x6ZK3yqgIQ3tunfeGFCRwUmS31JyJ/y/vuI
 QM3ULt8XfHpOifedIcjychyaBaCFxrg/GoV3seFgWpbya8xxOZxpTg9IxbhYRXz/
 JRb8RQbF33sFmVMZwJi4b/Hd3gqOsFb5k3Fy97m/atc8//+bD14=
 =G3QV
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmbZgnoACgkQYKtH/8kJ
 UideUhAAyFzWzEMOAUgexXDWEFaKSNW+bebPvGcRnNgcYi1uPSdFXFabnxPHpwR9
 B2PjBcgoC2c85BNc8xIrn+qrSszSuvPFNygdB9HUvRtChPHrJaJFLdsMHZtcb9j7
 tyTd9uPYQy3xcEE6TQfQzrDdx69+fU0TD68umdtjSOcgMfTv9UeJstr68tgobAjB
 HpdEMQ1xS9YrXpMorgs1SRcfSXMwmtDkkHmAmYl1UqKFnVG00dSrKrr2Oh3fXjuE
 TUbZgig1MIuVPVhVnDnhE1B9wMkqk2tNxR1RwO4q1yKLtcc20al4C0JE03N9Wj/w
 HPafDG4foh91ue7RFsjjjzabUT5csLyMljBsHvgwogRl4dAg+IrambqKlIzDPwvB
 KgP8vzX8PGti9Wr9/FE8QSTVhORst3IScyiphtPctIvc2qo1Z28DyujDqyljazM+
 bpB0lxoeRTUZx0BtaV22NSkP4sQM/MKD1XhctHspnAH4T47BEBCSrxOLgwOocJ2v
 3A1RLf+e3YvYO180ltRtYjvuFJCvUMgvndBS17PQjPTBQ9MhgVPlTS6IrPEytYtB
 amq6emB9Tnz9htR9TisuWjSkDOvhchvhzkfwu11f+Cr5i+nuRWyZBkpYhuYCow76
 y/K7Wf/v4HtIgstp+VzqymB74uJbjhSyDZItPvP4aE+TmXLEA6I=
 =4q2m
 -----END PGP SIGNATURE-----

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/20240904200530.80386-1-brgl@bgdev.pl
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-09-05 10:05:44 +00:00
commit 350d0f012c
6 changed files with 0 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-davinci/Makefile
View File

@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_DAVINCI_DA850) += da850.o pdata-quirks.o
obj-y += da8xx-dt.o
# Power Management
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
obj-$(CONFIG_HAVE_CLK) += pm_domain.o
ifeq ($(CONFIG_SUSPEND),y)
obj-$(CONFIG_ARCH_DAVINCI_DA850) += pm.o sleep.o

1
arch/arm/mach-davinci/common.h
View File

@ -52,7 +52,6 @@ struct davinci_soc_info {
extern struct davinci_soc_info davinci_soc_info;
extern void davinci_common_init(const struct davinci_soc_info *soc_info);
extern void davinci_init_ide(void);
void davinci_init_late(void);
#ifdef CONFIG_SUSPEND

99
arch/arm/mach-davinci/cpuidle.c
View File

@ -1,99 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* CPU idle for DaVinci SoCs
*
* Copyright (C) 2009 Texas Instruments Incorporated. https://www.ti.com/
*
* Derived from Marvell Kirkwood CPU idle code
* (arch/arm/mach-kirkwood/cpuidle.c)
*/
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/cpuidle.h>
#include <linux/io.h>
#include <linux/export.h>
#include <asm/cpuidle.h>
#include "cpuidle.h"
#include "ddr2.h"
#define DAVINCI_CPUIDLE_MAX_STATES 2
static void __iomem *ddr2_reg_base;
static bool ddr2_pdown;
static void davinci_save_ddr_power(int enter, bool pdown)
{
u32 val;
val = __raw_readl(ddr2_reg_base + DDR2_SDRCR_OFFSET);
if (enter) {
if (pdown)
val |= DDR2_SRPD_BIT;
else
val &= ~DDR2_SRPD_BIT;
val |= DDR2_LPMODEN_BIT;
} else {
val &= ~(DDR2_SRPD_BIT | DDR2_LPMODEN_BIT);
}
__raw_writel(val, ddr2_reg_base + DDR2_SDRCR_OFFSET);
}
/* Actual code that puts the SoC in different idle states */
static __cpuidle int davinci_enter_idle(struct cpuidle_device *dev,
struct cpuidle_driver *drv, int index)
{
davinci_save_ddr_power(1, ddr2_pdown);
cpu_do_idle();
davinci_save_ddr_power(0, ddr2_pdown);
return index;
}
static struct cpuidle_driver davinci_idle_driver = {
.name = "cpuidle-davinci",
.owner = THIS_MODULE,
.states[0] = ARM_CPUIDLE_WFI_STATE,
.states[1] = {
.enter = davinci_enter_idle,
.exit_latency = 10,
.target_residency = 10000,
.name = "DDR SR",
.desc = "WFI and DDR Self Refresh",
},
.state_count = DAVINCI_CPUIDLE_MAX_STATES,
};
static int __init davinci_cpuidle_probe(struct platform_device *pdev)
{
struct davinci_cpuidle_config *pdata = pdev->dev.platform_data;
if (!pdata) {
dev_err(&pdev->dev, "cannot get platform data\n");
return -ENOENT;
}
ddr2_reg_base = pdata->ddr2_ctlr_base;
ddr2_pdown = pdata->ddr2_pdown;
return cpuidle_register(&davinci_idle_driver, NULL);
}
static struct platform_driver davinci_cpuidle_driver = {
.driver = {
.name = "cpuidle-davinci",
},
};
static int __init davinci_cpuidle_init(void)
{
return platform_driver_probe(&davinci_cpuidle_driver,
davinci_cpuidle_probe);
}
device_initcall(davinci_cpuidle_init);

15
arch/arm/mach-davinci/cpuidle.h
View File

@ -1,15 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* TI DaVinci cpuidle platform support
*
* 2009 (C) Texas Instruments, Inc. https://www.ti.com/
*/
#ifndef _MACH_DAVINCI_CPUIDLE_H
#define _MACH_DAVINCI_CPUIDLE_H
struct davinci_cpuidle_config {
u32 ddr2_pdown;
void __iomem *ddr2_ctlr_base;
};
#endif

1
arch/arm/mach-davinci/devices-da8xx.c
View File

@ -21,7 +21,6 @@
#include "common.h"
#include "cputype.h"
#include "da8xx.h"
#include "cpuidle.h"
#include "irqs.h"
#include "sram.h"

5
arch/arm/mach-davinci/mux.h
View File

@ -654,14 +654,9 @@ enum davinci_da850_index {
#ifdef CONFIG_DAVINCI_MUX
/* setup pin muxing */
extern int davinci_cfg_reg(unsigned long reg_cfg);
extern int davinci_cfg_reg_list(const short pins[]);
#else
/* boot loader does it all (no warnings from CONFIG_DAVINCI_MUX_WARNINGS) */
static inline int davinci_cfg_reg(unsigned long reg_cfg) { return 0; }
static inline int davinci_cfg_reg_list(const short pins[])
{
return 0;
}
#endif