Commit 70814a9b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.8-arm-soc' of... 

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
parents 979f97dd da35cbca

arch/arm/mach-tegra/common.h

+22 −0
Original line number Diff line number Diff line 
/*

 * 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

arch/arm/mach-tegra/cpuidle-tegra114.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/suspend.h>

#include <asm/psci.h>



#include "cpuidle.h"

#include "pm.h"

#include "sleep.h"

arch/arm/mach-tegra/cpuidle-tegra20.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-tegra/cpuidle-tegra30.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <asm/smp_plat.h>

#include <asm/suspend.h>



#include "cpuidle.h"

#include "pm.h"

#include "sleep.h"

arch/arm/mach-tegra/cpuidle.h

+2 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE