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

Commit 4b3c3be0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards 

A couple of board updates for PXA, from Haojian Zhuang.

* 'armsoc/board' of git://github.com/hzhuang1/linux

:
  ARM: pxa: pxa27x.c: add dummy SA1100 rtc clock
  ARM: palmtreo: replace #if defined with IF_ENABLED
  ARM: palmtreo: add docg4 device initialization

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b297d9cd 495b21dc

arch/arm/mach-pxa/palmtreo.c

+33 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static unsigned long centro685_pin_config[] __initdata = { 
/******************************************************************************

 * GPIO keyboard

 ******************************************************************************/

#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)

#if IS_ENABLED(CONFIG_KEYBOARD_PXA27x)

static unsigned int treo680_matrix_keys[] = {

	KEY(0, 0, KEY_F8),		/* Red/Off/Power */

	KEY(0, 1, KEY_LEFT),
@@ -309,7 +309,7 @@ static inline void palmtreo_kpc_init(void) {} 
/******************************************************************************

 * USB host

 ******************************************************************************/

#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)

#if IS_ENABLED(CONFIG_USB_OHCI_HCD)

static struct pxaohci_platform_data treo680_ohci_info = {

	.port_mode    = PMM_PERPORT_MODE,

	.flags        = ENABLE_PORT1 | ENABLE_PORT3,
@@ -395,6 +395,36 @@ static void __init palmtreo_leds_init(void) 
static inline void palmtreo_leds_init(void) {}

#endif



/******************************************************************************

 * diskonchip docg4 flash

 ******************************************************************************/

#if defined(CONFIG_MACH_TREO680)

/* REVISIT: does the centro have this device also? */

#if IS_ENABLED(CONFIG_MTD_NAND_DOCG4)

static struct resource docg4_resources[] = {

	{

		.start	= 0x00000000,

		.end	= 0x00001FFF,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device treo680_docg4_flash = {

	.name   = "docg4",

	.id     = -1,

	.resource = docg4_resources,

	.num_resources = ARRAY_SIZE(docg4_resources),

};



static void __init treo680_docg4_flash_init(void)

{

	platform_device_register(&treo680_docg4_flash);

}

#else

static inline void treo680_docg4_flash_init(void) {}

#endif

#endif



/******************************************************************************

 * Machine init

 ******************************************************************************/
@@ -430,6 +460,7 @@ static void __init treo680_init(void) 
	palmphone_common_init();

	palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, GPIO_NR_TREO680_SD_READONLY,

			GPIO_NR_TREO680_SD_POWER, 0);

	treo680_docg4_flash_init();

}

#endif

arch/arm/mach-pxa/pxa27x.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static struct clk_lookup pxa27x_clkregs[] = { 
	INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),

	INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),

	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),

	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),

};



#ifdef CONFIG_PM