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

Commit 1f51b001 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixes

parents 7caaf7ef 87635501 897a6a1a

arch/arm/mach-davinci/board-da850-evm.c

+28 −0
Original line number Diff line number Diff line
@@ -115,6 +115,32 @@ static struct spi_board_info da850evm_spi_info[] = { 
	},

};



#ifdef CONFIG_MTD

static void da850_evm_m25p80_notify_add(struct mtd_info *mtd)

{

	char *mac_addr = davinci_soc_info.emac_pdata->mac_addr;

	size_t retlen;



	if (!strcmp(mtd->name, "MAC-Address")) {

		mtd->read(mtd, 0, ETH_ALEN, &retlen, mac_addr);

		if (retlen == ETH_ALEN)

			pr_info("Read MAC addr from SPI Flash: %pM\n",

				mac_addr);

	}

}



static struct mtd_notifier da850evm_spi_notifier = {

	.add	= da850_evm_m25p80_notify_add,

};



static void da850_evm_setup_mac_addr(void)

{

	register_mtd_user(&da850evm_spi_notifier);

}

#else

static void da850_evm_setup_mac_addr(void) { }

#endif



static struct mtd_partition da850_evm_norflash_partition[] = {

	{

		.name           = "bootloaders + env",
@@ -1244,6 +1270,8 @@ static __init void da850_evm_init(void) 
	if (ret)

		pr_warning("da850_evm_init: sata registration failed: %d\n",

				ret);



	da850_evm_setup_mac_addr();

}



#ifdef CONFIG_SERIAL_8250_CONSOLE

arch/arm/mach-davinci/include/mach/psc.h

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ 
#define PSC_STATE_DISABLE	2

#define PSC_STATE_ENABLE	3



#define MDSTAT_STATE_MASK	0x1f

#define MDSTAT_STATE_MASK	0x3f

#define MDCTL_FORCE		BIT(31)



#ifndef __ASSEMBLER__

arch/arm/mach-davinci/sleep.S

+5 −1
Original line number Diff line number Diff line
@@ -217,7 +217,11 @@ ddr2clk_stop_done: 
ENDPROC(davinci_ddr_psc_config)



CACHE_FLUSH:

#ifdef CONFIG_CPU_V6

	.word	v6_flush_kern_cache_all

#else

	.word   arm926_flush_kern_cache_all

#endif



ENTRY(davinci_cpu_suspend_sz)

	.word	. - davinci_cpu_suspend

arch/arm/mach-omap2/clock3xxx_data.c

+2 −0
Original line number Diff line number Diff line
@@ -3078,6 +3078,7 @@ static struct clk gpt12_fck = { 
	.name		= "gpt12_fck",

	.ops		= &clkops_null,

	.parent		= &secure_32k_fck,

	.clkdm_name	= "wkup_clkdm",

	.recalc		= &followparent_recalc,

};
@@ -3085,6 +3086,7 @@ static struct clk wdt1_fck = { 
	.name		= "wdt1_fck",

	.ops		= &clkops_null,

	.parent		= &secure_32k_fck,

	.clkdm_name	= "wkup_clkdm",

	.recalc		= &followparent_recalc,

};

arch/arm/mach-omap2/clock44xx_data.c

+9 −1
Original line number Diff line number Diff line
@@ -3376,10 +3376,18 @@ int __init omap4xxx_clk_init(void) 
	} else if (cpu_is_omap446x()) {

		cpu_mask = RATE_IN_4460;

		cpu_clkflg = CK_446X;

	} else {

		return 0;

	}



	clk_init(&omap2_clk_functions);

	omap2_clk_disable_clkdm_control();



	/*

	 * Must stay commented until all OMAP SoC drivers are

	 * converted to runtime PM, or drivers may start crashing

	 *

	 * omap2_clk_disable_clkdm_control();

	 */



	for (c = omap44xx_clks; c < omap44xx_clks + ARRAY_SIZE(omap44xx_clks);

									  c++)