| Message ID | 1438638870-3728-3-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | Hans de Goede |
| Headers | show |
On Mon, 2015-08-03 at 23:54 +0200, Hans de Goede wrote: > Add a few extra sunxi display registers and constant defines. + "Also rename some existing defines (e.g. dropping _GCTRL) and make some more generic (e.g. dropping the 2x scaling from SUNXI_LCDC_TCON1_TIMING_V_TOTAL)." > This is a preparation patch for adding composite video out support. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk> > --- > arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 2 +- > arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 1 + > arch/arm/include/asm/arch-sunxi/display.h | 45 > ++++++++++++++++++++++++--- > drivers/video/sunxi_display.c | 8 ++--- > 4 files changed, 46 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h > b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h > index 01d3e28..a7e25f4 100644 > --- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h > +++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h > @@ -291,7 +291,7 @@ struct sunxi_ccm_reg { > #define CCM_LCD_CH0_CTRL_GATE (0x1 << 31) > > #define CCM_LCD_CH1_CTRL_M(n) ((((n) - 1) & 0xf) << 0) > -/* We leave bit 11 set to 0, so sclk1 == sclk2 */ > +#define CCM_LCD_CH1_CTRL_HALF_SCLK1 (1 << 11) > #define CCM_LCD_CH1_CTRL_PLL3 (0 << 24) > #define CCM_LCD_CH1_CTRL_PLL7 (1 << 24) > #define CCM_LCD_CH1_CTRL_PLL3_2X (2 << 24) > diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h > b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h > index 8a26b9f..06c6feb 100644 > --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h > +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h > @@ -290,6 +290,7 @@ struct sunxi_ccm_reg { > #define CCM_LCD_CH0_CTRL_GATE (0x1 << 31) > > #define CCM_LCD_CH1_CTRL_M(n) ((((n) - 1) & 0xf) << 0) > +#define CCM_LCD_CH1_CTRL_HALF_SCLK1 0 /* no seperate sclk1 & 2 > on sun6i */ > #define CCM_LCD_CH1_CTRL_PLL3 (0 << 24) > #define CCM_LCD_CH1_CTRL_PLL7 (1 << 24) > #define CCM_LCD_CH1_CTRL_PLL3_2X (2 << 24) > diff --git a/arch/arm/include/asm/arch-sunxi/display.h > b/arch/arm/include/asm/arch-sunxi/display.h > index ae95417..830ec42 100644 > --- a/arch/arm/include/asm/arch-sunxi/display.h > +++ b/arch/arm/include/asm/arch-sunxi/display.h > @@ -151,6 +151,10 @@ struct sunxi_de_be_reg { > u32 layer1_attr1_ctrl; /* 0x8a4 */ > u32 layer2_attr1_ctrl; /* 0x8a8 */ > u32 layer3_attr1_ctrl; /* 0x8ac */ > + u8 res5[0x110]; /* 0x8b0 */ > + u32 output_color_ctrl; /* 0x9c0 */ > + u8 res6[0xc]; /* 0x9c4 */ > + u32 output_color_coef[12]; /* 0x9d0 */ > }; > > struct sunxi_lcdc_reg { > @@ -298,7 +302,7 @@ struct sunxi_tve_reg { > u32 cbr_level; /* 0x10c */ > u32 burst_phase; /* 0x110 */ > u32 burst_width; /* 0x114 */ > - u8 res2[0x04]; /* 0x118 */ > + u32 unknown2; /* 0x118 */ > u32 sync_vbi_level; /* 0x11c */ > u32 white_level; /* 0x120 */ > u32 active_num; /* 0x124 */ > @@ -331,11 +335,14 @@ struct sunxi_tve_reg { > #define SUNXI_DE_BE_HEIGHT(y) (((y) - 1) << 16) > #define SUNXI_DE_BE_MODE_ENABLE (1 << 0) > #define SUNXI_DE_BE_MODE_START (1 << 1) > +#define SUNXI_DE_BE_MODE_DEFLICKER_ENABLE (1 << 4) > #define SUNXI_DE_BE_MODE_LAYER0_ENABLE (1 << 8) > +#define SUNXI_DE_BE_MODE_INTERLACE_ENABLE (1 << 28) > #define SUNXI_DE_BE_LAYER_STRIDE(x) ((x) << 5) > #define SUNXI_DE_BE_REG_CTRL_LOAD_REGS (1 << 0) > #define SUNXI_DE_BE_LAYER_ATTR0_SRC_FE0 0x00000002 > #define SUNXI_DE_BE_LAYER_ATTR1_FMT_XRGB8888 (0x09 << 8) > +#define SUNXI_DE_BE_OUTPUT_COLOR_CTRL_ENABLE 1 > > /* > * LCDC register constants. > @@ -372,11 +379,12 @@ struct sunxi_tve_reg { > #define SUNXI_LCDC_TCON0_LVDS_INTF_ENABLE (1 << 31) > #define SUNXI_LCDC_TCON0_IO_POL_DCLK_PHASE(x) ((x) << 28) > #define SUNXI_LCDC_TCON1_CTRL_CLK_DELAY(n) (((n) & 0x1f) << 4) > +#define SUNXI_LCDC_TCON1_CTRL_INTERLACE(n) ((n) << 20) > #define SUNXI_LCDC_TCON1_CTRL_ENABLE (1 << 31) > #define SUNXI_LCDC_TCON1_TIMING_H_BP(n) (((n) - 1) > << 0) > #define SUNXI_LCDC_TCON1_TIMING_H_TOTAL(n) (((n) - 1) << 16) > #define SUNXI_LCDC_TCON1_TIMING_V_BP(n) (((n) - 1) > << 0) > -#define SUNXI_LCDC_TCON1_TIMING_V_TOTAL(n) (((n) * 2) << 16) > +#define SUNXI_LCDC_TCON1_TIMING_V_TOTAL(n) ((n) << 16) > #ifdef CONFIG_SUNXI_GEN_SUN6I > #define SUNXI_LCDC_LVDS_ANA0 0x40040320 > #define SUNXI_LCDC_LVDS_ANA0_EN_MB (1 << 31) > @@ -494,9 +502,22 @@ struct sunxi_tve_reg { > */ > #define SUNXI_TVE_GCTRL_DAC_INPUT_MASK(dac) (0xf << (((dac) + 1) > * 4)) > #define SUNXI_TVE_GCTRL_DAC_INPUT(dac, sel) ((sel) << (((dac) + > 1) * 4)) > -#define SUNXI_TVE_GCTRL_CFG0_VGA 0x20000000 > -#define SUNXI_TVE_GCTRL_DAC_CFG0_VGA 0x403e1ac7 > -#define SUNXI_TVE_GCTRL_UNKNOWN1_VGA 0x00000000 > +#define SUNXI_TVE_CFG0_VGA 0x20000000 > +#define SUNXI_TVE_CFG0_PAL 0x07030001 > +#define SUNXI_TVE_CFG0_NTSC 0x07030000 > +#define SUNXI_TVE_DAC_CFG0_VGA 0x403e1ac7 > +#define SUNXI_TVE_DAC_CFG0_COMPOSITE 0x403f0008 > +#define SUNXI_TVE_FILTER_COMPOSITE 0x00000120 > +#define SUNXI_TVE_CHROMA_FREQ_PAL_M 0x21e6efe3 > +#define SUNXI_TVE_CHROMA_FREQ_PAL_NC 0x21f69446 > +#define SUNXI_TVE_PORCH_NUM_PAL 0x008a0018 > +#define SUNXI_TVE_PORCH_NUM_NTSC 0x00760020 > +#define SUNXI_TVE_LINE_NUM_PAL 0x00160271 > +#define SUNXI_TVE_LINE_NUM_NTSC 0x0016020d > +#define SUNXI_TVE_BLANK_BLACK_LEVEL_PAL 0x00fc00fc > +#define SUNXI_TVE_BLANK_BLACK_LEVEL_NTSC 0x00f0011a > +#define SUNXI_TVE_UNKNOWN1_VGA 0x00000000 > +#define SUNXI_TVE_UNKNOWN1_COMPOSITE 0x18181818 > #define SUNXI_TVE_AUTO_DETECT_EN_DET_EN(dac) (1 << ((dac) + 0)) > #define SUNXI_TVE_AUTO_DETECT_EN_INT_EN(dac) (1 << ((dac) + 16)) > #define SUNXI_TVE_AUTO_DETECT_INT_STATUS(dac) (1 << ((dac) + 0)) > @@ -512,6 +533,20 @@ struct sunxi_tve_reg { > #define SUNXI_TVE_CSC_REG1 0x3b6dace1 > #define SUNXI_TVE_CSC_REG2 0x0e1d13dc > #define SUNXI_TVE_CSC_REG3 0x00108080 > +#define SUNXI_TVE_COLOR_BURST_PAL_M 0x00000000 > +#define SUNXI_TVE_CBR_LEVEL_PAL 0x00002828 > +#define SUNXI_TVE_CBR_LEVEL_NTSC 0x0000004f > +#define SUNXI_TVE_BURST_PHASE_NTSC 0x00000000 > +#define SUNXI_TVE_BURST_WIDTH_COMPOSITE 0x0016447e > +#define SUNXI_TVE_UNKNOWN2_PAL 0x0000e0e0 > +#define SUNXI_TVE_UNKNOWN2_NTSC 0x0000a0a0 > +#define SUNXI_TVE_SYNC_VBI_LEVEL_NTSC 0x001000f0 > +#define SUNXI_TVE_ACTIVE_NUM_COMPOSITE 0x000005a0 > +#define SUNXI_TVE_CHROMA_BW_GAIN_COMP 0x00000002 > +#define SUNXI_TVE_NOTCH_WIDTH_COMPOSITE 0x00000101 > +#define SUNXI_TVE_RESYNC_NUM_PAL 0x800d000c > +#define SUNXI_TVE_RESYNC_NUM_NTSC 0x000e000c > +#define SUNXI_TVE_SLAVE_PARA_COMPOSITE 0x00000000 > > int sunxi_simplefb_setup(void *blob); > > diff --git a/drivers/video/sunxi_display.c > b/drivers/video/sunxi_display.c > index fa4241e..74a4280 100644 > --- a/drivers/video/sunxi_display.c > +++ b/drivers/video/sunxi_display.c > @@ -791,7 +791,7 @@ static void sunxi_lcdc_tcon1_mode_set(const > struct ctfb_res_modes *mode, > > bp = mode->vsync_len + mode->upper_margin; > total = mode->yres + mode->lower_margin + bp; > - writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(total) | > + writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(2 * total) | > SUNXI_LCDC_TCON1_TIMING_V_BP(bp), &lcdc > ->tcon1_timing_v); > > writel(SUNXI_LCDC_X(mode->hsync_len) | SUNXI_LCDC_Y(mode > ->vsync_len), > @@ -944,9 +944,9 @@ static void sunxi_vga_mode_set(void) > writel(SUNXI_TVE_GCTRL_DAC_INPUT(0, 1) | > SUNXI_TVE_GCTRL_DAC_INPUT(1, 2) | > SUNXI_TVE_GCTRL_DAC_INPUT(2, 3), &tve->gctrl); > - writel(SUNXI_TVE_GCTRL_CFG0_VGA, &tve->cfg0); > - writel(SUNXI_TVE_GCTRL_DAC_CFG0_VGA, &tve->dac_cfg0); > - writel(SUNXI_TVE_GCTRL_UNKNOWN1_VGA, &tve->unknown1); > + writel(SUNXI_TVE_CFG0_VGA, &tve->cfg0); > + writel(SUNXI_TVE_DAC_CFG0_VGA, &tve->dac_cfg0); > + writel(SUNXI_TVE_UNKNOWN1_VGA, &tve->unknown1); > } > > static void sunxi_vga_enable(void)
Hi, On 05-08-15 09:57, Ian Campbell wrote: > On Mon, 2015-08-03 at 23:54 +0200, Hans de Goede wrote: >> Add a few extra sunxi display registers and constant defines. > > + "Also rename some existing defines (e.g. dropping _GCTRL) and make > some more generic (e.g. dropping the 2x scaling from > SUNXI_LCDC_TCON1_TIMING_V_TOTAL)." Added to the commit msg, thanks for the reviews. Regards, Hans > >> This is a preparation patch for adding composite video out support. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Acked-by: Ian Campbell <ijc@hellion.org.uk> > >> --- >> arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 2 +- >> arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 1 + >> arch/arm/include/asm/arch-sunxi/display.h | 45 >> ++++++++++++++++++++++++--- >> drivers/video/sunxi_display.c | 8 ++--- >> 4 files changed, 46 insertions(+), 10 deletions(-) >> >> diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h >> b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h >> index 01d3e28..a7e25f4 100644 >> --- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h >> +++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h >> @@ -291,7 +291,7 @@ struct sunxi_ccm_reg { >> #define CCM_LCD_CH0_CTRL_GATE (0x1 << 31) >> >> #define CCM_LCD_CH1_CTRL_M(n) ((((n) - 1) & 0xf) << 0) >> -/* We leave bit 11 set to 0, so sclk1 == sclk2 */ >> +#define CCM_LCD_CH1_CTRL_HALF_SCLK1 (1 << 11) >> #define CCM_LCD_CH1_CTRL_PLL3 (0 << 24) >> #define CCM_LCD_CH1_CTRL_PLL7 (1 << 24) >> #define CCM_LCD_CH1_CTRL_PLL3_2X (2 << 24) >> diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h >> b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h >> index 8a26b9f..06c6feb 100644 >> --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h >> +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h >> @@ -290,6 +290,7 @@ struct sunxi_ccm_reg { >> #define CCM_LCD_CH0_CTRL_GATE (0x1 << 31) >> >> #define CCM_LCD_CH1_CTRL_M(n) ((((n) - 1) & 0xf) << 0) >> +#define CCM_LCD_CH1_CTRL_HALF_SCLK1 0 /* no seperate sclk1 & 2 >> on sun6i */ >> #define CCM_LCD_CH1_CTRL_PLL3 (0 << 24) >> #define CCM_LCD_CH1_CTRL_PLL7 (1 << 24) >> #define CCM_LCD_CH1_CTRL_PLL3_2X (2 << 24) >> diff --git a/arch/arm/include/asm/arch-sunxi/display.h >> b/arch/arm/include/asm/arch-sunxi/display.h >> index ae95417..830ec42 100644 >> --- a/arch/arm/include/asm/arch-sunxi/display.h >> +++ b/arch/arm/include/asm/arch-sunxi/display.h >> @@ -151,6 +151,10 @@ struct sunxi_de_be_reg { >> u32 layer1_attr1_ctrl; /* 0x8a4 */ >> u32 layer2_attr1_ctrl; /* 0x8a8 */ >> u32 layer3_attr1_ctrl; /* 0x8ac */ >> + u8 res5[0x110]; /* 0x8b0 */ >> + u32 output_color_ctrl; /* 0x9c0 */ >> + u8 res6[0xc]; /* 0x9c4 */ >> + u32 output_color_coef[12]; /* 0x9d0 */ >> }; >> >> struct sunxi_lcdc_reg { >> @@ -298,7 +302,7 @@ struct sunxi_tve_reg { >> u32 cbr_level; /* 0x10c */ >> u32 burst_phase; /* 0x110 */ >> u32 burst_width; /* 0x114 */ >> - u8 res2[0x04]; /* 0x118 */ >> + u32 unknown2; /* 0x118 */ >> u32 sync_vbi_level; /* 0x11c */ >> u32 white_level; /* 0x120 */ >> u32 active_num; /* 0x124 */ >> @@ -331,11 +335,14 @@ struct sunxi_tve_reg { >> #define SUNXI_DE_BE_HEIGHT(y) (((y) - 1) << 16) >> #define SUNXI_DE_BE_MODE_ENABLE (1 << 0) >> #define SUNXI_DE_BE_MODE_START (1 << 1) >> +#define SUNXI_DE_BE_MODE_DEFLICKER_ENABLE (1 << 4) >> #define SUNXI_DE_BE_MODE_LAYER0_ENABLE (1 << 8) >> +#define SUNXI_DE_BE_MODE_INTERLACE_ENABLE (1 << 28) >> #define SUNXI_DE_BE_LAYER_STRIDE(x) ((x) << 5) >> #define SUNXI_DE_BE_REG_CTRL_LOAD_REGS (1 << 0) >> #define SUNXI_DE_BE_LAYER_ATTR0_SRC_FE0 0x00000002 >> #define SUNXI_DE_BE_LAYER_ATTR1_FMT_XRGB8888 (0x09 << 8) >> +#define SUNXI_DE_BE_OUTPUT_COLOR_CTRL_ENABLE 1 >> >> /* >> * LCDC register constants. >> @@ -372,11 +379,12 @@ struct sunxi_tve_reg { >> #define SUNXI_LCDC_TCON0_LVDS_INTF_ENABLE (1 << 31) >> #define SUNXI_LCDC_TCON0_IO_POL_DCLK_PHASE(x) ((x) << 28) >> #define SUNXI_LCDC_TCON1_CTRL_CLK_DELAY(n) (((n) & 0x1f) << 4) >> +#define SUNXI_LCDC_TCON1_CTRL_INTERLACE(n) ((n) << 20) >> #define SUNXI_LCDC_TCON1_CTRL_ENABLE (1 << 31) >> #define SUNXI_LCDC_TCON1_TIMING_H_BP(n) (((n) - 1) >> << 0) >> #define SUNXI_LCDC_TCON1_TIMING_H_TOTAL(n) (((n) - 1) << 16) >> #define SUNXI_LCDC_TCON1_TIMING_V_BP(n) (((n) - 1) >> << 0) >> -#define SUNXI_LCDC_TCON1_TIMING_V_TOTAL(n) (((n) * 2) << 16) >> +#define SUNXI_LCDC_TCON1_TIMING_V_TOTAL(n) ((n) << 16) >> #ifdef CONFIG_SUNXI_GEN_SUN6I >> #define SUNXI_LCDC_LVDS_ANA0 0x40040320 >> #define SUNXI_LCDC_LVDS_ANA0_EN_MB (1 << 31) >> @@ -494,9 +502,22 @@ struct sunxi_tve_reg { >> */ >> #define SUNXI_TVE_GCTRL_DAC_INPUT_MASK(dac) (0xf << (((dac) + 1) >> * 4)) >> #define SUNXI_TVE_GCTRL_DAC_INPUT(dac, sel) ((sel) << (((dac) + >> 1) * 4)) >> -#define SUNXI_TVE_GCTRL_CFG0_VGA 0x20000000 >> -#define SUNXI_TVE_GCTRL_DAC_CFG0_VGA 0x403e1ac7 >> -#define SUNXI_TVE_GCTRL_UNKNOWN1_VGA 0x00000000 >> +#define SUNXI_TVE_CFG0_VGA 0x20000000 >> +#define SUNXI_TVE_CFG0_PAL 0x07030001 >> +#define SUNXI_TVE_CFG0_NTSC 0x07030000 >> +#define SUNXI_TVE_DAC_CFG0_VGA 0x403e1ac7 >> +#define SUNXI_TVE_DAC_CFG0_COMPOSITE 0x403f0008 >> +#define SUNXI_TVE_FILTER_COMPOSITE 0x00000120 >> +#define SUNXI_TVE_CHROMA_FREQ_PAL_M 0x21e6efe3 >> +#define SUNXI_TVE_CHROMA_FREQ_PAL_NC 0x21f69446 >> +#define SUNXI_TVE_PORCH_NUM_PAL 0x008a0018 >> +#define SUNXI_TVE_PORCH_NUM_NTSC 0x00760020 >> +#define SUNXI_TVE_LINE_NUM_PAL 0x00160271 >> +#define SUNXI_TVE_LINE_NUM_NTSC 0x0016020d >> +#define SUNXI_TVE_BLANK_BLACK_LEVEL_PAL 0x00fc00fc >> +#define SUNXI_TVE_BLANK_BLACK_LEVEL_NTSC 0x00f0011a >> +#define SUNXI_TVE_UNKNOWN1_VGA 0x00000000 >> +#define SUNXI_TVE_UNKNOWN1_COMPOSITE 0x18181818 >> #define SUNXI_TVE_AUTO_DETECT_EN_DET_EN(dac) (1 << ((dac) + 0)) >> #define SUNXI_TVE_AUTO_DETECT_EN_INT_EN(dac) (1 << ((dac) + 16)) >> #define SUNXI_TVE_AUTO_DETECT_INT_STATUS(dac) (1 << ((dac) + 0)) >> @@ -512,6 +533,20 @@ struct sunxi_tve_reg { >> #define SUNXI_TVE_CSC_REG1 0x3b6dace1 >> #define SUNXI_TVE_CSC_REG2 0x0e1d13dc >> #define SUNXI_TVE_CSC_REG3 0x00108080 >> +#define SUNXI_TVE_COLOR_BURST_PAL_M 0x00000000 >> +#define SUNXI_TVE_CBR_LEVEL_PAL 0x00002828 >> +#define SUNXI_TVE_CBR_LEVEL_NTSC 0x0000004f >> +#define SUNXI_TVE_BURST_PHASE_NTSC 0x00000000 >> +#define SUNXI_TVE_BURST_WIDTH_COMPOSITE 0x0016447e >> +#define SUNXI_TVE_UNKNOWN2_PAL 0x0000e0e0 >> +#define SUNXI_TVE_UNKNOWN2_NTSC 0x0000a0a0 >> +#define SUNXI_TVE_SYNC_VBI_LEVEL_NTSC 0x001000f0 >> +#define SUNXI_TVE_ACTIVE_NUM_COMPOSITE 0x000005a0 >> +#define SUNXI_TVE_CHROMA_BW_GAIN_COMP 0x00000002 >> +#define SUNXI_TVE_NOTCH_WIDTH_COMPOSITE 0x00000101 >> +#define SUNXI_TVE_RESYNC_NUM_PAL 0x800d000c >> +#define SUNXI_TVE_RESYNC_NUM_NTSC 0x000e000c >> +#define SUNXI_TVE_SLAVE_PARA_COMPOSITE 0x00000000 >> >> int sunxi_simplefb_setup(void *blob); >> >> diff --git a/drivers/video/sunxi_display.c >> b/drivers/video/sunxi_display.c >> index fa4241e..74a4280 100644 >> --- a/drivers/video/sunxi_display.c >> +++ b/drivers/video/sunxi_display.c >> @@ -791,7 +791,7 @@ static void sunxi_lcdc_tcon1_mode_set(const >> struct ctfb_res_modes *mode, >> >> bp = mode->vsync_len + mode->upper_margin; >> total = mode->yres + mode->lower_margin + bp; >> - writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(total) | >> + writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(2 * total) | >> SUNXI_LCDC_TCON1_TIMING_V_BP(bp), &lcdc >> ->tcon1_timing_v); >> >> writel(SUNXI_LCDC_X(mode->hsync_len) | SUNXI_LCDC_Y(mode >> ->vsync_len), >> @@ -944,9 +944,9 @@ static void sunxi_vga_mode_set(void) >> writel(SUNXI_TVE_GCTRL_DAC_INPUT(0, 1) | >> SUNXI_TVE_GCTRL_DAC_INPUT(1, 2) | >> SUNXI_TVE_GCTRL_DAC_INPUT(2, 3), &tve->gctrl); >> - writel(SUNXI_TVE_GCTRL_CFG0_VGA, &tve->cfg0); >> - writel(SUNXI_TVE_GCTRL_DAC_CFG0_VGA, &tve->dac_cfg0); >> - writel(SUNXI_TVE_GCTRL_UNKNOWN1_VGA, &tve->unknown1); >> + writel(SUNXI_TVE_CFG0_VGA, &tve->cfg0); >> + writel(SUNXI_TVE_DAC_CFG0_VGA, &tve->dac_cfg0); >> + writel(SUNXI_TVE_UNKNOWN1_VGA, &tve->unknown1); >> } >> >> static void sunxi_vga_enable(void)
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h index 01d3e28..a7e25f4 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h @@ -291,7 +291,7 @@ struct sunxi_ccm_reg { #define CCM_LCD_CH0_CTRL_GATE (0x1 << 31) #define CCM_LCD_CH1_CTRL_M(n) ((((n) - 1) & 0xf) << 0) -/* We leave bit 11 set to 0, so sclk1 == sclk2 */ +#define CCM_LCD_CH1_CTRL_HALF_SCLK1 (1 << 11) #define CCM_LCD_CH1_CTRL_PLL3 (0 << 24) #define CCM_LCD_CH1_CTRL_PLL7 (1 << 24) #define CCM_LCD_CH1_CTRL_PLL3_2X (2 << 24) diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index 8a26b9f..06c6feb 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -290,6 +290,7 @@ struct sunxi_ccm_reg { #define CCM_LCD_CH0_CTRL_GATE (0x1 << 31) #define CCM_LCD_CH1_CTRL_M(n) ((((n) - 1) & 0xf) << 0) +#define CCM_LCD_CH1_CTRL_HALF_SCLK1 0 /* no seperate sclk1 & 2 on sun6i */ #define CCM_LCD_CH1_CTRL_PLL3 (0 << 24) #define CCM_LCD_CH1_CTRL_PLL7 (1 << 24) #define CCM_LCD_CH1_CTRL_PLL3_2X (2 << 24) diff --git a/arch/arm/include/asm/arch-sunxi/display.h b/arch/arm/include/asm/arch-sunxi/display.h index ae95417..830ec42 100644 --- a/arch/arm/include/asm/arch-sunxi/display.h +++ b/arch/arm/include/asm/arch-sunxi/display.h @@ -151,6 +151,10 @@ struct sunxi_de_be_reg { u32 layer1_attr1_ctrl; /* 0x8a4 */ u32 layer2_attr1_ctrl; /* 0x8a8 */ u32 layer3_attr1_ctrl; /* 0x8ac */ + u8 res5[0x110]; /* 0x8b0 */ + u32 output_color_ctrl; /* 0x9c0 */ + u8 res6[0xc]; /* 0x9c4 */ + u32 output_color_coef[12]; /* 0x9d0 */ }; struct sunxi_lcdc_reg { @@ -298,7 +302,7 @@ struct sunxi_tve_reg { u32 cbr_level; /* 0x10c */ u32 burst_phase; /* 0x110 */ u32 burst_width; /* 0x114 */ - u8 res2[0x04]; /* 0x118 */ + u32 unknown2; /* 0x118 */ u32 sync_vbi_level; /* 0x11c */ u32 white_level; /* 0x120 */ u32 active_num; /* 0x124 */ @@ -331,11 +335,14 @@ struct sunxi_tve_reg { #define SUNXI_DE_BE_HEIGHT(y) (((y) - 1) << 16) #define SUNXI_DE_BE_MODE_ENABLE (1 << 0) #define SUNXI_DE_BE_MODE_START (1 << 1) +#define SUNXI_DE_BE_MODE_DEFLICKER_ENABLE (1 << 4) #define SUNXI_DE_BE_MODE_LAYER0_ENABLE (1 << 8) +#define SUNXI_DE_BE_MODE_INTERLACE_ENABLE (1 << 28) #define SUNXI_DE_BE_LAYER_STRIDE(x) ((x) << 5) #define SUNXI_DE_BE_REG_CTRL_LOAD_REGS (1 << 0) #define SUNXI_DE_BE_LAYER_ATTR0_SRC_FE0 0x00000002 #define SUNXI_DE_BE_LAYER_ATTR1_FMT_XRGB8888 (0x09 << 8) +#define SUNXI_DE_BE_OUTPUT_COLOR_CTRL_ENABLE 1 /* * LCDC register constants. @@ -372,11 +379,12 @@ struct sunxi_tve_reg { #define SUNXI_LCDC_TCON0_LVDS_INTF_ENABLE (1 << 31) #define SUNXI_LCDC_TCON0_IO_POL_DCLK_PHASE(x) ((x) << 28) #define SUNXI_LCDC_TCON1_CTRL_CLK_DELAY(n) (((n) & 0x1f) << 4) +#define SUNXI_LCDC_TCON1_CTRL_INTERLACE(n) ((n) << 20) #define SUNXI_LCDC_TCON1_CTRL_ENABLE (1 << 31) #define SUNXI_LCDC_TCON1_TIMING_H_BP(n) (((n) - 1) << 0) #define SUNXI_LCDC_TCON1_TIMING_H_TOTAL(n) (((n) - 1) << 16) #define SUNXI_LCDC_TCON1_TIMING_V_BP(n) (((n) - 1) << 0) -#define SUNXI_LCDC_TCON1_TIMING_V_TOTAL(n) (((n) * 2) << 16) +#define SUNXI_LCDC_TCON1_TIMING_V_TOTAL(n) ((n) << 16) #ifdef CONFIG_SUNXI_GEN_SUN6I #define SUNXI_LCDC_LVDS_ANA0 0x40040320 #define SUNXI_LCDC_LVDS_ANA0_EN_MB (1 << 31) @@ -494,9 +502,22 @@ struct sunxi_tve_reg { */ #define SUNXI_TVE_GCTRL_DAC_INPUT_MASK(dac) (0xf << (((dac) + 1) * 4)) #define SUNXI_TVE_GCTRL_DAC_INPUT(dac, sel) ((sel) << (((dac) + 1) * 4)) -#define SUNXI_TVE_GCTRL_CFG0_VGA 0x20000000 -#define SUNXI_TVE_GCTRL_DAC_CFG0_VGA 0x403e1ac7 -#define SUNXI_TVE_GCTRL_UNKNOWN1_VGA 0x00000000 +#define SUNXI_TVE_CFG0_VGA 0x20000000 +#define SUNXI_TVE_CFG0_PAL 0x07030001 +#define SUNXI_TVE_CFG0_NTSC 0x07030000 +#define SUNXI_TVE_DAC_CFG0_VGA 0x403e1ac7 +#define SUNXI_TVE_DAC_CFG0_COMPOSITE 0x403f0008 +#define SUNXI_TVE_FILTER_COMPOSITE 0x00000120 +#define SUNXI_TVE_CHROMA_FREQ_PAL_M 0x21e6efe3 +#define SUNXI_TVE_CHROMA_FREQ_PAL_NC 0x21f69446 +#define SUNXI_TVE_PORCH_NUM_PAL 0x008a0018 +#define SUNXI_TVE_PORCH_NUM_NTSC 0x00760020 +#define SUNXI_TVE_LINE_NUM_PAL 0x00160271 +#define SUNXI_TVE_LINE_NUM_NTSC 0x0016020d +#define SUNXI_TVE_BLANK_BLACK_LEVEL_PAL 0x00fc00fc +#define SUNXI_TVE_BLANK_BLACK_LEVEL_NTSC 0x00f0011a +#define SUNXI_TVE_UNKNOWN1_VGA 0x00000000 +#define SUNXI_TVE_UNKNOWN1_COMPOSITE 0x18181818 #define SUNXI_TVE_AUTO_DETECT_EN_DET_EN(dac) (1 << ((dac) + 0)) #define SUNXI_TVE_AUTO_DETECT_EN_INT_EN(dac) (1 << ((dac) + 16)) #define SUNXI_TVE_AUTO_DETECT_INT_STATUS(dac) (1 << ((dac) + 0)) @@ -512,6 +533,20 @@ struct sunxi_tve_reg { #define SUNXI_TVE_CSC_REG1 0x3b6dace1 #define SUNXI_TVE_CSC_REG2 0x0e1d13dc #define SUNXI_TVE_CSC_REG3 0x00108080 +#define SUNXI_TVE_COLOR_BURST_PAL_M 0x00000000 +#define SUNXI_TVE_CBR_LEVEL_PAL 0x00002828 +#define SUNXI_TVE_CBR_LEVEL_NTSC 0x0000004f +#define SUNXI_TVE_BURST_PHASE_NTSC 0x00000000 +#define SUNXI_TVE_BURST_WIDTH_COMPOSITE 0x0016447e +#define SUNXI_TVE_UNKNOWN2_PAL 0x0000e0e0 +#define SUNXI_TVE_UNKNOWN2_NTSC 0x0000a0a0 +#define SUNXI_TVE_SYNC_VBI_LEVEL_NTSC 0x001000f0 +#define SUNXI_TVE_ACTIVE_NUM_COMPOSITE 0x000005a0 +#define SUNXI_TVE_CHROMA_BW_GAIN_COMP 0x00000002 +#define SUNXI_TVE_NOTCH_WIDTH_COMPOSITE 0x00000101 +#define SUNXI_TVE_RESYNC_NUM_PAL 0x800d000c +#define SUNXI_TVE_RESYNC_NUM_NTSC 0x000e000c +#define SUNXI_TVE_SLAVE_PARA_COMPOSITE 0x00000000 int sunxi_simplefb_setup(void *blob); diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index fa4241e..74a4280 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -791,7 +791,7 @@ static void sunxi_lcdc_tcon1_mode_set(const struct ctfb_res_modes *mode, bp = mode->vsync_len + mode->upper_margin; total = mode->yres + mode->lower_margin + bp; - writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(total) | + writel(SUNXI_LCDC_TCON1_TIMING_V_TOTAL(2 * total) | SUNXI_LCDC_TCON1_TIMING_V_BP(bp), &lcdc->tcon1_timing_v); writel(SUNXI_LCDC_X(mode->hsync_len) | SUNXI_LCDC_Y(mode->vsync_len), @@ -944,9 +944,9 @@ static void sunxi_vga_mode_set(void) writel(SUNXI_TVE_GCTRL_DAC_INPUT(0, 1) | SUNXI_TVE_GCTRL_DAC_INPUT(1, 2) | SUNXI_TVE_GCTRL_DAC_INPUT(2, 3), &tve->gctrl); - writel(SUNXI_TVE_GCTRL_CFG0_VGA, &tve->cfg0); - writel(SUNXI_TVE_GCTRL_DAC_CFG0_VGA, &tve->dac_cfg0); - writel(SUNXI_TVE_GCTRL_UNKNOWN1_VGA, &tve->unknown1); + writel(SUNXI_TVE_CFG0_VGA, &tve->cfg0); + writel(SUNXI_TVE_DAC_CFG0_VGA, &tve->dac_cfg0); + writel(SUNXI_TVE_UNKNOWN1_VGA, &tve->unknown1); } static void sunxi_vga_enable(void)
Add a few extra sunxi display registers and constant defines. This is a preparation patch for adding composite video out support. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 1 + arch/arm/include/asm/arch-sunxi/display.h | 45 ++++++++++++++++++++++++--- drivers/video/sunxi_display.c | 8 ++--- 4 files changed, 46 insertions(+), 10 deletions(-)