diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2010-05-05 10:11:15 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-11 11:25:06 -0400 |
commit | baffe1699c68da5040de6b274054adc995795782 (patch) | |
tree | cdb8a8b80ffb7d8d14b80305c38af650a9842abf /arch/arm/plat-pxa/include/plat/ssp.h | |
parent | 2503991a56483dc8477a3c6ca86da253eb5f8af9 (diff) |
[ARM] pxa: add namespace on ssp
In order to prevent code ambiguous, add namespace on functions in ssp driver.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/plat-pxa/include/plat/ssp.h')
-rw-r--r-- | arch/arm/plat-pxa/include/plat/ssp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-pxa/include/plat/ssp.h b/arch/arm/plat-pxa/include/plat/ssp.h index d16d79a3a48a..fe43150690ed 100644 --- a/arch/arm/plat-pxa/include/plat/ssp.h +++ b/arch/arm/plat-pxa/include/plat/ssp.h | |||
@@ -159,28 +159,28 @@ struct ssp_device { | |||
159 | }; | 159 | }; |
160 | 160 | ||
161 | /** | 161 | /** |
162 | * ssp_write_reg - Write to a SSP register | 162 | * pxa_ssp_write_reg - Write to a SSP register |
163 | * | 163 | * |
164 | * @dev: SSP device to access | 164 | * @dev: SSP device to access |
165 | * @reg: Register to write to | 165 | * @reg: Register to write to |
166 | * @val: Value to be written. | 166 | * @val: Value to be written. |
167 | */ | 167 | */ |
168 | static inline void ssp_write_reg(struct ssp_device *dev, u32 reg, u32 val) | 168 | static inline void pxa_ssp_write_reg(struct ssp_device *dev, u32 reg, u32 val) |
169 | { | 169 | { |
170 | __raw_writel(val, dev->mmio_base + reg); | 170 | __raw_writel(val, dev->mmio_base + reg); |
171 | } | 171 | } |
172 | 172 | ||
173 | /** | 173 | /** |
174 | * ssp_read_reg - Read from a SSP register | 174 | * pxa_ssp_read_reg - Read from a SSP register |
175 | * | 175 | * |
176 | * @dev: SSP device to access | 176 | * @dev: SSP device to access |
177 | * @reg: Register to read from | 177 | * @reg: Register to read from |
178 | */ | 178 | */ |
179 | static inline u32 ssp_read_reg(struct ssp_device *dev, u32 reg) | 179 | static inline u32 pxa_ssp_read_reg(struct ssp_device *dev, u32 reg) |
180 | { | 180 | { |
181 | return __raw_readl(dev->mmio_base + reg); | 181 | return __raw_readl(dev->mmio_base + reg); |
182 | } | 182 | } |
183 | 183 | ||
184 | struct ssp_device *ssp_request(int port, const char *label); | 184 | struct ssp_device *pxa_ssp_request(int port, const char *label); |
185 | void ssp_free(struct ssp_device *); | 185 | void pxa_ssp_free(struct ssp_device *); |
186 | #endif /* __ASM_ARCH_SSP_H */ | 186 | #endif /* __ASM_ARCH_SSP_H */ |