Merge "ARM: dts: mdm: Add K61 CAN controller DT node for MDM9x07." (b86395c2) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/mdm9607-mtp.dtsi

+12 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,18 @@

		&spi_1 {
		status = "ok";

		can-controller@0 {
		compatible = "fsl,k61";
		spi-max-frequency = <4800000>;
		reg = <0>;
		interrupt-parent = <&tlmm_pinmux>;
		interrupts = <25 0>;
		reset-gpio = <&tlmm_pinmux 11 0x1>;
		pinctrl-names = "active", "sleep";
		pinctrl-0 = <&can_rst_on>;
		pinctrl-1 = <&can_rst_off>;
		};
		};

		&blsp1_uart3 {

+33 −4

Original line number	Diff line number	Diff line
		@@ -182,11 +182,11 @@
		sdc1_wlan_gpio {
		sdc1_wlan_gpio_active: sdc1_wlan_gpio_active {
		mux {
		pins = "gpio38", "gpio25";
		pins = "gpio38";
		function = "gpio";
		};
		config {
		pins = "gpio38", "gpio25";
		pins = "gpio38";
		output-high;
		drive-strength = <8>;
		bias-pull-up;
		@@ -195,11 +195,11 @@

		sdc1_wlan_gpio_sleep: sdc1_wlan_gpio_sleep {
		mux {
		pins = "gpio38", "gpio25";
		pins = "gpio38";
		function = "gpio";
		};
		config {
		pins = "gpio38", "gpio25";
		pins = "gpio38";
		drive-strength = <2>;
		bias-disable;
		output-low;
		@@ -1047,5 +1047,34 @@
		bias-pull-down;
		};
		};

		can_reset {
		can_rst_on: rst_on {
		mux {
		pins = "gpio11";
		function = "gpio";
		};

		config {
		pins = "gpio11";
		drive-strength = <2>; /* 2 mA */
		bias-pull-up;
		};
		};

		can_rst_off: rst_off {
		mux {
		pins = "gpio11";
		function = "gpio";
		};

		config {
		pins = "gpio11";
		drive-strength = <2>; /* 2 mA */
		bias-pull-up;
		output-high;
		};
		};
		};
		};
		};