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

Commit c0d61a79 authored by Russell King's avatar Russell King
Browse files

Merge branch 'davinci-fixes' of... 

Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into fixes
parents 78240e37 079db590

arch/arm/mach-davinci/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ out: 
	return ret;

}



static int __init davinci_cpu_init(struct cpufreq_policy *policy)

static int davinci_cpu_init(struct cpufreq_policy *policy)

{

	int result = 0;

	struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;

arch/arm/mach-davinci/devices-da8xx.c

+7 −0
Original line number Diff line number Diff line
@@ -480,8 +480,15 @@ static struct platform_device da850_mcasp_device = { 
	.resource	= da850_mcasp_resources,

};



struct platform_device davinci_pcm_device = {

	.name	= "davinci-pcm-audio",

	.id	= -1,

};



void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata)

{

	platform_device_register(&davinci_pcm_device);



	/* DA830/OMAP-L137 has 3 instances of McASP */

	if (cpu_is_davinci_da830() && id == 1) {

		da830_mcasp1_device.dev.platform_data = pdata;

arch/arm/mach-davinci/gpio-tnetv107x.c

+9 −9
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int tnetv107x_gpio_request(struct gpio_chip *chip, unsigned offset) 


	spin_lock_irqsave(&ctlr->lock, flags);



	gpio_reg_set_bit(&regs->enable, gpio);

	gpio_reg_set_bit(regs->enable, gpio);



	spin_unlock_irqrestore(&ctlr->lock, flags);
@@ -74,7 +74,7 @@ static void tnetv107x_gpio_free(struct gpio_chip *chip, unsigned offset) 


	spin_lock_irqsave(&ctlr->lock, flags);



	gpio_reg_clear_bit(&regs->enable, gpio);

	gpio_reg_clear_bit(regs->enable, gpio);



	spin_unlock_irqrestore(&ctlr->lock, flags);

}
@@ -88,7 +88,7 @@ static int tnetv107x_gpio_dir_in(struct gpio_chip *chip, unsigned offset) 


	spin_lock_irqsave(&ctlr->lock, flags);



	gpio_reg_set_bit(&regs->direction, gpio);

	gpio_reg_set_bit(regs->direction, gpio);



	spin_unlock_irqrestore(&ctlr->lock, flags);
@@ -106,11 +106,11 @@ static int tnetv107x_gpio_dir_out(struct gpio_chip *chip, 
	spin_lock_irqsave(&ctlr->lock, flags);



	if (value)

		gpio_reg_set_bit(&regs->data_out, gpio);

		gpio_reg_set_bit(regs->data_out, gpio);

	else

		gpio_reg_clear_bit(&regs->data_out, gpio);

		gpio_reg_clear_bit(regs->data_out, gpio);



	gpio_reg_clear_bit(&regs->direction, gpio);

	gpio_reg_clear_bit(regs->direction, gpio);



	spin_unlock_irqrestore(&ctlr->lock, flags);
@@ -124,7 +124,7 @@ static int tnetv107x_gpio_get(struct gpio_chip *chip, unsigned offset) 
	unsigned gpio = chip->base + offset;

	int ret;



	ret = gpio_reg_get_bit(&regs->data_in, gpio);

	ret = gpio_reg_get_bit(regs->data_in, gpio);



	return ret ? 1 : 0;

}
@@ -140,9 +140,9 @@ static void tnetv107x_gpio_set(struct gpio_chip *chip, 
	spin_lock_irqsave(&ctlr->lock, flags);



	if (value)

		gpio_reg_set_bit(&regs->data_out, gpio);

		gpio_reg_set_bit(regs->data_out, gpio);

	else

		gpio_reg_clear_bit(&regs->data_out, gpio);

		gpio_reg_clear_bit(regs->data_out, gpio);



	spin_unlock_irqrestore(&ctlr->lock, flags);

}

arch/arm/mach-davinci/include/mach/clkdev.h

+2 −0
Original line number Diff line number Diff line 
#ifndef __MACH_CLKDEV_H

#define __MACH_CLKDEV_H



struct clk;



static inline int __clk_get(struct clk *clk)

{

	return 1;