diff options
author | Vinod Koul <vinod.koul@intel.com> | 2017-05-04 16:08:52 +0530 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2017-05-04 16:08:52 +0530 |
commit | be13ec668d043e5313985014d34735ec6ede074a (patch) | |
tree | a3393344a8eb1f9c8a3d167c7c6a0a7a68ca979c /include/linux/amba | |
parent | b7b0201a6743c4d9b634da68ad8bb94db28b8e69 (diff) | |
parent | e8bb4673596ea28fab287dbc417e8100d798cd40 (diff) | |
download | linux-be13ec668d043e5313985014d34735ec6ede074a.tar.gz linux-be13ec668d043e5313985014d34735ec6ede074a.tar.bz2 linux-be13ec668d043e5313985014d34735ec6ede074a.zip |
Merge branch 'topic/pl330' into for-linus
Diffstat (limited to 'include/linux/amba')
-rw-r--r-- | include/linux/amba/pl330.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h deleted file mode 100644 index fe93758e8403..000000000000 --- a/include/linux/amba/pl330.h +++ /dev/null @@ -1,35 +0,0 @@ -/* linux/include/linux/amba/pl330.h - * - * Copyright (C) 2010 Samsung Electronics Co. Ltd. - * Jaswinder Singh <jassi.brar@samsung.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef __AMBA_PL330_H_ -#define __AMBA_PL330_H_ - -#include <linux/dmaengine.h> - -struct dma_pl330_platdata { - /* - * Number of valid peripherals connected to DMAC. - * This may be different from the value read from - * CR0, as the PL330 implementation might have 'holes' - * in the peri list or the peri could also be reached - * from another DMAC which the platform prefers. - */ - u8 nr_valid_peri; - /* Array of valid peripherals */ - u8 *peri_id; - /* Operational capabilities */ - dma_cap_mask_t cap_mask; - /* Bytes to allocate for MC buffer */ - unsigned mcbuf_sz; -}; - -extern bool pl330_filter(struct dma_chan *chan, void *param); -#endif /* __AMBA_PL330_H_ */ |