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

Commit 604f4498 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'tegra/fixes' of... 

Merge branch 'tegra/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/fixes
parents 1d9e5a2b 29e9c68a

arch/arm/mach-tegra/board-seaboard.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static void __init seaboard_i2c_init(void) 


	i2c_register_board_info(0, &isl29018_device, 1);



	i2c_register_board_info(4, &adt7461_device, 1);

	i2c_register_board_info(3, &adt7461_device, 1);



	tegra_i2c_device1.dev.platform_data = &seaboard_i2c1_platform_data;

	tegra_i2c_device2.dev.platform_data = &seaboard_i2c2_platform_data;

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = { 
	{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_NORMAL},

	{TEGRA_PINGROUP_DAP2,  TEGRA_MUX_DAP2,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DAP3,  TEGRA_MUX_DAP3,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_DAP3,  TEGRA_MUX_DAP3,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DAP4,  TEGRA_MUX_DAP4,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_DDC,   TEGRA_MUX_I2C2,          TEGRA_PUPD_PULL_UP,     TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_DTA,   TEGRA_MUX_VI,            TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},