Merge "defconfig: msm-auto: Add qti can driver support" (bf29451f) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/net/can/k61-can.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@
	This driver implements SPI slave protocol for Freescale K61 CAN controller.		This driver implements SPI slave protocol for Freescale K61 CAN controller.

	Required properties:		Required properties:
	- compatible: Should be "fsl,k61" or "nxp,mpc5746c".		- compatible: Should be "fsl,k61".
	- reg: Should contain SPI chip select.		- reg: Should contain SPI chip select.
	- interrupt-parent: Should specify interrupt controller for the interrupt.		- interrupt-parent: Should specify interrupt controller for the interrupt.
	- interrupts: Should contain IRQ line for the CAN controller.		- interrupts: Should contain IRQ line for the CAN controller.

Documentation/devicetree/bindings/net/can/qti-can.txt

0 → 100644

+48 −0

Original line number	Original line	Diff line number	Diff line
			* QTI CAN driver *

			Required properties:
			- compatible: Should be "qcom,renesas,rh850" or "qcom,nxp,mpc5746c".
			- reg: Should contain SPI chip select.
			- interrupt-parent: Should specify interrupt controller for the interrupt.
			- interrupts: Should contain IRQ line for the CAN controller.
			- spi-max-frequency: Should contain maximum spi clock frequency for slave device
			- qcom,clk-freq-mhz : The frequency at which the CAN clock should be configured.
			- qcom,max-can-channels : Maximum number of CAN channels supported by the controller.

			Optional properties:
			- qcom,reset-gpio: Reference to the GPIO connected to the reset input.
			- pinctrl-names : Names corresponding to the numbered pinctrl states.
			- pinctrl-0 : This explains the active state of the GPIO line.
			- pinctrl-1 : This explains the suspend state of the GPIO line.
			- qcom,bits-per-word: Indicate how many bits are in a SPI frame. e.g.: 8, 16, 32.
			Default to 16.
			- qcom,reset-delay-msec: Delay in milliseconds to be applied after resetting the chip.
			This is applicable only if the reset-gpio is specified. Default value is 1 ms.
			- qcom,support-can-fd: Whether CAN FD mode is supported or not.
			- qcom,can-fw-cmd-timeout-req: Whether a timeout is required if we don't get a response from
			the firmware after flash write.
			- qcom,can-fw-cmd-timeout-ms: The duration after which timeout will happen if we don't get a
			response from the firmware.
			- qcom,rem-all-buffering-timeout-ms: The duration after which timeout will happen if we don't get a
			response from the firmware while trying to remove all the buffered frames IDs from flash.

			Example:

			can-controller@0 {
			compatible = "qcom,nxp,mpc5746c";
			reg = <0>;
			spi-max-frequency = <9600000>;
			interrupt-parent = <&tlmm_pinmux>;
			interrupts = <87 0>;
			qcom,reset-gpio = <&tlmm_pinmux 89 0x1>;
			qcom,clk-freq-mhz = <20000000>;
			qcom,max-can-channels = <2>;
			qcom,bits-per-word = <8>;
			qcom,reset-delay-msec = <150>;
			qcom,can-fw-cmd-timeout-req;
			qcom,can-fw-cmd-timeout-ms = <400>;
			qcom,rem-all-buffering-timeout-ms = <2000>;
			pinctrl-names = "active", "sleep";
			pinctrl-0 = <&can_rst_on>;
			pinctrl-1 = <&can_rst_off>;
			};

Documentation/devicetree/bindings/net/can/rh850-can.txt

deleted100644 → 0

+0 −21

Original line number	Original line	Diff line number	Diff line
	* Renesas RH850 CAN *

	This driver implements spi slave protocol for rh850 can controller

	Required properties:
	- compatible: Should be "renesas,rh850"
	- reg: Should contain spi chip select
	- interrupt-parent: Should specify interrupt controller for the interrupt
	- interrupts: Should contain IRQ line for the CAN controller
	- spi-max-frequency: Should contain maximum spi clock frequency for
	slave device

	Example:

	can-controller@0 {
	compatible = "renesas,rh850";
	reg = <0>;
	interrupt-parent = <&tlmm>;
	interrupts = <127 0>;
	spi-max-frequency = <5000000>;
	};

arch/arm/boot/dts/qcom/apq8096-v2-auto-dragonboard.dts

+6 −2

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2015, The Linux Foundation. All rights reserved.		/* Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -27,10 +27,14 @@
	&spi_9 {		&spi_9 {
	status = "ok";		status = "ok";
	can-controller@0 {		can-controller@0 {
	compatible = "renesas,rh850";		compatible = "qcom,renesas,rh850";
	reg = <0>;		reg = <0>;
	interrupt-parent = <&tlmm>;		interrupt-parent = <&tlmm>;
	interrupts = <127 0>;		interrupts = <127 0>;
	spi-max-frequency = <5000000>;		spi-max-frequency = <5000000>;
			qcom,clk-freq-mhz = <16000000>;
			qcom,max-can-channels = <4>;
			qcom,bits-per-word = <8>;
			qcom,support-can-fd;
	};		};
	};		};

arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts

+6 −2

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.		/* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -27,11 +27,15 @@
	&spi_9 {		&spi_9 {
	status = "ok";		status = "ok";
	can-controller@0 {		can-controller@0 {
	compatible = "renesas,rh850";		compatible = "qcom,renesas,rh850";
	reg = <0>;		reg = <0>;
	interrupt-parent = <&tlmm>;		interrupt-parent = <&tlmm>;
	interrupts = <122 0>;		interrupts = <122 0>;
	spi-max-frequency = <5000000>;		spi-max-frequency = <5000000>;
			qcom,clk-freq-mhz = <16000000>;
			qcom,max-can-channels = <4>;
			qcom,bits-per-word = <8>;
			qcom,support-can-fd;
	};		};
	};		};