tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into fixes

Russell King c0d61a79 78240e37

+19 -10
+1 -1
arch/arm/mach-davinci/cpufreq.c
··· 132 132 return ret; 133 133 } 134 134 135 - static int __init davinci_cpu_init(struct cpufreq_policy *policy) 135 + static int davinci_cpu_init(struct cpufreq_policy *policy) 136 136 { 137 137 int result = 0; 138 138 struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;
+7
arch/arm/mach-davinci/devices-da8xx.c
··· 480 480 .resource = da850_mcasp_resources, 481 481 }; 482 482 483 + struct platform_device davinci_pcm_device = { 484 + .name = "davinci-pcm-audio", 485 + .id = -1, 486 + }; 487 + 483 488 void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata) 484 489 { 490 + platform_device_register(&davinci_pcm_device); 491 + 485 492 /* DA830/OMAP-L137 has 3 instances of McASP */ 486 493 if (cpu_is_davinci_da830() && id == 1) { 487 494 da830_mcasp1_device.dev.platform_data = pdata;
+9 -9
arch/arm/mach-davinci/gpio-tnetv107x.c
··· 58 58 59 59 spin_lock_irqsave(&ctlr->lock, flags); 60 60 61 - gpio_reg_set_bit(&regs->enable, gpio); 61 + gpio_reg_set_bit(regs->enable, gpio); 62 62 63 63 spin_unlock_irqrestore(&ctlr->lock, flags); 64 64 ··· 74 74 75 75 spin_lock_irqsave(&ctlr->lock, flags); 76 76 77 - gpio_reg_clear_bit(&regs->enable, gpio); 77 + gpio_reg_clear_bit(regs->enable, gpio); 78 78 79 79 spin_unlock_irqrestore(&ctlr->lock, flags); 80 80 } ··· 88 88 89 89 spin_lock_irqsave(&ctlr->lock, flags); 90 90 91 - gpio_reg_set_bit(&regs->direction, gpio); 91 + gpio_reg_set_bit(regs->direction, gpio); 92 92 93 93 spin_unlock_irqrestore(&ctlr->lock, flags); 94 94 ··· 106 106 spin_lock_irqsave(&ctlr->lock, flags); 107 107 108 108 if (value) 109 - gpio_reg_set_bit(&regs->data_out, gpio); 109 + gpio_reg_set_bit(regs->data_out, gpio); 110 110 else 111 - gpio_reg_clear_bit(&regs->data_out, gpio); 111 + gpio_reg_clear_bit(regs->data_out, gpio); 112 112 113 - gpio_reg_clear_bit(&regs->direction, gpio); 113 + gpio_reg_clear_bit(regs->direction, gpio); 114 114 115 115 spin_unlock_irqrestore(&ctlr->lock, flags); 116 116 ··· 124 124 unsigned gpio = chip->base + offset; 125 125 int ret; 126 126 127 - ret = gpio_reg_get_bit(&regs->data_in, gpio); 127 + ret = gpio_reg_get_bit(regs->data_in, gpio); 128 128 129 129 return ret ? 1 : 0; 130 130 } ··· 140 140 spin_lock_irqsave(&ctlr->lock, flags); 141 141 142 142 if (value) 143 - gpio_reg_set_bit(&regs->data_out, gpio); 143 + gpio_reg_set_bit(regs->data_out, gpio); 144 144 else 145 - gpio_reg_clear_bit(&regs->data_out, gpio); 145 + gpio_reg_clear_bit(regs->data_out, gpio); 146 146 147 147 spin_unlock_irqrestore(&ctlr->lock, flags); 148 148 }
+2
arch/arm/mach-davinci/include/mach/clkdev.h
··· 1 1 #ifndef __MACH_CLKDEV_H 2 2 #define __MACH_CLKDEV_H 3 3 4 + struct clk; 5 + 4 6 static inline int __clk_get(struct clk *clk) 5 7 { 6 8 return 1;