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

Commit 1543966a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pxa-palm' into pxa-machines 

Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
parents 5ff7f78a 4e9687d9

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -623,6 +623,12 @@ M: marek.vasut@gmail.com 
W:	http://hackndev.com

S:	Maintained



ARM/PALMZ72 SUPPORT

P:     Sergey Lapin

M:     slapin@ossfans.org

W:     http://hackndev.com

S:     Maintained



ARM/PLEB SUPPORT

P:	Peter Chubb

M:	pleb@gelato.unsw.edu.au

arch/arm/configs/palmz72_defconfig

0 → 100644
+951 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-pxa/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -288,6 +288,16 @@ config MACH_PALMTX 
	  Say Y here if you intend to run this kernel on a Palm T|X

	  handheld computer.



config MACH_PALMZ72

	bool "Palm Zire 72"

	default y

	depends on ARCH_PXA_PALM

	select PXA27x

	select IWMMXT

	help

	  Say Y here if you intend to run this kernel on Palm Zire 72

	  handheld computer.



config MACH_PCM990_BASEBOARD

	bool "PHYTEC PCM-990 development board"

	select HAVE_PWM

arch/arm/mach-pxa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ obj-$(CONFIG_MACH_E750) += e750_lcd.o 
obj-$(CONFIG_MACH_E400)		+= e400_lcd.o

obj-$(CONFIG_MACH_E800)		+= e800_lcd.o

obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o

obj-$(CONFIG_MACH_PALMZ72)	+= palmz72.o



ifeq ($(CONFIG_MACH_ZYLONITE),y)

  obj-y				+= zylonite.o

arch/arm/mach-pxa/include/mach/palmz72.h

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * GPIOs and interrupts for Palm Zire72 Handheld Computer

 *

 * Authors:	Alex Osborne <bobofdoom@gmail.com>

 *		Jan Herman <2hp@seznam.cz>

 *		Sergey Lapin <slapin@ossfans.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */



#ifndef _INCLUDE_PALMZ72_H_

#define _INCLUDE_PALMZ72_H_



/* Power and control */

#define GPIO_NR_PALMZ72_GPIO_RESET		1

#define GPIO_NR_PALMZ72_POWER_DETECT		0



/* SD/MMC */

#define GPIO_NR_PALMZ72_SD_DETECT_N		14

#define GPIO_NR_PALMZ72_SD_POWER_N		98

#define GPIO_NR_PALMZ72_SD_RO 115



/* Touchscreen */

#define GPIO_NR_PALMZ72_WM9712_IRQ		27



/* IRDA -  disable GPIO connected to SD pin of tranceiver (TFBS4710?) ? */

#define GPIO_NR_PALMZ72_IR_DISABLE		49



/* USB */

#define GPIO_NR_PALMZ72_USB_DETECT_N		15

#define GPIO_NR_PALMZ72_USB_POWER		95

#define GPIO_NR_PALMZ72_USB_PULLUP		12



/* LCD/Backlight */

#define GPIO_NR_PALMZ72_BL_POWER		20

#define GPIO_NR_PALMZ72_LCD_POWER		96



/* LED */

#define GPIO_NR_PALMZ72_LED_GREEN		88



/* Bluetooth */

#define GPIO_NR_PALMZ72_BT_POWER		17

#define GPIO_NR_PALMZ72_BT_RESET		83



/** Initial values **/



/* Battery */

#define PALMZ72_BAT_MAX_VOLTAGE		4000	/* 4.00v current voltage */

#define PALMZ72_BAT_MIN_VOLTAGE		3550	/* 3.55v critical voltage */

#define PALMZ72_BAT_MAX_CURRENT		0	/* unknokn */

#define PALMZ72_BAT_MIN_CURRENT		0	/* unknown */

#define PALMZ72_BAT_MAX_CHARGE		1	/* unknown */

#define PALMZ72_BAT_MIN_CHARGE		1	/* unknown */

#define PALMZ72_MAX_LIFE_MINS		360	/* on-life in minutes */



/* Backlight */

#define PALMZ72_MAX_INTENSITY		0xFE

#define PALMZ72_DEFAULT_INTENSITY	0x7E

#define PALMZ72_LIMIT_MASK		0x7F

#define PALMZ72_PRESCALER		0x3F

#define PALMZ72_PERIOD_NS		3500



#endif