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

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

Merge branch 'tegra/t114' into next/soc 



Add a couple of fixes sent via email (via Stephen/Hiroshi).

* tegra/t114:
  ARM: tegra: sort Kconfig selects for Tegra114
  ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
  ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e2efc25a 1d7e5c2c

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -641,6 +641,7 @@ config ARCH_LPC32XX 
config ARCH_TEGRA

config ARCH_TEGRA

	bool "NVIDIA Tegra"

	bool "NVIDIA Tegra"

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_MMIO

	select CLKSRC_OF

	select CLKSRC_OF

arch/arm/mach-tegra/Kconfig

+2 −4
Original line number Original line Diff line number Diff line
@@ -5,7 +5,6 @@ comment "NVIDIA Tegra options" 
config ARCH_TEGRA_2x_SOC

config ARCH_TEGRA_2x_SOC

	bool "Enable support for Tegra20 family"

	bool "Enable support for Tegra20 family"

	select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP

	select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_720789

	select ARM_ERRATA_720789

	select ARM_ERRATA_742230 if SMP

	select ARM_ERRATA_742230 if SMP

	select ARM_ERRATA_751472

	select ARM_ERRATA_751472
@@ -27,7 +26,6 @@ config ARCH_TEGRA_2x_SOC 




config ARCH_TEGRA_3x_SOC

config ARCH_TEGRA_3x_SOC

	bool "Enable support for Tegra30 family"

	bool "Enable support for Tegra30 family"

	select ARCH_REQUIRE_GPIOLIB

	select ARM_ERRATA_743622

	select ARM_ERRATA_743622

	select ARM_ERRATA_751472

	select ARM_ERRATA_751472

	select ARM_ERRATA_754322

	select ARM_ERRATA_754322
@@ -47,10 +45,10 @@ config ARCH_TEGRA_3x_SOC 




config ARCH_TEGRA_114_SOC

config ARCH_TEGRA_114_SOC

	bool "Enable support for Tegra114 family"

	bool "Enable support for Tegra114 family"

	select ARM_ARCH_TIMER

	select ARM_GIC

	select ARM_GIC

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select ARM_L1_CACHE_SHIFT_6

	select ARM_ARCH_TIMER

	select CPU_V7

	select PINCTRL

	select PINCTRL

	select PINCTRL_TEGRA114

	select PINCTRL_TEGRA114

	help

	help

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ static const char * const tegra114_dt_board_compat[] = { 
DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)")

DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)")

	.smp		= smp_ops(tegra_smp_ops),

	.smp		= smp_ops(tegra_smp_ops),

	.map_io		= tegra_map_common_io,

	.map_io		= tegra_map_common_io,

	.init_early	= tegra30_init_early,

	.init_early	= tegra114_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_irq	= tegra_dt_init_irq,

	.init_time	= clocksource_of_init,

	.init_time	= clocksource_of_init,

	.init_machine	= tegra114_dt_init,

	.init_machine	= tegra114_dt_init,

arch/arm/mach-tegra/board.h

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

/*

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

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

 *

 *

 * Copyright (c) 2013 NVIDIA Corporation. All rights reserved.

 * Copyright (C) 2010 Google, Inc.

 * Copyright (C) 2010 Google, Inc.

 *

 *

 * Author:

 * Author:
@@ -27,6 +28,7 @@ void tegra_assert_system_reset(char mode, const char *cmd); 




void __init tegra20_init_early(void);

void __init tegra20_init_early(void);

void __init tegra30_init_early(void);

void __init tegra30_init_early(void);

void __init tegra114_init_early(void);

void __init tegra_map_common_io(void);

void __init tegra_map_common_io(void);

void __init tegra_init_irq(void);

void __init tegra_init_irq(void);

void __init tegra_dt_init_irq(void);

void __init tegra_dt_init_irq(void);

arch/arm/mach-tegra/common.c

+17 −8
Original line number Original line Diff line number Diff line 
/*

/*

 * arch/arm/mach-tegra/common.c

 * arch/arm/mach-tegra/common.c

 *

 *

 * Copyright (c) 2013 NVIDIA Corporation. All rights reserved.

 * Copyright (C) 2010 Google, Inc.

 * Copyright (C) 2010 Google, Inc.

 *

 *

 * Author:

 * Author:
@@ -93,8 +94,7 @@ static void __init tegra_init_cache(void) 




}

}





#ifdef CONFIG_ARCH_TEGRA_2x_SOC

static void __init tegra_init_early(void)

void __init tegra20_init_early(void)

{

{

	tegra_cpu_reset_handler_init();

	tegra_cpu_reset_handler_init();

	tegra_apb_io_init();

	tegra_apb_io_init();
@@ -102,22 +102,31 @@ void __init tegra20_init_early(void) 
	tegra_init_cache();

	tegra_init_cache();

	tegra_pmc_init();

	tegra_pmc_init();

	tegra_powergate_init();

	tegra_powergate_init();

}



#ifdef CONFIG_ARCH_TEGRA_2x_SOC

void __init tegra20_init_early(void)

{

	tegra_init_early();

	tegra20_hotplug_init();

	tegra20_hotplug_init();

}

}

#endif

#endif



#ifdef CONFIG_ARCH_TEGRA_3x_SOC

#ifdef CONFIG_ARCH_TEGRA_3x_SOC

void __init tegra30_init_early(void)

void __init tegra30_init_early(void)

{

{

	tegra_cpu_reset_handler_init();

	tegra_init_early();

	tegra_apb_io_init();

	tegra_init_fuse();

	tegra_init_cache();

	tegra_pmc_init();

	tegra_powergate_init();

	tegra30_hotplug_init();

	tegra30_hotplug_init();

}

}

#endif

#endif





#ifdef CONFIG_ARCH_TEGRA_114_SOC

void __init tegra114_init_early(void)

{

	tegra_init_early();

}

#endif



void __init tegra_init_late(void)

void __init tegra_init_late(void)

{

{

	tegra_powergate_debugfs_init();

	tegra_powergate_debugfs_init();