mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

ARM: tegra: Core SoC changes for v4.8-rc1

Browse source 
Some cleanups to eliminate sparse warnings and a section mismatch.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJXg7YdAAoJEN0jrNd/PrOhXy0P/0IEMndWkrubAOvf0bnV4hR0
 /SiNGiS+ROyTDd8LkntXJFTgwPzEd/pHUL6z/X2imLvVurAwDP19zEO9rm7CzFaL
 goOnCSm5VEz6euwzh+i7PYlDYSETZ+Iy+izO3r6vWMJJxsHbYZ5POxJvCM7e14pp
 V70vRXwSaQqUBzX5jykFmIeypQ1q/o/VeMsEeLfKQXBYqq3Z4F4x91E1UVgopp5z
 mpE0O1v191ZpwqdFJUfzTBwM7nrDruYNedrw2jCQDcr3O5bmns1IQPymJGLO6iJk
 rKfL6NXHJD7IH3RH4rd3hW7j2It6crSLbyZSnfNNxC9eFpfgnQk+jXe6/oo712Ng
 FPwvB0Hy/z+q5hXfEEB9lgxB8AurnLHm5Kt8qxmsdBMsJ0KbL2kUSUrlpOcWcatO
 QeBAC+mO4Ff4lUM5eCkH9uetmB2TO4/WkCgL0iTQt4Taq4qY/9jS5WABsu0L7htX
 2L0jWxffmrNBREysRmXJltV7H9ZujEkGaQcGvdDFtv2nOGVivbw2n8YCB4MIz/1h
 WLUjNKbm9HhneH/Croxtt7dYytR7tFgEbVXP2+s/nTq2LgQb7iAJZeBV6pp3VY6L
 aEzYCvRCTDW/QVqnGg97I7dWK//j20oLYN3+PwjrM2dATJ8OIN8Zrk28ljB+9Cto
 uNsiRRInpuW8t18Y4BMD
 =ZvUr
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.8-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup

Merge "ARM: tegra: Core SoC changes for v4.8-rc1" into next/cleanup:

Some cleanups to eliminate sparse warnings and a section mismatch.

* tag 'tegra-for-4.8-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Remove board_init_funcs array
  ARM: tegra: pm: Add tegra_cpu_do_idle() prototype
  ARM: tegra: irq: Add missing irq.h include
  ARM: tegra: cpuidle: Add missing cpuidle.h include
  ARM: tegra: hotplug: Include missing common.h
This commit is contained in:
Arnd Bergmann 2016-07-14 15:37:41 +02:00
commit 70814a9b32
9 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/arm/mach-tegra/common.h
View file

@ -1,4 +1,26 @@
/*
* Copyright (c) 2011, ARM Ltd.
* Copyright (c) 2013, NVIDIA Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __MACH_TEGRA_COMMON_H
#define __MACH_TEGRA_COMMON_H
extern const struct smp_operations tegra_smp_ops;
extern int tegra_cpu_kill(unsigned int cpu);
extern void tegra_cpu_die(unsigned int cpu);
#endif

1
arch/arm/mach-tegra/cpuidle-tegra114.c
View file

@ -26,6 +26,7 @@
#include <asm/suspend.h>
#include <asm/psci.h>
#include "cpuidle.h"
#include "pm.h"
#include "sleep.h"

1
arch/arm/mach-tegra/cpuidle-tegra20.c
View file

@ -30,6 +30,7 @@
#include <asm/smp_plat.h>
#include <asm/suspend.h>
#include "cpuidle.h"
#include "flowctrl.h"
#include "iomap.h"
#include "irq.h"

1
arch/arm/mach-tegra/cpuidle-tegra30.c
View file

@ -30,6 +30,7 @@
#include <asm/smp_plat.h>
#include <asm/suspend.h>
#include "cpuidle.h"
#include "pm.h"
#include "sleep.h"

2
arch/arm/mach-tegra/cpuidle.h
View file

@ -23,8 +23,10 @@ void tegra20_cpuidle_pcie_irqs_in_use(void);
int tegra30_cpuidle_init(void);
int tegra114_cpuidle_init(void);
void tegra_cpuidle_init(void);
void tegra_cpuidle_pcie_irqs_in_use(void);
#else
static inline void tegra_cpuidle_init(void) {}
static inline void tegra_cpuidle_pcie_irqs_in_use(void) {}
#endif
#endif

1
arch/arm/mach-tegra/hotplug.c
View file

@ -17,6 +17,7 @@
#include <asm/smp_plat.h>
#include "common.h"
#include "sleep.h"
static void (*tegra_hotplug_shutdown)(void);

1
arch/arm/mach-tegra/irq.c
View file

@ -29,6 +29,7 @@
#include "board.h"
#include "iomap.h"
#include "irq.h"
#define SGI_MASK 0xFFFF

2
arch/arm/mach-tegra/pm.h
View file

@ -36,7 +36,7 @@ void tegra30_sleep_core_init(void);
void tegra_clear_cpu_in_lp2(void);
bool tegra_set_cpu_in_lp2(void);
int tegra_cpu_do_idle(void);
void tegra_idle_lp2_last(void);
extern void (*tegra_tear_down_cpu)(void);

24
arch/arm/mach-tegra/tegra.c
View file

@ -118,32 +118,14 @@ static void __init tegra_dt_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
}
static void __init paz00_init(void)
{
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
tegra_paz00_wifikill_init();
}
static struct {
char *machine;
void (*init)(void);
} board_init_funcs[] = {
{ "compal,paz00", paz00_init },
};
static void __init tegra_dt_init_late(void)
{
int i;
tegra_init_suspend();
tegra_cpuidle_init();
for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) {
if (of_machine_is_compatible(board_init_funcs[i].machine)) {
board_init_funcs[i].init();
break;
}
}
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
of_machine_is_compatible("compal,paz00"))
tegra_paz00_wifikill_init();
}
static const char * const tegra_dt_board_compat[] = {