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

* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5131/1: Annotate platform_secondary_init with trace_hardirqs_off [ARM] 5117/1: pxafb: fix __devinit/exit annotations [ARM] Export dma_sync_sg_for_device() [ARM] 5109/1: Mark rtc sa1100 driver as wakeup source before registering it [ARM] 5116/1: pxafb: cleanup and fix order of failure handling [ARM] 5115/1: pxafb: fix ifdef for command line option handling ARM: OMAP: Correcting the gpmc prefetch control register address ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq

Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5131/1: Annotate platform_secondary_init with trace_hardirqs_off [ARM] 5117/1: pxafb: fix __devinit/exit annotations [ARM] Export dma_sync_sg_for_device() [ARM] 5109/1: Mark rtc sa1100 driver as wakeup source before registering it [ARM] 5116/1: pxafb: cleanup and fix order of failure handling [ARM] 5115/1: pxafb: fix ifdef for command line option handling ARM: OMAP: Correcting the gpmc prefetch control register address ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq
Linus Torvalds
2 parents 3e2a078ca6 08383ef29f
Showing 6 changed files Side-by-side Diff
arch/arm/common/dmabounce.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-realview/platsmp.c
arch/arm/plat-omap/dma.c
drivers/rtc/rtc-sa1100.c
drivers/video/pxafb.c
@@ -650,7 +650,8 @@
 EXPORT_SYMBOL(dma_unmap_sg);
 EXPORT_SYMBOL(dma_sync_single_for_cpu);
 EXPORT_SYMBOL(dma_sync_single_for_device);
-EXPORT_SYMBOL(dma_sync_sg);
+EXPORT_SYMBOL(dma_sync_sg_for_cpu);
+EXPORT_SYMBOL(dma_sync_sg_for_device);
 EXPORT_SYMBOL(dmabounce_register_dev);
 EXPORT_SYMBOL(dmabounce_unregister_dev);
  
@@ -42,7 +42,7 @@
 #define GPMC_STATUS		0x54
 #define GPMC_PREFETCH_CONFIG1	0x1e0
 #define GPMC_PREFETCH_CONFIG2	0x1e4
-#define GPMC_PREFETCH_CONTROL	0x1e8
+#define GPMC_PREFETCH_CONTROL	0x1ec
 #define GPMC_PREFETCH_STATUS	0x1f0
 #define GPMC_ECC_CONFIG		0x1f4
 #define GPMC_ECC_CONTROL	0x1f8
@@ -74,6 +74,8 @@
  
 void __cpuinit platform_secondary_init(unsigned int cpu)
 {
+	trace_hardirqs_off();
+
 	/*
 	 * the primary core may have used a "cross call" soft interrupt
 	 * to get this processor out of WFI in the BootMonitor - make
@@ -501,8 +501,6 @@
  
 	/* Enable some nice interrupts. */
 	OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs;
-
-	dma_chan[lch].flags |= OMAP_DMA_ACTIVE;
 }
  
 static void omap_disable_channel_irq(int lch)
@@ -331,13 +331,13 @@
 		RCNR = 0;
 	}
  
+	device_init_wakeup(&pdev->dev, 1);
+
 	rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
 				THIS_MODULE);
  
 	if (IS_ERR(rtc))
 		return PTR_ERR(rtc);
-
-	device_init_wakeup(&pdev->dev, 1);
  
 	platform_set_drvdata(pdev, rtc);
  
@@ -1246,7 +1246,7 @@
  *      cache.  Once this area is remapped, all virtual memory
  *      access to the video memory should occur at the new region.
  */
