lkml.org 
[lkml]   [2008]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/6] gxfb: move MSR bit fields into gxfb.h
    From bee7242cf04c4a060b311b11985efb495f308355 Mon Sep 17 00:00:00 2001
    From: Andres Salomon <dilinger@debian.org>
    Date: Mon, 25 Feb 2008 15:29:36 -0500
    Subject: [PATCH] gxfb: move MSR bit fields into gxfb.h

    This continues the gxfb header cleanups. MSRs are defined in geode.h;
    the specific bits we care about are defined in gxfb.h.

    Signed-off-by: Andres Salomon <dilinger@debian.org>
    ---
    drivers/video/geode/display_gx.h | 3 ---
    drivers/video/geode/gxfb.h | 16 ++++++++++++++++
    drivers/video/geode/gxfb_core.c | 2 +-
    drivers/video/geode/video_gx.c | 4 ++--
    drivers/video/geode/video_gx.h | 14 --------------
    5 files changed, 19 insertions(+), 20 deletions(-)

    diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
    index 56e9d2e..ad556d3 100644
    --- a/drivers/video/geode/display_gx.h
    +++ b/drivers/video/geode/display_gx.h
    @@ -16,7 +16,4 @@ int gx_line_delta(int xres, int bpp);

    extern struct geode_dc_ops gx_dc_ops;

    -/* MSR that tells us if a TFT or CRT is attached */
    -#define GLD_MSR_CONFIG_DM_FP 0x40
    -
    #endif /* !__DISPLAY_GX1_H__ */
    diff --git a/drivers/video/geode/gxfb.h b/drivers/video/geode/gxfb.h
    index 3367fdc..19cf8ca 100644
    --- a/drivers/video/geode/gxfb.h
    +++ b/drivers/video/geode/gxfb.h
    @@ -231,4 +231,20 @@ enum fp_registers {
    #define write_fp(reg, val) writel((uint32_t) (val), \
    par->vid_regs + 8*(reg) + VP_FP_START)

    +
    +/* MSRs are defined in asm/geode.h; their bitfields are here */
    +
    +#define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (1 << 3)
    +#define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (1 << 2)
    +#define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2 (1 << 1)
    +
    +#define MSR_GLCP_DOTPLL_LOCK (1 << 25) /* r/o */
    +#define MSR_GLCP_DOTPLL_BYPASS (1 << 15)
    +#define MSR_GLCP_DOTPLL_DOTRESET (1 << 0)
    +
    +#define MSR_GX_MSR_PADSEL_MASK 0x3FFFFFFF /* undocumented? */
    +#define MSR_GX_MSR_PADSEL_TFT 0x1FFFFFFF /* undocumented? */
    +
    +#define MSR_GX_GLD_MSR_CONFIG_FP (1 << 3)
    +
    #endif
    diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
    index 2e49a5e..ee25774 100644
    --- a/drivers/video/geode/gxfb_core.c
    +++ b/drivers/video/geode/gxfb_core.c
    @@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i

    rdmsrl(MSR_GX_GLD_MSR_CONFIG, val);

    - if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
    + if ((val & MSR_GX_GLD_MSR_CONFIG_FP) == MSR_GX_GLD_MSR_CONFIG_FP)
    par->enable_crt = 0;
    else
    par->enable_crt = 1;
    diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
    index 51b03b7..bb77ccc 100644
    --- a/drivers/video/geode/video_gx.c
    +++ b/drivers/video/geode/video_gx.c
    @@ -187,8 +187,8 @@ gx_configure_tft(struct fb_info *info)
    /* Set up the DF pad select MSR */

    rdmsrl(MSR_GX_MSR_PADSEL, val);
    - val &= ~GX_VP_PAD_SELECT_MASK;
    - val |= GX_VP_PAD_SELECT_TFT;
    + val &= ~MSR_GX_MSR_PADSEL_MASK;
    + val |= MSR_GX_MSR_PADSEL_TFT;
    wrmsrl(MSR_GX_MSR_PADSEL, val);

    /* Turn off the panel */
    diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
    index 5457bd0..79f6e81 100644
    --- a/drivers/video/geode/video_gx.h
    +++ b/drivers/video/geode/video_gx.h
    @@ -13,18 +13,4 @@

    extern struct geode_vid_ops gx_vid_ops;

    -/* GX Flatpanel control MSR */
    -#define GX_VP_PAD_SELECT_MASK 0x3FFFFFFF
    -#define GX_VP_PAD_SELECT_TFT 0x1FFFFFFF
    -
    -/* Geode GX clock control MSRs */
    -
    -# define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2 (0x0000000000000002ull)
    -# define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (0x0000000000000004ull)
    -# define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (0x0000000000000008ull)
    -
    -# define MSR_GLCP_DOTPLL_DOTRESET (0x0000000000000001ull)
    -# define MSR_GLCP_DOTPLL_BYPASS (0x0000000000008000ull)
    -# define MSR_GLCP_DOTPLL_LOCK (0x0000000002000000ull)
    -
    #endif /* !__VIDEO_GX_H__ */
    --
    1.5.3.7


    \
     
     \ /
      Last update: 2008-03-09 02:49    [W:0.023 / U:1.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site