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

Commit a3fd869a authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/urgent' and 'sh/regulator' into sh-latest

parents 90eed7d8 89d71486

arch/sh/boards/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ config SH_7724_SOLUTION_ENGINE 
	depends on CPU_SUBTYPE_SH7724

	select ARCH_REQUIRE_GPIOLIB

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  Select 7724 SolutionEngine if configuring for a Hitachi SH7724

	  evaluation board.
@@ -140,6 +141,7 @@ config SH_RSK 
	bool "Renesas Starter Kit"

	depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \

	  CPU_SUBTYPE_SH7264 || CPU_SUBTYPE_SH7269

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	 Select this option if configuring for any of the RSK+ MCU

	 evaluation platforms.
@@ -159,6 +161,7 @@ config SH_SDK7786 
	select NO_IOPORT if !PCI

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_SRAM_POOL

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  Select SDK7786 if configuring for a Renesas Technology Europe

	  SH7786-65nm board.
@@ -173,6 +176,7 @@ config SH_SH7757LCR 
	bool "SH7757LCR"

	depends on CPU_SUBTYPE_SH7757

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config SH_SH7785LCR

	bool "SH7785LCR"
@@ -206,6 +210,7 @@ config SH_MIGOR 
	bool "Migo-R"

	depends on CPU_SUBTYPE_SH7722

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  Select Migo-R if configuring for the SH7722 Migo-R platform

          by Renesas System Solutions Asia Pte. Ltd.
@@ -214,6 +219,7 @@ config SH_AP325RXA 
	bool "AP-325RXA"

	depends on CPU_SUBTYPE_SH7723

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  Renesas "AP-325RXA" support.

	  Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
@@ -222,6 +228,7 @@ config SH_KFR2R09 
	bool "KFR2R09"

	depends on CPU_SUBTYPE_SH7724

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  "Kit For R2R for 2009" support.
@@ -230,6 +237,7 @@ config SH_ECOVEC 
	depends on CPU_SUBTYPE_SH7724

	select ARCH_REQUIRE_GPIOLIB

	select SND_SOC_DA7210 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  Renesas "R0P7724LC0011/21RL (EcoVec)" support.
@@ -305,6 +313,7 @@ config SH_MAGIC_PANEL_R2 
	bool "Magic Panel R2"

	depends on CPU_SUBTYPE_SH7720

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	  Select Magic Panel R2 if configuring for Magic Panel R2.
@@ -316,6 +325,7 @@ config SH_CAYMAN 
config SH_POLARIS

	bool "SMSC Polaris"

	select CPU_HAS_IPR_IRQ

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on CPU_SUBTYPE_SH7709

	help

	  Select if configuring for an SMSC Polaris development board
@@ -323,6 +333,7 @@ config SH_POLARIS 
config SH_SH2007

	bool "SH-2007 board"

	select NO_IOPORT

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on CPU_SUBTYPE_SH7780

	help

	  SH-2007 is a single-board computer based around SH7780 chip
@@ -334,6 +345,7 @@ config SH_SH2007 
config SH_APSH4A3A

	bool "AP-SH4A-3A"

	select SH_ALPHA_BOARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on CPU_SUBTYPE_SH7785

	help

	  Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A.
@@ -342,6 +354,7 @@ config SH_APSH4AD0A 
	bool "AP-SH4AD-0A"

	select SH_ALPHA_BOARD

	select SYS_SUPPORTS_PCI

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on CPU_SUBTYPE_SH7786

	help

	  Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A.

arch/sh/boards/board-apsh4a3a.c

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/mtd/physmap.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <linux/irq.h>

#include <linux/clk.h>
@@ -66,6 +68,12 @@ static struct platform_device nor_flash_device = { 
	.resource	= nor_flash_resources,

};



/* Dummy supplies, where voltage doesn't matter */

static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



static struct resource smsc911x_resources[] = {

	[0] = {

		.name		= "smsc911x-memory",
@@ -105,6 +113,8 @@ static struct platform_device *apsh4a3a_devices[] __initdata = { 


static int __init apsh4a3a_devices_setup(void)

{

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



	return platform_add_devices(apsh4a3a_devices,

				    ARRAY_SIZE(apsh4a3a_devices));

}

arch/sh/boards/board-apsh4ad0a.c

+10 −0
Original line number Diff line number Diff line
@@ -12,12 +12,20 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <linux/irq.h>

#include <linux/clk.h>

#include <asm/machvec.h>

#include <asm/sizes.h>



/* Dummy supplies, where voltage doesn't matter */

static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



static struct resource smsc911x_resources[] = {

	[0] = {

		.name		= "smsc911x-memory",
@@ -56,6 +64,8 @@ static struct platform_device *apsh4ad0a_devices[] __initdata = { 


static int __init apsh4ad0a_devices_setup(void)

{

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



	return platform_add_devices(apsh4ad0a_devices,

				    ARRAY_SIZE(apsh4ad0a_devices));

}

arch/sh/boards/board-magicpanelr2.c

+10 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -24,6 +26,12 @@ 
#include <asm/heartbeat.h>

#include <cpu/sh7720.h>



/* Dummy supplies, where voltage doesn't matter */

static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



#define LAN9115_READY	(__raw_readl(0xA8000084UL) & 0x00000001UL)



/* Wait until reset finished. Timeout is 100ms. */
@@ -348,6 +356,8 @@ static struct platform_device *mpr2_devices[] __initdata = { 


static int __init mpr2_devices_setup(void)

{

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



	return platform_add_devices(mpr2_devices, ARRAY_SIZE(mpr2_devices));

}

device_initcall(mpr2_devices_setup);

arch/sh/boards/board-polaris.c

+10 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <linux/io.h>

#include <asm/irq.h>
@@ -22,6 +24,12 @@ 
#define AREA5_WAIT_CTRL	(0x1C00)

#define WAIT_STATES_10	(0x7)



/* Dummy supplies, where voltage doesn't matter */

static struct regulator_consumer_supply dummy_supplies[] = {

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

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

};



static struct resource smsc911x_resources[] = {

	[0] = {

		.name		= "smsc911x-memory",
@@ -88,6 +96,8 @@ static int __init polaris_initialise(void) 


	printk(KERN_INFO "Configuring Polaris external bus\n");



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



	/* Configure area 5 with 2 wait states */

	wcr = __raw_readw(WCR2);

	wcr &= (~AREA5_WAIT_CTRL);