-static int __init pxafb_map_video_memory(struct pxafb_info *fbi)
+static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
 {
 	/*
 	 * We reserve one page for the palette, plus the size
@@ -1348,7 +1348,7 @@
 	pxafb_decode_mode_info(fbi, inf->modes, inf->num_modes);
 }
  
-static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
+static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
 {
 	struct pxafb_info *fbi;
 	void *addr;
@@ -1410,7 +1410,7 @@
 }
  
 #ifdef CONFIG_FB_PXA_PARAMETERS
-static int __init parse_opt_mode(struct device *dev, const char *this_opt)
+static int __devinit parse_opt_mode(struct device *dev, const char *this_opt)
 {
 	struct pxafb_mach_info *inf = dev->platform_data;
  
@@ -1469,7 +1469,7 @@
 	return 0;
 }
  
-static int __init parse_opt(struct device *dev, char *this_opt)
+static int __devinit parse_opt(struct device *dev, char *this_opt)
 {
 	struct pxafb_mach_info *inf = dev->platform_data;
 	struct pxafb_mode_info *mode = &inf->modes[0];
@@ -1567,7 +1567,7 @@
 	return 0;
 }
  
-static int __init pxafb_parse_options(struct device *dev, char *options)
+static int __devinit pxafb_parse_options(struct device *dev, char *options)
 {
 	char *this_opt;
 	int ret;
@@ -1588,8 +1588,8 @@
  
 static char g_options[256] __devinitdata = "";
  
-#ifndef CONFIG_MODULES
-static int __devinit pxafb_setup_options(void)
+#ifndef MODULE
+static int __init pxafb_setup_options(void)
 {
 	char *options = NULL;
  
@@ -1613,7 +1613,7 @@
 #define pxafb_setup_options()		(0)
 #endif
  
-static int __init pxafb_probe(struct platform_device *dev)
+static int __devinit pxafb_probe(struct platform_device *dev)
 {
 	struct pxafb_info *fbi;
 	struct pxafb_mach_info *inf;
  
@@ -1685,14 +1685,14 @@
 	if (r == NULL) {
 		dev_err(&dev->dev, "no I/O memory resource defined\n");
 		ret = -ENODEV;
-		goto failed;
+		goto failed_fbi;
 	}
  
 	r = request_mem_region(r->start, r->end - r->start + 1, dev->name);
 	if (r == NULL) {
 		dev_err(&dev->dev, "failed to request I/O memory\n");
 		ret = -EBUSY;
-		goto failed;
+		goto failed_fbi;
 	}
  
 	fbi->mmio_base = ioremap(r->start, r->end - r->start + 1);
  
  
@@ -1735,16 +1735,25 @@
 	 * This makes sure that our colour bitfield
 	 * descriptors are correctly initialised.
 	 */
-	pxafb_check_var(&fbi->fb.var, &fbi->fb);
-	pxafb_set_par(&fbi->fb);
+	ret = pxafb_check_var(&fbi->fb.var, &fbi->fb);
+	if (ret) {
+		dev_err(&dev->dev, "failed to get suitable mode\n");
+		goto failed_free_irq;
+	}
  
+	ret = pxafb_set_par(&fbi->fb);
+	if (ret) {
+		dev_err(&dev->dev, "Failed to set parameters\n");
+		goto failed_free_irq;
+	}
+
 	platform_set_drvdata(dev, fbi);
  
 	ret = register_framebuffer(&fbi->fb);
 	if (ret < 0) {
 		dev_err(&dev->dev,
 			"Failed to register framebuffer device: %d\n", ret);
-		goto failed_free_irq;
+		goto failed_free_cmap;
 	}
  
 #ifdef CONFIG_CPU_FREQ
  
  
  
@@ -1763,18 +1772,23 @@
  
 	return 0;
  
+failed_free_cmap:
+	if (fbi->fb.cmap.len)
+		fb_dealloc_cmap(&fbi->fb.cmap);
 failed_free_irq:
 	free_irq(irq, fbi);
-failed_free_res:
-	release_mem_region(r->start, r->end - r->start + 1);
-failed_free_io:
-	iounmap(fbi->mmio_base);
 failed_free_mem:
 	dma_free_writecombine(&dev->dev, fbi->map_size,
 			fbi->map_cpu, fbi->map_dma);
-failed:
+failed_free_io:
+	iounmap(fbi->mmio_base);
+failed_free_res:
+	release_mem_region(r->start, r->end - r->start + 1);
+failed_fbi:
+	clk_put(fbi->clk);
 	platform_set_drvdata(dev, NULL);
 	kfree(fbi);
+failed:
 	return ret;
 }
  
@@ -1787,7 +1801,7 @@
 	},
 };
  
