Commit 697b4f16 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v5.6/fixes-rc3' into fixes

parents e500ba0e 51c22d7b

arch/arm/boot/dts/dra7.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x20013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;
@@ -238,6 +239,7 @@ 
				device_type = "pci";

				ranges = <0x81000000 0 0          0x03000 0 0x00010000

					  0x82000000 0 0x30013000 0x13000 0 0xffed000>;

				dma-ranges = <0x02000000 0x0 0x00000000 0x00000000 0x1 0x00000000>;

				bus-range = <0x00 0xff>;

				#interrupt-cells = <1>;

				num-lanes = <1>;

arch/arm/boot/dts/dra76x.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -128,3 +128,8 @@ 
&usb4_tm {

	status = "disabled";

};



&mmc3 {

	/* dra76x is not affected by i887 */

	max-frequency = <96000000>;

};

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ hwmod-common = omap_hwmod.o omap_hwmod_reset.o \ 
clock-common				= clock.o

secure-common				= omap-smc.o omap-secure.o



obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)

obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common) $(secure-common)

arch/arm/mach-omap2/io.c

+0 −2
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ void __init omap2420_init_early(void) 
	omap_hwmod_init_postsetup();

	omap_clk_soc_init = omap2420_dt_clk_init;

	rate_table = omap2420_rate_table;

	omap_secure_init();

}



void __init omap2420_init_late(void)
@@ -456,7 +455,6 @@ void __init omap2430_init_early(void) 
	omap_hwmod_init_postsetup();

	omap_clk_soc_init = omap2430_dt_clk_init;

	rate_table = omap2430_rate_table;

	omap_secure_init();

}



void __init omap2430_init_late(void)

drivers/bus/ti-sysc.c

+2 −2
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ static void sysc_init_revision_quirks(struct sysc *ddata) 
}



/* 1-wire needs module's internal clocks enabled for reset */

static void sysc_clk_enable_quirk_hdq1w(struct sysc *ddata)

static void sysc_pre_reset_quirk_hdq1w(struct sysc *ddata)

{

	int offset = 0x0c;	/* HDQ_CTRL_STATUS */

	u16 val;
@@ -1488,7 +1488,7 @@ static void sysc_init_module_quirks(struct sysc *ddata) 
		return;



	if (ddata->cfg.quirks & SYSC_MODULE_QUIRK_HDQ1W) {

		ddata->clk_enable_quirk = sysc_clk_enable_quirk_hdq1w;

		ddata->clk_disable_quirk = sysc_pre_reset_quirk_hdq1w;



		return;

	}