Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c830343a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'pxa-for-3.19' of https://github.com/rjarzmik/linux into next/soc 

Pull "arm: pxa: pxa for v3.19" from Robert Jarzmik:

This is a very quiet release, featuring a small cleanup, a tosa change
on its charger driver, and support for pxa device-tree based pxa27x
boards.

The device-tree part will only be fully activated once clocks support
is fully operation in the common clock framework.

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

:
  arm: pxa: add pxa27x device-tree support
  arm: pxa: remove unnecessary includes from pxa-dt
  arm: pxa: move init functions into generic.h
  arm: pxa: add device-tree irq init for pxa27x
  ARM: pxa: tosa: switch to gpio-charger
  arm: mach-pxa: Convert pr_warning to pr_warn

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 73a0e335 03ec7fe7

arch/arm/mach-pxa/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -4,6 +4,17 @@ menu "Intel PXA2xx/PXA3xx Implementations" 


comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"



config MACH_PXA27X_DT

	bool "Support PXA27x platforms from device tree"

	select CPU_PXA27x

	select POWER_SUPPLY

	select PXA27x

	select USE_OF

	help

	  Include support for Marvell PXA27x based platforms using

	  the device tree. Needn't select any other machine while

	  MACH_PXA27X_DT is enabled.



config MACH_PXA3XX_DT

	bool "Support PXA3xx platforms from device tree"

	select CPU_PXA300

arch/arm/mach-pxa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_CPU_PXA930) += pxa930.o 


# Device Tree support

obj-$(CONFIG_MACH_PXA3XX_DT)	+= pxa-dt.o

obj-$(CONFIG_MACH_PXA27X_DT)	+= pxa-dt.o



# Intel/Marvell Dev Platforms

obj-$(CONFIG_ARCH_LUBBOCK)	+= lubbock.o

arch/arm/mach-pxa/em-x270.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static void __init em_x270_init_nand(void) 


	err = gpio_request(GPIO11_NAND_CS, "NAND CS");

	if (err) {

		pr_warning("EM-X270: failed to request NAND CS gpio\n");

		pr_warn("EM-X270: failed to request NAND CS gpio\n");

		return;

	}
@@ -386,7 +386,7 @@ static void __init em_x270_init_nand(void) 


	err = gpio_request(nand_rb, "NAND R/B");

	if (err) {

		pr_warning("EM-X270: failed to request NAND R/B gpio\n");

		pr_warn("EM-X270: failed to request NAND R/B gpio\n");

		gpio_free(GPIO11_NAND_CS);

		return;

	}

arch/arm/mach-pxa/generic.h

+42 −23
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ 


struct irq_data;



extern void pxa_timer_init(void);



extern void __init pxa_map_io(void);



extern unsigned int get_clk_frequency_khz(int info);

extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *,

					     unsigned int));

extern void __init pxa_map_io(void);

extern void pxa_timer_init(void);



#define SET_BANK(__nr,__start,__size) \

	mi->bank[__nr].start = (__start), \
@@ -25,6 +25,43 @@ extern unsigned int get_clk_frequency_khz(int info); 


#define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)



#define pxa25x_handle_irq icip_handle_irq

extern void __init pxa25x_init_irq(void);

extern void __init pxa25x_map_io(void);

extern void __init pxa26x_init_irq(void);



#define pxa27x_handle_irq ichp_handle_irq

extern void __init pxa27x_dt_init_irq(void);

extern unsigned	pxa27x_get_clk_frequency_khz(int);

extern void __init pxa27x_init_irq(void);

extern void __init pxa27x_map_io(void);



#define pxa3xx_handle_irq ichp_handle_irq

extern void __init pxa3xx_dt_init_irq(void);

extern void __init pxa3xx_init_irq(void);

extern void __init pxa3xx_map_io(void);



extern struct syscore_ops pxa_irq_syscore_ops;

extern struct syscore_ops pxa2xx_mfp_syscore_ops;

extern struct syscore_ops pxa3xx_mfp_syscore_ops;



void __init pxa_set_ffuart_info(void *info);

void __init pxa_set_btuart_info(void *info);

void __init pxa_set_stuart_info(void *info);

void __init pxa_set_hwuart_info(void *info);



void pxa_restart(enum reboot_mode, const char *);



#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)

extern void pxa2xx_clear_reset_status(unsigned int);

#else

static inline void pxa2xx_clear_reset_status(unsigned int mask) {}

#endif



/*

 * Once fully converted to the clock framework, all these functions should be

 * removed, and replaced with a clk_get(NULL, "core").

 */

#ifdef CONFIG_PXA25x

extern unsigned pxa25x_get_clk_frequency_khz(int);

#else
@@ -32,30 +69,12 @@ extern unsigned pxa25x_get_clk_frequency_khz(int); 
#endif



#ifdef CONFIG_PXA27x

extern unsigned pxa27x_get_clk_frequency_khz(int);

#else

#define pxa27x_get_clk_frequency_khz(x)		(0)

#endif



#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)

extern void pxa2xx_clear_reset_status(unsigned int);

#else

static inline void pxa2xx_clear_reset_status(unsigned int mask) {}

#endif



#ifdef CONFIG_PXA3xx

extern unsigned	pxa3xx_get_clk_frequency_khz(int);

#else

#define pxa3xx_get_clk_frequency_khz(x)		(0)

#endif
 


extern struct syscore_ops pxa_irq_syscore_ops;

extern struct syscore_ops pxa2xx_mfp_syscore_ops;

extern struct syscore_ops pxa3xx_mfp_syscore_ops;



void __init pxa_set_ffuart_info(void *info);

void __init pxa_set_btuart_info(void *info);

void __init pxa_set_stuart_info(void *info);

void __init pxa_set_hwuart_info(void *info);



void pxa_restart(enum reboot_mode, const char *);

arch/arm/mach-pxa/gumstix.c

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ static void gumstix_setup_bt_clock(void) 
	int timeout = 500;



	if (!(OSCC & OSCC_OOK))

		pr_warning("32kHz clock was not on. Bootloader may need to "

				"be updated\n");

		pr_warn("32kHz clock was not on. Bootloader may need to be updated\n");

	else

		return;