-static int __devinit pxafb_init(void)
+static int __init pxafb_init(void)
 {
 	if (pxafb_setup_options())
 		return -EINVAL;
...	...	@@ -650,7 +650,8 @@
650	650	EXPORT_SYMBOL(dma_unmap_sg);
651	651	EXPORT_SYMBOL(dma_sync_single_for_cpu);
652	652	EXPORT_SYMBOL(dma_sync_single_for_device);
653		-EXPORT_SYMBOL(dma_sync_sg);
	653	+EXPORT_SYMBOL(dma_sync_sg_for_cpu);
	654	+EXPORT_SYMBOL(dma_sync_sg_for_device);
654	655	EXPORT_SYMBOL(dmabounce_register_dev);
655	656	EXPORT_SYMBOL(dmabounce_unregister_dev);
656	657
...	...	@@ -42,7 +42,7 @@
42	42	#define GPMC_STATUS 0x54
43	43	#define GPMC_PREFETCH_CONFIG1 0x1e0
44	44	#define GPMC_PREFETCH_CONFIG2 0x1e4
45		-#define GPMC_PREFETCH_CONTROL 0x1e8
	45	+#define GPMC_PREFETCH_CONTROL 0x1ec
46	46	#define GPMC_PREFETCH_STATUS 0x1f0
47	47	#define GPMC_ECC_CONFIG 0x1f4
48	48	#define GPMC_ECC_CONTROL 0x1f8
...	...	@@ -74,6 +74,8 @@
74	74
75	75	void __cpuinit platform_secondary_init(unsigned int cpu)
76	76	{
	77	+ trace_hardirqs_off();
	78	+
77	79	/*
78	80	* the primary core may have used a "cross call" soft interrupt
79	81	* to get this processor out of WFI in the BootMonitor - make
...	...	@@ -501,8 +501,6 @@
501	501
502	502	/* Enable some nice interrupts. */
503	503	OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs;
504		-
505		- dma_chan[lch].flags \|= OMAP_DMA_ACTIVE;
506	504	}
507	505
508	506	static void omap_disable_channel_irq(int lch)
...	...	@@ -331,13 +331,13 @@
331	331	RCNR = 0;
332	332	}
333	333
	334	+ device_init_wakeup(&pdev->dev, 1);
	335	+
334	336	rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
335	337	THIS_MODULE);
336	338
337	339	if (IS_ERR(rtc))
338	340	return PTR_ERR(rtc);
339		-
340		- device_init_wakeup(&pdev->dev, 1);
341	341
342	342	platform_set_drvdata(pdev, rtc);
343	343
...	...	@@ -1246,7 +1246,7 @@
1246	1246	* cache. Once this area is remapped, all virtual memory
1247	1247	* access to the video memory should occur at the new region.
1248	1248	*/
1249		-static int __init pxafb_map_video_memory(struct pxafb_info *fbi)
	1249	+static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi)
