Content-Security-Policy: default-src 'none'
Content-Type: text/plain; charset=UTF-8
Content-Length: 1300
Content-Disposition: inline; filename="950-0453-media-i2c-imx290-Replace-V4L2_CID_GAIN-with-V4L2_CID.patch"
Last-Modified: Fri, 26 Jul 2024 20:59:06 GMT
Expires: Mon, 24 Jul 2034 20:59:06 GMT
ETag: "7195802624e9ec5ba68b20dfd650a47ebe822fe2"

From 4a7aa2079f074dc7c2767bfa98eafb1a387f5129 Mon Sep 17 00:00:00 2001
From: David Plowman <david.plowman@raspberrypi.com>
Date: Thu, 4 Feb 2021 17:29:32 +0000
Subject: [PATCH] media: i2c: imx290: Replace V4L2_CID_GAIN with
 V4L2_CID_ANALOGUE_GAIN

Most software (including libcamera) requires V4L2_CID_ANALOGUE_GAIN,
not V4L2_CID_GAIN.

The range for the control is 0 to 100 for which the sensor uses only
analogue gain; higher values would involve digital gain which this
control should not apply.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
---
 drivers/media/i2c/imx290.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/media/i2c/imx290.c
+++ b/drivers/media/i2c/imx290.c
@@ -647,7 +647,7 @@ static int imx290_set_ctrl(struct v4l2_c
 		return 0;
 
 	switch (ctrl->id) {
-	case V4L2_CID_GAIN:
+	case V4L2_CID_ANALOGUE_GAIN:
 		ret = imx290_set_gain(imx290, ctrl->val);
 		break;
 	case V4L2_CID_EXPOSURE:
@@ -1331,7 +1331,7 @@ static int imx290_probe(struct i2c_clien
 	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
 
 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-			  V4L2_CID_GAIN, 0, 238, 1, 0);
+			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
 
 	mode = imx290->current_mode;
 	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
ion>
<option value='less-old-master'>less-old-master</option>
<option value='master'>master</option>
<option value='old-master'>old-master</option>
<option value='openwrt-18.06'>openwrt-18.06</option>
<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=v22.03.0-rc6'>about</a><a href='/cgit.cgi/openwrt/upstream/?h=v22.03.0-rc6'>summary</a><a href='/cgit.cgi/openwrt/upstream/refs/?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>refs</a><a href='/cgit.cgi/openwrt/upstream/log/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch?h=v22.03.0-rc6'>log</a><a class='active' href='/cgit.cgi/openwrt/upstream/tree/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>tree</a><a href='/cgit.cgi/openwrt/upstream/commit/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>commit</a><a href='/cgit.cgi/openwrt/upstream/diff/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>diff</a><a href='/cgit.cgi/openwrt/upstream/stats/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch?h=v22.03.0-rc6'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/upstream/log/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch'>
<input type='hidden' name='h' value='v22.03.0-rc6'/><input type='hidden' name='id' value='e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'/><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=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>root</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>target</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>linux</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/bcm27xx?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>bcm27xx</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/bcm27xx/patches-5.10?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>patches-5.10</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch</a></div><div class='content'>blob: 5a4205e4e5ba44762999d263c3334f17e54d872b (<a href='/cgit.cgi/openwrt/upstream/plain/target/linux/bcm27xx/patches-5.10/950-0434-overlays-give-Seeed-Studio-CAN-BUS-FD-HAT-a-v2-postf.patch?h=v22.03.0-rc6&amp;id=e0aaecdbb89eed44eb15fcc7e32f68a78d84a536'>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>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
<a id='n98' href='#n98'>98</a>
<a id='n99' href='#n99'>99</a>
<a id='n100' href='#n100'>100</a>
<a id='n101' href='#n101'>101</a>
<a id='n102' href='#n102'>102</a>
<a id='n103' href='#n103'>103</a>
<a id='n104' href='#n104'>104</a>
<a id='n105' href='#n105'>105</a>
<a id='n106' href='#n106'>106</a>
<a id='n107' href='#n107'>107</a>
<a id='n108' href='#n108'>108</a>
<a id='n109' href='#n109'>109</a>
<a id='n110' href='#n110'>110</a>
<a id='n111' href='#n111'>111</a>
<a id='n112' href='#n112'>112</a>
<a id='n113' href='#n113'>113</a>
<a id='n114' href='#n114'>114</a>
<a id='n115' href='#n115'>115</a>
<a id='n116' href='#n116'>116</a>
<a id='n117' href='#n117'>117</a>
<a id='n118' href='#n118'>118</a>
<a id='n119' href='#n119'>119</a>
<a id='n120' href='#n120'>120</a>
<a id='n121' href='#n121'>121</a>
<a id='n122' href='#n122'>122</a>
<a id='n123' href='#n123'>123</a>
<a id='n124' href='#n124'>124</a>
<a id='n125' href='#n125'>125</a>
<a id='n126' href='#n126'>126</a>
<a id='n127' href='#n127'>127</a>
<a id='n128' href='#n128'>128</a>
<a id='n129' href='#n129'>129</a>
<a id='n130' href='#n130'>130</a>
<a id='n131' href='#n131'>131</a>
<a id='n132' href='#n132'>132</a>
<a id='n133' href='#n133'>133</a>
<a id='n134' href='#n134'>134</a>
<a id='n135' href='#n135'>135</a>
<a id='n136' href='#n136'>136</a>
<a id='n137' href='#n137'>137</a>
<a id='n138' href='#n138'>138</a>
<a id='n139' href='#n139'>139</a>
<a id='n140' href='#n140'>140</a>
<a id='n141' href='#n141'>141</a>
<a id='n142' href='#n142'>142</a>
<a id='n143' href='#n143'>143</a>
<a id='n144' href='#n144'>144</a>
<a id='n145' href='#n145'>145</a>
<a id='n146' href='#n146'>146</a>
<a id='n147' href='#n147'>147</a>
<a id='n148' href='#n148'>148</a>
<a id='n149' href='#n149'>149</a>
<a id='n150' href='#n150'>150</a>
<a id='n151' href='#n151'>151</a>
<a id='n152' href='#n152'>152</a>
<a id='n153' href='#n153'>153</a>
<a id='n154' href='#n154'>154</a>
<a id='n155' href='#n155'>155</a>
<a id='n156' href='#n156'>156</a>
<a id='n157' href='#n157'>157</a>
<a id='n158' href='#n158'>158</a>
<a id='n159' href='#n159'>159</a>
<a id='n160' href='#n160'>160</a>
<a id='n161' href='#n161'>161</a>
<a id='n162' href='#n162'>162</a>
<a id='n163' href='#n163'>163</a>
<a id='n164' href='#n164'>164</a>
<a id='n165' href='#n165'>165</a>
<a id='n166' href='#n166'>166</a>
<a id='n167' href='#n167'>167</a>
<a id='n168' href='#n168'>168</a>
<a id='n169' href='#n169'>169</a>
<a id='n170' href='#n170'>170</a>
<a id='n171' href='#n171'>171</a>
<a id='n172' href='#n172'>172</a>
<a id='n173' href='#n173'>173</a>
<a id='n174' href='#n174'>174</a>
<a id='n175' href='#n175'>175</a>
<a id='n176' href='#n176'>176</a>
<a id='n177' href='#n177'>177</a>
<a id='n178' href='#n178'>178</a>
<a id='n179' href='#n179'>179</a>
<a id='n180' href='#n180'>180</a>
<a id='n181' href='#n181'>181</a>
<a id='n182' href='#n182'>182</a>
<a id='n183' href='#n183'>183</a>
<a id='n184' href='#n184'>184</a>
<a id='n185' href='#n185'>185</a>
<a id='n186' href='#n186'>186</a>
<a id='n187' href='#n187'>187</a>
<a id='n188' href='#n188'>188</a>
<a id='n189' href='#n189'>189</a>
<a id='n190' href='#n190'>190</a>
<a id='n191' href='#n191'>191</a>
<a id='n192' href='#n192'>192</a>
<a id='n193' href='#n193'>193</a>
<a id='n194' href='#n194'>194</a>
<a id='n195' href='#n195'>195</a>
<a id='n196' href='#n196'>196</a>
<a id='n197' href='#n197'>197</a>
<a id='n198' href='#n198'>198</a>
<a id='n199' href='#n199'>199</a>
<a id='n200' href='#n200'>200</a>
<a id='n201' href='#n201'>201</a>
<a id='n202' href='#n202'>202</a>
<a id='n203' href='#n203'>203</a>
<a id='n204' href='#n204'>204</a>
<a id='n205' href='#n205'>205</a>
<a id='n206' href='#n206'>206</a>
<a id='n207' href='#n207'>207</a>
<a id='n208' href='#n208'>208</a>
<a id='n209' href='#n209'>209</a>
<a id='n210' href='#n210'>210</a>
<a id='n211' href='#n211'>211</a>
<a id='n212' href='#n212'>212</a>
<a id='n213' href='#n213'>213</a>
<a id='n214' href='#n214'>214</a>
<a id='n215' href='#n215'>215</a>
<a id='n216' href='#n216'>216</a>
<a id='n217' href='#n217'>217</a>
<a id='n218' href='#n218'>218</a>
<a id='n219' href='#n219'>219</a>
<a id='n220' href='#n220'>220</a>
<a id='n221' href='#n221'>221</a>
<a id='n222' href='#n222'>222</a>
<a id='n223' href='#n223'>223</a>
<a id='n224' href='#n224'>224</a>
<a id='n225' href='#n225'>225</a>
<a id='n226' href='#n226'>226</a>
<a id='n227' href='#n227'>227</a>
<a id='n228' href='#n228'>228</a>
<a id='n229' href='#n229'>229</a>
<a id='n230' href='#n230'>230</a>
<a id='n231' href='#n231'>231</a>
<a id='n232' href='#n232'>232</a>
<a id='n233' href='#n233'>233</a>
<a id='n234' href='#n234'>234</a>
<a id='n235' href='#n235'>235</a>
<a id='n236' href='#n236'>236</a>
<a id='n237' href='#n237'>237</a>
<a id='n238' href='#n238'>238</a>
<a id='n239' href='#n239'>239</a>
<a id='n240' href='#n240'>240</a>
<a id='n241' href='#n241'>241</a>
<a id='n242' href='#n242'>242</a>
<a id='n243' href='#n243'>243</a>
<a id='n244' href='#n244'>244</a>
<a id='n245' href='#n245'>245</a>
<a id='n246' href='#n246'>246</a>
<a id='n247' href='#n247'>247</a>
<a id='n248' href='#n248'>248</a>
<a id='n249' href='#n249'>249</a>
<a id='n250' href='#n250'>250</a>
<a id='n251' href='#n251'>251</a>
<a id='n252' href='#n252'>252</a>
<a id='n253' href='#n253'>253</a>
<a id='n254' href='#n254'>254</a>
<a id='n255' href='#n255'>255</a>
<a id='n256' href='#n256'>256</a>
<a id='n257' href='#n257'>257</a>
<a id='n258' href='#n258'>258</a>
<a id='n259' href='#n259'>259</a>
<a id='n260' href='#n260'>260</a>
<a id='n261' href='#n261'>261</a>
<a id='n262' href='#n262'>262</a>
<a id='n263' href='#n263'>263</a>
<a id='n264' href='#n264'>264</a>
<a id='n265' href='#n265'>265</a>
<a id='n266' href='#n266'>266</a>
<a id='n267' href='#n267'>267</a>
<a id='n268' href='#n268'>268</a>
<a id='n269' href='#n269'>269</a>
<a id='n270' href='#n270'>270</a>
<a id='n271' href='#n271'>271</a>
<a id='n272' href='#n272'>272</a>
<a id='n273' href='#n273'>273</a>
<a id='n274' href='#n274'>274</a>
<a id='n275' href='#n275'>275</a>
<a id='n276' href='#n276'>276</a>
<a id='n277' href='#n277'>277</a>
<a id='n278' href='#n278'>278</a>
<a id='n279' href='#n279'>279</a>
<a id='n280' href='#n280'>280</a>
<a id='n281' href='#n281'>281</a>
<a id='n282' href='#n282'>282</a>
<a id='n283' href='#n283'>283</a>
<a id='n284' href='#n284'>284</a>
<a id='n285' href='#n285'>285</a>
<a id='n286' href='#n286'>286</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>From 69da0bd66630848403a1ccbb927d5325fc54381e Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde &lt;mkl@pengutronix.de&gt;
Date: Sat, 2 Jan 2021 21:08:59 +0100
Subject: [PATCH] overlays: give Seeed Studio CAN BUS FD HAT a -v2
 postfix

There are several versions of the Seeed Studio CAN BUS FD HAT. This is the
second version, based on the mcp2518fd, so give it a -v2 postfix.

Signed-off-by: Marc Kleine-Budde &lt;mkl@pengutronix.de&gt;
<span class="gd">---</span>
 arch/arm/boot/dts/overlays/Makefile                       | 2 +-
 arch/arm/boot/dts/overlays/README                         | 8 ++++----
 ...fd-hat-overlay.dts =&gt; seeed-can-fd-hat-v2-overlay.dts} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename arch/arm/boot/dts/overlays/{seeed-can-fd-hat-overlay.dts =&gt; seeed-can-fd-hat-v2-overlay.dts} (100%)

<span class="gd">--- a/arch/arm/boot/dts/overlays/Makefile</span>
<span class="gi">+++ b/arch/arm/boot/dts/overlays/Makefile</span>
<span class="gu">@@ -161,7 +161,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \</span>
 	sc16is752-spi1.dtbo \
 	sdhost.dtbo \
 	sdio.dtbo \
<span class="gd">-	seeed-can-fd-hat.dtbo \</span>
<span class="gi">+	seeed-can-fd-hat-v2.dtbo \</span>
 	sh1106-spi.dtbo \
 	smi.dtbo \
 	smi-dev.dtbo \
<span class="gd">--- a/arch/arm/boot/dts/overlays/README</span>
<span class="gi">+++ b/arch/arm/boot/dts/overlays/README</span>
<span class="gu">@@ -2504,11 +2504,11 @@ Info:   This overlay is now deprecated.</span>
 Load:   &lt;Deprecated&gt;
 
 
<span class="gd">-Name:   seeed-can-fd-hat</span>
<span class="gd">-Info:   Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD channels and an</span>
<span class="gd">-        RTC.</span>
<span class="gi">+Name:   seeed-can-fd-hat-v2</span>
<span class="gi">+Info:   Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD channels</span>
<span class="gi">+        (based on the mcp2518fd) and an RTC.</span>
         https://www.seeedstudio.com/CAN-BUS-FD-HAT-for-Raspberry-Pi-p-4742.html
<span class="gd">-Load:   dtoverlay=seeed-can-fd-hat</span>
<span class="gi">+Load:   dtoverlay=seeed-can-fd-hat-v2</span>
 Params: &lt;None&gt;
 
 
<span class="gd">--- a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts</span>
<span class="gi">+++ /dev/null</span>
<span class="gu">@@ -1,117 +0,0 @@</span>
<span class="gd">-// redo: ovmerge -c mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi0-1,interrupt=24 i2c-rtc-overlay.dts,pcf85063</span>
<span class="gd">-</span>
<span class="gd">-// Device tree overlay for https://www.seeedstudio.com/CAN-BUS-FD-HAT-for-Raspberry-Pi-p-4742.html </span>
<span class="gd">-</span>
<span class="gd">-/dts-v1/;</span>
<span class="gd">-/plugin/;</span>
<span class="gd">-</span>
<span class="gd">-#include &lt;dt-bindings/gpio/gpio.h&gt;</span>
<span class="gd">-#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</span>
<span class="gd">-#include &lt;dt-bindings/pinctrl/bcm2835.h&gt;</span>
<span class="gd">-</span>
<span class="gd">-/ {</span>
<span class="gd">-	compatible = &quot;brcm,bcm2835&quot;;</span>
<span class="gd">-	fragment@0 {</span>
<span class="gd">-		target = &lt;&amp;spidev0&gt;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			status = &quot;disabled&quot;;</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@1 {</span>
<span class="gd">-		target = &lt;&amp;gpio&gt;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			mcp251xfd_pins: mcp251xfd_spi0_0_pins {</span>
<span class="gd">-				brcm,pins = &lt;25&gt;;</span>
<span class="gd">-				brcm,function = &lt;BCM2835_FSEL_GPIO_IN&gt;;</span>
<span class="gd">-			};</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@2 {</span>
<span class="gd">-		target-path = &quot;/clocks&quot;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {</span>
<span class="gd">-				#clock-cells = &lt;0&gt;;</span>
<span class="gd">-				compatible = &quot;fixed-clock&quot;;</span>
<span class="gd">-				clock-frequency = &lt;40000000&gt;;</span>
<span class="gd">-			};</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@3 {</span>
<span class="gd">-		target = &lt;&amp;spi0&gt;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			status = &quot;okay&quot;;</span>
<span class="gd">-			#address-cells = &lt;1&gt;;</span>
<span class="gd">-			#size-cells = &lt;0&gt;;</span>
<span class="gd">-			mcp251xfd@0 {</span>
<span class="gd">-				compatible = &quot;microchip,mcp251xfd&quot;;</span>
<span class="gd">-				reg = &lt;0&gt;;</span>
<span class="gd">-				pinctrl-names = &quot;default&quot;;</span>
<span class="gd">-				pinctrl-0 = &lt;&amp;mcp251xfd_pins&gt;;</span>
<span class="gd">-				spi-max-frequency = &lt;20000000&gt;;</span>
<span class="gd">-				interrupt-parent = &lt;&amp;gpio&gt;;</span>
<span class="gd">-				interrupts = &lt;25 IRQ_TYPE_LEVEL_LOW&gt;;</span>
<span class="gd">-				clocks = &lt;&amp;clk_mcp251xfd_osc&gt;;</span>
<span class="gd">-			};</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@4 {</span>
<span class="gd">-		target = &lt;&amp;spidev1&gt;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			status = &quot;disabled&quot;;</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@5 {</span>
<span class="gd">-		target = &lt;&amp;gpio&gt;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			mcp251xfd_pins_1: mcp251xfd_spi0_1_pins {</span>
<span class="gd">-				brcm,pins = &lt;24&gt;;</span>
<span class="gd">-				brcm,function = &lt;BCM2835_FSEL_GPIO_IN&gt;;</span>
<span class="gd">-			};</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@6 {</span>
<span class="gd">-		target-path = &quot;/clocks&quot;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			clk_mcp251xfd_osc_1: mcp251xfd-spi0-1-osc {</span>
<span class="gd">-				#clock-cells = &lt;0&gt;;</span>
<span class="gd">-				compatible = &quot;fixed-clock&quot;;</span>
<span class="gd">-				clock-frequency = &lt;40000000&gt;;</span>
<span class="gd">-			};</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@7 {</span>
<span class="gd">-		target = &lt;&amp;spi0&gt;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			status = &quot;okay&quot;;</span>
<span class="gd">-			#address-cells = &lt;1&gt;;</span>
<span class="gd">-			#size-cells = &lt;0&gt;;</span>
<span class="gd">-			mcp251xfd@1 {</span>
<span class="gd">-				compatible = &quot;microchip,mcp251xfd&quot;;</span>
<span class="gd">-				reg = &lt;1&gt;;</span>
<span class="gd">-				pinctrl-names = &quot;default&quot;;</span>
<span class="gd">-				pinctrl-0 = &lt;&amp;mcp251xfd_pins_1&gt;;</span>
<span class="gd">-				spi-max-frequency = &lt;20000000&gt;;</span>
<span class="gd">-				interrupt-parent = &lt;&amp;gpio&gt;;</span>
<span class="gd">-				interrupts = &lt;24 IRQ_TYPE_LEVEL_LOW&gt;;</span>
<span class="gd">-				clocks = &lt;&amp;clk_mcp251xfd_osc_1&gt;;</span>
<span class="gd">-			};</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@8 {</span>
<span class="gd">-		target = &lt;&amp;i2cbus&gt;;</span>
<span class="gd">-		__overlay__ {</span>
<span class="gd">-			#address-cells = &lt;1&gt;;</span>
<span class="gd">-			#size-cells = &lt;0&gt;;</span>
<span class="gd">-			pcf85063@51 {</span>
<span class="gd">-				compatible = &quot;nxp,pcf85063&quot;;</span>
<span class="gd">-				reg = &lt;0x51&gt;;</span>
<span class="gd">-			};</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-	fragment@9 {</span>
<span class="gd">-		target = &lt;&amp;i2c_arm&gt;;</span>
<span class="gd">-		i2cbus: __overlay__ {</span>
<span class="gd">-			status = &quot;okay&quot;;</span>
<span class="gd">-		};</span>
<span class="gd">-	};</span>
<span class="gd">-};</span>
<span class="gd">--- /dev/null</span>
<span class="gi">+++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts</span>
<span class="gu">@@ -0,0 +1,117 @@</span>
<span class="gi">+// redo: ovmerge -c mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi0-1,interrupt=24 i2c-rtc-overlay.dts,pcf85063</span>
<span class="gi">+</span>
<span class="gi">+// Device tree overlay for https://www.seeedstudio.com/CAN-BUS-FD-HAT-for-Raspberry-Pi-p-4742.html </span>
<span class="gi">+</span>
<span class="gi">+/dts-v1/;</span>
<span class="gi">+/plugin/;</span>
<span class="gi">+</span>
<span class="gi">+#include &lt;dt-bindings/gpio/gpio.h&gt;</span>
<span class="gi">+#include &lt;dt-bindings/interrupt-controller/irq.h&gt;</span>
<span class="gi">+#include &lt;dt-bindings/pinctrl/bcm2835.h&gt;</span>
<span class="gi">+</span>
<span class="gi">+/ {</span>
<span class="gi">+	compatible = &quot;brcm,bcm2835&quot;;</span>
<span class="gi">+	fragment@0 {</span>
<span class="gi">+		target = &lt;&amp;spidev0&gt;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			status = &quot;disabled&quot;;</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@1 {</span>
<span class="gi">+		target = &lt;&amp;gpio&gt;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			mcp251xfd_pins: mcp251xfd_spi0_0_pins {</span>
<span class="gi">+				brcm,pins = &lt;25&gt;;</span>
<span class="gi">+				brcm,function = &lt;BCM2835_FSEL_GPIO_IN&gt;;</span>
<span class="gi">+			};</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@2 {</span>
<span class="gi">+		target-path = &quot;/clocks&quot;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {</span>
<span class="gi">+				#clock-cells = &lt;0&gt;;</span>
<span class="gi">+				compatible = &quot;fixed-clock&quot;;</span>
<span class="gi">+				clock-frequency = &lt;40000000&gt;;</span>
<span class="gi">+			};</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@3 {</span>
<span class="gi">+		target = &lt;&amp;spi0&gt;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			status = &quot;okay&quot;;</span>
<span class="gi">+			#address-cells = &lt;1&gt;;</span>
<span class="gi">+			#size-cells = &lt;0&gt;;</span>
<span class="gi">+			mcp251xfd@0 {</span>
<span class="gi">+				compatible = &quot;microchip,mcp251xfd&quot;;</span>
<span class="gi">+				reg = &lt;0&gt;;</span>
<span class="gi">+				pinctrl-names = &quot;default&quot;;</span>
<span class="gi">+				pinctrl-0 = &lt;&amp;mcp251xfd_pins&gt;;</span>
<span class="gi">+				spi-max-frequency = &lt;20000000&gt;;</span>
<span class="gi">+				interrupt-parent = &lt;&amp;gpio&gt;;</span>
<span class="gi">+				interrupts = &lt;25 IRQ_TYPE_LEVEL_LOW&gt;;</span>
<span class="gi">+				clocks = &lt;&amp;clk_mcp251xfd_osc&gt;;</span>
<span class="gi">+			};</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@4 {</span>
<span class="gi">+		target = &lt;&amp;spidev1&gt;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			status = &quot;disabled&quot;;</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@5 {</span>
<span class="gi">+		target = &lt;&amp;gpio&gt;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			mcp251xfd_pins_1: mcp251xfd_spi0_1_pins {</span>
<span class="gi">+				brcm,pins = &lt;24&gt;;</span>
<span class="gi">+				brcm,function = &lt;BCM2835_FSEL_GPIO_IN&gt;;</span>
<span class="gi">+			};</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@6 {</span>
<span class="gi">+		target-path = &quot;/clocks&quot;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			clk_mcp251xfd_osc_1: mcp251xfd-spi0-1-osc {</span>
<span class="gi">+				#clock-cells = &lt;0&gt;;</span>
<span class="gi">+				compatible = &quot;fixed-clock&quot;;</span>
<span class="gi">+				clock-frequency = &lt;40000000&gt;;</span>
<span class="gi">+			};</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@7 {</span>
<span class="gi">+		target = &lt;&amp;spi0&gt;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			status = &quot;okay&quot;;</span>
<span class="gi">+			#address-cells = &lt;1&gt;;</span>
<span class="gi">+			#size-cells = &lt;0&gt;;</span>
<span class="gi">+			mcp251xfd@1 {</span>
<span class="gi">+				compatible = &quot;microchip,mcp251xfd&quot;;</span>
<span class="gi">+				reg = &lt;1&gt;;</span>
<span class="gi">+				pinctrl-names = &quot;default&quot;;</span>
<span class="gi">+				pinctrl-0 = &lt;&amp;mcp251xfd_pins_1&gt;;</span>
<span class="gi">+				spi-max-frequency = &lt;20000000&gt;;</span>
<span class="gi">+				interrupt-parent = &lt;&amp;gpio&gt;;</span>
<span class="gi">+				interrupts = &lt;24 IRQ_TYPE_LEVEL_LOW&gt;;</span>
<span class="gi">+				clocks = &lt;&amp;clk_mcp251xfd_osc_1&gt;;</span>
<span class="gi">+			};</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@8 {</span>
<span class="gi">+		target = &lt;&amp;i2cbus&gt;;</span>
<span class="gi">+		__overlay__ {</span>
<span class="gi">+			#address-cells = &lt;1&gt;;</span>
<span class="gi">+			#size-cells = &lt;0&gt;;</span>
<span class="gi">+			pcf85063@51 {</span>
<span class="gi">+				compatible = &quot;nxp,pcf85063&quot;;</span>
<span class="gi">+				reg = &lt;0x51&gt;;</span>
<span class="gi">+			};</span>
<span class="gi">+		};</span>
<span class="gi">+	};</span>
<span class="gi">+	fragment@9 {</span>
<span class="gi">+		target = &lt;&amp;i2c_arm&gt;;</span>
<span class="gi">+		i2cbus: __overlay__ {</span>
<span class="gi">+			status = &quot;okay&quot;;</span>
<span class="gi">+		};</span>
<span class="gi">+	};</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 2024-07-26 20:59:06 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
