Content-Security-Policy: default-src 'none'
Content-Type: text/plain; charset=UTF-8
Content-Length: 1462
Content-Disposition: inline; filename="0142-V4L2-Enable-MJPEG-encoding.patch"
Last-Modified: Sun, 26 Jan 2025 02:43:14 GMT
Expires: Wed, 24 Jan 2035 02:43:14 GMT
ETag: "556919ced66c4504c7e3da1f068d6d6b3b09b6e3"

From 9878725ea0cedbc79d962e0ac041acdc1135d79c Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dsteve@broadcom.com>
Date: Mon, 23 Dec 2013 15:42:21 +0000
Subject: [PATCH 142/174] V4L2: Enable MJPEG encoding

Requires GPU firmware update to support MJPEG encoder.

Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
---
 drivers/media/platform/bcm2835/bcm2835-camera.c | 7 +++++++
 drivers/media/platform/bcm2835/mmal-encodings.h | 1 +
 2 files changed, 8 insertions(+)

--- a/drivers/media/platform/bcm2835/bcm2835-camera.c
+++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
@@ -100,6 +100,13 @@ static struct mmal_fmt formats[] = {
 	 .mmal = MMAL_ENCODING_H264,
 	 .depth = 8,
 	 .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
+	 },
+	{
+	 .name = "MJPEG",
+	 .fourcc = V4L2_PIX_FMT_MJPEG,
+	 .mmal = MMAL_ENCODING_MJPEG,
+	 .depth = 8,
+	 .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
 	 }
 };
 
--- a/drivers/media/platform/bcm2835/mmal-encodings.h
+++ b/drivers/media/platform/bcm2835/mmal-encodings.h
@@ -27,6 +27,7 @@
 #define MMAL_ENCODING_VP6              MMAL_FOURCC('V', 'P', '6', ' ')
 #define MMAL_ENCODING_THEORA           MMAL_FOURCC('T', 'H', 'E', 'O')
 #define MMAL_ENCODING_SPARK            MMAL_FOURCC('S', 'P', 'R', 'K')
+#define MMAL_ENCODING_MJPEG            MMAL_FOURCC('M', 'J', 'P', 'G')
 
 #define MMAL_ENCODING_JPEG             MMAL_FOURCC('J', 'P', 'E', 'G')
 #define MMAL_ENCODING_GIF              MMAL_FOURCC('G', 'I', 'F', ' ')
ion>
<option value='openwrt-19.07'>openwrt-19.07</option>
<option value='upstream'>upstream</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>upstream openwrt</td><td class='sub right'>James</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/openwrt/upstream/about/?h=v14.07'>about</a><a href='/cgit.cgi/openwrt/upstream/?h=v14.07'>summary</a><a href='/cgit.cgi/openwrt/upstream/refs/?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>refs</a><a href='/cgit.cgi/openwrt/upstream/log/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch?h=v14.07'>log</a><a class='active' href='/cgit.cgi/openwrt/upstream/tree/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>tree</a><a href='/cgit.cgi/openwrt/upstream/commit/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>commit</a><a href='/cgit.cgi/openwrt/upstream/diff/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>diff</a><a href='/cgit.cgi/openwrt/upstream/stats/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch?h=v14.07'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/upstream/log/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch'>
<input type='hidden' name='h' value='v14.07'/><input type='hidden' name='id' value='f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/openwrt/upstream/tree/?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>root</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>target</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>linux</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/gemini?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>gemini</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/gemini/patches-3.3?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>patches-3.3</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>121-arm-gemini-add-ethernet-device.patch</a></div><div class='content'>blob: 00100c0a96952033b4904c18129a0eb7f2771793 (<a href='/cgit.cgi/openwrt/upstream/plain/target/linux/gemini/patches-3.3/121-arm-gemini-add-ethernet-device.patch?h=v14.07&amp;id=f004690f1a9a4c5b67c10f0b1c32c1caaeed837d'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; margin: 0; }
td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight { background: #ffffff; }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span><span class="gd">--- a/arch/arm/mach-gemini/common.h</span>
<span class="gi">+++ b/arch/arm/mach-gemini/common.h</span>
<span class="gu">@@ -13,6 +13,7 @@</span>
 #define __GEMINI_COMMON_H__
 
 struct mtd_partition;
<span class="gi">+struct gemini_gmac_platform_data;</span>
 
 extern void gemini_map_io(void);
 extern void gemini_init_irq(void);
<span class="gu">@@ -26,5 +27,6 @@ extern int platform_register_pflash(unsi</span>
 				    struct mtd_partition *parts,
 				    unsigned int nr_parts);
 extern int platform_register_watchdog(void);
<span class="gi">+extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata);</span>
 
 #endif /* __GEMINI_COMMON_H__ */
