← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/media/video/omap24xxcam.h

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft
  • Date: 2012-06-21 09:16:38 UTC
  • Revision ID: package-import@ubuntu.com-20120621091638-gubhv4nox8xez1ct
Tags: 3.5.0-1.1
[ Andy Whitcroft]

* Rebuild lowlatency against Ubuntu-3.5.0-1.1
* All new configuration system to allow configuration deltas to be
  exposed via debian.lowlatency/config-delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/omap24xxcam.h
429
429
struct omap24xxcam_dma {
430
430
        spinlock_t lock;        /* Lock for the whole structure. */
431
431
 
432
 
        unsigned long base;     /* base address for dma controller */
 
432
        void __iomem *base;     /* base address for dma controller */
433
433
 
434
434
        /* While dma_stop!=0, an attempt to start a new DMA transfer will
435
435
         * fail.
491
491
 
492
492
        /*** hardware resources ***/
493
493
        unsigned int irq;
494
 
        unsigned long mmio_base;
 
494
        void __iomem *mmio_base;
495
495
        unsigned long mmio_base_phys;
496
496
        unsigned long mmio_size;
497
497
 
544
544
 *
545
545
 */
546
546
 
547
 
static inline u32 omap24xxcam_reg_in(unsigned long base, u32 offset)
 
547
static inline u32 omap24xxcam_reg_in(u32 __iomem *base, u32 offset)
548
548
{
549
549
        return readl(base + offset);
550
550
}
551
551
 
552
 
static inline u32 omap24xxcam_reg_out(unsigned long base, u32 offset,
 
552
static inline u32 omap24xxcam_reg_out(u32 __iomem *base, u32 offset,
553
553
                                          u32 val)
554
554
{
555
555
        writel(val, base + offset);
556
556
        return val;
557
557
}
558
558
 
559
 
static inline u32 omap24xxcam_reg_merge(unsigned long base, u32 offset,
 
559
static inline u32 omap24xxcam_reg_merge(u32 __iomem *base, u32 offset,
560
560
                                            u32 val, u32 mask)
561
561
{
562
 
        u32 addr = base + offset;
 
562
        u32 __iomem *addr = base + offset;
563
563
        u32 new_val = (readl(addr) & ~mask) | (val & mask);
564
564
 
565
565
        writel(new_val, addr);
585
585
                            int len, sgdma_callback_t callback, void *arg);
586
586
void omap24xxcam_sgdma_sync(struct omap24xxcam_sgdma *sgdma);
587
587
void omap24xxcam_sgdma_init(struct omap24xxcam_sgdma *sgdma,
588
 
                            unsigned long base,
 
588
                            void __iomem *base,
589
589
                            void (*reset_callback)(unsigned long data),
590
590
                            unsigned long reset_callback_data);
591
591
void omap24xxcam_sgdma_exit(struct omap24xxcam_sgdma *sgdma);