lkml.org 
[lkml]   [2010]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[179/289] drm/radeon/kms: fix i2c pad masks on rs4xx
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Alex Deucher <alexdeucher@gmail.com>

    commit be66305718bee9927e6acc6b75618ce3cd745718 upstream.

    These got lost in the last i2c cleanup. Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=23222

    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/radeon/radeon_combios.c | 13 +++++++++++++
    1 file changed, 13 insertions(+)

    --- a/drivers/gpu/drm/radeon/radeon_combios.c
    +++ b/drivers/gpu/drm/radeon/radeon_combios.c
    @@ -571,6 +571,7 @@ static struct radeon_i2c_bus_rec combios
    }

    if (clk_mask && data_mask) {
    + /* system specific masks */
    i2c.mask_clk_mask = clk_mask;
    i2c.mask_data_mask = data_mask;
    i2c.a_clk_mask = clk_mask;
    @@ -579,7 +580,19 @@ static struct radeon_i2c_bus_rec combios
    i2c.en_data_mask = data_mask;
    i2c.y_clk_mask = clk_mask;
    i2c.y_data_mask = data_mask;
    + } else if ((ddc_line == RADEON_GPIOPAD_MASK) ||
    + (ddc_line == RADEON_MDGPIO_MASK)) {
    + /* default gpiopad masks */
    + i2c.mask_clk_mask = (0x20 << 8);
    + i2c.mask_data_mask = 0x80;
    + i2c.a_clk_mask = (0x20 << 8);
    + i2c.a_data_mask = 0x80;
    + i2c.en_clk_mask = (0x20 << 8);
    + i2c.en_data_mask = 0x80;
    + i2c.y_clk_mask = (0x20 << 8);
    + i2c.y_data_mask = 0x80;
    } else {
    + /* default masks for ddc pads */
    i2c.mask_clk_mask = RADEON_GPIO_EN_1;
    i2c.mask_data_mask = RADEON_GPIO_EN_0;
    i2c.a_clk_mask = RADEON_GPIO_A_1;



    \
     
     \ /
      Last update: 2010-12-08 02:29    [W:5.330 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site