[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-350-g5af65d5
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-350-g5af65d5
|
From: jorasse <jo...@us...> - 2012-06-07 16:16:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5af65d53f2c509dc406915daca5041d5fbb8e0d5 (commit)
from 6e188825b32f3908ba701b653888ba03d6002751 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5af65d53f2c509dc406915daca5041d5fbb8e0d5
Author: Eric Jarrige <eri...@ar...>
Date: Thu Jun 7 18:18:00 2012 +0200
[LINUX] apf28: support variable intensity LCD backlight - preliminary draft
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-add_apf28dev_baseboard_support.patch | 43 ++++++++++----------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 14444c9..5c1ea39 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -45,7 +45,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
===================================================================
--- /dev/null
+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
-@@ -0,0 +1,756 @@
+@@ -0,0 +1,755 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -273,7 +273,6 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .voltage = PAD_3_3V,
+ .drive = 1,
+ },
-+/*
+ {
+ .name = "LCD_CONTRAST",
+ .id = PINID_PWM3,
@@ -282,7 +281,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .voltage = PAD_3_3V,
+ .drive = 1,
+ },
-+*/
++
+#endif
+ /* SSP0 SD/MMC port pins */
+ {
@@ -1043,9 +1042,9 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
+ __raw_writel(BF_PWM_PERIODn_CDIV(6) | /* divide by 64 */
+ BF_PWM_PERIODn_INACTIVE_STATE(2) | /* low */
+ BF_PWM_PERIODn_ACTIVE_STATE(3) | /* high */
-+ BF_PWM_PERIODn_PERIOD(599),
++ BF_PWM_PERIODn_PERIOD(99),
+ REGS_PWM_BASE + HW_PWM_PERIODn(3));
-+ __raw_writel(BM_PWM_CTRL_PWM2_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_SET);
++ __raw_writel(BM_PWM_CTRL_PWM3_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_SET);
+
+ return 0;
+}
@@ -1058,9 +1057,9 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
+ __raw_writel(BF_PWM_PERIODn_CDIV(6) | /* divide by 64 */
+ BF_PWM_PERIODn_INACTIVE_STATE(2) | /* low */
+ BF_PWM_PERIODn_ACTIVE_STATE(3) | /* high */
-+ BF_PWM_PERIODn_PERIOD(599),
++ BF_PWM_PERIODn_PERIOD(99),
+ REGS_PWM_BASE + HW_PWM_PERIODn(3));
-+ __raw_writel(BM_PWM_CTRL_PWM2_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_CLR);
++ __raw_writel(BM_PWM_CTRL_PWM3_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_CLR);
+
+ clk_disable(pwm_clk);
+ clk_put(pwm_clk);
@@ -1122,7 +1121,7 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_tm035.c
+ __raw_writel(BF_PWM_PERIODn_CDIV(6) | /* divide by 64 */
+ BF_PWM_PERIODn_INACTIVE_STATE(2) | /* low */
+ BF_PWM_PERIODn_ACTIVE_STATE(3) | /* high */
-+ BF_PWM_PERIODn_PERIOD(399),
++ BF_PWM_PERIODn_PERIOD(99),
+ REGS_PWM_BASE + HW_PWM_PERIODn(3));
+ return 0;
+}
@@ -1341,13 +1340,13 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
+
+ __raw_writel(BF_PWM_ACTIVEn_INACTIVE(0) |
+ BF_PWM_ACTIVEn_ACTIVE(0),
-+ REGS_PWM_BASE + HW_PWM_ACTIVEn(2));
-+ __raw_writel(BF_PWM_PERIODn_CDIV(6) | /* divide by 64 */
++ REGS_PWM_BASE + HW_PWM_ACTIVEn(3));
++ __raw_writel(BF_PWM_PERIODn_CDIV(3) | /* divide by 8 */
+ BF_PWM_PERIODn_INACTIVE_STATE(2) | /* low */
+ BF_PWM_PERIODn_ACTIVE_STATE(3) | /* high */
-+ BF_PWM_PERIODn_PERIOD(599),
-+ REGS_PWM_BASE + HW_PWM_PERIODn(2));
-+ __raw_writel(BM_PWM_CTRL_PWM2_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_SET);
++ BF_PWM_PERIODn_PERIOD(99),
++ REGS_PWM_BASE + HW_PWM_PERIODn(3));
++ __raw_writel(BM_PWM_CTRL_PWM3_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_SET);
+
+ return 0;
+}
@@ -1356,13 +1355,13 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
+{
+ __raw_writel(BF_PWM_ACTIVEn_INACTIVE(0) |
+ BF_PWM_ACTIVEn_ACTIVE(0),
-+ REGS_PWM_BASE + HW_PWM_ACTIVEn(2));
-+ __raw_writel(BF_PWM_PERIODn_CDIV(6) | /* divide by 64 */
++ REGS_PWM_BASE + HW_PWM_ACTIVEn(3));
++ __raw_writel(BF_PWM_PERIODn_CDIV(3) | /* divide by 8 */
+ BF_PWM_PERIODn_INACTIVE_STATE(2) | /* low */
+ BF_PWM_PERIODn_ACTIVE_STATE(3) | /* high */
-+ BF_PWM_PERIODn_PERIOD(599),
-+ REGS_PWM_BASE + HW_PWM_PERIODn(2));
-+ __raw_writel(BM_PWM_CTRL_PWM2_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_CLR);
++ BF_PWM_PERIODn_PERIOD(99),
++ REGS_PWM_BASE + HW_PWM_PERIODn(3));
++ __raw_writel(BM_PWM_CTRL_PWM3_ENABLE, REGS_PWM_BASE + HW_PWM_CTRL_CLR);
+
+ clk_disable(pwm_clk);
+ clk_put(pwm_clk);
@@ -1420,12 +1419,12 @@ Index: linux-2.6.35.3/drivers/video/mxs/lcd_lw700.c
+ }
+ __raw_writel(BF_PWM_ACTIVEn_INACTIVE(scaled_int) |
+ BF_PWM_ACTIVEn_ACTIVE(0),
-+ REGS_PWM_BASE + HW_PWM_ACTIVEn(2));
-+ __raw_writel(BF_PWM_PERIODn_CDIV(6) | /* divide by 64 */
++ REGS_PWM_BASE + HW_PWM_ACTIVEn(3));
++ __raw_writel(BF_PWM_PERIODn_CDIV(3) | /* divide by 8 */
+ BF_PWM_PERIODn_INACTIVE_STATE(2) | /* low */
+ BF_PWM_PERIODn_ACTIVE_STATE(3) | /* high */
-+ BF_PWM_PERIODn_PERIOD(399),
-+ REGS_PWM_BASE + HW_PWM_PERIODn(2));
++ BF_PWM_PERIODn_PERIOD(99),
++ REGS_PWM_BASE + HW_PWM_PERIODn(3));
+ return 0;
+}
+
hooks/post-receive
--
armadeus
|
