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

Commit 4dcf0334 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'tegra-for-3.13-soc-v2' of... 

Merge tag 'tegra-for-3.13-soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc

From Stephen Warren:
ARM: tegra: core SoC support changes for 3.13

This branch includes:
* SoC fuse values are used as device randomness at boot.
* Initial support for the Tegra124 SoC is added. When coupled with an
  appropriate clock driver, which should also be merged for 3.13, we are
  able to boot to user-space using an initrd.
* The powergate code gains support for Tegra114.

This branch is based on previous pull request tegra-for-3.13-cleanup.

* tag 'tegra-for-3.13-soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra

:
  ARM: tegra: Add Tegra114 powergate support
  ARM: tegra: Constify list of CPU domains
  ARM: tegra: Remove duplicate powergate defines
  ARM: tegra: add LP1 support code for Tegra124
  ARM: tegra: re-calculate the LP1 data for Tegra30/114
  ARM: tegra: enable CPU idle for Tegra124
  ARM: tegra: make tegra_resume can work with current and later chips
  ARM: tegra: CPU hotplug support for Tegra124
  ARM: tegra: add PMC compatible value for Tegra124
  ARM: tegra: add Tegra124 SoC support
  ARM: tegra: add fuses as device randomness
  ARM: tegra: fix ARCH_TEGRA_114_SOC select sort order
  ARM: tegra: make tegra_init_fuse() __init
  ARM: tegra: remove much of iomap.h
  ARM: tegra: move resume vector define to irammap.h
  ARM: tegra: delete gpio-names.h
  ARM: tegra: delete stale header content
  ARM: tegra: remove common.c
  ARM: tegra: split tegra_pmc_init() in two

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents abcba009 bd6a9ddc

arch/arm/mach-tegra/Kconfig

+9 −1
Original line number Diff line number Diff line
@@ -53,14 +53,22 @@ config ARCH_TEGRA_3x_SOC 


config ARCH_TEGRA_114_SOC

	bool "Enable support for Tegra114 family"

	select HAVE_ARM_ARCH_TIMER

	select ARM_ERRATA_798181

	select ARM_L1_CACHE_SHIFT_6

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL_TEGRA114

	help

	  Support for NVIDIA Tegra T114 processor family, based on the

	  ARM CortexA15MP CPU



config ARCH_TEGRA_124_SOC

	bool "Enable support for Tegra124 family"

	select ARM_L1_CACHE_SHIFT_6

	select HAVE_ARM_ARCH_TIMER

	help

	  Support for NVIDIA Tegra T124 processor family, based on the

	  ARM CortexA15MP CPU



config TEGRA_AHB

	bool "Enable AHB driver for NVIDIA Tegra SoCs"

	default y

arch/arm/mach-tegra/Makefile

+5 −1
Original line number Diff line number Diff line 
asflags-y				+= -march=armv7-a



obj-y                                   += common.o

obj-y                                   += io.o

obj-y                                   += irq.o

obj-y					+= fuse.o
@@ -36,5 +35,10 @@ obj-$(CONFIG_ARCH_TEGRA_114_SOC) += pm-tegra30.o 
ifeq ($(CONFIG_CPU_IDLE),y)

obj-$(CONFIG_ARCH_TEGRA_114_SOC)	+= cpuidle-tegra114.o

endif

obj-$(CONFIG_ARCH_TEGRA_124_SOC)	+= sleep-tegra30.o

obj-$(CONFIG_ARCH_TEGRA_124_SOC)	+= pm-tegra30.o

ifeq ($(CONFIG_CPU_IDLE),y)

obj-$(CONFIG_ARCH_TEGRA_124_SOC)	+= cpuidle-tegra114.o

endif



obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= board-paz00.o

arch/arm/mach-tegra/board-paz00.c

+2 −3
Original line number Diff line number Diff line
@@ -20,12 +20,11 @@ 
#include <linux/platform_device.h>

#include <linux/rfkill-gpio.h>

#include "board.h"

#include "board-paz00.h"



static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {

	.name		= "wifi_rfkill",

	.reset_gpio	= TEGRA_WIFI_RST,

	.shutdown_gpio	= TEGRA_WIFI_PWRN,

	.reset_gpio	= 25, /* PD1 */

	.shutdown_gpio	= 85, /* PK5 */

	.type	= RFKILL_TYPE_WLAN,

};

arch/arm/mach-tegra/board-paz00.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-tegra/board-paz00.h

 *

 * Copyright (C) 2010 Marc Dietrich <marvin24@gmx.de>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that 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.

 *

 */



#ifndef _MACH_TEGRA_BOARD_PAZ00_H

#define _MACH_TEGRA_BOARD_PAZ00_H



#include "gpio-names.h"



#define TEGRA_WIFI_PWRN			TEGRA_GPIO_PK5

#define TEGRA_WIFI_RST			TEGRA_GPIO_PD1



#endif

arch/arm/mach-tegra/board.h

+0 −12
Original line number Diff line number Diff line
@@ -25,20 +25,8 @@ 
#include <linux/types.h>

#include <linux/reboot.h>



void tegra_assert_system_reset(enum reboot_mode mode, const char *cmd);



void __init tegra_init_early(void);

void __init tegra_map_common_io(void);

void __init tegra_init_irq(void);

void __init tegra_dt_init_irq(void);



void tegra_init_late(void);



#ifdef CONFIG_DEBUG_FS

int tegra_clk_debugfs_init(void);

#else

static inline int tegra_clk_debugfs_init(void) { return 0; }

#endif



int __init tegra_powergate_init(void);

#if defined(CONFIG_ARCH_TEGRA_2x_SOC) && defined(CONFIG_DEBUG_FS)