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

Commit d07b3c25 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: (22 commits)
  [ARM] spelling fixes
  [ARM] at91_adc parenthesis balance
  [ARM] 4400/1: S3C24XX: Add high-speed MMC device definition
  [ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings
  [ARM] 4398/1: S3C2443: Fix watchdog IRQ number
  [ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity
  [ARM] 4396/1: S3C2443: Add missing HCLK clocks
  [ARM] 4395/1: S3C24XX: add include of <linux/sysdev.h> to relevant machines
  [ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu
  [ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts
  [ARM] ARMv6: add CPU_HAS_ASID configuration
  [ARM] integrator: fix pci_v3 compile error with DEBUG_LL
  [ARM] gic: Fix gic cascade irq handling
  [ARM] Silence OMAP kernel configuration warning
  [ARM] Update ARM syscalls
  [ARM] 4384/1: S3C2412/13 SPI registers offset correction
  [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files
  [ARM] 4382/1: iop13xx: fix msi support
  [ARM] Remove Integrator/CP SMP platform support
  [ARM] 4378/1: KS8695: Serial driver fix
  ...
parents dde33348 6cbdc8c5

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ config ARCH_IXP2000 
config ARCH_IXP4XX

	bool "IXP4xx-based"

	depends on MMU

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	help

arch/arm/common/dmabounce.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *  copy data to/from buffers located outside the DMA region. This

 *  only works for systems in which DMA memory is at the bottom of

 *  RAM, the remainder of memory is at the top and the DMA memory

 *  can be marked as ZONE_DMA. Anything beyond that such as discontigous

 *  can be marked as ZONE_DMA. Anything beyond that such as discontiguous

 *  DMA windows will require custom implementations that reserve memory

 *  areas at early bootup.

 *

arch/arm/common/gic.c

+10 −12
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static inline unsigned int gic_irq(unsigned int irq) 
 * unmask it, in the same way we need to unmask an interrupt when

 * we first enable it.

 *

 * The GIC has a seperate notion of "end of interrupt" to re-enable

 * The GIC has a separate notion of "end of interrupt" to re-enable

 * an interrupt after handling, in order to support hardware

 * prioritisation.

 *
@@ -125,12 +125,11 @@ static void gic_set_cpu(unsigned int irq, cpumask_t mask_val) 
}

#endif



static void fastcall gic_handle_cascade_irq(unsigned int irq,

					    struct irq_desc *desc)

static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)

{

	struct gic_chip_data *chip_data = get_irq_data(irq);

	struct irq_chip *chip = get_irq_chip(irq);

	unsigned int cascade_irq;

	unsigned int cascade_irq, gic_irq;

	unsigned long status;



	/* primary controller ack'ing */
@@ -140,15 +139,14 @@ static void fastcall gic_handle_cascade_irq(unsigned int irq, 
	status = readl(chip_data->cpu_base + GIC_CPU_INTACK);

	spin_unlock(&irq_controller_lock);



	cascade_irq = (status & 0x3ff);

	if (cascade_irq > 1020)

	gic_irq = (status & 0x3ff);

	if (gic_irq == 1023)

		goto out;

	if (cascade_irq < 32 || cascade_irq >= NR_IRQS) {

		do_bad_IRQ(cascade_irq, desc);

		goto out;

	}



	cascade_irq += chip_data->irq_offset;

	cascade_irq = gic_irq + chip_data->irq_offset;

	if (unlikely(gic_irq < 32 || gic_irq > 1020 || cascade_irq >= NR_IRQS))

		do_bad_IRQ(cascade_irq, desc);

	else

		generic_handle_irq(cascade_irq);



 out:

arch/arm/common/sharpsl_param.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * typically including LCD parameters are loaded by the bootloader at the

 * address PARAM_BASE. As the kernel will overwrite them, we need to store

 * them early in the boot process, then pass them to the appropriate drivers.

 * Not all devices use all paramaters but the format is common to all.

 * Not all devices use all parameters but the format is common to all.

 */

#ifdef CONFIG_ARCH_SA1100

#define PARAM_BASE	0xe8ffc000

arch/arm/common/sharpsl_pm.c

+13 −9
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) 
		sharpsl_pm.battstat.mainbat_percent = percent;

	}



	dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %d\n", voltage,

	dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage,

			sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies);



	/* If battery is low. limit backlight intensity to save power. */
@@ -291,7 +291,7 @@ static void sharpsl_chrg_full_timer(unsigned long data) 
}



/* Charging Finished Interrupt (Not present on Corgi) */

/* Can trigger at the same time as an AC staus change so

/* Can trigger at the same time as an AC status change so

   delay until after that has been processed */

irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id)

{
@@ -625,7 +625,7 @@ static int sharpsl_fatal_check(void) 
	}



	temp = get_select_val(buff);

	dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %d\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT));

	dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %ld\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT));



	if ((acin && (temp < sharpsl_pm.machinfo->fatal_acin_volt)) ||

			(!acin && (temp < sharpsl_pm.machinfo->fatal_noacin_volt)))
@@ -635,7 +635,7 @@ static int sharpsl_fatal_check(void) 


static int sharpsl_off_charge_error(void)

{

	dev_err(sharpsl_pm.dev, "Offline Charger: Error occured.\n");

	dev_err(sharpsl_pm.dev, "Offline Charger: Error occurred.\n");

	sharpsl_pm.machinfo->charge(0);

	sharpsl_pm_led(SHARPSL_LED_ERROR);

	sharpsl_pm.charge_mode = CHRG_ERROR;
@@ -691,14 +691,14 @@ static int sharpsl_off_charge_battery(void) 


		time = RCNR;

		while(1) {

			/* Check if any wakeup event had occured */

			/* Check if any wakeup event had occurred */

			if (sharpsl_pm.machinfo->charger_wakeup() != 0)

				return 0;

			/* Check for timeout */

			if ((RCNR - time) > SHARPSL_WAIT_CO_TIME)

				return 1;

			if (sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_CHRGFULL)) {

				dev_dbg(sharpsl_pm.dev, "Offline Charger: Charge full occured. Retrying to check\n");

				dev_dbg(sharpsl_pm.dev, "Offline Charger: Charge full occurred. Retrying to check\n");

	   			sharpsl_pm.full_count++;

				sharpsl_pm.machinfo->charge(0);

				mdelay(SHARPSL_CHARGE_WAIT_TIME);
@@ -714,7 +714,7 @@ static int sharpsl_off_charge_battery(void) 


	time = RCNR;

	while(1) {

		/* Check if any wakeup event had occured */

		/* Check if any wakeup event had occurred */

		if (sharpsl_pm.machinfo->charger_wakeup() != 0)

			return 0;

		/* Check for timeout */
@@ -774,6 +774,8 @@ static struct pm_ops sharpsl_pm_ops = { 


static int __init sharpsl_pm_probe(struct platform_device *pdev)

{

	int ret;



	if (!pdev->dev.platform_data)

		return -EINVAL;
@@ -792,8 +794,10 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) 


	sharpsl_pm.machinfo->init();



	device_create_file(&pdev->dev, &dev_attr_battery_percentage);

	device_create_file(&pdev->dev, &dev_attr_battery_voltage);

	ret = device_create_file(&pdev->dev, &dev_attr_battery_percentage);

	ret |= device_create_file(&pdev->dev, &dev_attr_battery_voltage);

	if (ret != 0)

		dev_warn(&pdev->dev, "Failed to register attributes (%d)\n", ret);



	apm_get_power_status = sharpsl_apm_get_power_status;