From 0a1a0397cd5d07a44a1dc31a1bfbbef02db0c93d Mon Sep 17 00:00:00 2001
From: Kassey Li <ygli@marvell.com>
Date: Fri, 20 May 2011 04:08:39 -0300
Subject: [PATCH] --- yaml --- r: 250290 b: refs/heads/master c:
 64149deb6a9ec35cc8a3ac3e7b5bc19d4a79ff44 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/soc_mediabus.c | 11 +++++++++++
 trunk/include/media/soc_mediabus.h       |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fab7af42caeb..54ee877251f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dac322db63473901ba9484690ee6864bb1292d0
+refs/heads/master: 64149deb6a9ec35cc8a3ac3e7b5bc19d4a79ff44
diff --git a/trunk/drivers/media/video/soc_mediabus.c b/trunk/drivers/media/video/soc_mediabus.c
index ed77aa055b63..13e86df78e56 100644
--- a/trunk/drivers/media/video/soc_mediabus.c
+++ b/trunk/drivers/media/video/soc_mediabus.c
@@ -130,6 +130,13 @@ static const struct soc_mbus_pixelfmt mbus_fmt[] = {
 		.packing		= SOC_MBUS_PACKING_2X8_PADLO,
 		.order			= SOC_MBUS_ORDER_BE,
 	},
+	[MBUS_IDX(JPEG_1X8)] = {
+		.fourcc                 = V4L2_PIX_FMT_JPEG,
+		.name                   = "JPEG",
+		.bits_per_sample        = 8,
+		.packing                = SOC_MBUS_PACKING_VARIABLE,
+		.order                  = SOC_MBUS_ORDER_LE,
+	},
 };
 
 int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf)
@@ -141,6 +148,8 @@ int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf)
 	case SOC_MBUS_PACKING_2X8_PADHI:
 	case SOC_MBUS_PACKING_2X8_PADLO:
 		return 2;
+	case SOC_MBUS_PACKING_VARIABLE:
+		return 0;
 	}
 	return -EINVAL;
 }
@@ -155,6 +164,8 @@ s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf)
 	case SOC_MBUS_PACKING_2X8_PADLO:
 	case SOC_MBUS_PACKING_EXTEND16:
 		return width * 2;
+	case SOC_MBUS_PACKING_VARIABLE:
+		return 0;
 	}
 	return -EINVAL;
 }
diff --git a/trunk/include/media/soc_mediabus.h b/trunk/include/media/soc_mediabus.h
index b338108ec305..3b5a70b97528 100644
--- a/trunk/include/media/soc_mediabus.h
+++ b/trunk/include/media/soc_mediabus.h
@@ -28,6 +28,7 @@ enum soc_mbus_packing {
 	SOC_MBUS_PACKING_2X8_PADHI,
 	SOC_MBUS_PACKING_2X8_PADLO,
 	SOC_MBUS_PACKING_EXTEND16,
+	SOC_MBUS_PACKING_VARIABLE,
 };
 
 /**