Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0390669 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.9-cleanup' of... 

Merge tag 'tegra-for-3.9-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup

From Stephen Warren:
ARM: tegra: cleanup

This pull request contains various cleanup and minor changes to core
Tegra code:
* Tegra clocksource driver is moved to drivers/clocksource.
* Various typos, warning cleanup, statics cleanup, section mismatch
  fixes, etc.
* Various small fixes/cleanups for CPU/hotplug/SMP code.

This pull request is based on a merge of v3.8-rc3 and at least part of
arm-soc's timer/cleanup branch.

* tag 'tegra-for-3.9-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: tegra: fix compile error when disable CPU_IDLE
  ARM: tegra30: make the wait time of CPU power up to proportional to HZ
  ARM: tegra: make device can run on UP
  ARM: tegra: clean up the CPUINIT section
  ARM: tegra: moving the clock gating procedure to tegra_cpu_kill
  ARM: tegra: update the cache maintenance order for CPU shutdown
  ARM: tegra30: fix power up sequence for boot_secondary
  ARM: tegra: cpufreq: move clk_get/put out of function tegra_cpu_init/exit
  ARM: tegra: fix Kconfig warnings when !SMP
  ARM: tegra: Make variables static
  clocksource: tegra: cosmetic: Fix error message
  ARM: tegra: move timer.c to drivers/clocksource/

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

Trivial conflicts:
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/board-dt-tegra30.c
	drivers/clocksource/Makefile
parents b60decad 24e30c94

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ config ARCH_TEGRA 
	select ARCH_HAS_CPUFREQ

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

arch/arm/mach-tegra/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ config ARCH_TEGRA_2x_SOC 
	bool "Enable support for Tegra20 family"

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_720789

	select ARM_ERRATA_742230

	select ARM_ERRATA_742230 if SMP

	select ARM_ERRATA_751472

	select ARM_ERRATA_754327

	select ARM_ERRATA_754327 if SMP

	select ARM_ERRATA_764369 if SMP

	select ARM_GIC

	select CPU_FREQ_TABLE if CPU_FREQ

arch/arm/mach-tegra/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -2,15 +2,16 @@ obj-y += common.o 
obj-y                                   += io.o

obj-y                                   += irq.o

obj-y                                   += clock.o

obj-y                                   += timer.o

obj-y					+= fuse.o

obj-y					+= pmc.o

obj-y					+= flowctrl.o

obj-y					+= powergate.o

obj-y					+= apbio.o

obj-y					+= pm.o

obj-y					+= reset.o

obj-y					+= reset-handler.o

obj-y					+= sleep.o

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

obj-$(CONFIG_CPU_IDLE)			+= sleep.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra20_clocks.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra20_clocks_data.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra20_speedo.o
@@ -27,7 +28,6 @@ ifeq ($(CONFIG_CPU_IDLE),y) 
obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= cpuidle-tegra30.o

endif

obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o

obj-$(CONFIG_SMP)                       += reset.o

obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o

obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o

obj-$(CONFIG_TEGRA_PCI)			+= pcie.o

arch/arm/mach-tegra/apbio.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void tegra_apb_writel_direct(u32 value, unsigned long offset); 
static struct dma_chan *tegra_apb_dma_chan;

static struct dma_slave_config dma_sconfig;



bool tegra_apb_dma_init(void)

static bool tegra_apb_dma_init(void)

{

	dma_cap_mask_t mask;

arch/arm/mach-tegra/board-dt-tegra20.c

+7 −6
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 *

 */



#include <linux/clocksource.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>
@@ -43,31 +44,31 @@ 
#include "common.h"

#include "iomap.h"



struct tegra_ehci_platform_data tegra_ehci1_pdata = {

static struct tegra_ehci_platform_data tegra_ehci1_pdata = {

	.operating_mode = TEGRA_USB_OTG,

	.power_down_on_bus_suspend = 1,

	.vbus_gpio = -1,

};



struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = {

static struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = {

	.reset_gpio = -1,

	.clk = "cdev2",

};



struct tegra_ehci_platform_data tegra_ehci2_pdata = {

static struct tegra_ehci_platform_data tegra_ehci2_pdata = {

	.phy_config = &tegra_ehci2_ulpi_phy_config,

	.operating_mode = TEGRA_USB_HOST,

	.power_down_on_bus_suspend = 1,

	.vbus_gpio = -1,

};



struct tegra_ehci_platform_data tegra_ehci3_pdata = {

static struct tegra_ehci_platform_data tegra_ehci3_pdata = {

	.operating_mode = TEGRA_USB_HOST,

	.power_down_on_bus_suspend = 1,

	.vbus_gpio = -1,

};



struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {

static struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC3_BASE, "sdhci-tegra.2", NULL),
@@ -200,7 +201,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") 
	.smp		= smp_ops(tegra_smp_ops),

	.init_early	= tegra20_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_time	= tegra_init_timer,

	.init_time	= clocksource_of_init,

	.init_machine	= tegra_dt_init,

	.init_late	= tegra_dt_init_late,

	.restart	= tegra_assert_system_reset,