Commit 5ae79473 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-ap4evb' into renesas-board 

* renesas-ap4evb:
  ARM: mach-shmobile: add fixed voltage regulators to ap4evb
  ARM: shmobile: use common extra gpio functions on ap4evb
parents b315ec06 8778b8f4

arch/arm/mach-shmobile/board-ap4evb.c

+31 −17
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <linux/i2c.h>

#include <linux/i2c/tsc2007.h>

#include <linux/io.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <linux/sh_intc.h>

#include <linux/sh_clk.h>
@@ -159,6 +161,27 @@ 
 * CN12: 3.3v

 */



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

static struct regulator_consumer_supply fixed1v8_power_consumers[] =

{

	/* J22 default position: 1.8V */

	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),

	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),

	REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),

	REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"),

};



static struct regulator_consumer_supply fixed3v3_power_consumers[] =

{

	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),

	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),

};



static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



/* MTD */

static struct mtd_partition nor_flash_partitions[] = {

	{
@@ -1138,21 +1161,6 @@ static void __init fsi_init_pm_clock(void) 
	clk_put(fsia_ick);

}



/*

 * FIXME !!

 *

 * gpio_no_direction

 * are quick_hack.

 *

 * current gpio frame work doesn't have

 * the method to control only pull up/down/free.

 * this function should be replaced by correct gpio function

 */

static void __init gpio_no_direction(u32 addr)

{

	__raw_writeb(0x00, addr);

}



/* TouchScreen */

#ifdef CONFIG_AP4EVB_QHD

# define GPIO_TSC_IRQ	GPIO_FN_IRQ28_123
@@ -1224,6 +1232,12 @@ static void __init ap4evb_init(void) 
	u32 srcr4;

	struct clk *clk;



	regulator_register_always_on(0, "fixed-1.8V", fixed1v8_power_consumers,

				     ARRAY_SIZE(fixed1v8_power_consumers), 1800000);

	regulator_register_always_on(1, "fixed-3.3V", fixed3v3_power_consumers,

				     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);

	regulator_register_fixed(2, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	/* External clock source */

	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
@@ -1302,8 +1316,8 @@ static void __init ap4evb_init(void) 


	gpio_request(GPIO_PORT9, NULL);

	gpio_request(GPIO_PORT10, NULL);

	gpio_no_direction(GPIO_PORT9CR);  /* FSIAOBT needs no direction */

	gpio_no_direction(GPIO_PORT10CR); /* FSIAOLR needs no direction */

	gpio_direction_none(GPIO_PORT9CR);  /* FSIAOBT needs no direction */

	gpio_direction_none(GPIO_PORT10CR); /* FSIAOLR needs no direction */



	/* card detect pin for MMC slot (CN7) */

	gpio_request(GPIO_PORT41, NULL);