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

Commit c85421c4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable CAN controller for msm8996 CV2X boards"

parents ef93f7a1 be06210b

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

+9 −2
Original line number Diff line number Diff line
@@ -3,15 +3,20 @@ 
This driver implements SPI slave protocol for Freescale K61 CAN controller.



Required properties:

  - compatible: Should be "fsl,k61".

  - compatible: Should be "fsl,k61" or "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.



Optional properties:

  - 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.



  - bits-per-word: Indicate how many bits are in a SPI frame. e.g.: 8, 16, 32.

                   Default to 16.

  - reset-delay-msec: Delay in milliseconds to be applied after resetting the chip.

                      Default to 1 ms.



Example:
@@ -24,4 +29,6 @@ Example: 
		pinctrl-names = "active", "sleep";

		pinctrl-0 = <&can_rst_on>;

		pinctrl-1 = <&can_rst_off>;

		bits-per-word = <8>;

		reset-delay-msec = <100>;

	};

arch/arm/boot/dts/qcom/msm8996-cv2x.dtsi

+11 −10
Original line number Diff line number Diff line
@@ -216,11 +216,18 @@ 
&spi_9 {

	status = "okay";



	/* CAN controller */

	spi@0 {

		compatible = "nxp,mpc57xx";

	can-controller@0 {

		compatible = "nxp,mpc5746c";

		reg = <0>;

		spi-max-frequency = <19200000>;

		spi-max-frequency = <9600000>;

		interrupt-parent = <&tlmm>;

		interrupts = <78 0>;

		reset-gpio = <&tlmm 71 GPIO_ACTIVE_LOW>;

		bits-per-word = <8>;

		reset-delay-msec = <100>;

		pinctrl-names = "active", "sleep";

		pinctrl-0 = <&can_rst_on>;

		pinctrl-1 = <&can_rst_off>;

	};

};
@@ -400,12 +407,6 @@ 
	status = "okay";

};



&tlmm {

	/* Set these up as hogs */

	pinctrl-names = "default";

	pinctrl-0 = <&can_reset_gpio>;

};



&pm8994_gpios {

	gpio@c700 { /* GPIO 8 - WLAN_EN */

		qcom,mode = <1>;		/* Digital output*/

arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi

+24 −9
Original line number Diff line number Diff line
@@ -2745,7 +2745,8 @@ 
				};

		};



		can_reset_gpio: can_reset_gpio {

		can_reset {

			can_rst_on: rst_on {

				mux {

					pins = "gpio71";

					function = "gpio";
@@ -2753,10 +2754,24 @@ 


				config {

					pins = "gpio71";

				drive-strength = <2>;

				output-high;

					drive-strength = <2>; /* 2 mA */

					bias-pull-up;

				};

			};



			can_rst_off: rst_off {

				mux {

					pins = "gpio71";

					function = "gpio";

				};



				config {

					pins = "gpio71";

					drive-strength = <2>; /* 2 mA */

					bias-pull-up;

					output-high;

				};

			};

		};

	};

};

arch/arm64/configs/msm-auto-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ CONFIG_RMNET_DATA_DEBUG_PKT=y 
CONFIG_SOCKEV_NLMCAST=y

CONFIG_CAN=y

CONFIG_CAN_RH850=y

CONFIG_CAN_K61=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y

CONFIG_BTFM_SLIM=y

arch/arm64/configs/msm-auto_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ CONFIG_RMNET_DATA_DEBUG_PKT=y 
CONFIG_SOCKEV_NLMCAST=y

CONFIG_CAN=y

CONFIG_CAN_RH850=y

CONFIG_CAN_K61=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y

CONFIG_BTFM_SLIM=y