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

Commit 3c52b2be authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'for-3.2/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes

parents c30c8f9f 686448d7

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

+1 −2
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
	sdhci@c8000400 {

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

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

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

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

	};



	sdhci@c8000600 {

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

		support-8bit;

	};

};

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

+7 −6
Original line number Diff line number Diff line
@@ -101,6 +101,13 @@ static void __init tegra_dt_init(void) 


	tegra_clk_init_from_table(tegra_dt_clk_init_table);



	/*

	 * Finished with the static registrations now; fill in the missing

	 * devices

	 */

	of_platform_populate(NULL, tegra_dt_match_table,

				tegra20_auxdata_lookup, NULL);



	for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {

		if (of_machine_is_compatible(pinmux_configs[i].machine)) {

			pinmux_configs[i].init();
@@ -110,12 +117,6 @@ static void __init tegra_dt_init(void) 


	WARN(i == ARRAY_SIZE(pinmux_configs),

		"Unknown platform! Pinmuxing not initialized\n");



	/*

	 * Finished with the static registrations now; fill in the missing

	 * devices

	 */

	of_platform_populate(NULL, tegra_dt_match_table, tegra20_auxdata_lookup, NULL);

}



static const char * tegra_dt_board_compat[] = {

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

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/of.h>



#include <mach/pinmux.h>



#include "gpio-names.h"
@@ -161,7 +163,9 @@ static struct tegra_gpio_table gpio_table[] = { 


void harmony_pinmux_init(void)

{

	platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));

	if (!of_machine_is_compatible("nvidia,tegra20"))

		platform_add_devices(pinmux_devices,

					ARRAY_SIZE(pinmux_devices));



	tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux));

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

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/of.h>



#include <mach/pinmux.h>



#include "gpio-names.h"
@@ -158,7 +160,9 @@ static struct tegra_gpio_table gpio_table[] = { 


void paz00_pinmux_init(void)

{

	platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));

	if (!of_machine_is_compatible("nvidia,tegra20"))

		platform_add_devices(pinmux_devices,

					ARRAY_SIZE(pinmux_devices));



	tegra_pinmux_config_table(paz00_pinmux, ARRAY_SIZE(paz00_pinmux));

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

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/gpio.h>

#include <linux/of.h>



#include <mach/pinmux.h>

#include <mach/pinmux-t2.h>
@@ -191,6 +192,7 @@ static struct tegra_gpio_table common_gpio_table[] = { 
	{ .gpio = TEGRA_GPIO_SD2_POWER,		.enable = true },

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

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

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

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

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

	{ .gpio = TEGRA_GPIO_USB1,		.enable = true },
@@ -218,7 +220,9 @@ static void __init update_pinmux(struct tegra_pingroup_config *newtbl, int size) 


void __init seaboard_common_pinmux_init(void)

{

	platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));

	if (!of_machine_is_compatible("nvidia,tegra20"))

		platform_add_devices(pinmux_devices,

					ARRAY_SIZE(pinmux_devices));



	tegra_pinmux_config_table(seaboard_pinmux, ARRAY_SIZE(seaboard_pinmux));