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

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

Merge branch 'tegra/devel' into next/devel

parents 29ea3596 ecb7b0e3

Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt

0 → 100644
+5 −0
Original line number Diff line number Diff line 
NVIDIA Tegra 2 pinmux controller



Required properties:

- compatible : "nvidia,tegra20-pinmux"

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

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



/memreserve/ 0x1c000000 0x04000000;

/include/ "tegra20.dtsi"



/ {

	model = "NVIDIA Tegra2 Ventana evaluation board";

	compatible = "nvidia,ventana", "nvidia,tegra20";



	chosen {

		bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";

	};



	memory {

		reg = < 0x00000000 0x40000000 >;

	};



	serial@70006300 {

		clock-frequency = < 216000000 >;

	};



	sdhci@c8000400 {

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

	};



	sdhci@c8000600 {

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

		support-8bit;

	};

};

arch/arm/boot/dts/tegra20.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -77,6 +77,14 @@ 
		gpio-controller;

	};



	pinmux: pinmux@70000000 {

		compatible = "nvidia,tegra20-pinmux";

		reg = < 0x70000014 0x10    /* Tri-state registers */

			0x70000080 0x20    /* Mux registers */

			0x700000a0 0x14    /* Pull-up/down registers */

			0x70000868 0xa8 >; /* Pad control registers */

	};



	serial@70006000 {

		compatible = "nvidia,tegra20-uart";

		reg = <0x70006000 0x40>;

arch/arm/configs/tegra_defconfig

+32 −7
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ CONFIG_MACH_KAEN=y 
CONFIG_MACH_PAZ00=y

CONFIG_MACH_TRIMSLICE=y

CONFIG_MACH_WARIO=y

CONFIG_MACH_VENTANA=y

CONFIG_TEGRA_DEBUG_UARTD=y

CONFIG_ARM_ERRATA_742230=y

CONFIG_NO_HZ=y
@@ -38,7 +39,6 @@ CONFIG_HIGHMEM=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_VFP=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -65,6 +65,7 @@ CONFIG_IPV6_TUNNEL=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

# CONFIG_WIRELESS is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_MISC_DEVICES=y

CONFIG_AD525X_DPOT=y
@@ -72,34 +73,61 @@ CONFIG_AD525X_DPOT_I2C=y 
CONFIG_ICS932S401=y

CONFIG_APDS9802ALS=y

CONFIG_ISL29003=y

CONFIG_SCSI=y

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_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_TEGRA=y

CONFIG_SPI=y

CONFIG_SPI_TEGRA=y

CONFIG_SENSORS_LM90=y

CONFIG_MFD_TPS6586X=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TPS6586X=y

# CONFIG_USB_SUPPORT is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_PCI is not set

# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_TEGRA=y

CONFIG_SND_SOC_TEGRA_WM8903=y

CONFIG_SND_SOC_TEGRA_TRIMSLICE=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_TEGRA=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_TEGRA=y

CONFIG_STAGING=y

# CONFIG_STAGING_EXCLUDE_BUILD is not set

CONFIG_IIO=y

CONFIG_SENSORS_ISL29018=y

CONFIG_SENSORS_AK8975=y
@@ -123,18 +151,15 @@ CONFIG_NLS_ISO8859_1=y 
CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_SLAB=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_SG=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_ECB=y

arch/arm/mach-tegra/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ config MACH_WARIO 
       help

         Support for the Wario version of Seaboard



config MACH_VENTANA

       bool "Ventana board"

       select MACH_TEGRA_DT

       help

         Support for the nVidia Ventana development platform



choice

        prompt "Low-level debug console UART"

        default TEGRA_DEBUG_UART_NONE