Commit 15544135 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

Merge branch 'arm64-fixes-for-6.3' into arm64-for-6.4 

Merge the arm64-fixes-for-6.3 branch to avoid merge conflicts with
changes for v6.4.
parents 0514b376 1dc40551

arch/arm64/boot/dts/qcom/ipq8074-hk01.dts

+2 −2
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ &pcie1 { 
	perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;

};



&pcie_phy0 {

&pcie_qmp0 {

	status = "okay";

};



&pcie_phy1 {

&pcie_qmp1 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ &pcie1 { 
	perst-gpios = <&tlmm 61 GPIO_ACTIVE_LOW>;

};



&pcie_phy0 {

&pcie_qmp0 {

	status = "okay";

};



&pcie_phy1 {

&pcie_qmp1 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts

+0 −4
Original line number Diff line number Diff line
@@ -33,7 +33,3 @@ &button_default { 
&gpio_leds_default {

	pins = "gpio81", "gpio82", "gpio83";

};
 


&sim_ctrl_default {

	pins = "gpio1", "gpio2";

};

arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts

+26 −2
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ &led_b { 
	gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;

};



&mpss {

	pinctrl-0 = <&sim_ctrl_default>;

	pinctrl-names = "default";

};



&button_default {

	pins = "gpio37";

	bias-pull-down;
@@ -34,6 +39,25 @@ &gpio_leds_default { 
	pins = "gpio20", "gpio21", "gpio22";

};



&sim_ctrl_default {

	pins = "gpio1", "gpio2";

/* This selects the external SIM card slot by default */

&msmgpio {

	sim_ctrl_default: sim-ctrl-default-state {

		esim-sel-pins {

			pins = "gpio0", "gpio3";

			bias-disable;

			output-low;

		};



		sim-en-pins {

			pins = "gpio1";

			bias-disable;

			output-low;

		};



		sim-sel-pins {

			pins = "gpio2";

			bias-disable;

			output-high;

		};

	};

};

arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ &gcc { 
};



&mpss {

	pinctrl-0 = <&sim_ctrl_default>;

	pinctrl-names = "default";



	status = "okay";

};
@@ -240,11 +237,4 @@ gpio_leds_default: gpio-leds-default-state { 
		drive-strength = <2>;

		bias-disable;

	};



	sim_ctrl_default: sim-ctrl-default-state {

		function = "gpio";

		drive-strength = <2>;

		bias-disable;

		output-low;

	};

};