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

Commit 6e50e9f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra 

* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
  ARM: tegra: harmony: initialize the TPS65862 PMIC
  ARM: tegra: update defconfig
  ARM: tegra: harmony: update PCI-e initialization sequence
  ARM: tegra: trimslice: enable MMC/SD slots
  ARM: tegra: enable new drivers in defconfig
  ARM: tegra: Add Toshiba AC100 support
  ARM: tegra: harmony: Set WM8903 gpio_base
  ARM: tegra: harmony: I2C-related portions of audio support
  ARM: tegra: harmony: register i2c devices
  ARM: tegra: seaboard: register i2c devices
  ARM: tegra: harmony: Beginnings of audio support
  ARM: tegra: create defines for SD-related GPIO names
  ARM: tegra: add devices.c entries for audio
parents e264ac8c 84abf608

arch/arm/configs/tegra_defconfig

+26 −3
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_TEGRA=y

CONFIG_MACH_HARMONY=y

CONFIG_MACH_KAEN=y

CONFIG_MACH_PAZ00=y

CONFIG_MACH_TRIMSLICE=y

CONFIG_MACH_WARIO=y

CONFIG_TEGRA_DEBUG_UARTD=y

CONFIG_ARM_ERRATA_742230=y

CONFIG_NO_HZ=y
@@ -40,6 +44,10 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -66,7 +74,7 @@ CONFIG_APDS9802ALS=y 
CONFIG_ISL29003=y

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

# CONFIG_NETDEV_1000 is not set

CONFIG_R8169=y

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set
@@ -78,12 +86,23 @@ CONFIG_SERIAL_8250_CONSOLE=y 
# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_TEGRA=y

CONFIG_SENSORS_LM90=y

CONFIG_MFD_TPS6586X=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TPS6586X=y

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_STAGING=y

# CONFIG_STAGING_EXCLUDE_BUILD is not set

CONFIG_IIO=y

CONFIG_SENSORS_ISL29018=y

CONFIG_SENSORS_AK8975=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y
@@ -95,6 +114,10 @@ CONFIG_EXT3_FS_SECURITY=y 
# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_EFI_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

arch/arm/mach-tegra/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ config MACH_KAEN 
       help

         Support for the Kaen version of Seaboard



config MACH_PAZ00

       bool "Paz00 board"

       help

         Support for the Toshiba AC100/Dynabook AZ netbook



config MACH_SEABOARD

       bool "Seaboard board"

       help

arch/arm/mach-tegra/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ obj-$(CONFIG_USB_SUPPORT) += usb_phy.o 
obj-${CONFIG_MACH_HARMONY}              += board-harmony.o

obj-${CONFIG_MACH_HARMONY}              += board-harmony-pinmux.o

obj-${CONFIG_MACH_HARMONY}              += board-harmony-pcie.o

obj-${CONFIG_MACH_HARMONY}              += board-harmony-power.o



obj-${CONFIG_MACH_PAZ00}		+= board-paz00.o

obj-${CONFIG_MACH_PAZ00}		+= board-paz00-pinmux.o



obj-${CONFIG_MACH_SEABOARD}             += board-seaboard.o

obj-${CONFIG_MACH_SEABOARD}             += board-seaboard-pinmux.o

arch/arm/mach-tegra/board-harmony-pcie.c

+23 −1
Original line number Diff line number Diff line
@@ -27,13 +27,29 @@ 


#ifdef CONFIG_TEGRA_PCI



/* GPIO 3 of the PMIC */

#define EN_VDD_1V05_GPIO	(TEGRA_NR_GPIOS + 2)



static int __init harmony_pcie_init(void)

