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

Commit f4efe967 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: Remove cd-gpio pinctrl for sdhc on msm8909 SKU"

parents dc8f7b35 2c076b7a

arch/arm/boot/dts/qcom/msm8909-qrd-skua.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015,2018, The Linux Foundation. All rights

 * reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -214,6 +215,9 @@ 
		1 &intc 0 221 0>;

	interrupt-names = "hc_irq", "pwr_irq";

	/delete-property/ cd-gpios;

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;

};



&pm8909_mpps {

arch/arm/boot/dts/qcom/msm8909-qrd-skue.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights

 * reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -287,6 +288,9 @@ 
			1 &intc 0 221 0>;

	interrupt-names = "hc_irq", "pwr_irq";

	/delete-property/ cd-gpios;

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;

};



&pm8909_mpps {