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

Commit 89622eb9 authored by shaohanlin's avatar shaohanlin
Browse files

Merge branch qc2 into vanilla

parents 1fb67693 5afe8ba1

arch/arm64/boot/dts/qcom/qcs605.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ 
	status = "disabled";

};



&sde_dp {

	qcom,max-pclk-frequency-khz = <675000>;

};



&mem_dump {

	rpmh {

		qcom,dump-size = <0x400000>;

arch/arm64/boot/dts/qcom/sdm439-cdp.dtsi

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019 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
@@ -15,6 +15,8 @@ 


&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};



&pm8953_gpios {

arch/arm64/boot/dts/qcom/sdm439-mtp.dtsi

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -15,6 +15,8 @@ 


&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};



&pm8953_gpios {

arch/arm64/boot/dts/qcom/sdm439-qrd.dtsi

+3 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -16,6 +16,8 @@ 


&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};



&sdhc_1 {

arch/arm64/boot/dts/qcom/sdm670-sde.dtsi

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

/* Copyright (c) 2017-2019, 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
@@ -605,7 +605,7 @@ 
		qcom,aux-cfg8-settings = [40 bb];

		qcom,aux-cfg9-settings = [44 03];



		qcom,max-pclk-frequency-khz = <675000>;

		qcom,max-pclk-frequency-khz = <300000>;



		qcom,ctrl-supply-entries {

			#address-cells = <1>;