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

Commit 5d2b9fdc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: fix sd card regulator info for msm krypton"

parents bec74b58 b8165395

arch/arm/boot/dts/qti/msmkrypton-regulator.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ 
	sd_slot_vreg: regulator-isl80101 {

		compatible = "regulator-fixed";

		regulator-name = "sd_2.95";

		gpio = <&msmgpio 51 0>;

		gpio = <&msmgpio 89 0>;

		startup-delay-us = <1000>;

		enable-active-high;

	};

arch/arm/mach-msm/board-krypton-gpiomux.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static struct gpiomux_setting gpio_sd_card_vreg_config = { 


static struct msm_gpiomux_config msm_sd_card_configs[] __initdata = {

	{

		.gpio      = 51,		/* SD CARD VREG EN GPIO */

		.gpio      = 89,		/* SD CARD VREG EN GPIO */

		.settings = {

			[GPIOMUX_SUSPENDED] = &gpio_sd_card_vreg_config,

		},