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

Commit 7105212b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5326/1: AFEB9260: Fix for i2c_board_info structure
  [ARM] mx31ads: Add missing include
  [ARM] MXC: Fix mxc_gpio_get(), which must read PSR register instead DR.
  [ARM] MX3: Use ioremap wrapper to map SoC devices nonshared
  [ARM] gpio_free might sleep, arm architecture
  [ARM] ep93xx: fix OHCI DMA mask
  leds: da903x: (da9030 only) led brightness reversed.
  [ARM] sharpsl_pm: fix compilation w/o CONFIG_PM
  [ARM] pcm037: map AIPS1 and AIPS2 as nonshared area
  [ARM] build fixes for netX serial driver
  [ARM] 5323/1: Remove outdated empeg documentation.
  [ARM] 5299/1: Add maintainer for Mobilepro 900/c
  [ARM] corgi_lcd: fix simultaneous compilation with corgi_bl
  [ARM] pxa/spitz: fix spi cs on spitz
  [ARM] 5322/1: Fix fastpath issue in mmci.c
  [ARM] xsc3: revert writethrough memory-type encoding change
parents 65fc716f b73b925a

Documentation/arm/empeg/README

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
Empeg, Ltd's Empeg MP3 Car Audio Player



The initial design is to go in your car, but you can use it at home, on a

boat... almost anywhere. The principle is to store CD-quality music using

MPEG technology onto a hard disk in the unit, and use the power of the

embedded computer to serve up the music you want.



For more details, see:



	http://www.empeg.com

Documentation/arm/empeg/ir.txt

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
Infra-red driver documentation.



Mike Crowe <mac@empeg.com>

(C) Empeg Ltd 1999



Not a lot here yet :-)



The Kenwood KCA-R6A remote control generates a sequence like the following:



Go low for approx 16T (Around 9000us)

Go high for approx 8T (Around 4000us)

Go low for less than 2T (Around 750us)



For each of the 32 bits

  Go high for more than 2T (Around 1500us) == 1

  Go high for less than T (Around 400us) == 0

  Go low for less than 2T (Around 750us)



Rather than repeat a signal when the button is held down certain buttons

generate the following code to indicate repetition.



Go low for approx 16T

Go high for approx 4T

Go low for less than 2T



(By removing the <2T from the start of the sequence and placing at the end

 it can be considered a stop bit but I found it easier to deal with it at

 the start).



The 32 bits are encoded as XxYy where x and y are the actual data values

while X and Y are the logical inverses of the associated data values. Using 

LSB first yields sensible codes for the numbers.



All codes are of the form b9xx



The numeric keys generate the code 0x where x is the number pressed.



Tuner		1c

Tape		1d

CD		1e

CD-MD-CH	1f

Track-		0a

Track+		0b

Rewind		0c

FF		0d

DNPP		5e

Play/Pause	0e

Vol+		14

Vol-		15

Documentation/arm/empeg/mkdevs

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#!/bin/sh

mknod /dev/display c 244 0

mknod /dev/ir c 242 0

mknod /dev/usb0 c 243 0

mknod /dev/audio c 245 4

mknod /dev/dsp c 245 3

mknod /dev/mixer c 245 0

mknod /dev/empeg_state c 246 0

mknod /dev/radio0 c 81 64

ln -sf radio0 radio

ln -sf usb0 usb

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -610,6 +610,11 @@ P: Philipp Zabel 
M:	philipp.zabel@gmail.com

S:	Maintained



ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT

P:	Michael Petchkovsky

M:	mkpetch@internode.on.net

S:	Maintained



ARM/TOSA MACHINE SUPPORT

P:	Dmitry Baryshkov

M:	dbaryshkov@gmail.com

arch/arm/common/sharpsl_pm.c

+14 −5
Original line number Diff line number Diff line
@@ -54,11 +54,13 @@ 
/*

 * Prototypes

 */

#ifdef CONFIG_PM

static int sharpsl_off_charge_battery(void);

static int sharpsl_check_battery_temp(void);

static int sharpsl_check_battery_voltage(void);

static int sharpsl_ac_check(void);

static int sharpsl_fatal_check(void);

#endif

static int sharpsl_check_battery_temp(void);

static int sharpsl_ac_check(void);

static int sharpsl_average_value(int ad);

static void sharpsl_average_clear(void);

static void sharpsl_charge_toggle(struct work_struct *private_);
@@ -424,6 +426,7 @@ static int sharpsl_check_battery_temp(void) 
	return 0;

}



#ifdef CONFIG_PM

static int sharpsl_check_battery_voltage(void)

{

	int val, i, buff[5];
@@ -455,6 +458,7 @@ static int sharpsl_check_battery_voltage(void) 


	return 0;

}

#endif



static int sharpsl_ac_check(void)

{
@@ -586,8 +590,6 @@ static int corgi_pxa_pm_enter(suspend_state_t state) 


	return 0;

}

#endif





/*

 * Check for fatal battery errors
@@ -738,7 +740,10 @@ static int sharpsl_off_charge_battery(void) 
		}

	}

}



#else

#define sharpsl_pm_suspend	NULL

#define sharpsl_pm_resume	NULL

#endif



static ssize_t battery_percentage_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -768,10 +773,12 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) 
	info->battery_life = sharpsl_pm.battstat.mainbat_percent;

}



#ifdef CONFIG_PM

static struct platform_suspend_ops sharpsl_pm_ops = {

	.enter		= corgi_pxa_pm_enter,

	.valid		= suspend_valid_only_mem,

};

#endif



static int __init sharpsl_pm_probe(struct platform_device *pdev)

{
@@ -802,7 +809,9 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) 


	apm_get_power_status = sharpsl_apm_get_power_status;



#ifdef CONFIG_PM

	suspend_set_ops(&sharpsl_pm_ops);

#endif



	mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));