diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-19 18:03:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-19 18:03:23 -0700 |
| commit | 30160a82d3cf4e3e9d280bbf40adbb6cdb4066c7 (patch) | |
| tree | 08a55f7fef11a3a0c180ce31c6117cd37a6ad187 | |
| parent | 675ca2f48beb7623f95c5f125bc34eb8a81d1d2a (diff) | |
| parent | f7eceb3ec0c2066608b783283104e9591a28b247 (diff) | |
Merge "defconfig: msm-auto: Add qti can driver support"
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/k61-can.txt | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/msm-auto-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msm-auto_defconfig | 1 | ||||
| -rw-r--r-- | drivers/net/can/spi/k61.c | 3 | ||||
| -rw-r--r-- | drivers/net/can/spi/qti-can.c | 1 |
5 files changed, 4 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/arch/arm64/configs/msm-auto-perf_defconfig b/arch/arm64/configs/msm-auto-perf_defconfig index a8d66b122429..69d857b32c15 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 3a7e60990a81..8be1b84d53c6 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 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" }, { } }; |