{

	struct regulator *regulator = NULL;

	int err;



	if (!machine_is_harmony())

		return 0;



	err = gpio_request(EN_VDD_1V05_GPIO, "EN_VDD_1V05");

	if (err)

		return err;



	gpio_direction_output(EN_VDD_1V05_GPIO, 1);



	regulator = regulator_get(NULL, "pex_clk");

	if (IS_ERR_OR_NULL(regulator))

		goto err_reg;



	regulator_enable(regulator);



	tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_NORMAL);

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_NORMAL);

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_NORMAL);
@@ -49,9 +65,15 @@ err_pcie: 
	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_TRISTATE);

	tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_TRISTATE);



	regulator_disable(regulator);

	regulator_put(regulator);

err_reg:

	gpio_free(EN_VDD_1V05_GPIO);



	return err;

}



subsys_initcall(harmony_pcie_init);

/* PCI should be initialized after I2C, mfd and regulators */

subsys_initcall_sync(harmony_pcie_init);



#endif

arch/arm/mach-tegra/board-harmony-pinmux.c

+16 −12
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ static struct tegra_pingroup_config harmony_pinmux[] = { 
	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_ATD,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_ATE,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_CDEV1, TEGRA_MUX_OSC,           TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_CDEV1, TEGRA_MUX_PLLA_OUT,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_CDEV2, TEGRA_MUX_PLLP_OUT4,     TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_CRTP,  TEGRA_MUX_CRT,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_CSUS,  TEGRA_MUX_VI_SENSOR_CLK, TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DAP1,  TEGRA_MUX_DAP1,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DAP1,  TEGRA_MUX_DAP1,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_DAP2,  TEGRA_MUX_DAP2,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DAP3,  TEGRA_MUX_DAP3,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DAP4,  TEGRA_MUX_DAP4,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
@@ -114,13 +114,13 @@ static struct tegra_pingroup_config harmony_pinmux[] = { 
	{TEGRA_PINGROUP_SLXK,  TEGRA_MUX_PCIE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPDI,  TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPDO,  TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIA,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIB,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIC,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_SPIA,  TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_SPIB,  TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_SPIC,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPID,  TEGRA_MUX_SPI1,          TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIE,  TEGRA_MUX_SPI1,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIF,  TEGRA_MUX_SPI1,          TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIG,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIG,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_SPIH,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_UAA,   TEGRA_MUX_ULPI,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_UAB,   TEGRA_MUX_ULPI,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
@@ -141,12 +141,16 @@ static struct tegra_pingroup_config harmony_pinmux[] = { 
};



static struct tegra_gpio_table gpio_table[] = {

	{ .gpio = TEGRA_GPIO_PI5,	.enable = true	}, /* mmc2 cd	*/

	{ .gpio = TEGRA_GPIO_PH1,	.enable = true	}, /* mmc2 wp	*/

	{ .gpio = TEGRA_GPIO_PT3,	.enable = true	}, /* mmc2 pwr	*/

	{ .gpio = TEGRA_GPIO_PH2,	.enable = true	}, /* mmc4 cd	*/

	{ .gpio = TEGRA_GPIO_PH3,	.enable = true	}, /* mmc4 wp	*/

	{ .gpio = TEGRA_GPIO_PI6,	.enable = true	}, /* mmc4 pwr	*/

	{ .gpio = TEGRA_GPIO_SD2_CD,		.enable = true	},

	{ .gpio = TEGRA_GPIO_SD2_WP,		.enable = true	},

	{ .gpio = TEGRA_GPIO_SD2_POWER,		.enable = true	},

	{ .gpio = TEGRA_GPIO_SD4_CD,		.enable = true	},

	{ .gpio = TEGRA_GPIO_SD4_WP,		.enable = true	},

	{ .gpio = TEGRA_GPIO_SD4_POWER,		.enable = true	},

	{ .gpio = TEGRA_GPIO_CDC_IRQ,		.enable = true	},

	{ .gpio = TEGRA_GPIO_HP_DET,		.enable = true	},

	{ .gpio = TEGRA_GPIO_INT_MIC_EN,	.enable = true	},

	{ .gpio = TEGRA_GPIO_EXT_MIC_EN,	.enable = true	},

};



void harmony_pinmux_init(void)