Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342225
b: refs/heads/master
c: a4dabca
h: refs/heads/master
i:
  342223: c6a96fa
v: v3
  • Loading branch information
Gwenhael Goavec-Merou authored and Shawn Guo committed Nov 5, 2012
1 parent 49c6edb commit 3775e03
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 24acd6bf1d18636344e7f58a69294c2ce7c10a9e
refs/heads/master: a4dabca8b474aa5cf7ec1bec5bc1904a5e18f642
28 changes: 28 additions & 0 deletions trunk/arch/arm/boot/dts/imx28-apf28dev.dts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,26 @@
fsl,voltage = <1>;
fsl,pull-up = <0>;
};

lcdif_pins_apf28dev: lcdif-apf28dev@0 {
reg = <0>;
fsl,pinmux-ids = <
0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
>;
fsl,drive-strength = <0>;
fsl,voltage = <1>;
fsl,pull-up = <0>;
};
};

lcdif@80030000 {
pinctrl-names = "default";
pinctrl-0 = <&lcdif_16bit_pins_a
&lcdif_pins_apf28dev>;
status = "okay";
};
};

Expand Down Expand Up @@ -110,4 +130,12 @@
linux,default-trigger = "heartbeat";
};
};

backlight {
compatible = "pwm-backlight";

pwms = <&pwm 3 191000>;
brightness-levels = <0 4 8 16 32 64 128 255>;
default-brightness-level = <6>;
};
};
24 changes: 24 additions & 0 deletions trunk/arch/arm/mach-mxs/mach-mxs.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,25 @@ static struct fb_videomode apx4devkit_video_modes[] = {
},
};

static struct fb_videomode apf28dev_video_modes[] = {
{
.name = "LW700",
.refresh = 60,
.xres = 800,
.yres = 480,
.pixclock = 30303, /* picosecond */
.left_margin = 96,
.right_margin = 96, /* at least 3 & 1 */
.upper_margin = 0x14,
.lower_margin = 0x15,
.hsync_len = 64,
.vsync_len = 4,
.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |
FB_SYNC_DATA_ENABLE_HIGH_ACT |
FB_SYNC_DOTCLK_FAILING_ACT,
},
};

static struct mxsfb_platform_data mxsfb_pdata __initdata;

/*
Expand Down Expand Up @@ -374,6 +393,11 @@ static void __init cfa10049_init(void)
static void __init apf28_init(void)
{
enable_clk_enet_out();

mxsfb_pdata.mode_list = apf28dev_video_modes;
mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes);
mxsfb_pdata.default_bpp = 16;
mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT;
}

static void __init mxs_machine_init(void)
Expand Down

0 comments on commit 3775e03

Please sign in to comment.