Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC non-urgent fixes from Arnd Bergmann: "As usual, we queue up a few fixes that don't seem urgent enough to go in through -rc, or that just came a little too late given their size. The zx fixes make the platform finally boot on real hardware, the davinci and imx31 get the DT support working better for some of the machines that are still normally used with classic board files. One tegra fix is important for new bootloader versions, but the bug has been around for a while without anyone noticing. The other changes are mostly cosmetic" * tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits) arm64: tegra: Add missing Smaug revision arm64: tegra: Add VDD_GPU regulator to Jetson TX1 arm64: dts: zte: clean up gic-v3 redistributor properties arm64: dts: zx: Fix gic GICR property bus: vexpress-config: fix device reference leak soc: ti: qmss: fix the case when !SMP ARM: lpc32xx: drop duplicate header device.h ARM: ixp4xx: drop duplicate header gpio.h ARM: socfpga: fix spelling mistake in error message ARM: dts: imx6q-cm-fx6: fix fec pinctrl ARM: dts: imx7d-pinfunc: fix UART pinmux defines ARM: dts: imx6qp: correct LDB clock inputs 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 ARM: zx: Fix error handling ARM: spear: Fix error handling ARM: davinci: da850: Fix pwm name matching ARM: clk: imx31: properly init clocks for machines with DT clk: imx31: fix rewritten input argument of mx31_clocks_init() ...
此提交包含在:
@@ -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();
|
||||
|
@@ -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 */
|
||||
|
@@ -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",
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
新增問題並參考
封鎖使用者