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

Commit ff140865 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes 

From Tony Lindgren:

Note that this also contains a set of fixes that are not regressions
or oopses to properly deal with the smsc911x regulator issue.

Basically the regulators must be per board file as the regulators
can also come from drivers, such as twl4030. So it's best to dumb
down gpmc-smsc911x.c to not even care about the regulators.

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: fix section mismatches in usb-host.c
  ARM: OMAP2+: Fix omap2+ build error
  ARM: OMAP2+: smsc911x: Add fixed board regulators
  ARM: OMAP2+: smsc911x: Remove regulator support from gmpc-smsc911x
  ARM: OMAP2+: smsc911x: Remove unused rate calculation
  ARM: OMAP2+ smsc911x: Fix possible stale smsc911x flags
  ARM: OMAP2+: smsc911x: Remove odd gpmc_cfg/board_data redirection
  ARM: OMAP3+: fix oops triggered in omap_prcm_register_chain_handler(v1)
  ARM: OMAP2+: OPP: allow OPP enumeration to continue if device is not present
  arm: omap3: pm34xx.c: Replace printk() with appropriate pr_*()
  arm: omap3: pm34xx.c: Fix omap3_pm_init() error out paths
  ARM: OMAP4: Workaround the OCP synchronisation issue with 32K synctimer.
  ARM: OMAP4: prm: fix interrupt register offsets
  ARM: OMAP: hwmod: Use sysc_fields->srst_shift and get rid of hardcoded SYSC_TYPE2_SOFTRESET_MASK
parents 80783426 08956f1c

arch/arm/include/asm/barrier.h

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __ASM_BARRIER_H



#ifndef __ASSEMBLY__

#include <asm/outercache.h>



#define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
@@ -39,7 +40,6 @@ 
#ifdef CONFIG_ARCH_HAS_BARRIERS

#include <mach/barriers.h>

#elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)

#include <asm/outercache.h>

#define mb()		do { dsb(); outer_sync(); } while (0)

#define rmb()		dsb()

#define wmb()		mb()

arch/arm/mach-omap2/board-cm-t35.c

+16 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <linux/i2c/at24.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/mmc/host.h>
@@ -81,8 +82,23 @@ static struct omap_smsc911x_platform_data sb_t35_smsc911x_cfg = { 
	.flags		= SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,

};



static struct regulator_consumer_supply cm_t35_smsc911x_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x.0"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),

};



static struct regulator_consumer_supply sb_t35_smsc911x_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x.1"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x.1"),

};



static void __init cm_t35_init_ethernet(void)

{

	regulator_register_fixed(0, cm_t35_smsc911x_supplies,

				 ARRAY_SIZE(cm_t35_smsc911x_supplies));

	regulator_register_fixed(1, sb_t35_smsc911x_supplies,

				 ARRAY_SIZE(sb_t35_smsc911x_supplies));



	gpmc_smsc911x_init(&cm_t35_smsc911x_cfg);

	gpmc_smsc911x_init(&sb_t35_smsc911x_cfg);

}

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

+6 −0
Original line number Diff line number Diff line
@@ -634,8 +634,14 @@ static void __init igep_wlan_bt_init(void) 
static inline void __init igep_wlan_bt_init(void) { }

#endif



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x.0"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),

};



static void __init igep_init(void)

{

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);



	/* Get IGEP2 hardware revision */

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

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/err.h>

#include <linux/clk.h>

#include <linux/spi/spi.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/i2c/twl.h>

#include <linux/io.h>
@@ -410,8 +411,14 @@ static struct mtd_partition ldp_nand_partitions[] = { 


};



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x.0"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),

};



static void __init omap_ldp_init(void)

{

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	ldp_init_smsc911x();

	omap_i2c_init();

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

+6 −9
Original line number Diff line number Diff line
@@ -114,15 +114,6 @@ static struct omap_smsc911x_platform_data smsc911x_cfg = { 


static inline void __init omap3evm_init_smsc911x(void)

{

	struct clk *l3ck;

	unsigned int rate;



	l3ck = clk_get(NULL, "l3_ck");

	if (IS_ERR(l3ck))

		rate = 100000000;

	else

		rate = clk_get_rate(l3ck);



	/* Configure ethernet controller reset gpio */

	if (cpu_is_omap3430()) {

		if (get_omap3_evm_rev() == OMAP3EVM_BOARD_GEN_1)
@@ -632,9 +623,15 @@ static void __init omap3_evm_wl12xx_init(void) 
#endif

}



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x.0"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),

};



static void __init omap3_evm_init(void)

{

	omap3_evm_get_revision();

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	if (cpu_is_omap3630())

		omap3_mux_init(omap36x_board_mux, OMAP_PACKAGE_CBB);