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

Commit 39160435 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'fixes-smsc911x' into fixes

parents 1512f0db 5b3689f4

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);

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

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

#include <linux/gpio.h>



#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>



#include <linux/i2c/twl.h>
@@ -188,8 +189,14 @@ static struct omap_board_mux board_mux[] __initdata = { 
};

#endif



static struct regulator_consumer_supply dummy_supplies[] = {

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

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

};



static void __init omap3logic_init(void)

{

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

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3torpedo_fix_pbias_voltage();

	omap3logic_i2c_init();