From patchwork Sat Jan 9 19:30:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Meng X-Patchwork-Id: 71950 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o09JUP45008346 for ; Sat, 9 Jan 2010 19:30:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751739Ab0AITaY (ORCPT ); Sat, 9 Jan 2010 14:30:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752098Ab0AITaY (ORCPT ); Sat, 9 Jan 2010 14:30:24 -0500 Received: from web32702.mail.mud.yahoo.com ([68.142.207.246]:25736 "HELO web32702.mail.mud.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751739Ab0AITaX (ORCPT ); Sat, 9 Jan 2010 14:30:23 -0500 Received: (qmail 90682 invoked by uid 60001); 9 Jan 2010 19:30:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1263065422; bh=tS1MUk8m4ygXyWVfluVGM+Msh1lAjtydRczItXp09zY=; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:MIME-Version:Content-Type; b=ARB/2xCtD8+LVGPTpNhQOxP5/rBljtPrNHyL/h+Vh32mMVZXddkwxD5oqVPoVRiyimQpV1N3TniH+txtQOdCBou7HaBof/ds6qi3c2/Fjef2etkJL5YFNO3QsLSu8VZye6vq57xNt54oSfK5bZwsOZgWk00DjTAzsqPnbPiIiL4= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:MIME-Version:Content-Type; b=IkPNW3bn//rFjeWk3Nxl87uJPFGzyxmO1sf2H9ziFAnYaPOjiyIULGhmGqZKU/894YeUHG3d7CPi5lLTl+YV4O0aBOEgQmZaHgxEgk/DuRBpKJNz+y/LxrI5UWwSl2twRpBPMNM+FhE7wxudNiJiOTSzhCU/qFg3rVN3CN0mj9o=; Message-ID: <430160.90047.qm@web32702.mail.mud.yahoo.com> X-YMail-OSG: td5dhggVM1lm8bdz4RpyDnJ4n4InOjzF5aCK947nDZOOP0C50WA0A26pfBPwv2dfILGioKMKhh.nIPG3ChusY95Wh.RNcBme6iOI9nxhMZ6R6gYguBebP08bSYyzx_xKEzulvRNoKByzywWyDj22XdNPcnwf8V_3.vxfxzp9.jTX4Q0H577_qH9KU9MsyLucJpGpZuUvx9CMjjs2Pb29XzW0nL9PdJ_f5DLWgW6oTo.JdgIMRnc.GiLY.II1cmO_DgtlFPaJbjvgix244.GPXRy7sovVRX4X2Tym7B7ykj.X0df0r9E5ynfOwbHUyBo4WcU2pcD9pxDa7P10wHEZf7NjSDaEdjTRGM_yQ6Vy7SI.mnfFVqdVw2s- Received: from [71.110.50.19] by web32702.mail.mud.yahoo.com via HTTP; Sat, 09 Jan 2010 11:30:21 PST X-Mailer: YahooMailClassic/9.0.20 YahooMailWebService/0.8.100.260964 Date: Sat, 9 Jan 2010 11:30:21 -0800 (PST) From: Franklin Meng Subject: Re: Kworld 315U and SAA7113? To: linux-media@vger.kernel.org MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff -r b6b82258cf5e linux/drivers/media/video/em28xx/em28xx-cards.c --- a/linux/drivers/media/video/em28xx/em28xx-cards.c Thu Dec 31 19:14:54 2009 -0200 +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Sat Jan 09 11:26:13 2010 -0800 @@ -122,13 +122,31 @@ }; #endif +/* Kworld 315U + GPIO0 - Enable digital power (lgdt3303) - low to enable + GPIO1 - Enable analog power (saa7113/emp202) - low to enable + GPIO7 - enables something ? + GOP2 - ?? some sort of reset ? + GOP3 - lgdt3303 reset + */ /* Board - EM2882 Kworld 315U digital */ static struct em28xx_reg_seq em2882_kworld_315u_digital[] = { - {EM28XX_R08_GPIO, 0xff, 0xff, 10}, - {EM28XX_R08_GPIO, 0xfe, 0xff, 10}, + {EM28XX_R08_GPIO, 0x7e, 0xff, 10}, {EM2880_R04_GPO, 0x04, 0xff, 10}, {EM2880_R04_GPO, 0x0c, 0xff, 10}, - {EM28XX_R08_GPIO, 0x7e, 0xff, 10}, + { -1, -1, -1, -1}, +}; + +/* Board - EM2882 Kworld 315U analog1 analog tv */ +static struct em28xx_reg_seq em2882_kworld_315u_analog1[] = { + {EM28XX_R08_GPIO, 0xfd, 0xff, 10}, + {EM28XX_R08_GPIO, 0x7d, 0xff, 10}, + { -1, -1, -1, -1}, +}; + +/* Board - EM2882 Kworld 315U analog2 component/svideo */ +static struct em28xx_reg_seq em2882_kworld_315u_analog2[] = { + {EM28XX_R08_GPIO, 0xfd, 0xff, 10}, { -1, -1, -1, -1}, }; @@ -140,6 +158,14 @@ { -1, -1, -1, -1}, }; +/* Board - EM2882 Kworld 315U suspend */ +static struct em28xx_reg_seq em2882_kworld_315u_suspend[] = { + {EM28XX_R08_GPIO, 0xff, 0xff, 10}, + {EM2880_R04_GPO, 0x08, 0xff, 10}, + {EM2880_R04_GPO, 0x0c, 0xff, 10}, + { -1, -1, -1, -1}, +}; + static struct em28xx_reg_seq kworld_330u_analog[] = { {EM28XX_R08_GPIO, 0x6d, ~EM_GPIO_4, 10}, {EM2880_R04_GPO, 0x00, 0xff, 10}, @@ -1314,28 +1340,28 @@ .decoder = EM28XX_SAA711X, .has_dvb = 1, .dvb_gpio = em2882_kworld_315u_digital, + .suspend_gpio = em2882_kworld_315u_suspend, .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE, - /* Analog mode - still not ready */ - /*.input = { { + .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = SAA7115_COMPOSITE2, .amux = EM28XX_AMUX_VIDEO, - .gpio = em2882_kworld_315u_analog, + .gpio = em2882_kworld_315u_analog1, .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO, }, { .type = EM28XX_VMUX_COMPOSITE1, .vmux = SAA7115_COMPOSITE0, .amux = EM28XX_AMUX_LINE_IN, - .gpio = em2882_kworld_315u_analog1, + .gpio = em2882_kworld_315u_analog2, .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO, }, { .type = EM28XX_VMUX_SVIDEO, .vmux = SAA7115_SVIDEO3, .amux = EM28XX_AMUX_LINE_IN, - .gpio = em2882_kworld_315u_analog1, + .gpio = em2882_kworld_315u_analog2, .aout = EM28XX_AOUT_PCM_IN | EM28XX_AOUT_PCM_STEREO, - } }, */ + } }, }, [EM2880_BOARD_EMPIRE_DUAL_TV] = { .name = "Empire dual TV", diff -r b6b82258cf5e linux/drivers/media/video/em28xx/em28xx-core.c --- a/linux/drivers/media/video/em28xx/em28xx-core.c Thu Dec 31 19:14:54 2009 -0200 +++ b/linux/drivers/media/video/em28xx/em28xx-core.c Sat Jan 09 11:26:13 2010 -0800 @@ -1132,6 +1132,7 @@ */ void em28xx_wake_i2c(struct em28xx *dev) { + v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 1); v4l2_device_call_all(&dev->v4l2_dev, 0, core, reset, 0); v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing, INPUT(dev->ctl_input)->vmux, 0, 0); diff -r b6b82258cf5e linux/drivers/media/video/saa7115.c --- a/linux/drivers/media/video/saa7115.c Thu Dec 31 19:14:54 2009 -0200 +++ b/linux/drivers/media/video/saa7115.c Sat Jan 09 11:26:13 2010 -0800 @@ -1338,6 +1338,59 @@ return 0; } +static int saa711x_s_power(struct v4l2_subdev *sd, int val) +{ + struct saa711x_state *state = to_state(sd); + + if(val > 1 || val < 0) + return -EINVAL; + + /* There really isn't a way to put the chip into power saving + other than by pulling CE to ground so all we do is return + out of this function + */ + if(val == 0) + return 0; + + /* When enabling the chip again we need to reinitialize the + all the values + */ + state->input = -1; + state->output = SAA7115_IPORT_ON; + state->enable = 1; + state->radio = 0; + state->bright = 128; + state->contrast = 64; + state->hue = 0; + state->sat = 64; + + state->audclk_freq = 48000; + + v4l2_dbg(1, debug, sd, "writing init values s_power\n"); + + /* init to 60hz/48khz */ + state->crystal_freq = SAA7115_FREQ_24_576_MHZ; + switch (state->ident) { + case V4L2_IDENT_SAA7111: + saa711x_writeregs(sd, saa7111_init); + break; + case V4L2_IDENT_SAA7113: + saa711x_writeregs(sd, saa7113_init); + break; + default: + state->crystal_freq = SAA7115_FREQ_32_11_MHZ; + saa711x_writeregs(sd, saa7115_init_auto_input); + } + if (state->ident != V4L2_IDENT_SAA7111) + saa711x_writeregs(sd, saa7115_init_misc); + saa711x_set_v4lstd(sd, V4L2_STD_NTSC); + + v4l2_dbg(1, debug, sd, "status: (1E) 0x%02x, (1F) 0x%02x\n", + saa711x_read(sd, R_1E_STATUS_BYTE_1_VD_DEC), + saa711x_read(sd, R_1F_STATUS_BYTE_2_VD_DEC)); + return 0; +} + static int saa711x_reset(struct v4l2_subdev *sd, u32 val) { v4l2_dbg(1, debug, sd, "decoder RESET\n"); @@ -1513,6 +1566,7 @@ .s_std = saa711x_s_std, .reset = saa711x_reset, .s_gpio = saa711x_s_gpio, + .s_power = saa711x_s_power, #ifdef CONFIG_VIDEO_ADV_DEBUG .g_register = saa711x_g_register, .s_register = saa711x_s_register,