<span class="gd">--- a/arch/arm/mach-gemini/devices.c</span>
<span class="gi">+++ b/arch/arm/mach-gemini/devices.c</span>
<span class="gu">@@ -17,6 +17,7 @@</span>
 #include &lt;mach/irqs.h&gt;
 #include &lt;mach/hardware.h&gt;
 #include &lt;mach/global_reg.h&gt;
<span class="gi">+#include &lt;mach/gmac.h&gt;</span>
 #include &quot;common.h&quot;
 
 static struct plat_serial8250_port serial_platform_data[] = {
<span class="gu">@@ -134,3 +135,53 @@ int __init platform_register_watchdog(vo</span>
 {
 	return platform_device_register(&amp;wdt_device);
 }
<span class="gi">+</span>
<span class="gi">+static struct resource gmac_resources[] = {</span>
<span class="gi">+	{</span>
<span class="gi">+		.start	= 0x60000000,</span>
<span class="gi">+		.end	= 0x6000ffff,</span>
<span class="gi">+		.flags	= IORESOURCE_MEM,</span>
<span class="gi">+	},</span>
<span class="gi">+	{</span>
<span class="gi">+		.start	= IRQ_GMAC0,</span>
<span class="gi">+		.end	= IRQ_GMAC0,</span>
<span class="gi">+		.flags	= IORESOURCE_IRQ,</span>
<span class="gi">+	},</span>
<span class="gi">+	{</span>
<span class="gi">+		.start	= IRQ_GMAC1,</span>
<span class="gi">+		.end	= IRQ_GMAC1,</span>
<span class="gi">+		.flags	= IORESOURCE_IRQ,</span>
<span class="gi">+	},</span>
<span class="gi">+};</span>
<span class="gi">+</span>
<span class="gi">+static u64 gmac_dmamask = 0xffffffffUL;</span>
<span class="gi">+</span>
<span class="gi">+static struct platform_device ethernet_device = {</span>
<span class="gi">+	.name	= &quot;gemini-gmac&quot;,</span>
<span class="gi">+	.id	= 0,</span>
<span class="gi">+	.dev	= {</span>
<span class="gi">+		.dma_mask = &amp;gmac_dmamask,</span>
<span class="gi">+		.coherent_dma_mask = DMA_BIT_MASK(32),</span>
<span class="gi">+	},</span>
<span class="gi">+	.num_resources	= ARRAY_SIZE(gmac_resources),</span>
<span class="gi">+	.resource	= gmac_resources,</span>
<span class="gi">+};</span>
<span class="gi">+</span>
<span class="gi">+int __init platform_register_ethernet(struct gemini_gmac_platform_data *pdata)</span>
<span class="gi">+{</span>
<span class="gi">+	unsigned int reg;</span>
<span class="gi">+</span>
<span class="gi">+	reg = __raw_readl(IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);</span>
<span class="gi">+	reg &amp;= ~(GMAC_GMII | GMAC_1_ENABLE);</span>
<span class="gi">+</span>
<span class="gi">+	if (pdata-&gt;bus_id[1])</span>
<span class="gi">+		reg |= GMAC_1_ENABLE;</span>
<span class="gi">+	else if (pdata-&gt;interface[0] == PHY_INTERFACE_MODE_GMII)</span>
<span class="gi">+		reg |= GMAC_GMII;</span>
<span class="gi">+</span>
<span class="gi">+	__raw_writel(reg, IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_MISC_CTRL);</span>
<span class="gi">+</span>
<span class="gi">+	ethernet_device.dev.platform_data = pdata;</span>
<span class="gi">+</span>
<span class="gi">+	return platform_device_register(&amp;ethernet_device);</span>
<span class="gi">+}</span>
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.25.1</a>) at 2025-01-26 02:43:14 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
