Commit f7fd41af authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-for-5.3-2' of https://github.com/rjarzmik/linux into arm/soc 

This is the pxa changes for 5.3 cycle :
 - a simple cleanup for lubbock

* tag 'pxa-for-5.3-2' of https://github.com/rjarzmik/linux

:
  ARM: pxa/lubbock: remove lubbock_set_misc_wr() from global view

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents abd6aa55 f5a38c8e

arch/arm/mach-pxa/include/mach/lubbock.h

+0 −4
Original line number Diff line number Diff line
@@ -50,7 +50,3 @@ 
#define LUBBOCK_LAST_IRQ	LUBBOCK_IRQ(6)



#define LUBBOCK_SA1111_IRQ_BASE	(LUBBOCK_NR_IRQS + 32)
 


#ifndef __ASSEMBLY__

extern void lubbock_set_misc_wr(unsigned int mask, unsigned int set);

#endif

arch/arm/mach-pxa/lubbock.c

+1 −2
Original line number Diff line number Diff line
@@ -119,12 +119,11 @@ void lubbock_set_hexled(uint32_t value) 


static struct gpio_chip *lubbock_misc_wr_gc;



void lubbock_set_misc_wr(unsigned int mask, unsigned int set)

static void lubbock_set_misc_wr(unsigned int mask, unsigned int set)

{

	unsigned long m = mask, v = set;

	lubbock_misc_wr_gc->set_multiple(lubbock_misc_wr_gc, &m, &v);

}

EXPORT_SYMBOL(lubbock_set_misc_wr);



static int lubbock_udc_is_connected(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE