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

Commit 5f1223c5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone_soc_for_4.11' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 61c5e492 6e03f653

drivers/soc/ti/knav_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int of_channel_match_helper(struct device_node *np, const char *name, 


	if (of_parse_phandle_with_fixed_args(np, "ti,navigator-dmas",

					1, index, &args)) {

		dev_err(kdev->dev, "Missing the pahndle args name %s\n", name);

		dev_err(kdev->dev, "Missing the phandle args name %s\n", name);

		return -ENODEV;

	}

drivers/soc/ti/knav_qmss_acc.c

+3 −12
Original line number Diff line number Diff line
@@ -16,21 +16,12 @@ 
 * General Public License for more details.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/io.h>

#include <linux/interrupt.h>

#include <linux/bitops.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/soc/ti/knav_qmss.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/firmware.h>

#include <linux/soc/ti/knav_qmss.h>



#include "knav_qmss.h"

drivers/soc/ti/knav_qmss_queue.c

+8 −17
Original line number Diff line number Diff line
@@ -16,26 +16,17 @@ 
 * General Public License for more details.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/device.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/interrupt.h>

#include <linux/bitops.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/platform_device.h>

#include <linux/debugfs.h>

#include <linux/dma-mapping.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/of_device.h>

#include <linux/firmware.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/pm_runtime.h>

#include <linux/firmware.h>

#include <linux/debugfs.h>

#include <linux/seq_file.h>

#include <linux/string.h>

#include <linux/slab.h>

#include <linux/soc/ti/knav_qmss.h>



#include "knav_qmss.h"