diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-20 06:13:24 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-20 06:18:46 (GMT) |
| commit | 0056a985fab537e161405a48dc8f8da0b47e0767 (patch) | |
| tree | afd223de79033a792d571916c1f9ee935a327abe /include | |
| parent | db2f95de7e6ab3d5cd7cc047bb09eb9ada07e3ba (diff) | |
| parent | 8e0d72d2c7a6955692ba0a21bbf5ca86e8061777 (diff) | |
| download | linux-fsl-qoriq-0056a985fab537e161405a48dc8f8da0b47e0767.tar.xz | |
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')
| -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 f39140a..3d47d21 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_ */ |