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

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

Merge "ARM: dts: qcom: enable suspend to ram for kona HDK"

parents 6950c7a4 2716f418

bindings/usb/msm-ssusb.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -87,9 +87,9 @@ Optional properties : 
	are supported. If omitted, assume HW supports "1.5".

	are supported. If omitted, assume HW supports "1.5".

- qcom,reset-ep-after-lpm-resume: If present, dbm requires ep reset after

- qcom,reset-ep-after-lpm-resume: If present, dbm requires ep reset after

	going to lpm

	going to lpm

- qcom,host-poweroff-in-pm-suspend: If present, allow PM suspend to happen

- qcom,ignore-wakeup-src-in-hostmode: If present, PM suspend/freeze allowed

	irrespective of runtimePM state of host and power collapse the core.

	irrespective of host runtimePM state. In PM suspend/resume case, core

	This also leads to reset-resume of connected devices on PM resume.

	will stay powered and connected devices will just be suspended/resumed.

- qcom,default-mode-none: If present, do not start any mode on probe for an OTG

- qcom,default-mode-none: If present, do not start any mode on probe for an OTG

	capable DWC3 which does not have extcon handle.

	capable DWC3 which does not have extcon handle.

- qcom,default-mode-host: If present, start host mode on probe for an OTG

- qcom,default-mode-host: If present, start host mode on probe for an OTG

bindings/usb/usb-xhci.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,9 @@ Optional properties: 
  - quirk-broken-port-ped: set if the controller has broken port disable mechanism

  - quirk-broken-port-ped: set if the controller has broken port disable mechanism

  - imod-interval-ns: default interrupt moderation interval is 5000ns

  - imod-interval-ns: default interrupt moderation interval is 5000ns

  - phys : see usb-hcd.txt in the current directory

  - phys : see usb-hcd.txt in the current directory

  - ignore-wakeup-src-in-hostmode: If present, PM suspend/freeze allowed

    irrespective of host runtimePM state. In PM suspend/resume case, core

    will stay powered and connected devices will just be suspended/resumed.





additionally the properties from usb-hcd.txt (in the current directory) are

additionally the properties from usb-hcd.txt (in the current directory) are

supported.

supported.

qcom/kona-hdk.dtsi

+6 −2
Original line number Original line Diff line number Diff line
@@ -20,9 +20,13 @@ 
	status = "disabled";

	status = "disabled";

};

};





&dwc1 {

&usb1 {

	qcom,ignore-wakeup-src-in-hostmode;



	dwc3@a800000 {

		dr_mode = "host";

		dr_mode = "host";

	};

	};

};





&usb2_phy0 {

&usb2_phy0 {

	qcom,param-override-seq =

	qcom,param-override-seq =

qcom/kona-usb.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ 
			<MSM_BUS_MASTER_USB3 MSM_BUS_SLAVE_IPA_CFG 1 1>,

			<MSM_BUS_MASTER_USB3 MSM_BUS_SLAVE_IPA_CFG 1 1>,

			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3 1 1>;

			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3 1 1>;





		dwc0: dwc3@a600000 {

		dwc3@a600000 {

			compatible = "snps,dwc3";

			compatible = "snps,dwc3";

			reg = <0x0a600000 0xd93c>;

			reg = <0x0a600000 0xd93c>;

			interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
@@ -418,7 +418,7 @@ 
			<MSM_BUS_MASTER_USB3_1 MSM_BUS_SLAVE_IPA_CFG 0 2400>,

			<MSM_BUS_MASTER_USB3_1 MSM_BUS_SLAVE_IPA_CFG 0 2400>,

			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3_1 0 40000>;

			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_USB3_1 0 40000>;





		dwc1: dwc3@a800000 {

		dwc3@a800000 {

			compatible = "snps,dwc3";

			compatible = "snps,dwc3";

			reg = <0xa800000 0xd93c>;

			reg = <0xa800000 0xd93c>;

			interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;