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

Commit e195ffbe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'tegra/soc' into next/soc 

* tegra/soc:
  arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF
  arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC
  arm/tegra: Delete tegra_init_clock()
  arm/tegra: Fix section mismatch errors in tegra30 pinmux
  arm/tegra: Fix section mismatch errors in tegra20 pinmux
  arm/tegra: refresh defconfig for tegra30
  arm/tegra: add support for tegra30 based board cardhu
  arm/tegra: implement support for tegra30
  arm/tegra: pinmux tables and definitions for tegra30
  arm/tegra: add new fields to struct tegra_pingroup_desc
  arm/tegra: prepare pinmux code for multiple tegra variants
  arm/tegra: rename tegra20 pinmux files
  arm/tegra: generalize L2 cache initialization
  arm/tegra: use PMC reset
  arm/tegra: rename board-dt.c to board-dt-tegra20.c
  arm/tegra: prepare early init for multiple tegra variants
  arm/tegra: don't export clk_measure_input_freq
  arm/tegra: prepare clock code for multiple tegra variants
  arm/tegra: cleanup tegra20 support
  arm/tegra: clk_get should not be fatal

Conflicts:
	arch/arm/mach-tegra/board-dt-tegra20.c
parents 0782e5bb e5570bbc

arch/arm/boot/dts/tegra-cardhu.dts

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "tegra30.dtsi"



/ {

	model = "NVIDIA Tegra30 Cardhu evaluation board";

	compatible = "nvidia,cardhu", "nvidia,tegra30";



	memory {

		reg = < 0x80000000 0x40000000 >;

	};



	serial@70006000 {

		clock-frequency = < 408000000 >;

	};



	i2c@7000c000 {

		clock-frequency = <100000>;

	};



	i2c@7000c400 {

		clock-frequency = <100000>;

	};



	i2c@7000c500 {

		clock-frequency = <100000>;

	};



	i2c@7000c700 {

		clock-frequency = <100000>;

	};



	i2c@7000d000 {

		clock-frequency = <100000>;

	};

};

arch/arm/configs/tegra_defconfig

+4 −5
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ CONFIG_RESOURCE_COUNTERS=y 
CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EMBEDDED=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_ELF_CORE is not set

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -20,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_TEGRA=y

CONFIG_ARCH_TEGRA_2x_SOC=y

CONFIG_ARCH_TEGRA_3x_SOC=y

CONFIG_MACH_HARMONY=y

CONFIG_MACH_KAEN=y

CONFIG_MACH_PAZ00=y
@@ -78,14 +79,12 @@ CONFIG_BLK_DEV_SD=y 
# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_NET_ETHERNET=y

CONFIG_R8169=y

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

CONFIG_USB_PEGASUS=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

arch/arm/mach-tegra/Kconfig

+24 −7
Original line number Diff line number Diff line
@@ -2,11 +2,8 @@ if ARCH_TEGRA 


comment "NVIDIA Tegra options"



choice

	prompt "Select Tegra processor family for target system"



config ARCH_TEGRA_2x_SOC

	bool "Tegra 2 family"

	bool "Enable support for Tegra20 family"

	select CPU_V7

	select ARM_GIC

	select ARCH_REQUIRE_GPIOLIB
@@ -17,22 +14,36 @@ config ARCH_TEGRA_2x_SOC 
	  Support for NVIDIA Tegra AP20 and T20 processors, based on the

	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller



endchoice

config ARCH_TEGRA_3x_SOC

	bool "Enable support for Tegra30 family"

	select CPU_V7

	select ARM_GIC

	select ARCH_REQUIRE_GPIOLIB

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select USB_ULPI if USB_SUPPORT

	select USB_ULPI_VIEWPORT if USB_SUPPORT

	select USE_OF

	help

	  Support for NVIDIA Tegra T30 processor family, based on the

	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller



config TEGRA_PCI

	bool "PCI Express support"

	depends on ARCH_TEGRA_2x_SOC

	select PCI



comment "Tegra board type"



config MACH_HARMONY

       bool "Harmony board"

       depends on ARCH_TEGRA_2x_SOC

       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

       help

         Support for nVidia Harmony development platform



config MACH_KAEN

       bool "Kaen board"

       depends on ARCH_TEGRA_2x_SOC

       select MACH_SEABOARD

       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

       help
@@ -40,11 +51,13 @@ config MACH_KAEN 


config MACH_PAZ00

       bool "Paz00 board"

       depends on ARCH_TEGRA_2x_SOC

       help

         Support for the Toshiba AC100/Dynabook AZ netbook



config MACH_SEABOARD

       bool "Seaboard board"

       depends on ARCH_TEGRA_2x_SOC

       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC

       help

         Support for nVidia Seaboard development platform. It will
@@ -52,25 +65,29 @@ config MACH_SEABOARD 
	 have large similarities with the seaboard design.



config MACH_TEGRA_DT

	bool "Generic Tegra board (FDT support)"

	bool "Generic Tegra20 board (FDT support)"

	depends on ARCH_TEGRA_2x_SOC

	select USE_OF

	help

	  Support for generic nVidia Tegra boards using Flattened Device Tree

	  Support for generic NVIDIA Tegra20 boards using Flattened Device Tree



config MACH_TRIMSLICE

       bool "TrimSlice board"

       depends on ARCH_TEGRA_2x_SOC

       select TEGRA_PCI

       help

         Support for CompuLab TrimSlice platform



config MACH_WARIO

       bool "Wario board"

       depends on ARCH_TEGRA_2x_SOC

       select MACH_SEABOARD

       help

         Support for the Wario version of Seaboard



config MACH_VENTANA

       bool "Ventana board"

       depends on ARCH_TEGRA_2x_SOC

       select MACH_TEGRA_DT

       help

         Support for the nVidia Ventana development platform

arch/arm/mach-tegra/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -5,12 +5,13 @@ obj-y += irq.o 
obj-y                                   += clock.o

obj-y                                   += timer.o

obj-y                                   += pinmux.o

obj-y                                   += powergate.o

obj-y					+= fuse.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= powergate.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-t2-tables.o

obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-tegra20-tables.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= pinmux-tegra30-tables.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o

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

obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o

obj-$(CONFIG_TEGRA_SYSTEM_DMA)		+= dma.o
@@ -29,7 +30,7 @@ obj-$(CONFIG_MACH_PAZ00) += board-paz00-pinmux.o 
obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard.o

obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard-pinmux.o



obj-$(CONFIG_MACH_TEGRA_DT)             += board-dt.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-dt-tegra20.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-harmony-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-seaboard-pinmux.o

obj-$(CONFIG_MACH_TEGRA_DT)             += board-paz00-pinmux.o

arch/arm/mach-tegra/Makefile.boot

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ dtb-$(CONFIG_MACH_PAZ00) += tegra-paz00.dtb 
dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb

dtb-$(CONFIG_MACH_TRIMSLICE) += tegra-trimslice.dtb

dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb

dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra-cardhu.dtb