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

Commit 9aa29e9e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.10/fixes-not-urgent-signed' of... 

Merge tag 'omap-for-v4.10/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Non-urgent fixes for omaps for v4.10 merge window:

- Fix mismatched interrupt numbers for tps65217, these are not yet
  used

- Remove unused omapdss_early_init_of()

- Use seq_putc() for pm-debug.c

* tag 'omap-for-v4.10/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: pm-debug: Use seq_putc() in two functions
  ARM: OMAP2+: Remove the omapdss_early_init_of() function
  mfd: tps65217: Fix mismatched interrupt number

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 04c0d567 5c02b01d

arch/arm/mach-omap2/board-generic.c

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ static const struct of_device_id omap_dt_match_table[] __initconst = { 


static void __init omap_generic_init(void)

{

	omapdss_early_init_of();



	pdata_quirks_init(omap_dt_match_table);



	omapdss_init_of();

arch/arm/mach-omap2/common.h

+0 −1
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ extern int omap_dss_reset(struct omap_hwmod *); 
int omap_clk_init(void);



int __init omapdss_init_of(void);

void __init omapdss_early_init_of(void);



#endif /* __ASSEMBLER__ */

#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/mach-omap2/display.c

+0 −5
Original line number Diff line number Diff line
@@ -565,11 +565,6 @@ int omap_dss_reset(struct omap_hwmod *oh) 
	return r;

}



void __init omapdss_early_init_of(void)

{



}



static const char * const omapdss_compat_names[] __initconst = {

	"ti,omap2-dss",

	"ti,omap3-dss",

arch/arm/mach-omap2/pm-debug.c

+2 −3
Original line number Diff line number Diff line
@@ -114,8 +114,7 @@ static int pwrdm_dbg_show_counter(struct powerdomain *pwrdm, void *user) 
		seq_printf(s, ",RET-MEMBANK%d-OFF:%d", i + 1,

				pwrdm->ret_mem_off_counter[i]);



	seq_printf(s, "\n");



	seq_putc(s, '\n');

	return 0;

}
@@ -138,7 +137,7 @@ static int pwrdm_dbg_show_timer(struct powerdomain *pwrdm, void *user) 
		seq_printf(s, ",%s:%lld", pwrdm_state_names[i],

			pwrdm->state_timer[i]);



	seq_printf(s, "\n");

	seq_putc(s, '\n');

	return 0;

}

include/linux/mfd/tps65217.h

+5 −6
Original line number Diff line number Diff line
@@ -234,12 +234,11 @@ struct tps65217_bl_pdata { 
	int dft_brightness;

};



enum tps65217_irq_type {

	TPS65217_IRQ_PB,

	TPS65217_IRQ_AC,

	TPS65217_IRQ_USB,

	TPS65217_NUM_IRQ

};

/* Interrupt numbers */

#define TPS65217_IRQ_USB		0

#define TPS65217_IRQ_AC			1

#define TPS65217_IRQ_PB			2

#define TPS65217_NUM_IRQ		3



/**

 * struct tps65217_board - packages regulator init data