From: Ryan Harkin <ryan.harkin@linaro.org>
To: ryan.harkin@linaro.org, arnd.bergmann@linaro.org,
shiraz.hashim@st.com, stigge@antcom.de, pawel.moll@arm.com,
tixy@linaro.org, liviu.dudau@arm.com, spear-devel@list.st.com,
viresh.linux@gmail.com, linux-arm-kernel@lists.infradead.org,
linux-fbdev@vger.kernel.org, devicetree-discuss@lists.ozlabs.org
Subject: [RFC PATCH 3/3] ARM: vexpress: configure CLCD driver device tree support for A9 CoreTile
Date: Wed, 19 Sep 2012 17:04:26 +0100 [thread overview]
Message-ID: <1348070666-9153-4-git-send-email-ryan.harkin@linaro.org> (raw)
In-Reply-To: <1348070666-9153-1-git-send-email-ryan.harkin@linaro.org>
Configuration for the amba-clcd PL111 driver is added to the A9 CoreTile's DTS
file.
Configuration of the motherboard CLCD driver is removed from the DTSI files to
prevent duplicate CLCD drivers being registered.
A generic set of CLCD panel descriptions has been split into its own DTSI file.
Currently, only XVGA and VGA monitors are described.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
---
arch/arm/boot/dts/clcd-panels.dtsi | 52 +++++++++++++++++++++++++++++++
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 8 ++---
arch/arm/boot/dts/vexpress-v2m.dtsi | 8 ++---
arch/arm/boot/dts/vexpress-v2p-ca9.dts | 6 ++++
4 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/clcd-panels.dtsi b/arch/arm/boot/dts/clcd-panels.dtsi
new file mode 100644
index 0000000..0b0ff6e
--- /dev/null
+++ b/arch/arm/boot/dts/clcd-panels.dtsi
@@ -0,0 +1,52 @@
+/*
+ * ARM Ltd. Versatile Express
+ *
+ */
+
+/ {
+ panels {
+ panel@0 {
+ compatible = "panel";
+ mode = "VGA";
+ refresh = <60>;
+ xres = <640>;
+ yres = <480>;
+ pixclock = <39721>;
+ left_margin = <40>;
+ right_margin = <24>;
+ upper_margin = <32>;
+ lower_margin = <11>;
+ hsync_len = <96>;
+ vsync_len = <2>;
+ sync = <0>;
+ vmode = "FB_VMODE_NONINTERLACED";
+
+ tim2 = "TIM2_BCD", "TIM2_IPC";
+ cntl = "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
+ caps = "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
+ bpp = <16>;
+ };
+
+ panel@1 {
+ compatible = "panel";
+ mode = "XVGA";
+ refresh = <60>;
+ xres = <1024>;
+ yres = <768>;
+ pixclock = <15748>;
+ left_margin = <152>;
+ right_margin = <48>;
+ upper_margin = <23>;
+ lower_margin = <3>;
+ hsync_len = <104>;
+ vsync_len = <4>;
+ sync = <0>;
+ vmode = "FB_VMODE_NONINTERLACED";
+
+ tim2 = "TIM2_BCD", "TIM2_IPC";
+ cntl = "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)";
+ caps = "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888";
+ bpp = <16>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index d8a827b..301d3f6 100644
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -17,6 +17,8 @@
* CHANGES TO vexpress-v2m.dtsi!
*/
+/include/ "clcd-panels.dtsi"
+
/ {
aliases {
arm,v2m_timer = &v2m_timer01;
@@ -193,12 +195,6 @@
0x1a0100 0xf00>;
reg-shift = <2>;
};
-
- clcd@1f0000 {
- compatible = "arm,pl111", "arm,primecell";
- reg = <0x1f0000 0x1000>;
- interrupts = <14>;
- };
};
v2m_fixed_3v3: fixedregulator@0 {
diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi
index dba53fd..43cd86f 100644
--- a/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -17,6 +17,8 @@
* CHANGES TO vexpress-v2m-rs1.dtsi!
*/
+/include/ "clcd-panels.dtsi"
+
/ {
aliases {
arm,v2m_timer = &v2m_timer01;
@@ -192,12 +194,6 @@
0x1a100 0xf00>;
reg-shift = <2>;
};
-
- clcd@1f000 {
- compatible = "arm,pl111", "arm,primecell";
- reg = <0x1f000 0x1000>;
- interrupts = <14>;
- };
};
v2m_fixed_3v3: fixedregulator@0 {
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index 3f0c736..2ebb132 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -9,6 +9,8 @@
/dts-v1/;
+/memreserve/ 0x9f000000 0x01000000;
+
/ {
model = "V2P-CA9";
arm,hbi = <0x191>;
@@ -70,6 +72,10 @@
compatible = "arm,pl111", "arm,primecell";
reg = <0x10020000 0x1000>;
interrupts = <0 44 4>;
+ mode = "XVGA";
+ arm,vexpress-osc = <1>;
+ use_dma = <1>;
+ framebuffer = <0x9f000000 0x01000000>;
};
memory-controller@100e0000 {
--
1.7.9.5
next prev parent reply other threads:[~2012-09-19 16:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 16:04 [RFC PATCH 0/3] amba-clcd: add device tree support Ryan Harkin
2012-09-19 16:04 ` [RFC PATCH 1/3] amba-clcd: Add Device Tree support to amba-clcd driver Ryan Harkin
2012-09-20 10:24 ` Liviu Dudau
[not found] ` <20120920102453.GG32603-CibnQJhq84/ZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2012-09-21 10:35 ` Ryan Harkin
2012-09-21 10:44 ` Pawel Moll
[not found] ` <1348070666-9153-2-git-send-email-ryan.harkin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2012-09-21 11:02 ` Russell King - ARM Linux
2012-09-21 11:43 ` Sascha Hauer
[not found] ` <20120921114345.GE24458-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-09-21 12:19 ` Russell King - ARM Linux
[not found] ` <20120921121903.GE15609-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2012-09-24 7:07 ` Ryan Harkin
2012-10-10 10:13 ` Jon Medhurst (Tixy)
2012-09-19 16:04 ` [RFC PATCH 2/3] ARM: vexpress: Add device tree support for CLCD driver Ryan Harkin
2012-09-19 16:11 ` Pawel Moll
2012-09-19 16:04 ` Ryan Harkin [this message]
2012-09-20 10:29 ` [RFC PATCH 3/3] ARM: vexpress: configure CLCD driver device tree support for A9 CoreTile Liviu Dudau
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=1348070666-9153-4-git-send-email-ryan.harkin@linaro.org \
--to=ryan.harkin@linaro.org \
--cc=arnd.bergmann@linaro.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=pawel.moll@arm.com \
--cc=shiraz.hashim@st.com \
--cc=spear-devel@list.st.com \
--cc=stigge@antcom.de \
--cc=tixy@linaro.org \
--cc=viresh.linux@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).