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

Commit 62df4df4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d80b9b5a on remote branch

Change-Id: Ia833d9e5b3fd584283f6c95bed2b3b6c5e488e13
parents df6a193b d80b9b5a
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
* Microchip MCP2517 stand-alone CAN controller device tree bindings

Required properties:
 - compatible: Should be one of the following:
   - "microchip,mcp2517fd" for MCP2517fd.
 - reg: SPI chip select.
 - clocks: The clock feeding the CAN controller.
 - interrupt-parent: The parent interrupt controller.
 - interrupts: Should contain IRQ line for the CAN controller.
 - gpio-controller: Marks the device node as a GPIO controller

Optional properties:
 - vdd-supply: Regulator that powers the CAN controller.
 - xceiver-supply: Regulator that powers the CAN transceiver.
 - microchip,clock_out_div = <0|1|2|4|10>: Clock output pin divider
					   0 = Start of Frame output
					   default: 10
 - microchip,clock_div2: bool: divide the internal clock by 2
 - gpio_opendrain: bool: enable open-drain for all pins (except cantx)

Example:
	can0: can@1 {
		compatible = "microchip,mcp2515";
		reg = <1>;
		clocks = <&clk24m>;
		interrupt-parent = <&gpio4>;
		interrupts = <13 0x8>;
		vdd-supply = <&reg5v0>;
		xceiver-supply = <&reg5v0>;
		gpio-controller;
	};
+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@

&ipa_hw {
	qcom,use-ipa-in-mhi-mode;
	qcom,ipa-config-is-auto;
	qcom,mhi-event-ring-id-limits = <9 13>; /* start and end */
};

&cnss_pcie {
+5 −0
Original line number Diff line number Diff line
@@ -20,3 +20,8 @@
		"qcom,sdxpoorwills", "qcom,ccard";
	qcom,board-id = <25 2>, <25 0x102>;
};

&ipa_hw {
	qcom,ipa-config-is-auto;
};
+5 −0
Original line number Diff line number Diff line
@@ -29,3 +29,8 @@
&mss_mem {
	reg = <0x86400000 0x9300000>;
};

&ipa_hw {
	qcom,ipa-config-is-auto;
};
+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@
	status = "okay";
	qcom,connector-type-uAB;
	extcon = <0>, <0>, <0>, <&vbus_detect>;
	dwc3@a600000 {
		normal-eps-in-gsi-mode;
	};
};

&soc {
Loading