hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIuBAABCAAYBQJYK1bEERx0b255QGF0b21pZGUuY29tAAoJEBvUPslcq6VzX9EQ
 AL7rLfFsVY39z2pu/QEdkiBfypIcJx1TE9jMR/9j4rJUxewhTkVvyK0fqHnUv7ZP
 znXM/v0ZGE7q4AoyaV2mBsrk+Gty8pkzW50swUxmKK6XwJSjmKAeX1RkzmmNmPYW
 xXC1h77GmbmGnxFJIqQrvbuJse2ItKUIq3ks7+ZELlAwe51SSM3CHHuEVKcPNcJS
 2gmwmaWEi8WaSLBEmlI4OverVlzZrAWYxGyG+QArY9RKRuzCeIKjyk4y+L6RVk6F
 J0Y6Wqbmd9LAwKGwkxBjhpOMTJnM9cHbje7w4wvKWOZ4PVNfneCQXGSwhI9CZIU9
 WqDCeTDkx42ElV7KQSrxSBOuXRv6uIoLYLQIVTQeSHf+EeN4v74CSPMNdgpMWoVu
 AvLgq0pUth4c2hEn8nl2M77jxdqtG7IbtrrOHhBI5TG6s4wPXOco7JKcZOQ7cKkN
 GG4RnvXPH4zFuX0pn9ONn3IAAQXXRP1fXolmMBewYOpaOhrNURasq/y75dPFohHx
 P7Frv/f6B5MUKciHe1nENJhL/BCubSHhqNGy2fyNXi3yHH3Z9LK0sfad6D938Kl8
 xSqLE1LUrp2rj3jvalj7masywssxpQMsyO26JtMqXUQxHXme5DR+m8pHOkz4/MKe
 rGaMSvE5lp84taz8/T8LHEybWog96ky2efsuTIcmMgWy
 =tMf4
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2016-11-18 16:41:41 -08:00
parent 04c0d567d3 5c02b01d23
commit 9aa29e9e5e
5 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-generic.c
View File

@ -30,8 +30,6 @@ static const struct of_device_id omap_dt_match_table[] __initconst = {
static void __init omap_generic_init(void) static void __init omap_generic_init(void)
{ {
omapdss_early_init_of();
pdata_quirks_init(omap_dt_match_table); pdata_quirks_init(omap_dt_match_table);
omapdss_init_of(); omapdss_init_of();

1
arch/arm/mach-omap2/common.h
View File

@ -332,7 +332,6 @@ extern int omap_dss_reset(struct omap_hwmod *);
int omap_clk_init(void); int omap_clk_init(void);
int __init omapdss_init_of(void); int __init omapdss_init_of(void);
void __init omapdss_early_init_of(void);
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

5
arch/arm/mach-omap2/display.c
View File

@ -565,11 +565,6 @@ int omap_dss_reset(struct omap_hwmod *oh)
return r; return r;
} }
void __init omapdss_early_init_of(void)
{
}
static const char * const omapdss_compat_names[] __initconst = { static const char * const omapdss_compat_names[] __initconst = {
"ti,omap2-dss", "ti,omap2-dss",
"ti,omap3-dss", "ti,omap3-dss",

5
arch/arm/mach-omap2/pm-debug.c
View File

@ -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, seq_printf(s, ",RET-MEMBANK%d-OFF:%d", i + 1,
pwrdm->ret_mem_off_counter[i]); pwrdm->ret_mem_off_counter[i]);
seq_printf(s, "\n"); seq_putc(s, '\n');
return 0; 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], seq_printf(s, ",%s:%lld", pwrdm_state_names[i],
pwrdm->state_timer[i]); pwrdm->state_timer[i]);
seq_printf(s, "\n"); seq_putc(s, '\n');
return 0; return 0;
} }

11
include/linux/mfd/tps65217.h
View File

@ -234,12 +234,11 @@ struct tps65217_bl_pdata {
int dft_brightness; int dft_brightness;
}; };
enum tps65217_irq_type { /* Interrupt numbers */
TPS65217_IRQ_PB, #define TPS65217_IRQ_USB 0
TPS65217_IRQ_AC, #define TPS65217_IRQ_AC 1
TPS65217_IRQ_USB, #define TPS65217_IRQ_PB 2
TPS65217_NUM_IRQ #define TPS65217_NUM_IRQ 3
};
/** /**
* struct tps65217_board - packages regulator init data * struct tps65217_board - packages regulator init data