1250	1250	{
1251	1251	/*
1252	1252	* We reserve one page for the palette, plus the size
...	...	@@ -1348,7 +1348,7 @@
1348	1348	pxafb_decode_mode_info(fbi, inf->modes, inf->num_modes);
1349	1349	}
1350	1350
1351		-static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
	1351	+static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev)
1352	1352	{
1353	1353	struct pxafb_info *fbi;
1354	1354	void *addr;
...	...	@@ -1410,7 +1410,7 @@
1410	1410	}
1411	1411
1412	1412	#ifdef CONFIG_FB_PXA_PARAMETERS
1413		-static int __init parse_opt_mode(struct device dev, const char this_opt)
	1413	+static int __devinit parse_opt_mode(struct device dev, const char this_opt)
1414	1414	{
1415	1415	struct pxafb_mach_info *inf = dev->platform_data;
1416	1416
...	...	@@ -1469,7 +1469,7 @@
1469	1469	return 0;
1470	1470	}
1471	1471
1472		-static int __init parse_opt(struct device dev, char this_opt)
	1472	+static int __devinit parse_opt(struct device dev, char this_opt)
1473	1473	{
1474	1474	struct pxafb_mach_info *inf = dev->platform_data;
1475	1475	struct pxafb_mode_info *mode = &inf->modes[0];
...	...	@@ -1567,7 +1567,7 @@
1567	1567	return 0;
1568	1568	}
1569	1569
1570		-static int __init pxafb_parse_options(struct device dev, char options)
	1570	+static int __devinit pxafb_parse_options(struct device dev, char options)
1571	1571	{
1572	1572	char *this_opt;
1573	1573	int ret;
...	...	@@ -1588,8 +1588,8 @@
1588	1588
1589	1589	static char g_options[256] __devinitdata = "";
1590	1590
1591		-#ifndef CONFIG_MODULES
1592		-static int __devinit pxafb_setup_options(void)
	1591	+#ifndef MODULE
	1592	+static int __init pxafb_setup_options(void)
1593	1593	{
1594	1594	char *options = NULL;
1595	1595
...	...	@@ -1613,7 +1613,7 @@
1613	1613	#define pxafb_setup_options() (0)
1614	1614	#endif
1615	1615
1616		-static int __init pxafb_probe(struct platform_device *dev)
	1616	+static int __devinit pxafb_probe(struct platform_device *dev)
1617	1617	{
1618	1618	struct pxafb_info *fbi;
1619	1619	struct pxafb_mach_info *inf;
1620	1620
...	...	@@ -1685,14 +1685,14 @@
1685	1685	if (r == NULL) {
1686	1686	dev_err(&dev->dev, "no I/O memory resource defined\n");
1687	1687	ret = -ENODEV;
1688		- goto failed;
	1688	+ goto failed_fbi;
1689	1689	}
1690	1690
1691	1691	r = request_mem_region(r->start, r->end - r->start + 1, dev->name);
1692	1692	if (r == NULL) {
1693	1693	dev_err(&dev->dev, "failed to request I/O memory\n");
1694	1694	ret = -EBUSY;
1695		- goto failed;
	1695	+ goto failed_fbi;
1696	1696	}
1697	1697
1698	1698	fbi->mmio_base = ioremap(r->start, r->end - r->start + 1);
1699	1699
1700	1700
...	...	@@ -1735,16 +1735,25 @@
1735	1735	* This makes sure that our colour bitfield
1736	1736	* descriptors are correctly initialised.
1737	1737	*/
1738		- pxafb_check_var(&fbi->fb.var, &fbi->fb);
1739		- pxafb_set_par(&fbi->fb);
	1738	+ ret = pxafb_check_var(&fbi->fb.var, &fbi->fb);
	1739	+ if (ret) {
	1740	+ dev_err(&dev->dev, "failed to get suitable mode\n");
	1741	+ goto failed_free_irq;
	1742	+ }
1740	1743
	1744	+ ret = pxafb_set_par(&fbi->fb);
	1745	+ if (ret) {
	1746	+ dev_err(&dev->dev, "Failed to set parameters\n");
	1747	+ goto failed_free_irq;
	1748	+ }
	1749	+
1741	1750	platform_set_drvdata(dev, fbi);
1742	1751
1743	1752	ret = register_framebuffer(&fbi->fb);
1744	1753	if (ret < 0) {
1745	1754	dev_err(&dev->dev,
1746	1755	"Failed to register framebuffer device: %d\n", ret);
1747		- goto failed_free_irq;
	1756	+ goto failed_free_cmap;
1748	1757	}
1749	1758
1750	1759	#ifdef CONFIG_CPU_FREQ
1751	1760
1752	1761
1753	1762
...	...	@@ -1763,18 +1772,23 @@
1763	1772
1764	1773	return 0;
1765	1774
	1775	+failed_free_cmap:
	1776	+ if (fbi->fb.cmap.len)
	1777	+ fb_dealloc_cmap(&fbi->fb.cmap);
1766	1778	failed_free_irq:
1767	1779	free_irq(irq, fbi);
1768		-failed_free_res:
1769		- release_mem_region(r->start, r->end - r->start + 1);
1770		-failed_free_io:
1771		- iounmap(fbi->mmio_base);
1772	1780	failed_free_mem:
1773	1781	dma_free_writecombine(&dev->dev, fbi->map_size,
1774	1782	fbi->map_cpu, fbi->map_dma);
1775		-failed:
	1783	+failed_free_io:
	1784	+ iounmap(fbi->mmio_base);
	1785	+failed_free_res:
	1786	+ release_mem_region(r->start, r->end - r->start + 1);
	1787	+failed_fbi:
	1788	+ clk_put(fbi->clk);
1776	1789	platform_set_drvdata(dev, NULL);
1777	1790	kfree(fbi);
	1791	+failed:
1778	1792	return ret;
1779	1793	}
1780	1794
...	...	@@ -1787,7 +1801,7 @@
1787	1801	},
1788	1802	};
1789	1803
1790		-static int __devinit pxafb_init(void)
	1804	+static int __init pxafb_init(void)
1791	1805	{
1792	1806	if (pxafb_setup_options())
1793	1807	return -EINVAL;