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

Commit c7b930e9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: update sdhc properties"

parents 4295f143 7c138aad

qcom/sa6155p-vm.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ 
	pdc: interrupt-controller@b220000 {

		compatible = "qcom,sm6150-pdc";

		reg = <0xb220000 0x30000>;

		qcom,pdc-ranges = <6 486 1>, <8 488 4>;

		qcom,pdc-ranges = <6 486 1>, <8 488 4>, <94 609 1>;

		#interrupt-cells = <2>;

		interrupt-parent = <&intc>;

		interrupt-controller;
@@ -475,8 +475,7 @@ 
		pinctrl-0 = <&sdc2_on>;

		pinctrl-1 = <&sdc2_off>;



		broken-cd;



		cd-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;

		status = "disabled";



		qos0 {
@@ -595,7 +594,7 @@ 
#include "sa6155p-vm-cnss.dtsi"



&tlmm {

	/delete-property/ wakeup-parent;

	qcom,gpio-irq-map = <99 94>;

};



&qupv3_0 {

qcom/sa8155-vm.dtsi

+2 −3
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,scc-sm8150.h>

#include "quin-vm-common.dtsi"

#include "pm8150-vm.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA8155 Virtual Machine";
@@ -578,8 +579,7 @@ 
		pinctrl-0 = <&sdc2_on>;

		pinctrl-1 = <&sdc2_off>;



		broken-cd;

		qcom,nonhotplug;

		cd-gpios = <&pm8150_gpios 4 GPIO_ACTIVE_LOW>;

		status = "disabled";



		qos0 {
@@ -827,7 +827,6 @@ 
#include "sa8155-vm-pcie.dtsi"

#include "sm8150-qupv3.dtsi"

#include "sm8150-ssc-qupv3.dtsi"

#include "pm8150-vm.dtsi"

#include "sa8155-vm-audio.dtsi"



&tlmm {

qcom/sa8195-vm.dtsi

+2 −2
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,gcc-scshrike.h>

#include <dt-bindings/clock/qcom,scc-sm8150.h>

#include "quin-vm-common.dtsi"

#include "pm8195-vm.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA8195 Virtual Machine";
@@ -600,7 +601,7 @@ 
		pinctrl-0 = <&sdc2_on>;

		pinctrl-1 = <&sdc2_off>;



		broken-cd;

		cd-gpios = <&pm8195_1_gpios 4 GPIO_ACTIVE_LOW>;

		status = "disabled";



		qos0 {
@@ -859,7 +860,6 @@ 
#include "sa8195-qupv3.dtsi"

#include "sa8195-ssc-qupv3.dtsi"

#include "sa8155-vm-audio.dtsi"

#include "pm8195-vm.dtsi"



&tlmm {

	/delete-property/ wakeup-parent;