From patchwork Fri Jun 11 10:19:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raffaele Recalcati X-Patchwork-Id: 105560 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5BAWtWT020379 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 11 Jun 2010 10:33:31 GMT Received: from dlep34.itg.ti.com ([157.170.170.115]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5BALHhj008795 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 11 Jun 2010 05:21:36 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o5BALFFv011918; Fri, 11 Jun 2010 05:21:16 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 83CB680658; Fri, 11 Jun 2010 05:21:01 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 577E080626 for ; Fri, 11 Jun 2010 05:20:06 -0500 (CDT) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id o5BAK6xn016120 for ; Fri, 11 Jun 2010 05:20:06 -0500 (CDT) Received: from psmtp.com (na3sys009amx160.postini.com [74.125.149.86]) by medina.ext.ti.com (8.13.7/8.13.7) with SMTP id o5BAK5qi026681 for ; Fri, 11 Jun 2010 05:20:05 -0500 Received: from source ([74.125.82.173]) by na3sys009amx160.postini.com ([74.125.148.10]) with SMTP; Fri, 11 Jun 2010 03:20:05 PDT Received: by mail-wy0-f173.google.com with SMTP id 36so682492wyb.4 for ; Fri, 11 Jun 2010 03:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=7ah3GYgSWP0MJKkPqfLo74YY+C6B1RKsbx96QlBg3Xc=; b=BtFrYXUwvMQS+mTbeHMFy/Y76QqyiW+b+UWP1Rc4PqGrEtKrVPJqqQg1bGlCQLpE4Q W5OREPK/BbzElWuxH6j97VnGkynnDEN0L/ZftCL1l0IdlwxFxhp1x+66OrAAnLgp7Ci5 hPsv1jLhHfrVu99LIl+pth+etPFORViydcQpE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=R17Tr7JZ0Sy+81tZuTw/oltBqMKrrOa0/8ZZ5GreeqlGhdSuGs1FAgMAWSEYDGu8di dT+u/BhPZypEwE6HtqV1FPAyQRu0gtO15wIfj7OErm1gMiX/1OYJz/E3yKLJmCGKouNx 3SdNrc/d34V+mBPU0AyuENkXmj44BcOKr7qs8= Received: by 10.227.146.75 with SMTP id g11mr1636186wbv.130.1276251603493; Fri, 11 Jun 2010 03:20:03 -0700 (PDT) Received: from localhost.localdomain (host81-90-static.72-81-b.business.telecomitalia.it [81.72.90.81]) by mx.google.com with ESMTPS id p17sm530613wbe.14.2010.06.11.03.20.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 11 Jun 2010 03:20:02 -0700 (PDT) From: Raffaele Recalcati To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 03/14] davinci: dm365: Added swap between y and c data in isif port. Date: Fri, 11 Jun 2010 12:19:43 +0200 Message-Id: <1276251594-5936-3-git-send-email-lamiaposta71@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1276251594-5936-1-git-send-email-lamiaposta71@gmail.com> References: <1276251594-5936-1-git-send-email-lamiaposta71@gmail.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:26.20927/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: Raffaele Recalcati X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 11 Jun 2010 10:33:31 +0000 (UTC) diff --git a/drivers/media/video/davinci/isif.c b/drivers/media/video/davinci/isif.c index 29c29c6..02a8bdb 100644 --- a/drivers/media/video/davinci/isif.c +++ b/drivers/media/video/davinci/isif.c @@ -105,6 +105,7 @@ static struct isif_oper_config { .hd_pol = VPFE_PINPOL_POSITIVE, .pix_order = CCDC_PIXORDER_CBYCRY, .buf_type = CCDC_BUFTYPE_FLD_INTERLEAVED, + .ycswap = YCIN_NOT_SWP, }, .bayer = { .pix_fmt = CCDC_PIXFMT_RAW, @@ -864,6 +865,7 @@ static void isif_setfbaddr(unsigned long addr) static int isif_set_hw_if_params(struct vpfe_hw_if_param *params) { isif_cfg.if_type = params->if_type; + isif_cfg.ycbcr.ycswap = params->ycswap; switch (params->if_type) { case VPFE_BT656: @@ -914,7 +916,9 @@ static int isif_config_ycbcr(void) } modeset |= (VPFE_PINPOL_NEGATIVE << ISIF_VD_POL_SHIFT); regw(3, REC656IF); - ccdcfg = ccdcfg | ISIF_DATA_PACK8 | ISIF_YCINSWP_YCBCR; + ccdcfg = ccdcfg | ISIF_DATA_PACK8; + if (params->ycswap == YCIN_SWP) + ccdcfg |= ISIF_YCINSWP_YCBCR; break; case VPFE_BT656_10BIT: if (params->pix_fmt != CCDC_PIXFMT_YCBCR_8BIT) { diff --git a/include/media/davinci/isif.h b/include/media/davinci/isif.h index b0b74ad..b123f2c 100644 --- a/include/media/davinci/isif.h +++ b/include/media/davinci/isif.h @@ -466,6 +466,8 @@ struct isif_ycbcr_config { enum vpfe_pin_pol hd_pol; /* isif pix order. Only used for ycbcr capture */ enum ccdc_pixorder pix_order; + /* ccdc data connection. 8 bit ycbcr data bus connection */ + enum vpfe_data_swap ycswap; /* isif buffer type. Only used for ycbcr capture */ enum ccdc_buftype buf_type; }; diff --git a/include/media/davinci/vpfe_types.h b/include/media/davinci/vpfe_types.h index 76fb74b..337c917 100644 --- a/include/media/davinci/vpfe_types.h +++ b/include/media/davinci/vpfe_types.h @@ -40,12 +40,20 @@ enum vpfe_hw_if_type { VPFE_BT656_10BIT }; +/* 8 bit interface can be swapped */ +enum vpfe_data_swap { + YCIN_NOT_SWP, + YCIN_SWP, +}; + /* interface description */ struct vpfe_hw_if_param { enum vpfe_hw_if_type if_type; enum vpfe_pin_pol hdpol; enum vpfe_pin_pol vdpol; + enum vpfe_data_swap ycswap; }; + #endif #endif