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

Commit 2eed4e7d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-boards' of... 

Merge tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/boards

Tegra board updates. Most of the board updates for tegra30 and for some
of the driver device-tree conversions have gone in through the other
branches, so that leaves quite little left here -- mostly a couple
of updates to the not-yet-converted tegra2 boards and a couple of
device-tree updates.

* tag 'tegra-boards' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra

:
  ARM: tegra: match SoC name not board name in DT board files
  ARM: tegra: PCIe: Provide 3.3V supply voltage
  ARM: dt: tegra: add the wifi led to paz00 device tree
  ARM: dt: tegra: add the power gpio key to paz00 device tree
  ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 721d6d1e c5444f39

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

+26 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 


	i2c@7000d000 {

		clock-frequency = <400000>;



		adt7461@4c {

			compatible = "adi,adt7461";

			reg = <0x4c>;

		};

	};



	serial@70006000 {
@@ -74,4 +79,25 @@ 
	sdhci@c8000600 {

		support-8bit;

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio 79 1>; /* gpio PJ7, active low */

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		wifi {

			label = "wifi-led";

			gpios = <&gpio 24 0>;

			linux,default-trigger = "rfkill0";

		};

	};

};

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

+1 −5
Original line number Diff line number Diff line
@@ -131,11 +131,7 @@ static void __init tegra_dt_init(void) 
}



static const char *tegra20_dt_board_compat[] = {

	"compulab,trimslice",

	"nvidia,harmony",

	"compal,paz00",

	"nvidia,seaboard",

	"nvidia,ventana",

	"nvidia,tegra20",

	NULL

};

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void __init tegra30_dt_init(void) 
}



static const char *tegra30_dt_board_compat[] = {

	"nvidia,cardhu",

	"nvidia,tegra30",

	NULL

};

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

+2 −1
Original line number Diff line number Diff line
@@ -36,13 +36,14 @@ static struct regulator_consumer_supply tps658621_ldo0_supply[] = { 


static struct regulator_init_data ldo0_data = {

	.constraints = {

		.min_uV = 1250 * 1000,

		.min_uV = 3300 * 1000,

		.max_uV = 3300 * 1000,

		.valid_modes_mask = (REGULATOR_MODE_NORMAL |

				     REGULATOR_MODE_STANDBY),

		.valid_ops_mask = (REGULATOR_CHANGE_MODE |

				   REGULATOR_CHANGE_STATUS |

				   REGULATOR_CHANGE_VOLTAGE),

		.apply_uV = 1,

	},

	.num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply),

	.consumer_supplies = tps658621_ldo0_supply,