From ecd187ab7f25044f1e1c19177e45a3b2a9b906c8 Mon Sep 17 00:00:00 2001 From: Jihoon Bang Date: Tue, 27 Sep 2011 11:23:55 -0700 Subject: arm: tegra: enterprise: add I2C mux driver instance Add I2C mux driver instance to support two rear sensors. Add new GPIO pin to control reset for I2C mux. If board doesn't have I2C mux, it falls back to previous I2C tree. Bug 871860 Reviewed-on: http://git-master/r/54763 (cherry picked from commit c53f8fc9d5d05427684aafb4ad6552eb6cff7ff7) Reviewed-on: http://git-master/r/55799 (cherry picked from commit c5fe68c1b4b1ed1e283526c8ac057efb3a2af5af) Change-Id: I40a35cbd301e53a8d70700043142d5cac0655b5c Reviewed-on: http://git-master/r/57414 Reviewed-by: Jihoon Bang Tested-by: Jihoon Bang Reviewed-by: Dan Willemsen Rebase-Id: Re59baf9b13c653c366f992913622d1a46c8aecde --- arch/arm/mach-tegra/board-enterprise-pinmux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/mach-tegra/board-enterprise-pinmux.c') diff --git a/arch/arm/mach-tegra/board-enterprise-pinmux.c b/arch/arm/mach-tegra/board-enterprise-pinmux.c index 3d91cc76018b..44a33aa9eb18 100644 --- a/arch/arm/mach-tegra/board-enterprise-pinmux.c +++ b/arch/arm/mach-tegra/board-enterprise-pinmux.c @@ -205,6 +205,7 @@ static __initdata struct tegra_pingroup_config enterprise_pinmux[] = { DEFAULT_PINMUX(LCD_D7, RSVD1, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(LCD_D8, DISPLAYA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(LCD_D9, DISPLAYA, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(LCD_D11, DISPLAYA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(LCD_D12, DISPLAYA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(LCD_D13, DISPLAYA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(LCD_D14, DISPLAYA, NORMAL, NORMAL, INPUT), @@ -381,7 +382,6 @@ static __initdata struct tegra_pingroup_config enterprise_unused_pinmux[] = { DEFAULT_PINMUX(LCD_HSYNC, DISPLAYA, PULL_DOWN, TRISTATE, OUTPUT), DEFAULT_PINMUX(LCD_VSYNC, DISPLAYA, PULL_DOWN, TRISTATE, OUTPUT), DEFAULT_PINMUX(LCD_D10, DISPLAYA, PULL_DOWN, TRISTATE, OUTPUT), - DEFAULT_PINMUX(LCD_D11, DISPLAYA, PULL_DOWN, TRISTATE, OUTPUT), DEFAULT_PINMUX(LCD_PWR0, DISPLAYA, PULL_DOWN, TRISTATE, OUTPUT), DEFAULT_PINMUX(LCD_SCK, DISPLAYA, PULL_DOWN, TRISTATE, OUTPUT), DEFAULT_PINMUX(LCD_SDOUT, DISPLAYA, PULL_DOWN, TRISTATE, OUTPUT), @@ -459,7 +459,6 @@ static __initdata struct pin_info_low_power_mode enterprise_unused_gpio_pins[] = PIN_GPIO_LPM("LCD_HSYNC", TEGRA_GPIO_PJ3, 0, 0), PIN_GPIO_LPM("LCD_VSYNC", TEGRA_GPIO_PJ4, 0, 0), PIN_GPIO_LPM("LCD_D10", TEGRA_GPIO_PF2, 0, 0), - PIN_GPIO_LPM("LCD_D12", TEGRA_GPIO_PF3, 0, 0), PIN_GPIO_LPM("LCD_PWR0", TEGRA_GPIO_PB2, 0, 0), PIN_GPIO_LPM("LCD_SCK", TEGRA_GPIO_PZ4, 0, 0), PIN_GPIO_LPM("LCD_SDOUT", TEGRA_GPIO_PN5, 0, 0), -- cgit v1.2.3