diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-11-19 22:13:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-19 22:18:46 -0800 |
| commit | 0056a985fab537e161405a48dc8f8da0b47e0767 (patch) | |
| tree | afd223de79033a792d571916c1f9ee935a327abe /include/linux/platform_data | |
| parent | Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc (diff) | |
| parent | ARM: davinci: da8xx: add DA850 PRUSS support (diff) | |
Merge tag 'davinci-for-v3.8/soc' of git://gitorious.org/linux-davinci/linux-davinci into next/soc
From Sekhar Nori:
SoC updates for DaVinci. Changes include:
1) Support for PRUSS UIO driver for DA850 SoC
and related SRAM support updates.
2) Prepration for common clock migration
3) Serial support related changes for DA850 DT boot
* tag 'davinci-for-v3.8/soc' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: da8xx: add DA850 PRUSS support
ARM: davinci: add platform hook to fetch the SRAM pool
ARM: davinci: da850: changed SRAM allocator to shared ram.
ARM: davinci: sram: switch from iotable to ioremapped regions
uio: uio_pruss: replace private SRAM API with genalloc
ARM: davinci: serial: provide API to initialze UART clocks
ARM: davinci: convert platform code to use clk_prepare/clk_unprepare
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/uio_pruss.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/platform_data/uio_pruss.h b/include/linux/platform_data/uio_pruss.h index f39140aabc6f..3d47d219827f 100644 --- a/include/linux/platform_data/uio_pruss.h +++ b/include/linux/platform_data/uio_pruss.h @@ -20,6 +20,7 @@ /* To configure the PRUSS INTC base offset for UIO driver */ struct uio_pruss_pdata { - u32 pintc_base; + u32 pintc_base; + struct gen_pool *sram_pool; }; #endif /* _UIO_PRUSS_H_ */ |