From: Tony Lindgren <tony@atomide.com>
To: linux-kernel@vger.kernel.org
Cc: Imre Deak <imre.deak@solidboot.com>,
Juha Yrjola <juha.yrjola@solidboot.com>,
Tony Lindgren <tony@atomide.com>
Subject: [PATCH 8/90] ARM: OMAP: FB: add controller platform data
Date: Wed, 4 Apr 2007 13:46:35 -0400 [thread overview]
Message-ID: <11757088953851-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <11757088932135-git-send-email-tony@atomide.com>
From: Imre Deak <imre.deak@solidboot.com>
Add controller platform data
Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/plat-omap/fb.c | 5 +++++
include/asm-arm/arch-omap/omapfb.h | 8 +++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 56acb87..91ebdaf 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -55,6 +55,11 @@ void omapfb_reserve_mem(void)
}
}
+void omapfb_set_ctrl_platform_data(void *data)
+{
+ omapfb_config.ctrl_platform_data = data;
+}
+
static inline int omap_init_fb(void)
{
const struct omap_lcd_config *conf;
diff --git a/include/asm-arm/arch-omap/omapfb.h b/include/asm-arm/arch-omap/omapfb.h
index fccdb3d..ce80a71 100644
--- a/include/asm-arm/arch-omap/omapfb.h
+++ b/include/asm-arm/arch-omap/omapfb.h
@@ -292,8 +292,9 @@ struct omapfb_device {
};
struct omapfb_platform_data {
- struct omap_lcd_config lcd;
- struct omap_fbmem_config fbmem;
+ struct omap_lcd_config lcd;
+ struct omapfb_mem_desc mem_desc;
+ void *ctrl_platform_data;
};
#define OMAPFB_EVENT_READY 1
@@ -317,8 +318,9 @@ extern int omapfb_update_window_async(struct omapfb_update_window *win,
void (*callback)(void *),
void *callback_data);
-/* in arch/arm/plat-omap/devices.c */
+/* in arch/arm/plat-omap/fb.c */
extern void omapfb_reserve_mem(void);
+extern void omapfb_set_ctrl_platform_data(void *pdata);
#endif /* __KERNEL__ */
--
1.4.4.2
next prev parent reply other threads:[~2007-04-04 17:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-04 17:46 [PATCH 0/90] Post 2.6.21 OMAP update Tony Lindgren
2007-04-04 17:46 ` [PATCH 1/90] ARM: OMAP: Place SMS and SDRC into smart idle mode Tony Lindgren
2007-04-04 17:46 ` [PATCH 2/90] ARM: OMAP: Force APLLs always active Tony Lindgren
2007-04-04 17:46 ` [PATCH 3/90] ARM: OMAP: Add DMA IRQ sanity checks Tony Lindgren
2007-04-04 17:46 ` [PATCH 4/90] ARM: OMAP: Enable 24xx GPIO autoidling Tony Lindgren
2007-04-04 17:46 ` [PATCH 5/90] ARM: OMAP: Add function to print clock usecounts Tony Lindgren
2007-04-04 17:46 ` [PATCH 6/90] ARM: OMAP: Enable serial idling and wakeup features Tony Lindgren
2007-04-04 17:46 ` [PATCH 7/90] ARM: OMAP: Optimize INTC register accesses and enable autoidling Tony Lindgren
2007-04-04 17:46 ` Tony Lindgren [this message]
2007-04-04 18:27 ` [PATCH 0/90] Post 2.6.21 OMAP update Tony Lindgren
2007-04-04 18:39 ` Randy Dunlap
2007-04-04 18:44 ` Tony Lindgren
2007-04-04 21:44 ` Alan Cox
2007-04-05 13:21 ` Tony Lindgren
2007-04-05 16:31 ` Roland Dreier
2007-04-05 18:03 ` Tony Lindgren
2007-04-05 18:29 ` Roland Dreier
2007-04-09 21:45 ` Tony Lindgren
2007-04-05 20:27 ` Alan Cox
2007-04-06 7:18 ` Russell King
2007-04-09 21:49 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11757088953851-git-send-email-tony@atomide.com \
--to=tony@atomide.com \
--cc=imre.deak@solidboot.com \
--cc=juha.yrjola@solidboot.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox