Commit 766475cb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: add back omap_set_dma_priority() stub 



One of my multiplatform patches went a little too far and removed
a declaration that is needed for compile-testing the omapfb
driver on non-OMAP1 platforms:

  arm-linux-gnueabi-ld: drivers/video/fbdev/omap/omapfb_main.o: in function `omapfb_do_probe':
  omapfb_main.c:(.text+0x41ec): undefined reference to `omap_set_dma_priority'

Add back the inline stub, and in turn hide the definition when
omapfb is disabled, like we do for the usb specific bits.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reviewed-by: default avatarTony Lindgren <tony@atomide.com>
Fixes: 52ef8efc ("dma: omap: hide legacy interface")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e514f1fd

arch/arm/mach-omap1/omap-dma.c

+2 −16
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static inline void set_gdma_dev(int req, int dev) 
	omap_writel(l, reg);

}



#ifdef CONFIG_ARCH_OMAP1

#if IS_ENABLED(CONFIG_FB_OMAP)

void omap_set_dma_priority(int lch, int dst_port, int priority)

{

	unsigned long reg;
@@ -129,22 +129,8 @@ void omap_set_dma_priority(int lch, int dst_port, int priority) 
		omap_writel(l, reg);

	}

}

#endif



#ifdef CONFIG_ARCH_OMAP2PLUS

void omap_set_dma_priority(int lch, int dst_port, int priority)

{

	u32 ccr;



	ccr = p->dma_read(CCR, lch);

	if (priority)

		ccr |= (1 << 6);

	else

		ccr &= ~(1 << 6);

	p->dma_write(ccr, CCR, lch);

}

#endif

EXPORT_SYMBOL(omap_set_dma_priority);

#endif



#if IS_ENABLED(CONFIG_USB_OMAP)

#ifdef CONFIG_ARCH_OMAP15XX

include/linux/omap-dma.h

+7 −0
Original line number Diff line number Diff line
@@ -294,7 +294,14 @@ struct omap_system_dma_plat_info { 


extern struct omap_system_dma_plat_info *omap_get_plat_info(void);



#if defined(CONFIG_ARCH_OMAP1)

extern void omap_set_dma_priority(int lch, int dst_port, int priority);

#else

static inline void omap_set_dma_priority(int lch, int dst_port, int priority)

{

}

#endif



extern int omap_request_dma(int dev_id, const char *dev_name,

			void (*callback)(int lch, u16 ch_status, void *data),

			void *data, int *dma_ch);