From 01965dc24a2098c1477caca7ea20a1f35dc42d04 Mon Sep 17 00:00:00 2001 From: Balachandra C S Date: Tue, 6 Mar 2018 19:38:26 +0530 Subject: Modify k61 driver to remove support for mpc5746c CAN card mpc5746c CAN driver will be supported by the unified driver qti-can also remove rh850 support from qti-can driver. Change-Id: I6743604c1298b9705ac3550b96c9dae04d5137bd Signed-off-by: Balachandra C S --- Documentation/devicetree/bindings/net/can/k61-can.txt | 2 +- drivers/net/can/spi/k61.c | 3 +-- drivers/net/can/spi/qti-can.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/net/can/k61-can.txt b/Documentation/devicetree/bindings/net/can/k61-can.txt index ea4a7b4ae035..ea9a3bc5cce0 100644 --- a/Documentation/devicetree/bindings/net/can/k61-can.txt +++ b/Documentation/devicetree/bindings/net/can/k61-can.txt @@ -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. diff --git a/drivers/net/can/spi/k61.c b/drivers/net/can/spi/k61.c index 84c13a1c04a5..7830d5badb94 100644 --- a/drivers/net/can/spi/k61.c +++ b/drivers/net/can/spi/k61.c @@ -1,4 +1,4 @@ -/* 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" }, { } }; diff --git a/drivers/net/can/spi/qti-can.c b/drivers/net/can/spi/qti-can.c index 6e5e51822238..e9123f07324a 100644 --- a/drivers/net/can/spi/qti-can.c +++ b/drivers/net/can/spi/qti-can.c @@ -1233,7 +1233,6 @@ cleanup_privdata: } static const struct of_device_id qti_can_match_table[] = { - { .compatible = "qcom,renesas,rh850" }, { .compatible = "qcom,nxp,mpc5746c" }, { } }; -- cgit v1.2.3 From f7eceb3ec0c2066608b783283104e9591a28b247 Mon Sep 17 00:00:00 2001 From: Balachandra C S Date: Fri, 16 Mar 2018 19:04:38 +0530 Subject: defconfig: msm-auto: Add qti can driver support Enable qti can driver support in msm-auto_defconfg and msm-auto-perf_defconfig. Change-Id: I9a88bb345c9ebf3dac49cfef9e46ff7f736d979c Signed-off-by: Balachandra C S --- arch/arm64/configs/msm-auto-perf_defconfig | 1 + arch/arm64/configs/msm-auto_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/msm-auto-perf_defconfig b/arch/arm64/configs/msm-auto-perf_defconfig index 44d4c072dd29..fb36bffa15e7 100644 --- a/arch/arm64/configs/msm-auto-perf_defconfig +++ b/arch/arm64/configs/msm-auto-perf_defconfig @@ -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 diff --git a/arch/arm64/configs/msm-auto_defconfig b/arch/arm64/configs/msm-auto_defconfig index b691690187c2..52808b06bfac 100644 --- a/arch/arm64/configs/msm-auto_defconfig +++ b/arch/arm64/configs/msm-auto_defconfig @@ -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 -- cgit v1.2.3