diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:30:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:30:31 -0700 |
| commit | 27a24cfa04c6f041c0191847d047f25e5627cd63 (patch) | |
| tree | c5377af546f914cc9ca665fd00c825204d61ef35 /include/linux | |
| parent | 6b3f7b5c2221c7a4fe715ea4fd479b6d07bbcbb5 (diff) | |
| parent | b59cc200ac025aca597fb21862c1c9e667f2eff2 (diff) | |
| download | linux-3.10-27a24cfa04c6f041c0191847d047f25e5627cd63.tar.gz linux-3.10-27a24cfa04c6f041c0191847d047f25e5627cd63.tar.bz2 linux-3.10-27a24cfa04c6f041c0191847d047f25e5627cd63.zip | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dma fixes from Vinod Koul:
"We have two patches from Andy & Rafael fixing the Lynxpoint dma"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
ACPI / LPSS: register clock device for Lynxpoint DMA properly
dma: acpi-dma: parse CSRT to extract additional resources
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi_dma.h | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/clk-lpss.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/acpi_dma.h b/include/linux/acpi_dma.h index d09deabc7bf..fb029808291 100644 --- a/include/linux/acpi_dma.h +++ b/include/linux/acpi_dma.h @@ -37,6 +37,8 @@ struct acpi_dma_spec { * @dev: struct device of this controller * @acpi_dma_xlate: callback function to find a suitable channel * @data: private data used by a callback function + * @base_request_line: first supported request line (CSRT) + * @end_request_line: last supported request line (CSRT) */ struct acpi_dma { struct list_head dma_controllers; @@ -44,6 +46,8 @@ struct acpi_dma { struct dma_chan *(*acpi_dma_xlate) (struct acpi_dma_spec *, struct acpi_dma *); void *data; + unsigned short base_request_line; + unsigned short end_request_line; }; /* Used with acpi_dma_simple_xlate() */ diff --git a/include/linux/platform_data/clk-lpss.h b/include/linux/platform_data/clk-lpss.h index 528e73ce46d..23901992b9d 100644 --- a/include/linux/platform_data/clk-lpss.h +++ b/include/linux/platform_data/clk-lpss.h @@ -13,6 +13,11 @@ #ifndef __CLK_LPSS_H #define __CLK_LPSS_H +struct lpss_clk_data { + const char *name; + struct clk *clk; +}; + extern int lpt_clk_init(void); #endif /* __CLK_LPSS_H */ |