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 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
davinci: cpufreq: fix section mismatch warning
DaVinci: fix compilation warnings in <mach/clkdev.h>
davinci: tnetv107x: fix register indexing for GPIOs numbers > 31
davinci: da8xx/omap-l1x: add platform device for davinci-pcm-audio
ARM: pxa/tosa: register wm9712 codec device
ARM: pxa: enable pxa-pcm-audio on pxa210/pxa25x platform
ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platforms
ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now
ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100
ARM: 6761/1: Update number of VIC for S5PV210
ARM: 6768/1: hw_breakpoint: ensure debug logic is powered up on v7 cores
ARM: 6767/1: ptrace: fix register indexing in GETHBPREGS request
ARM: 6765/1: remove obsolete comment from asm/mach/arch.h
ARM: 6757/1: fix tlb.h induced linux/swap.h build failure

Linus Torvalds 34d4ade7 1a345303

+59 -22
+2
arch/arm/common/Kconfig
··· 6 6 7 7 config ARM_VIC_NR 8 8 int 9 + default 4 if ARCH_S5PV210 10 + default 3 if ARCH_S5P6442 || ARCH_S5PC100 9 11 default 2 10 12 depends on ARM_VIC 11 13 help
-4
arch/arm/include/asm/mach/arch.h
··· 15 15 struct sys_timer; 16 16 17 17 struct machine_desc { 18 - /* 19 - * Note! The first two elements are used 20 - * by assembler code in head.S, head-common.S 21 - */ 22 18 unsigned int nr; /* architecture number */ 23 19 const char *name; /* architecture name */ 24 20 unsigned long boot_params; /* tagged list */
+2
arch/arm/include/asm/pgalloc.h
··· 10 10 #ifndef _ASMARM_PGALLOC_H 11 11 #define _ASMARM_PGALLOC_H 12 12 13 + #include <linux/pagemap.h> 14 + 13 15 #include <asm/domain.h> 14 16 #include <asm/pgtable-hwdef.h> 15 17 #include <asm/processor.h>
+23 -3
arch/arm/kernel/hw_breakpoint.c
··· 836 836 /* 837 837 * One-time initialisation. 838 838 */ 839 - static void reset_ctrl_regs(void *unused) 839 + static void reset_ctrl_regs(void *info) 840 840 { 841 - int i; 841 + int i, cpu = smp_processor_id(); 842 + u32 dbg_power; 843 + cpumask_t *cpumask = info; 842 844 843 845 /* 844 846 * v7 debug contains save and restore registers so that debug state ··· 851 849 * later on. 852 850 */ 853 851 if (debug_arch >= ARM_DEBUG_ARCH_V7_ECP14) { 852 + /* 853 + * Ensure sticky power-down is clear (i.e. debug logic is 854 + * powered up). 855 + */ 856 + asm volatile("mrc p14, 0, %0, c1, c5, 4" : "=r" (dbg_power)); 857 + if ((dbg_power & 0x1) == 0) { 858 + pr_warning("CPU %d debug is powered down!\n", cpu); 859 + cpumask_or(cpumask, cpumask, cpumask_of(cpu)); 860 + return; 861 + } 862 + 854 863 /* 855 864 * Unconditionally clear the lock by writing a value 856 865 * other than 0xC5ACCE55 to the access register. ··· 900 887 static int __init arch_hw_breakpoint_init(void) 901 888 { 902 889 u32 dscr; 890 + cpumask_t cpumask = { CPU_BITS_NONE }; 903 891 904 892 debug_arch = get_debug_arch(); 905 893 ··· 925 911 * Reset the breakpoint resources. We assume that a halting 926 912 * debugger will leave the world in a nice state for us. 927 913 */ 928 - on_each_cpu(reset_ctrl_regs, NULL, 1); 914 + on_each_cpu(reset_ctrl_regs, &cpumask, 1); 915 + if (!cpumask_empty(&cpumask)) { 916 + core_num_brps = 0; 917 + core_num_reserved_brps = 0; 918 + core_num_wrps = 0; 919 + return 0; 920 + } 929 921 930 922 ARM_DBG_READ(c1, 0, dscr); 931 923 if (dscr & ARM_DSCR_HDBGEN) {
+3 -3
arch/arm/kernel/ptrace.c
··· 996 996 while (!(arch_ctrl.len & 0x1)) 997 997 arch_ctrl.len >>= 1; 998 998 999 - if (idx & 0x1) 1000 - reg = encode_ctrl_reg(arch_ctrl); 1001 - else 999 + if (num & 0x1) 1002 1000 reg = bp->attr.bp_addr; 1001 + else 1002 + reg = encode_ctrl_reg(arch_ctrl); 1003 1003 } 1004 1004 1005 1005 put:
+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;
+1
arch/arm/mach-pxa/pxa25x.c
··· 347 347 &pxa25x_device_assp, 348 348 &pxa25x_device_pwm0, 349 349 &pxa25x_device_pwm1, 350 + &pxa_device_asoc_platform, 350 351 }; 351 352 352 353 static struct sys_device pxa25x_sysdev[] = {
-2
arch/arm/mach-pxa/tosa-bt.c
··· 81 81 goto err_rfk_alloc; 82 82 } 83 83 84 - rfkill_set_led_trigger_name(rfk, "tosa-bt"); 85 - 86 84 rc = rfkill_register(rfk); 87 85 if (rc) 88 86 goto err_rfkill;
+6
arch/arm/mach-pxa/tosa.c
··· 875 875 .dev.platform_data = &sharpsl_rom_data, 876 876 }; 877 877 878 + static struct platform_device wm9712_device = { 879 + .name = "wm9712-codec", 880 + .id = -1, 881 + }; 882 + 878 883 static struct platform_device *devices[] __initdata = { 879 884 &tosascoop_device, 880 885 &tosascoop_jc_device, ··· 890 885 &tosaled_device, 891 886 &tosa_bt_device, 892 887 &sharpsl_rom_device, 888 + &wm9712_device, 893 889 }; 894 890 895 891 static void tosa_poweroff(void)
+3
drivers/pcmcia/pxa2xx_colibri.c
··· 181 181 { 182 182 int ret; 183 183 184 + if (!machine_is_colibri() && !machine_is_colibri320()) 185 + return -ENODEV; 186 + 184 187 colibri_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1); 185 188 if (!colibri_pcmcia_device) 186 189 return -ENOMEM;