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: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-tegra/board-dt-tegra114.c
index 72598e298667ebce40878ed9cdc0986cc1ad11ca,b920df1b69fa93796ddd3fa5519c4d17d1f48419..085d63637b62bcbbbad4e57095870d414f642dc9
--- 1/arch/arm/mach-tegra/board-dt-tegra114.c
--- 2/arch/arm/mach-tegra/board-dt-tegra114.c
+++ b/arch/arm/mach-tegra/board-dt-tegra114.c
@@@ -36,8 -37,9 +36,8 @@@ static const char * const tegra114_dt_b
  DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)")
        .smp            = smp_ops(tegra_smp_ops),
        .map_io         = tegra_map_common_io,
-       .init_early     = tegra30_init_early,
+       .init_early     = tegra114_init_early,
        .init_irq       = tegra_dt_init_irq,
 -      .handle_irq     = gic_handle_irq,
        .init_time      = clocksource_of_init,
        .init_machine   = tegra114_dt_init,
        .init_late      = tegra_init_late,

diff --cc arch/arm/mach-tegra/common.c
Simple merge