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

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

Merge "defconfig: msm-auto: Add qti can driver support"

parents 675ca2f4 f7eceb3e

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

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



Required properties:

  - compatible: Should be "fsl,k61" or "nxp,mpc5746c".

  - compatible: Should be "fsl,k61".

  - reg: Should contain SPI chip select.

  - interrupt-parent: Should specify interrupt controller for the interrupt.

  - interrupts: Should contain IRQ line for the CAN controller.

arch/arm64/configs/msm-auto-perf_defconfig

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

CONFIG_CAN_RH850=y

CONFIG_CAN_K61=y

CONFIG_QTI_CAN=y

CONFIG_CAN_PEAK_USB=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y

arch/arm64/configs/msm-auto_defconfig

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

CONFIG_CAN_RH850=y

CONFIG_CAN_K61=y

CONFIG_QTI_CAN=y

CONFIG_CAN_PEAK_USB=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y

drivers/net/can/spi/k61.c

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 *

 * 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
@@ -918,7 +918,6 @@ static int k61_remove(struct spi_device *spi) 


static const struct of_device_id k61_match_table[] = {

	{ .compatible = "fsl,k61" },

	{ .compatible = "nxp,mpc5746c" },

	{ }

};

drivers/net/can/spi/qti-can.c

+0 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,6 @@ cleanup_privdata: 
}



static const struct of_device_id qti_can_match_table[] = {

	{ .compatible = "qcom,renesas,rh850" },

	{ .compatible = "qcom,nxp,mpc5746c" },

	{ }

};