aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-29 17:47:22 -0500
committerOlof Johansson <olof@lixom.net>2017-01-29 17:47:22 -0500
commit5f1223c5b09262bb5c88f77d2938c9a5ffefa40c (patch)
tree635d652db2883c3933af3e5a3f68d42803048e55
parent61c5e4927b271ee01c2f808e6196e1f62d7be092 (diff)
parent6e03f653e318ac8d248a945082174b39733489f5 (diff)
Merge tag 'keystone_soc_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
Couple of minor cleanups for Navigator drivers for 4.11 * tag 'keystone_soc_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: soc: ti: knav: cleanup includes and sort header files soc: ti: knav_dma: fix typos in trace message Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--drivers/soc/ti/knav_dma.c4
-rw-r--r--drivers/soc/ti/knav_qmss_acc.c15
-rw-r--r--drivers/soc/ti/knav_qmss_queue.c25
3 files changed, 13 insertions, 31 deletions
diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c
index 1a7b5caa127b..ecebe2eecc3a 100644
--- a/drivers/soc/ti/knav_dma.c
+++ b/drivers/soc/ti/knav_dma.c
@@ -395,7 +395,7 @@ static int of_channel_match_helper(struct device_node *np, const char *name,
395 395
396 if (of_parse_phandle_with_fixed_args(np, "ti,navigator-dmas", 396 if (of_parse_phandle_with_fixed_args(np, "ti,navigator-dmas",
397 1, index, &args)) { 397 1, index, &args)) {
398 dev_err(kdev->dev, "Missing the pahndle args name %s\n", name); 398 dev_err(kdev->dev, "Missing the phandle args name %s\n", name);
399 return -ENODEV; 399 return -ENODEV;
400 } 400 }
401 401
@@ -436,7 +436,7 @@ void *knav_dma_open_channel(struct device *dev, const char *name,
436 } 436 }
437 437
438 dev_dbg(kdev->dev, "initializing %s channel %d from DMA %s\n", 438 dev_dbg(kdev->dev, "initializing %s channel %d from DMA %s\n",
439 config->direction == DMA_MEM_TO_DEV ? "transmit" : 439 config->direction == DMA_MEM_TO_DEV ? "transmit" :
440 config->direction == DMA_DEV_TO_MEM ? "receive" : 440 config->direction == DMA_DEV_TO_MEM ? "receive" :
441 "unknown", chan_num, instance); 441 "unknown", chan_num, instance);
442 442
diff --git a/drivers/soc/ti/knav_qmss_acc.c b/drivers/soc/ti/knav_qmss_acc.c
index 0612ebae0a09..3d7225f4e77f 100644
--- a/drivers/soc/ti/knav_qmss_acc.c
+++ b/drivers/soc/ti/knav_qmss_acc.c
@@ -16,21 +16,12 @@
16 * General Public License for more details. 16 * General Public License for more details.
17 */ 17 */
18 18
19#include <linux/kernel.h> 19#include <linux/dma-mapping.h>
20#include <linux/module.h>
21#include <linux/device.h>
22#include <linux/io.h> 20#include <linux/io.h>
23#include <linux/interrupt.h> 21#include <linux/interrupt.h>
24#include <linux/bitops.h> 22#include <linux/module.h>
25#include <linux/slab.h>
26#include <linux/spinlock.h>
27#include <linux/soc/ti/knav_qmss.h>
28#include <linux/platform_device.h>
29#include <linux/dma-mapping.h>
30#include <linux/of.h>
31#include <linux/of_device.h>
32#include <linux/of_address.h> 23#include <linux/of_address.h>
33#include <linux/firmware.h> 24#include <linux/soc/ti/knav_qmss.h>
34 25
35#include "knav_qmss.h" 26#include "knav_qmss.h"
36 27
diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c
index eacad57f2977..279e7c5551dd 100644
--- a/drivers/soc/ti/knav_qmss_queue.c
+++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -16,26 +16,17 @@
16 * General Public License for more details. 16 * General Public License for more details.
17 */ 17 */
18 18
19#include <linux/kernel.h> 19#include <linux/debugfs.h>
20#include <linux/module.h>
21#include <linux/device.h>
22#include <linux/clk.h>
23#include <linux/io.h>
24#include <linux/interrupt.h>
25#include <linux/bitops.h>
26#include <linux/slab.h>
27#include <linux/spinlock.h>
28#include <linux/platform_device.h>
29#include <linux/dma-mapping.h> 20#include <linux/dma-mapping.h>
30#include <linux/of.h> 21#include <linux/firmware.h>
31#include <linux/of_irq.h> 22#include <linux/interrupt.h>
32#include <linux/of_device.h> 23#include <linux/io.h>
24#include <linux/module.h>
33#include <linux/of_address.h> 25#include <linux/of_address.h>
26#include <linux/of_device.h>
27#include <linux/of_irq.h>
34#include <linux/pm_runtime.h> 28#include <linux/pm_runtime.h>
35#include <linux/firmware.h> 29#include <linux/slab.h>
36#include <linux/debugfs.h>
37#include <linux/seq_file.h>
38#include <linux/string.h>
39#include <linux/soc/ti/knav_qmss.h> 30#include <linux/soc/ti/knav_qmss.h>
40 31
41#include "knav_qmss.h" 32#include "knav_qmss.h"