aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 00:44:20 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 00:44:20 -0500
commitf0d55cc1a65852e6647d4f5d707c1c9b5471ce3c (patch)
treee96d6a88590f656d86c1f58cb0b34d40d6091b63 /arch/avr32
parent549608eadb31eac5d579ed70a21ac722bdf72861 (diff)
parent3a41c5dbe8bc396a7fb16ca8739e945bb003342e (diff)
Merge tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev changes from Tomi Valkeinen: "Nothing particularly stands out in this pull request. The biggest part of the changes are cleanups. Maybe one fix to mention is the "fb: reorder the lock sequence to fix potential dead lock" which hopefully fixes the fb locking issues reported by multiple persons. There are also a few commits that have changes to arch/arm/mach-at91 and arch/avr32, which have been acked by the maintainers" * tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (143 commits) fb: reorder the lock sequence to fix potential dead lock fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare fbdev: shmobile-hdmi: Convert to clk_prepare/unprepare omapdss: Add new panel driver for Topolly td028ttec1 LCD. video: exynos_mipi_dsi: Unlock the mutex before returning video: da8xx-fb: remove unwanted define video: Remove unnecessary semicolons simplefb: use write-combined remapping simplefb: fix unmapping fb during destruction OMAPDSS: connector-dvi: fix releasing i2c_adapter OMAPDSS: DSI: fix perf measuring ifdefs framebuffer: Use fb_<level> framebuffer: Add fb_<level> convenience logging macros efifb: prevent null-deref when iterating dmi_list fbdev: fix error return code in metronomefb_probe() video: xilinxfb: Fix for "Use standard variable name convention" OMAPDSS: Fix de_level in videomode_to_omap_video_timings() video: xilinxfb: Simplify error path video: xilinxfb: Use devm_kzalloc instead of kzalloc video: xilinxfb: Use standard variable name convention ...
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/boards/atngw100/evklcd10x.c8
-rw-r--r--arch/avr32/boards/atngw100/mrmt.c4
-rw-r--r--arch/avr32/boards/atstk1000/atstk1000.h2
-rw-r--r--arch/avr32/boards/atstk1000/setup.c2
-rw-r--r--arch/avr32/boards/favr-32/setup.c2
-rw-r--r--arch/avr32/boards/hammerhead/setup.c2
-rw-r--r--arch/avr32/boards/merisc/display.c2
-rw-r--r--arch/avr32/boards/mimc200/setup.c4
-rw-r--r--arch/avr32/mach-at32ap/at32ap700x.c8
-rw-r--r--arch/avr32/mach-at32ap/include/mach/board.h4
10 files changed, 19 insertions, 19 deletions
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c
index 20388750d564..64919b0da7aa 100644
--- a/arch/avr32/boards/atngw100/evklcd10x.c
+++ b/arch/avr32/boards/atngw100/evklcd10x.c
@@ -58,7 +58,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
58 .dclkmax = 28330000, 58 .dclkmax = 28330000,
59}; 59};
60 60
61static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = { 61static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
62 .default_bpp = 16, 62 .default_bpp = 16,
63 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 63 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
64 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 64 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
@@ -96,7 +96,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
96 .dclkmax = 7000000, 96 .dclkmax = 7000000,
97}; 97};
98 98
99static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = { 99static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
100 .default_bpp = 16, 100 .default_bpp = 16,
101 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 101 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
102 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 102 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
@@ -134,7 +134,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
134 .dclkmax = 6400000, 134 .dclkmax = 6400000,
135}; 135};
136 136
137static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = { 137static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
138 .default_bpp = 16, 138 .default_bpp = 16,
139 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 139 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
140 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 140 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
@@ -145,7 +145,7 @@ static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
145}; 145};
146#endif 146#endif
147 147
148static void atevklcd10x_lcdc_power_control(int on) 148static void atevklcd10x_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
149{ 149{
150 gpio_set_value(GPIO_PIN_PB(15), on); 150 gpio_set_value(GPIO_PIN_PB(15), on);
151} 151}
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c
index 7de083d19b7e..1ba09e4c02b1 100644
--- a/arch/avr32/boards/atngw100/mrmt.c
+++ b/arch/avr32/boards/atngw100/mrmt.c
@@ -83,7 +83,7 @@ static struct fb_monspecs __initdata lcd_fb_default_monspecs = {
83 .dclkmax = 9260000, 83 .dclkmax = 9260000,
84}; 84};
85 85
86static struct atmel_lcdfb_info __initdata rmt_lcdc_data = { 86static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = {
87 .default_bpp = 24, 87 .default_bpp = 24,
88 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 88 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
89 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 89 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
@@ -126,7 +126,7 @@ static struct fb_monspecs __initdata lcd_fb_default_monspecs = {
126 .dclkmax = 9260000, 126 .dclkmax = 9260000,
127}; 127};
128 128
129static struct atmel_lcdfb_info __initdata rmt_lcdc_data = { 129static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = {
130 .default_bpp = 24, 130 .default_bpp = 24,
131 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 131 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
132 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 132 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
diff --git a/arch/avr32/boards/atstk1000/atstk1000.h b/arch/avr32/boards/atstk1000/atstk1000.h
index 9392d3252865..653cc09e536c 100644
--- a/arch/avr32/boards/atstk1000/atstk1000.h
+++ b/arch/avr32/boards/atstk1000/atstk1000.h
@@ -10,7 +10,7 @@
10#ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H 10#ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H
11#define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H 11#define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H
12 12
13extern struct atmel_lcdfb_info atstk1000_lcdc_data; 13extern struct atmel_lcdfb_pdata atstk1000_lcdc_data;
14 14
15void atstk1000_setup_j2_leds(void); 15void atstk1000_setup_j2_leds(void);
16 16
diff --git a/arch/avr32/boards/atstk1000/setup.c b/arch/avr32/boards/atstk1000/setup.c
index 2d6b560115d9..b6b88f5e0b43 100644
--- a/arch/avr32/boards/atstk1000/setup.c
+++ b/arch/avr32/boards/atstk1000/setup.c
@@ -55,7 +55,7 @@ static struct fb_monspecs __initdata atstk1000_default_monspecs = {
55 .dclkmax = 30000000, 55 .dclkmax = 30000000,
56}; 56};
57 57
58struct atmel_lcdfb_info __initdata atstk1000_lcdc_data = { 58struct atmel_lcdfb_pdata __initdata atstk1000_lcdc_data = {
59 .default_bpp = 24, 59 .default_bpp = 24,
60 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 60 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
61 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 61 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 27bd6fbe21cb..7b1f2cd85400 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -125,7 +125,7 @@ static struct fb_monspecs __initdata favr32_default_monspecs = {
125 .dclkmax = 28000000, 125 .dclkmax = 28000000,
126}; 126};
127 127
128struct atmel_lcdfb_info __initdata favr32_lcdc_data = { 128struct atmel_lcdfb_pdata __initdata favr32_lcdc_data = {
129 .default_bpp = 16, 129 .default_bpp = 16,
130 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 130 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
131 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 131 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c
index 9d1efd1cd425..dc0e317f2ecd 100644
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
@@ -77,7 +77,7 @@ static struct fb_monspecs __initdata hammerhead_hda350t_monspecs = {
77 .dclkmax = 10000000, 77 .dclkmax = 10000000,
78}; 78};
79 79
80struct atmel_lcdfb_info __initdata hammerhead_lcdc_data = { 80struct atmel_lcdfb_pdata __initdata hammerhead_lcdc_data = {
81 .default_bpp = 24, 81 .default_bpp = 24,
82 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 82 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
83 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 83 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
diff --git a/arch/avr32/boards/merisc/display.c b/arch/avr32/boards/merisc/display.c
index 85a543cd4abc..e7683ee7ed40 100644
--- a/arch/avr32/boards/merisc/display.c
+++ b/arch/avr32/boards/merisc/display.c
@@ -45,7 +45,7 @@ static struct fb_monspecs merisc_fb_monspecs = {
45 .dclkmax = 30000000, 45 .dclkmax = 30000000,
46}; 46};
47 47
48struct atmel_lcdfb_info merisc_lcdc_data = { 48struct atmel_lcdfb_pdata merisc_lcdc_data = {
49 .default_bpp = 24, 49 .default_bpp = 24,
50 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 50 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
51 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 51 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index 05358aa5ef7d..1cb8e9cc5cfa 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -8,7 +8,7 @@
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
9 */ 9 */
10 10
11extern struct atmel_lcdfb_info mimc200_lcdc_data; 11extern struct atmel_lcdfb_pdata mimc200_lcdc_data;
12 12
13#include <linux/clk.h> 13#include <linux/clk.h>
14#include <linux/etherdevice.h> 14#include <linux/etherdevice.h>
@@ -71,7 +71,7 @@ static struct fb_monspecs __initdata mimc200_default_monspecs = {
71 .dclkmax = 25200000, 71 .dclkmax = 25200000,
72}; 72};
73 73
74struct atmel_lcdfb_info __initdata mimc200_lcdc_data = { 74struct atmel_lcdfb_pdata __initdata mimc200_lcdc_data = {
75 .default_bpp = 16, 75 .default_bpp = 16,
76 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, 76 .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
77 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT 77 .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index a68f3cf7c3c1..a1f4d1e91b52 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1439,7 +1439,7 @@ fail:
1439 * LCDC 1439 * LCDC
1440 * -------------------------------------------------------------------- */ 1440 * -------------------------------------------------------------------- */
1441#if defined(CONFIG_CPU_AT32AP7000) || defined(CONFIG_CPU_AT32AP7002) 1441#if defined(CONFIG_CPU_AT32AP7000) || defined(CONFIG_CPU_AT32AP7002)
1442static struct atmel_lcdfb_info atmel_lcdfb0_data; 1442static struct atmel_lcdfb_pdata atmel_lcdfb0_data;
1443static struct resource atmel_lcdfb0_resource[] = { 1443static struct resource atmel_lcdfb0_resource[] = {
1444 { 1444 {
1445 .start = 0xff000000, 1445 .start = 0xff000000,
@@ -1467,12 +1467,12 @@ static struct clk atmel_lcdfb0_pixclk = {
1467}; 1467};
1468 1468
1469struct platform_device *__init 1469struct platform_device *__init
1470at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, 1470at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_pdata *data,
1471 unsigned long fbmem_start, unsigned long fbmem_len, 1471 unsigned long fbmem_start, unsigned long fbmem_len,
1472 u64 pin_mask) 1472 u64 pin_mask)
1473{ 1473{
1474 struct platform_device *pdev; 1474 struct platform_device *pdev;
1475 struct atmel_lcdfb_info *info; 1475 struct atmel_lcdfb_pdata *info;
1476 struct fb_monspecs *monspecs; 1476 struct fb_monspecs *monspecs;
1477 struct fb_videomode *modedb; 1477 struct fb_videomode *modedb;
1478 unsigned int modedb_size; 1478 unsigned int modedb_size;
@@ -1529,7 +1529,7 @@ at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
1529 } 1529 }
1530 1530
1531 info = pdev->dev.platform_data; 1531 info = pdev->dev.platform_data;
1532 memcpy(info, data, sizeof(struct atmel_lcdfb_info)); 1532 memcpy(info, data, sizeof(struct atmel_lcdfb_pdata));
1533 info->default_monspecs = monspecs; 1533 info->default_monspecs = monspecs;
1534 1534
1535 pdev->name = "at32ap-lcdfb"; 1535 pdev->name = "at32ap-lcdfb";
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index d485b0391357..f1a316d52c73 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -44,9 +44,9 @@ struct platform_device *
44at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); 44at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n);
45void at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b, unsigned int n); 45void at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b, unsigned int n);
46 46
47struct atmel_lcdfb_info; 47struct atmel_lcdfb_pdata;
48struct platform_device * 48struct platform_device *
49at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, 49at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_pdata *data,
50 unsigned long fbmem_start, unsigned long fbmem_len, 50 unsigned long fbmem_start, unsigned long fbmem_len,
51 u64 pin_mask); 51 u64 pin_mask);
52 52