mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-09-09 04:58:35 +00:00
Compare commits
661 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
b91d6fc7d1 | ||
![]() |
0c7b5ceacd | ||
![]() |
2d5e477092 | ||
![]() |
854fe94ab1 | ||
![]() |
a3567cd462 | ||
![]() |
c5c5b6bcbe | ||
![]() |
bd6562edf6 | ||
![]() |
2d526a3d8f | ||
![]() |
3dc6801bc2 | ||
![]() |
cbbecc355b | ||
![]() |
fe1d3fc29a | ||
![]() |
1b639f2248 | ||
![]() |
08e9eee2c5 | ||
![]() |
72d4656b1f | ||
![]() |
88da93d0d5 | ||
![]() |
4642552b2f | ||
![]() |
c3c48556ae | ||
![]() |
31e6aa07c9 | ||
![]() |
d76d08efa2 | ||
![]() |
95910387ca | ||
![]() |
7b644d87b7 | ||
![]() |
4bfb3cf10d | ||
![]() |
5a8b0ac1a2 | ||
![]() |
cbc3e5fa27 | ||
![]() |
50392b5b86 | ||
![]() |
b21b821ddf | ||
![]() |
82764e7822 | ||
![]() |
382a3cc7be | ||
![]() |
e384a7642e | ||
![]() |
2f11d70a40 | ||
![]() |
535b8332f3 | ||
![]() |
7f02b83271 | ||
![]() |
f778503596 | ||
![]() |
64bc2ff1db | ||
![]() |
f37e9673d3 | ||
![]() |
e94a875c2e | ||
![]() |
2f06354c3e | ||
![]() |
2069ccf24f | ||
![]() |
3e66591d35 | ||
![]() |
248ad07b23 | ||
![]() |
3aac1ae373 | ||
![]() |
cd0c9032d3 | ||
![]() |
48c3c8ccdf | ||
![]() |
20f02d2887 | ||
![]() |
b9f65295b3 | ||
![]() |
6afd378bd6 | ||
![]() |
9c239480b2 | ||
![]() |
98ac18cbd5 | ||
![]() |
d7d9e08a61 | ||
![]() |
29c0f2f729 | ||
![]() |
fb4d7c5f2f | ||
![]() |
2e78964517 | ||
![]() |
cb0fa11eeb | ||
![]() |
89c4d57b18 | ||
![]() |
a66f3380e3 | ||
![]() |
288f4a0082 | ||
![]() |
622cbb806d | ||
![]() |
5c8a0307fb | ||
![]() |
51e80cb7bc | ||
![]() |
9e921ed9ad | ||
![]() |
56730adf48 | ||
![]() |
22aa316483 | ||
![]() |
d60272b79a | ||
![]() |
068a57763c | ||
![]() |
6810659f9b | ||
![]() |
8020671ca6 | ||
![]() |
0f57b55b4c | ||
![]() |
c7909de767 | ||
![]() |
c1c6a6ce21 | ||
![]() |
111018b911 | ||
![]() |
40b4d5ca2e | ||
![]() |
25d1f5d7d1 | ||
![]() |
d6a86c29f9 | ||
![]() |
2d3119ef22 | ||
![]() |
9dd269d766 | ||
![]() |
3c6897e2cd | ||
![]() |
7afe867fd5 | ||
![]() |
779dc0bcb8 | ||
![]() |
70d6252eae | ||
![]() |
9ed200a70e | ||
![]() |
be2cfd7622 | ||
![]() |
367fc1561b | ||
![]() |
5ac85a4c45 | ||
![]() |
3d793dc7ef | ||
![]() |
b76d55283d | ||
![]() |
422bf2d1e1 | ||
![]() |
33e0ccb9ce | ||
![]() |
f86fcbd609 | ||
![]() |
99a4d4ea75 | ||
![]() |
0b1c349a8f | ||
![]() |
2a910b0e45 | ||
![]() |
05ba57e006 | ||
![]() |
56e0d941d0 | ||
![]() |
2d9540117f | ||
![]() |
5cae40c396 | ||
![]() |
ae0aeb84f5 | ||
![]() |
c9d091c1b3 | ||
![]() |
a52f7ae02c | ||
![]() |
366bb0e495 | ||
![]() |
aff28ce60e | ||
![]() |
40a705bbd3 | ||
![]() |
1e1d10570c | ||
![]() |
fe1083822d | ||
![]() |
b4710290b6 | ||
![]() |
bb7964ff02 | ||
![]() |
7f934b4470 | ||
![]() |
0eef6473ba | ||
![]() |
9c6cb6e1f0 | ||
![]() |
98ce2bec4a | ||
![]() |
1d6ab42f88 | ||
![]() |
dde7f1d073 | ||
![]() |
ef25289a6d | ||
![]() |
82db02756c | ||
![]() |
905aa21e8c | ||
![]() |
ab19c8c6cf | ||
![]() |
fdd8c246dd | ||
![]() |
23fb6b8dd3 | ||
![]() |
45abe203f5 | ||
![]() |
86cabd3d1a | ||
![]() |
8fe1d2ddbe | ||
![]() |
a15671a530 | ||
![]() |
6f512527aa | ||
![]() |
7e702a2ab2 | ||
![]() |
37d2f13e49 | ||
![]() |
0a2fdf47b3 | ||
![]() |
55f8704523 | ||
![]() |
19c03729f3 | ||
![]() |
66e5ea3b4b | ||
![]() |
28e3b109b7 | ||
![]() |
a5256fb2d0 | ||
![]() |
f358f322da | ||
![]() |
b77d633382 | ||
![]() |
cd022e6d5e | ||
![]() |
27e6aa60fd | ||
![]() |
dc795cfc51 | ||
![]() |
4d2229e50b | ||
![]() |
82a40de894 | ||
![]() |
5c17e0974b | ||
![]() |
9db5dc7ab8 | ||
![]() |
9ba4dd5524 | ||
![]() |
32b037af32 | ||
![]() |
c2c05312a0 | ||
![]() |
b91c432fa8 | ||
![]() |
023d0b27f5 | ||
![]() |
57ffd6444b | ||
![]() |
8bbc330407 | ||
![]() |
76853d1171 | ||
![]() |
0daf748c97 | ||
![]() |
8aabf65bb7 | ||
![]() |
825ef58f85 | ||
![]() |
614ff50394 | ||
![]() |
907857985a | ||
![]() |
846512a283 | ||
![]() |
e646650a7e | ||
![]() |
038f1b4bd6 | ||
![]() |
d7c09e15b9 | ||
![]() |
2c3c066ea0 | ||
![]() |
184eb9e048 | ||
![]() |
ce1f07126f | ||
![]() |
0188f24a0d | ||
![]() |
581de22a06 | ||
![]() |
9764273894 | ||
![]() |
cc53ad4fd6 | ||
![]() |
142e7df6cf | ||
![]() |
4d6991fd45 | ||
![]() |
98ab22c119 | ||
![]() |
381d2aa8f7 | ||
![]() |
594c24eab7 | ||
![]() |
be2a64f4d2 | ||
![]() |
51bd8bd0e5 | ||
![]() |
4fa3329d59 | ||
![]() |
7959113c97 | ||
![]() |
cd385be81f | ||
![]() |
8ed6bc2e31 | ||
![]() |
68e63d15e5 | ||
![]() |
89c31bb967 | ||
![]() |
e3120df5d0 | ||
![]() |
59b687f0db | ||
![]() |
cee0123105 | ||
![]() |
22aede0278 | ||
![]() |
dadc82ae37 | ||
![]() |
26af1dd907 | ||
![]() |
c515dd19f2 | ||
![]() |
a39b8576e8 | ||
![]() |
a4d8e8492f | ||
![]() |
323f415fa8 | ||
![]() |
4255425b93 | ||
![]() |
7c70e3ef84 | ||
![]() |
d42f80c65e | ||
![]() |
c3cc81249b | ||
![]() |
d8273af0ad | ||
![]() |
a6bdf2c1c9 | ||
![]() |
14bb885ce9 | ||
![]() |
e5eefc9978 | ||
![]() |
6001c34091 | ||
![]() |
17d0cdf823 | ||
![]() |
8aceb287de | ||
![]() |
e42835f163 | ||
![]() |
1a8f9ca2e3 | ||
![]() |
162084082e | ||
![]() |
c2098e1cf4 | ||
![]() |
22c668b500 | ||
![]() |
6672046b6f | ||
![]() |
78b456d05c | ||
![]() |
2cc78abe56 | ||
![]() |
46bb12844f | ||
![]() |
1537d02408 | ||
![]() |
a66591166f | ||
![]() |
7443c45001 | ||
![]() |
a4f5670cd8 | ||
![]() |
c9c5f1b3e9 | ||
![]() |
b4c9f2fce2 | ||
![]() |
c48184cf91 | ||
![]() |
681fe1421a | ||
![]() |
acc293b662 | ||
![]() |
3a67e2e8c4 | ||
![]() |
8682d8af78 | ||
![]() |
b82707ff9a | ||
![]() |
525dcfedfb | ||
![]() |
18cc261e35 | ||
![]() |
bda9c3d715 | ||
![]() |
4cbbeeb7dc | ||
![]() |
beaad9ac9b | ||
![]() |
bf1eaf44d5 | ||
![]() |
c94f7933ef | ||
![]() |
01475a8c45 | ||
![]() |
9436661958 | ||
![]() |
e88ae15272 | ||
![]() |
1fa53bc3dc | ||
![]() |
1a6dcbbf5b | ||
![]() |
4be3dee0b4 | ||
![]() |
5756969be9 | ||
![]() |
8442d2ccfa | ||
![]() |
300986f129 | ||
![]() |
08cbbe8988 | ||
![]() |
827c97f0ca | ||
![]() |
3f5b28a0b4 | ||
![]() |
7c25f7c187 | ||
![]() |
52e21c9ccf | ||
![]() |
8d448a130c | ||
![]() |
39debca9fc | ||
![]() |
29e92f4231 | ||
![]() |
0797bccc36 | ||
![]() |
e8c2bacae6 | ||
![]() |
80f02b8ab6 | ||
![]() |
a0871be6c0 | ||
![]() |
25a0dd3082 | ||
![]() |
50d304d7f3 | ||
![]() |
021b2c0357 | ||
![]() |
f922c14f15 | ||
![]() |
92541b7280 | ||
![]() |
f5ff224358 | ||
![]() |
6bc6300149 | ||
![]() |
fe9fc1cbd2 | ||
![]() |
4f28a284be | ||
![]() |
094208492e | ||
![]() |
ce95fdccd3 | ||
![]() |
2c335a4dd9 | ||
![]() |
1a99d07cae | ||
![]() |
58d4b79376 | ||
![]() |
0b52271b3a | ||
![]() |
503117d8bf | ||
![]() |
c92b4b54be | ||
![]() |
5e44dcc681 | ||
![]() |
2d257bd671 | ||
![]() |
8ed04ed73c | ||
![]() |
737a6f18c3 | ||
![]() |
ac942b8ed9 | ||
![]() |
a8bad54efc | ||
![]() |
481a79eb28 | ||
![]() |
8cd7dfe822 | ||
![]() |
2416c6c26c | ||
![]() |
4eb0cd6460 | ||
![]() |
e43747c2e9 | ||
![]() |
5f8aeb1c6d | ||
![]() |
dcfb296dcf | ||
![]() |
fdcb94f0d8 | ||
![]() |
5f0a8fe627 | ||
![]() |
0495ba25ad | ||
![]() |
fa242e32d7 | ||
![]() |
fc3b098170 | ||
![]() |
2b0fff31a3 | ||
![]() |
dade3adf80 | ||
![]() |
b4fad03613 | ||
![]() |
59b8636bc8 | ||
![]() |
3337cd0f79 | ||
![]() |
0c7cd8023e | ||
![]() |
502ef82b80 | ||
![]() |
1708ed11b4 | ||
![]() |
59b9d82a55 | ||
![]() |
39babd5368 | ||
![]() |
2595dd815b | ||
![]() |
d1577a6a65 | ||
![]() |
f219f239d8 | ||
![]() |
ebc93692f5 | ||
![]() |
3af31c2265 | ||
![]() |
f4f6908c80 | ||
![]() |
31fc13cf03 | ||
![]() |
ec1561661b | ||
![]() |
272430a58c | ||
![]() |
1537e14dfc | ||
![]() |
22f7777099 | ||
![]() |
813030bb4c | ||
![]() |
31bb38ffd4 | ||
![]() |
b6cfe04422 | ||
![]() |
0ae67991d1 | ||
![]() |
f892334077 | ||
![]() |
2e2f6e893b | ||
![]() |
a2a4cf8668 | ||
![]() |
b8cf3face0 | ||
![]() |
1c991c229d | ||
![]() |
a3c5e670ef | ||
![]() |
ffc75a5053 | ||
![]() |
4d6246be4d | ||
![]() |
c6a1e668f4 | ||
![]() |
b19f83d74d | ||
![]() |
a877e0c3dd | ||
![]() |
265cb08e79 | ||
![]() |
c473aca701 | ||
![]() |
f93f8e34b3 | ||
![]() |
fa53c7bc99 | ||
![]() |
1f4bd67f7e | ||
![]() |
0c427d0dee | ||
![]() |
701e4f78aa | ||
![]() |
cd5cb880ea | ||
![]() |
cf033ec49d | ||
![]() |
0ec506470a | ||
![]() |
606da02461 | ||
![]() |
e49f8fe630 | ||
![]() |
02836524ce | ||
![]() |
50176a0e3b | ||
![]() |
06e7ee7efb | ||
![]() |
e08bbd7047 | ||
![]() |
653bcbe3ae | ||
![]() |
3700516097 | ||
![]() |
3fe09a4e6a | ||
![]() |
2b8dc1c913 | ||
![]() |
9f7a846d6b | ||
![]() |
466225806e | ||
![]() |
8e42ad5536 | ||
![]() |
39e78a1014 | ||
![]() |
cc4a6ebf96 | ||
![]() |
4a3837374f | ||
![]() |
f70067c570 | ||
![]() |
24b6463fbb | ||
![]() |
78152db78f | ||
![]() |
985f3b8e3d | ||
![]() |
245dc7603f | ||
![]() |
53bbc43ff3 | ||
![]() |
ad6ac0a770 | ||
![]() |
de67752a46 | ||
![]() |
a5eb7ffc8e | ||
![]() |
b09e5b5688 | ||
![]() |
a4c65b3fd1 | ||
![]() |
ec6f7978b5 | ||
![]() |
c9033551f2 | ||
![]() |
375e688938 | ||
![]() |
9d6b3a1d0b | ||
![]() |
43e4bc81d3 | ||
![]() |
4bcba322ff | ||
![]() |
0991cc1c25 | ||
![]() |
83cbc37422 | ||
![]() |
0909462d51 | ||
![]() |
27fc2de146 | ||
![]() |
be7228c7e6 | ||
![]() |
e51b1bd9eb | ||
![]() |
2706b4d866 | ||
![]() |
83af2731a8 | ||
![]() |
f66fbda032 | ||
![]() |
d215e81fb1 | ||
![]() |
afe39c279b | ||
![]() |
ee13d1fb45 | ||
![]() |
917f022614 | ||
![]() |
fc68bce7d9 | ||
![]() |
0363ddab37 | ||
![]() |
f18345a6c4 | ||
![]() |
8b13cfd902 | ||
![]() |
16313059d9 | ||
![]() |
deb072cb76 | ||
![]() |
b206787520 | ||
![]() |
0db61e85b0 | ||
![]() |
c3fba76142 | ||
![]() |
7fc9c7d03b | ||
![]() |
70c41b5690 | ||
![]() |
68522d2062 | ||
![]() |
3bb6442117 | ||
![]() |
2b3e806e56 | ||
![]() |
a034fc9997 | ||
![]() |
4861cc58ce | ||
![]() |
3160b59730 | ||
![]() |
032af2f56d | ||
![]() |
035e3884d8 | ||
![]() |
ce3c80641b | ||
![]() |
4eda8a1ff3 | ||
![]() |
b410b70814 | ||
![]() |
eca72c9898 | ||
![]() |
71974edfd7 | ||
![]() |
613604ea74 | ||
![]() |
6c62029a74 | ||
![]() |
a5209dc400 | ||
![]() |
1118335b1c | ||
![]() |
f96163f04e | ||
![]() |
b0dbbf963c | ||
![]() |
a38bf6e75a | ||
![]() |
0d892dbf23 | ||
![]() |
a403b790f7 | ||
![]() |
43aa64bb86 | ||
![]() |
ba17e542c5 | ||
![]() |
73dedf35de | ||
![]() |
96c622b36f | ||
![]() |
698f2bb7d4 | ||
![]() |
be39da4855 | ||
![]() |
b14d0223c2 | ||
![]() |
fcfd951f2b | ||
![]() |
fcefb1e515 | ||
![]() |
3070b52a3e | ||
![]() |
37639fc3ff | ||
![]() |
770bcb62a0 | ||
![]() |
b3530d1ce1 | ||
![]() |
ba9d1bac1e | ||
![]() |
db184bf5d3 | ||
![]() |
15a80bb405 | ||
![]() |
f0b5be41fe | ||
![]() |
517abe0ea9 | ||
![]() |
ca90fa515d | ||
![]() |
6605b1511f | ||
![]() |
f8b24f4b70 | ||
![]() |
ada03f6736 | ||
![]() |
04e679798a | ||
![]() |
6a49aa1c2b | ||
![]() |
34b7bbd68d | ||
![]() |
c0d8e14c2a | ||
![]() |
c017b43456 | ||
![]() |
98f13d9282 | ||
![]() |
5ef1e83197 | ||
![]() |
4df2ab6013 | ||
![]() |
45c62716cb | ||
![]() |
48f3045854 | ||
![]() |
3281cbd365 | ||
![]() |
5a6678147e | ||
![]() |
0c2b5aff65 | ||
![]() |
9dca4fc837 | ||
![]() |
fff08c6101 | ||
![]() |
1022053aef | ||
![]() |
0629c58d31 | ||
![]() |
bc2afe33b0 | ||
![]() |
2c963fcd05 | ||
![]() |
d4a403b640 | ||
![]() |
89cb68f7b7 | ||
![]() |
c371e45144 | ||
![]() |
2e7e039899 | ||
![]() |
c6e01d3468 | ||
![]() |
5336e17a06 | ||
![]() |
a017fae49d | ||
![]() |
96d59c2a40 | ||
![]() |
1f23c3ac72 | ||
![]() |
3f26a61d9a | ||
![]() |
6a728d916f | ||
![]() |
7f0ab07752 | ||
![]() |
7d7a52732d | ||
![]() |
2d6f692a4c | ||
![]() |
279a4c4db1 | ||
![]() |
a65db13c9e | ||
![]() |
a592fc9866 | ||
![]() |
66c1b016c9 | ||
![]() |
f9a3bccf7b | ||
![]() |
1c95022184 | ||
![]() |
d4deca66b2 | ||
![]() |
1c2ef541ea | ||
![]() |
55d84758a2 | ||
![]() |
82010866b1 | ||
![]() |
294ad6cd58 | ||
![]() |
bfdedbffe6 | ||
![]() |
d409e328be | ||
![]() |
a6ae25da06 | ||
![]() |
bc1266a44b | ||
![]() |
c1eb0ac4cd | ||
![]() |
9939422d10 | ||
![]() |
51cf310472 | ||
![]() |
f38a31eee3 | ||
![]() |
e388662422 | ||
![]() |
0258ef641d | ||
![]() |
bf29dd3971 | ||
![]() |
7314ce1963 | ||
![]() |
70d69d3518 | ||
![]() |
574c883207 | ||
![]() |
5812ed014e | ||
![]() |
13e4578b7a | ||
![]() |
d6a700565e | ||
![]() |
d9d8c96c70 | ||
![]() |
329caf6c1c | ||
![]() |
27ee3ef98f | ||
![]() |
63967cf6c0 | ||
![]() |
a874bb5fb5 | ||
![]() |
dc4ee61809 | ||
![]() |
febc4473d3 | ||
![]() |
7b379e648c | ||
![]() |
e4bff62923 | ||
![]() |
3839e43428 | ||
![]() |
9e8cccdf82 | ||
![]() |
f87032c302 | ||
![]() |
30aa775450 | ||
![]() |
308fccd7b1 | ||
![]() |
6e7bbdbe63 | ||
![]() |
4c9a4aadc8 | ||
![]() |
d340e79bea | ||
![]() |
09cf67cb73 | ||
![]() |
0ef7c459ca | ||
![]() |
bf9795f70b | ||
![]() |
712dcf9f74 | ||
![]() |
c42dba1623 | ||
![]() |
d44d271c28 | ||
![]() |
501b4bd9f4 | ||
![]() |
2fd14442c7 | ||
![]() |
4efd038805 | ||
![]() |
3e1adf8325 | ||
![]() |
60e4d1a3cd | ||
![]() |
a13089516e | ||
![]() |
2e3e518982 | ||
![]() |
c12ae11ed7 | ||
![]() |
956badb2fd | ||
![]() |
e71400cd5c | ||
![]() |
6668d77b93 | ||
![]() |
629f13f3d9 | ||
![]() |
dfe261a715 | ||
![]() |
756a0c9b13 | ||
![]() |
49948b577e | ||
![]() |
61516914ce | ||
![]() |
c424b295b1 | ||
![]() |
c37d0ecd76 | ||
![]() |
37615a135b | ||
![]() |
abf9a3b7c3 | ||
![]() |
c87ac63e9b | ||
![]() |
28d262eecd | ||
![]() |
d1d3593d65 | ||
![]() |
9f06ffbbd5 | ||
![]() |
b963b1a587 | ||
![]() |
998c8365c0 | ||
![]() |
70e43c02fb | ||
![]() |
fed40532c1 | ||
![]() |
08fac89fb0 | ||
![]() |
e7da2e0779 | ||
![]() |
3d999f8936 | ||
![]() |
b26d4bbb40 | ||
![]() |
e5734a9024 | ||
![]() |
8c691e8e56 | ||
![]() |
14d91e094a | ||
![]() |
2f40d76b6f | ||
![]() |
219e9ca1ef | ||
![]() |
f3f9bd9697 | ||
![]() |
2e205cafd3 | ||
![]() |
4d7e0977ac | ||
![]() |
0f93fcc477 | ||
![]() |
fa6f7ac74d | ||
![]() |
081f7124d7 | ||
![]() |
2caaf89186 | ||
![]() |
5a612922f3 | ||
![]() |
9f584f2c6a | ||
![]() |
ee4b3a101e | ||
![]() |
a04fa47883 | ||
![]() |
efc61a57d9 | ||
![]() |
1e627fed34 | ||
![]() |
20afea35d9 | ||
![]() |
db8127c253 | ||
![]() |
e03ea97133 | ||
![]() |
3d858e3bb6 | ||
![]() |
a0cba05830 | ||
![]() |
868935f8a0 | ||
![]() |
6581ec4028 | ||
![]() |
41d3f59002 | ||
![]() |
bb201fb842 | ||
![]() |
a55aaf7f38 | ||
![]() |
edcca58e38 | ||
![]() |
d1c2715402 | ||
![]() |
1febb31647 | ||
![]() |
d5e6cc78d5 | ||
![]() |
e8d14bdc60 | ||
![]() |
5f1fadad29 | ||
![]() |
5c38357ba6 | ||
![]() |
27aa12911d | ||
![]() |
c662ef86d7 | ||
![]() |
450a8295f7 | ||
![]() |
a13e7ad3e1 | ||
![]() |
3077b9423d | ||
![]() |
6204b3d165 | ||
![]() |
1624e26447 | ||
![]() |
cec027a6e6 | ||
![]() |
d347532c96 | ||
![]() |
d9c2347e7c | ||
![]() |
2e7c93428d | ||
![]() |
4455e9a907 | ||
![]() |
5d16ac24c3 | ||
![]() |
f715486c58 | ||
![]() |
7c77a692ce | ||
![]() |
ac5121f067 | ||
![]() |
e34b01755e | ||
![]() |
5971ee1a46 | ||
![]() |
6bda70a451 | ||
![]() |
9a9e2cc5df | ||
![]() |
3dbe3e9ea7 | ||
![]() |
3ad7dc3714 | ||
![]() |
1a3bcf6486 | ||
![]() |
6ddbfabfae | ||
![]() |
c72e61e542 | ||
![]() |
f8081d7829 | ||
![]() |
27c25da90d | ||
![]() |
d47e169bd5 | ||
![]() |
6510cf9619 | ||
![]() |
1419e72dbc | ||
![]() |
30448dbc5a | ||
![]() |
85c82c4479 | ||
![]() |
e21f59111c | ||
![]() |
543075222e | ||
![]() |
661b39565f | ||
![]() |
7439de3d25 | ||
![]() |
c9f4879780 | ||
![]() |
60cf077e48 | ||
![]() |
06e65b5734 | ||
![]() |
ac70f1bfac | ||
![]() |
1fc912eaf9 | ||
![]() |
83a0981113 | ||
![]() |
79dc34c531 | ||
![]() |
6ca35fb1af | ||
![]() |
e273883077 | ||
![]() |
0fb9102e69 | ||
![]() |
9a4027e9d4 | ||
![]() |
5e82060124 | ||
![]() |
d861ecae6f | ||
![]() |
061ab0ed8a | ||
![]() |
722f27d3c8 | ||
![]() |
57ec2bb25c | ||
![]() |
f0c38a20bc | ||
![]() |
267b61405d | ||
![]() |
98b14be0f6 | ||
![]() |
fa20ccdd94 | ||
![]() |
454964877d | ||
![]() |
16fcb84886 | ||
![]() |
1d40ffd4f9 | ||
![]() |
a21871f4af | ||
![]() |
ba01ed951b | ||
![]() |
7308bad953 | ||
![]() |
9415e2c5d0 | ||
![]() |
aa392e78a6 | ||
![]() |
2703ec31b9 | ||
![]() |
8cd0ca2cfe | ||
![]() |
c317941767 | ||
![]() |
d1cf8e0016 | ||
![]() |
188fbc340e | ||
![]() |
5e8f910714 | ||
![]() |
30b599acc6 | ||
![]() |
7b4be3b4f7 | ||
![]() |
662eda3c3b | ||
![]() |
aad41225f4 | ||
![]() |
d697c4bc8e | ||
![]() |
2a2e97ddf9 | ||
![]() |
32fe415515 | ||
![]() |
292e4b3515 | ||
![]() |
1a337ab937 | ||
![]() |
43828c2555 | ||
![]() |
73a875c263 | ||
![]() |
c270ac5c9a |
@@ -3,5 +3,9 @@ buildroot/
|
|||||||
buildroot-external/
|
buildroot-external/
|
||||||
buildroot-patches/
|
buildroot-patches/
|
||||||
|
|
||||||
# Ignore too
|
# Release directory gets created using build scripts
|
||||||
release/
|
release/
|
||||||
|
|
||||||
|
# Ignore hidden directories as well
|
||||||
|
.git/
|
||||||
|
.github/
|
||||||
|
54
.github/ISSUE_TEMPLATE.md
vendored
Normal file
54
.github/ISSUE_TEMPLATE.md
vendored
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
<!-- READ THIS FIRST:
|
||||||
|
- If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
|
||||||
|
- Make sure you are running the latest version before reporting an issue: https://github.com/home-assistant/operating-system/releases
|
||||||
|
- Do not report issues for integrations here, please refer to https://github.com/home-assistant/core/issues
|
||||||
|
- Do not report issues for Add-Ons here, please refer to
|
||||||
|
Official Add-ons: https://github.com/home-assistant/addons/issues
|
||||||
|
Home Assistant Community Add-ons: https://github.com/hassio-addons/repository
|
||||||
|
- This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
|
||||||
|
- Provide as many details as possible. Paste logs, configuration sample and code using blocks with three backticks. Do not delete text from this template!
|
||||||
|
- Please add modifications to boot files, e.g. if you are using Raspberry Pi and did modifications in config.txt.
|
||||||
|
-->
|
||||||
|
|
||||||
|
**Hardware Environment**
|
||||||
|
<!--
|
||||||
|
Describe the Home Assistant image you are using and the hardware environment
|
||||||
|
-->
|
||||||
|
- [ ] Raspberry Pi [1/2/3/4]
|
||||||
|
- [ ] ODROID [C2/C4/N2(+)/XU4]
|
||||||
|
- [ ] ASUS Tinker [S]
|
||||||
|
- [ ] Generic x86-64 (like Intel NUC)
|
||||||
|
- [ ] OVA (Open Virtualization Appliance, on Intel NUC or any other hardware, please add the Hypervisor you are using)
|
||||||
|
|
||||||
|
**Home Assistant OS release:**
|
||||||
|
- [ ] Fresh installation of release x.y
|
||||||
|
- [ ] Updated from version x.y
|
||||||
|
- Additional information (if accessible):
|
||||||
|
<!--
|
||||||
|
- Home Assistant Frontend -> Configuration -> Info (use the copy button in the System Health block)
|
||||||
|
- Or use this command: `ha info`
|
||||||
|
-->
|
||||||
|
|
||||||
|
**Supervisor logs:**
|
||||||
|
<!--
|
||||||
|
- Home Assistant Frontend -> Supervisor -> System (Log Provider Supervisor)
|
||||||
|
- Or use this command: ha su logs
|
||||||
|
-->
|
||||||
|
|
||||||
|
**Journal logs:**
|
||||||
|
<!--
|
||||||
|
- Enable SSH on OS level and login, then use `journalctl`
|
||||||
|
-->
|
||||||
|
|
||||||
|
**Kernel logs:**
|
||||||
|
<!--
|
||||||
|
- use this command: dmesg
|
||||||
|
- Enable SSH on OS level and login, then use `dmesg`.
|
||||||
|
-->
|
||||||
|
|
||||||
|
**Description of problem:**
|
||||||
|
<!--
|
||||||
|
- Is the problem reproducible?
|
||||||
|
- Has this been working before (is this a regression?)
|
||||||
|
- Has there been attempt to rule out hardware issues? (different SD card etc.)
|
||||||
|
-->
|
21
.github/release-drafter.yml
vendored
Normal file
21
.github/release-drafter.yml
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
categories:
|
||||||
|
- title: 'Home Assistant Operating System'
|
||||||
|
label: 'os'
|
||||||
|
- title: 'Build System'
|
||||||
|
label: 'build'
|
||||||
|
- title: 'Raspberry Pi'
|
||||||
|
label: 'board/raspberrypi'
|
||||||
|
- title: 'Open Virtual Appliance'
|
||||||
|
label: 'board/ova'
|
||||||
|
- title: 'Generic x86-64'
|
||||||
|
label: 'board/generic-x86-64'
|
||||||
|
- title: 'Hardkernel ODROID'
|
||||||
|
label: 'board/odroid'
|
||||||
|
- title: 'ASUS Tinker'
|
||||||
|
label: 'board/tinker'
|
||||||
|
filter-by-commitish: true
|
||||||
|
commitish: dev
|
||||||
|
template: |
|
||||||
|
## Changes
|
||||||
|
|
||||||
|
$CHANGES
|
17
.github/stale.yml
vendored
Normal file
17
.github/stale.yml
vendored
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
# Number of days of inactivity before an issue becomes stale
|
||||||
|
daysUntilStale: 60
|
||||||
|
# Number of days of inactivity before a stale issue is closed
|
||||||
|
daysUntilClose: 7
|
||||||
|
# Issues with these labels will never be considered stale
|
||||||
|
exemptLabels:
|
||||||
|
- pinned
|
||||||
|
- security
|
||||||
|
# Label to use when marking an issue as stale
|
||||||
|
staleLabel: wontfix
|
||||||
|
# Comment to post when marking an issue as stale. Set to `false` to disable
|
||||||
|
markComment: >
|
||||||
|
This issue has been automatically marked as stale because it has not had
|
||||||
|
recent activity. It will be closed if no further activity occurs. Thank you
|
||||||
|
for your contributions.
|
||||||
|
# Comment to post when closing a stale issue. Set to `false` to disable
|
||||||
|
closeComment: false
|
109
.github/workflows/dev.yml
vendored
Normal file
109
.github/workflows/dev.yml
vendored
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
# Home Assistant Operating System build workflow
|
||||||
|
|
||||||
|
name: Development build
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
version:
|
||||||
|
|
||||||
|
name: Generate version
|
||||||
|
runs-on: [ "ubuntu-20.04" ]
|
||||||
|
outputs:
|
||||||
|
version_main: ${{ steps.version_main.outputs.version_main }}
|
||||||
|
version_dev: ${{ steps.version_dev.outputs.version_dev }}
|
||||||
|
steps:
|
||||||
|
- name: Generate Development build version
|
||||||
|
shell: bash
|
||||||
|
id: version_dev
|
||||||
|
run: |
|
||||||
|
version_dev="dev$(date --utc +'%Y%m%d')"
|
||||||
|
echo "Development version \"${version_dev}\""
|
||||||
|
echo "::set-output name=version_dev::${version_dev}"
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: Get Major/Minor version
|
||||||
|
id: version_main
|
||||||
|
run: |
|
||||||
|
major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
|
||||||
|
build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
|
||||||
|
echo "::set-output name=version_main::${major}.${build}"
|
||||||
|
|
||||||
|
build:
|
||||||
|
name: Release build for ${{ matrix.board.name }}
|
||||||
|
needs: version
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
board:
|
||||||
|
- {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
|
||||||
|
- {"name": "generic_x86_64", "output": "generic-x86-64", "runner": "x86-64-runner"}
|
||||||
|
- {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "odroid_xu4", "output": "odroid-xu4" , "runner": "aarch64-runner"}
|
||||||
|
- {"name": "rpi", "output": "rpi", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi0_w", "output": "rpi0-w", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi2", "output": "rpi2", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi3", "output": "rpi3", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi3_64", "output": "rpi3-64", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "rpi4", "output": "rpi4", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi4_64", "output": "rpi4-64", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "tinker", "output": "tinker", "runner": "arm-runner"}
|
||||||
|
runs-on: ${{ matrix.board.runner }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Build container
|
||||||
|
run: docker build -t haos-builder .
|
||||||
|
|
||||||
|
- name: 'Add release PKI certs'
|
||||||
|
env:
|
||||||
|
RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
|
||||||
|
RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
|
||||||
|
run: |
|
||||||
|
echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
|
||||||
|
echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
BUILDER_UID="$(id -u)"
|
||||||
|
BUILDER_GID="$(id -g)"
|
||||||
|
docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
|
||||||
|
-e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
|
||||||
|
-v "${{ matrix.board.runner }}-build-cache:/cache" \
|
||||||
|
haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.version.outputs.version_dev }} ${{ matrix.board.name }}
|
||||||
|
|
||||||
|
- name: Upload images
|
||||||
|
uses: appleboy/scp-action@master
|
||||||
|
with:
|
||||||
|
host: ${{ secrets.DEV_HOST }}
|
||||||
|
username: ${{ secrets.DEV_USERNAME }}
|
||||||
|
port: ${{ secrets.DEV_PORT }}
|
||||||
|
key: ${{ secrets.DEV_SCP_KEY }}
|
||||||
|
source: "release/*"
|
||||||
|
target: ${{ secrets.DEV_TARGET_PATH }}/${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}/
|
||||||
|
strip_components: 1
|
||||||
|
|
||||||
|
bump_version:
|
||||||
|
name: Bump dev version to ${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}
|
||||||
|
needs: [ build, version ]
|
||||||
|
runs-on: [ "ubuntu-20.04" ]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Initialize git
|
||||||
|
uses: home-assistant/actions/helpers/git-init@master
|
||||||
|
with:
|
||||||
|
name: ${{ secrets.GIT_NAME }}
|
||||||
|
email: ${{ secrets.GIT_EMAIL }}
|
||||||
|
token: ${{ secrets.GIT_TOKEN }}
|
||||||
|
|
||||||
|
- name: Bump Home Assistant OS dev version
|
||||||
|
uses: home-assistant/actions/helpers/version-push@master
|
||||||
|
with:
|
||||||
|
key: "hassos[]"
|
||||||
|
key-description: "Home Assistant OS"
|
||||||
|
version: ${{ needs.version.outputs.version_main }}.${{ needs.version.outputs.version_dev }}
|
||||||
|
channel: "dev"
|
20
.github/workflows/pr-checks.yml
vendored
Normal file
20
.github/workflows/pr-checks.yml
vendored
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
# Home Assistant Operating System pull-request checks
|
||||||
|
|
||||||
|
name: PR checks
|
||||||
|
|
||||||
|
on: [pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
linters:
|
||||||
|
runs-on: ubuntu-20.04
|
||||||
|
steps:
|
||||||
|
- name: Check out code
|
||||||
|
uses: actions/checkout@v1
|
||||||
|
- name: Check Dockerfile
|
||||||
|
uses: brpaz/hadolint-action@v1.1.0
|
||||||
|
with:
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
- name: Check shell scripts
|
||||||
|
uses: ludeeus/action-shellcheck@1.0.0
|
||||||
|
with:
|
||||||
|
ignore: "buildroot"
|
15
.github/workflows/release-drafter.yml
vendored
Normal file
15
.github/workflows/release-drafter.yml
vendored
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
name: Release Drafter
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- dev
|
||||||
|
- rel-4
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update_release_draft:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: release-drafter/release-drafter@v5
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
179
.github/workflows/release.yml
vendored
Normal file
179
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,179 @@
|
|||||||
|
# Home Assistant Operating System release build workflow
|
||||||
|
|
||||||
|
name: Release build
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [published]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
validate_release:
|
||||||
|
name: Validate release
|
||||||
|
runs-on: [ "ubuntu-20.04" ]
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.version_check.outputs.version }}
|
||||||
|
version_dev: ${{ steps.version_check.outputs.version_dev }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: Validate version
|
||||||
|
id: version_check
|
||||||
|
run: |
|
||||||
|
major=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_MAJOR | cut -d'=' -f2)
|
||||||
|
build=$(cat ${GITHUB_WORKSPACE}/buildroot-external/meta | grep VERSION_BUILD | cut -d'=' -f2)
|
||||||
|
tag_major=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 1)
|
||||||
|
tag_build=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 2)
|
||||||
|
tag_dev=$(echo "${{ github.event.release.tag_name }}" | cut -d '.' -f 3)
|
||||||
|
if [ "${major}.${build}" != "${tag_major}.${tag_build}" ]; then
|
||||||
|
echo "Version number in Buildroot metadata is does not match tag (${major}.${build} vs ${{ github.event.release.tag_name }})."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ "" != "${tag_dev}" ]; then
|
||||||
|
echo "Note: Release build with custom dev part: ${tag_dev}."
|
||||||
|
echo "::set-output name=version::${major}.${build}.${tag_dev}"
|
||||||
|
else
|
||||||
|
echo "::set-output name=version::${major}.${build}"
|
||||||
|
fi
|
||||||
|
echo "::set-output name=version_dev::${tag_dev}"
|
||||||
|
|
||||||
|
build:
|
||||||
|
name: Release build for ${{ matrix.board.name }}
|
||||||
|
needs: validate_release
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
board:
|
||||||
|
- {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
|
||||||
|
- {"name": "generic_x86_64", "output": "generic-x86-64", "runner": "x86-64-runner"}
|
||||||
|
- {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "odroid_xu4", "output": "odroid-xu4" , "runner": "aarch64-runner"}
|
||||||
|
- {"name": "rpi", "output": "rpi", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi0_w", "output": "rpi0-w", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi2", "output": "rpi2", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi3", "output": "rpi3", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi3_64", "output": "rpi3-64", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "rpi4", "output": "rpi4", "runner": "arm-runner"}
|
||||||
|
- {"name": "rpi4_64", "output": "rpi4-64", "runner": "aarch64-runner"}
|
||||||
|
- {"name": "tinker", "output": "tinker", "runner": "arm-runner"}
|
||||||
|
runs-on: ${{ matrix.board.runner }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Build container
|
||||||
|
run: docker build -t haos-builder .
|
||||||
|
|
||||||
|
- name: 'Add release PKI certs'
|
||||||
|
env:
|
||||||
|
RAUC_CERTIFICATE: ${{ secrets.RAUC_CERTIFICATE }}
|
||||||
|
RAUC_PRIVATE_KEY: ${{ secrets.RAUC_PRIVATE_KEY }}
|
||||||
|
run: |
|
||||||
|
echo -e "-----BEGIN CERTIFICATE-----\n${RAUC_CERTIFICATE}\n-----END CERTIFICATE-----" > cert.pem
|
||||||
|
echo -e "-----BEGIN PRIVATE KEY-----\n${RAUC_PRIVATE_KEY}\n-----END PRIVATE KEY-----" > key.pem
|
||||||
|
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
BUILDER_UID="$(id -u)"
|
||||||
|
BUILDER_GID="$(id -g)"
|
||||||
|
docker run --rm --privileged -v "${GITHUB_WORKSPACE}:/build" \
|
||||||
|
-e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
|
||||||
|
-v "${{ matrix.board.runner }}-build-cache:/cache" \
|
||||||
|
haos-builder make BUILDDIR=/build VERSION_DEV=${{ needs.validate_release.outputs.version_dev }} ${{ matrix.board.name }}
|
||||||
|
|
||||||
|
- name: Upload disk image
|
||||||
|
if: ${{ matrix.board.name != 'ova' }}
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
|
||||||
|
asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.img.xz
|
||||||
|
asset_content_type: application/x-xz
|
||||||
|
|
||||||
|
- name: Upload rauc update
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
|
||||||
|
asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.raucb
|
||||||
|
asset_content_type: application/octet-stream
|
||||||
|
|
||||||
|
- name: Upload ova image
|
||||||
|
if: ${{ matrix.board.name == 'ova' }}
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
|
||||||
|
asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.ova
|
||||||
|
asset_content_type: application/x-tar
|
||||||
|
|
||||||
|
- name: Upload qcow2 image
|
||||||
|
if: ${{ matrix.board.name == 'ova' }}
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
|
||||||
|
asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.qcow2.xz
|
||||||
|
asset_content_type: application/x-xz
|
||||||
|
|
||||||
|
- name: Upload vdi image
|
||||||
|
if: ${{ matrix.board.name == 'ova' }}
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.zip
|
||||||
|
asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vdi.zip
|
||||||
|
asset_content_type: application/zip
|
||||||
|
|
||||||
|
- name: Upload vhdx image
|
||||||
|
if: ${{ matrix.board.name == 'ova' }}
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
|
||||||
|
asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vhdx.zip
|
||||||
|
asset_content_type: application/zip
|
||||||
|
|
||||||
|
- name: Upload vmdk image
|
||||||
|
if: ${{ matrix.board.name == 'ova' }}
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.release.upload_url }}
|
||||||
|
asset_path: ${{ github.workspace }}/release/haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
|
||||||
|
asset_name: haos_${{ matrix.board.output }}-${{ needs.validate_release.outputs.version }}.vmdk.zip
|
||||||
|
asset_content_type: application/zip
|
||||||
|
|
||||||
|
bump_version:
|
||||||
|
name: Bump dev version to ${{ needs.validate_release.outputs.version }}
|
||||||
|
needs: [ build, validate_release ]
|
||||||
|
runs-on: [ "ubuntu-20.04" ]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Initialize git
|
||||||
|
uses: home-assistant/actions/helpers/git-init@master
|
||||||
|
with:
|
||||||
|
name: ${{ secrets.GIT_NAME }}
|
||||||
|
email: ${{ secrets.GIT_EMAIL }}
|
||||||
|
token: ${{ secrets.GIT_TOKEN }}
|
||||||
|
|
||||||
|
- name: Bump Home Assistant OS beta version
|
||||||
|
uses: home-assistant/actions/helpers/version-push@master
|
||||||
|
with:
|
||||||
|
key: "hassos[]"
|
||||||
|
key-description: "Home Assistant OS"
|
||||||
|
version: ${{ needs.validate_release.outputs.version }}
|
||||||
|
channel: "beta"
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
|
.DS_Store
|
||||||
/release
|
/release
|
||||||
*.pem
|
*.pem
|
||||||
|
2
.hadolint.yaml
Normal file
2
.hadolint.yaml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
ignored:
|
||||||
|
- DL3008
|
25
.travis.yml
25
.travis.yml
@@ -1,25 +0,0 @@
|
|||||||
language: bash
|
|
||||||
|
|
||||||
sudo: required
|
|
||||||
service: docker
|
|
||||||
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- docker-ce
|
|
||||||
|
|
||||||
before_install:
|
|
||||||
- shopt -s globstar
|
|
||||||
- docker pull koalaman/shellcheck
|
|
||||||
|
|
||||||
script:
|
|
||||||
- docker run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh
|
|
||||||
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
|
|
||||||
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
|
|
||||||
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh
|
|
||||||
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*
|
|
||||||
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*
|
|
||||||
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
fast_finish: true
|
|
45
Dockerfile
45
Dockerfile
@@ -1,21 +1,46 @@
|
|||||||
FROM ubuntu:18.04
|
FROM debian:buster
|
||||||
|
|
||||||
|
# Set shell
|
||||||
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
apt-transport-https \
|
apt-transport-https \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
|
gpg-agent \
|
||||||
|
gpg \
|
||||||
|
dirmngr \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
|
||||||
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
|
&& add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
|
||||||
&& add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
|
&& apt-get update && apt-get install -y --no-install-recommends \
|
||||||
&& apt-get update && apt-get install -y docker-ce \
|
docker-ce \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Build Tools
|
# Build tools
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \
|
bash \
|
||||||
git make g++ file perl bash binutils locales qemu-utils bison flex \
|
bc \
|
||||||
|
binutils \
|
||||||
|
build-essential \
|
||||||
|
bzip2 \
|
||||||
|
cpio \
|
||||||
|
file \
|
||||||
|
git \
|
||||||
|
make \
|
||||||
|
ncurses-dev \
|
||||||
|
patch \
|
||||||
|
perl \
|
||||||
|
python \
|
||||||
|
rsync \
|
||||||
|
sudo \
|
||||||
|
unzip \
|
||||||
|
zip \
|
||||||
|
wget \
|
||||||
|
qemu-utils \
|
||||||
|
openssh-client \
|
||||||
|
vim \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Init entry
|
# Init entry
|
||||||
|
13
Documentation/README.md
Normal file
13
Documentation/README.md
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Developer Documentation
|
||||||
|
|
||||||
|
## Contents
|
||||||
|
|
||||||
|
- [Getting started](./getting_started_development.md) - the place for developers to begin
|
||||||
|
- [Development](./development.md) - more details for developers
|
||||||
|
- [Deployment](./deployment.md) - approach to git branching and releases
|
||||||
|
- [Configuration](./configuration.md) - how users can configure HassOS
|
||||||
|
- [Partition](./partition.md) - partition layout
|
||||||
|
- [Network](./network.md) - approach to networking
|
||||||
|
- [Bluetooth](./bluetooth.md) - approach to bluetooth
|
||||||
|
- [Kernel](./kernel.md) - kernel versions
|
||||||
|
- [Boards](./boards/README.md) - board specific documentation
|
@@ -1,9 +1,9 @@
|
|||||||
# Bluetooth
|
# Bluetooth
|
||||||
|
|
||||||
We support `bluetoothctl` on host. Later we want also support Bluetooth trought UI.
|
We support `bluetoothctl` on the host. Later we want to support Bluetooth through the UI.
|
||||||
All pairs and settings are persistent over reboots and updates.
|
All pairs and settings are persistent over reboots and updates.
|
||||||
|
|
||||||
If you want setup Bluetooth on host, use the `bluetoothctl` utility.
|
If you want to setup Bluetooth on the host, use the `bluetoothctl` utility.
|
||||||
|
|
||||||
## Scan devices
|
## Scan devices
|
||||||
|
|
||||||
|
55
Documentation/boards/README.md
Normal file
55
Documentation/boards/README.md
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
# Boards
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The following boards/devices are supported:
|
||||||
|
|
||||||
|
- Raspberry Pi
|
||||||
|
- Pi 4 Model B (1 GB, 2 GB and 4 GB model) 32-bit (recommended)
|
||||||
|
- Pi 4 Model B (1 GB, 2 GB and 4 GB model) 64-bit
|
||||||
|
- Pi 3 Model B and B+ 32-bit (recommended)
|
||||||
|
- Pi 3 Model B and B+ 64-bit
|
||||||
|
- Pi 2 (not recommended)
|
||||||
|
- Pi Zero-W (not recommended)
|
||||||
|
- Pi (not recommended)
|
||||||
|
- Hardkernel
|
||||||
|
- Odroid-C2
|
||||||
|
- Odroid-C4 (_experimental_)
|
||||||
|
- Odroid-N2
|
||||||
|
- Odroid-XU4
|
||||||
|
- Generic x86-64 (UEFI, not suited for virtualization)
|
||||||
|
- Intel NUC5CPYH
|
||||||
|
- Intel NUC6CAYH
|
||||||
|
- Intel NUC10I3FNK2
|
||||||
|
- Gigabyte GB-BPCE-3455
|
||||||
|
- Computers supporting x64-64 architecture and UEFI boot should generally work
|
||||||
|
- Asus
|
||||||
|
- Tinker Board
|
||||||
|
- Virtual appliance (x86_64/UEFI):
|
||||||
|
- VMDK
|
||||||
|
- OVA ?
|
||||||
|
- VHDX ?
|
||||||
|
- VDI ?
|
||||||
|
- QCOW2 ?
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- see ? above: are these currently supported? see ova documentation which explains issues with previous OVA distribution)
|
||||||
|
|
||||||
|
## Board specifics
|
||||||
|
|
||||||
|
|Board|Build|Config|Docs|
|
||||||
|
|-----|----|------|----|
|
||||||
|
|Pi4B 32-bit |`make rpi4` |[rpi4](../../buildroot-external/configs/rpi4_defconfig)|[raspberrypi](./raspberrypi/)|
|
||||||
|
|Pi4B 64-bit |`make rpi4_64` |[rpi4_64](../../buildroot-external/configs/rpi4_64_defconfig)|[raspberrypi](./raspberrypi/)|
|
||||||
|
|Pi3B 32-bit |`make rpi3` |[rpi3](../../buildroot-external/configs/rpi3_defconfig)|[raspberrypi](./raspberrypi/)|
|
||||||
|
|Pi3B 64-bit |`make rpi3_64` |[rpi3_64](../../buildroot-external/configs/rpi3_64_defconfig)|[raspberrypi](./raspberrypi/)|
|
||||||
|
|Pi2 |`make rpi2` |[rpi2](../../buildroot-external/configs/rpi2_defconfig)|[raspberrypi](./raspberrypi/)|
|
||||||
|
|Pi Zero |`make rpi0_w` |[rpi0_w](../../buildroot-external/configs/rpi0_w_defconfig)|[raspberrypi](./raspberrypi/)|
|
||||||
|
|Pi |`make rpi` |[rpi](../../buildroot-external/configs/rpi_defconfig)|[raspberrypi](./raspberrypi/)|
|
||||||
|
|Odroid-C2 |`make odroid_c2` |[odroid_c2](../../buildroot-external/configs/odroid_c2_defconfig)|[hardkernel](./hardkernel/)|
|
||||||
|
|Odroid-C4 |`make odroid_c4` |[odroid_c4](../../buildroot-external/configs/odroid_c4_defconfig)|[hardkernel](./hardkernel/)|
|
||||||
|
|Odroid-N2 |`make odroid_n2` |[odroid_n2](../../buildroot-external/configs/odroid_n2_defconfig)|[hardkernel](./hardkernel/)|
|
||||||
|
|Odroid-XU4 |`make odroid_xu4` |[odroid_xu4](../../buildroot-external/configs/odroid_xu4_defconfig)|[hardkernel](./hardkernel/)|
|
||||||
|
|Tinker Board |`make tinker` |[tinker](../../buildroot-external/configs/tinker_defconfig)|[asus](./asus/)|
|
||||||
|
|Generic x86-64 |`make generic_x86_64` |[generic_x86_64](../../buildroot-external/configs/generic_x86_64_defconfig)|[generic-x86-64](./generic-x86-64/)|
|
||||||
|
|OVA |`make ova` |[ova](../../buildroot-external/configs/ova_defconfig)|[ova](./ova/)|
|
31
Documentation/boards/asus/README.md
Normal file
31
Documentation/boards/asus/README.md
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
# Tinker Board
|
||||||
|
|
||||||
|
## Supported Hardware
|
||||||
|
|
||||||
|
| Device | Release Date | Support | Config |
|
||||||
|
|----------------|---------------|---------|----------|
|
||||||
|
| Tinker RK3288 | April 2017 | yes | [tinker](../../../buildroot-external/configs/tinker_defconfig) |
|
||||||
|
| Tinker S RK3288| January 2018 | yes | [tinker](../../../buildroot-external/configs/tinker_defconfig) |
|
||||||
|
| Tinker Edge T | November 2019 | no? | |
|
||||||
|
| Tinker Edge R | November 2019 | no? | |
|
||||||
|
|
||||||
|
## eMMC
|
||||||
|
|
||||||
|
eMMC support is provided with the same image. Just flash the image to the eMMC by connecting your Tinker Board S to your PC via Micro-USB. Refer to the Tinkerboard documentation how-to flash using Micro-USB and UMS.
|
||||||
|
|
||||||
|
The Home Assistant OS provided U-Boot does support UMS as well,
|
||||||
|
however manual intervention is necessary:
|
||||||
|
|
||||||
|
1. Set the jumper between Micro-USB and HDMI the maskrom mode
|
||||||
|
2. Insert SD card and connect the board via Micro-USB to your PC
|
||||||
|
3. Continusly press Ctrl+C to interrupt boot
|
||||||
|
4. Set the jumper back to the park position
|
||||||
|
5. Start UMS using:
|
||||||
|
```
|
||||||
|
ums 0 mmc 0
|
||||||
|
```
|
||||||
|
6. A mass storage device should appear. Flash Home Assistant OS to it.
|
||||||
|
|
||||||
|
## Serial console
|
||||||
|
|
||||||
|
To access the terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
|
61
Documentation/boards/generic-x86-64/README.md
Normal file
61
Documentation/boards/generic-x86-64/README.md
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
# Generic x86-64
|
||||||
|
|
||||||
|
## Supported Hardware
|
||||||
|
|
||||||
|
This board configuration aims to support most x86-64 systems with UEFI boot. The
|
||||||
|
main aim is to support Intel NUC mini PCs and similar systems. Hardware it has
|
||||||
|
been tested with is listed below.
|
||||||
|
|
||||||
|
## Tested Hardware
|
||||||
|
|
||||||
|
| Device | Release Date | Support | Config |
|
||||||
|
|-----------------------|--------------|---------|-------------|
|
||||||
|
| Intel NUC5CPYH | Q3 2015 | yes | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
|
||||||
|
| Intel NUC6CAYH | Q4 2016 | yes | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
|
||||||
|
| Intel NUC7i3DNHE | Q3 2017 | yes | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
|
||||||
|
| Intel NUC10i3FNK2 | Q4 2019 | yes | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
|
||||||
|
| Gigabyte GB-BPCE-3455 | 2017 | yes* | [generic_x86_64](../../../buildroot-external/configs/generic_x86_64_defconfig) |
|
||||||
|
|
||||||
|
\* needs 'nomodeset' in cmdline.txt if you want a console
|
||||||
|
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
- x86-64 support
|
||||||
|
- UEFI boot
|
||||||
|
- SATA/AHCI or eMMC storage
|
||||||
|
- Supported NIC:
|
||||||
|
- Intel Gigabit NIC (e1000, igb - via Linux mainline)
|
||||||
|
- Intel PCIe Gigabit NIC (e1000e - via out-of-tree module in *buildroot-external/package/intel-e1000e*)
|
||||||
|
- Realtek Gigabit NIC (r8169)
|
||||||
|
- Intel Wireless Wifi 802.11ac (iwlwifi, see below)
|
||||||
|
|
||||||
|
## Wifi
|
||||||
|
|
||||||
|
The following cards are supported:
|
||||||
|
|
||||||
|
- Intel Wireless 3160
|
||||||
|
- Intel Wireless 7260
|
||||||
|
- Intel Wireless 7265
|
||||||
|
- Intel Wireless-AC 3165
|
||||||
|
- Intel Wireless-AC 3168
|
||||||
|
- Intel Wireless-AC 8260
|
||||||
|
- Intel Wireless-AC 8265
|
||||||
|
- Intel Wireless-AC 9260
|
||||||
|
- Intel Wireless-AC 9461
|
||||||
|
- Intel Wireless-AC 9462
|
||||||
|
- Intel Wireless-AC 9560
|
||||||
|
|
||||||
|
## Bluetooth
|
||||||
|
|
||||||
|
Bluetooth is untested.
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
Make sure secure boot is disabled in the UEFI BIOS settings.
|
||||||
|
|
||||||
|
Currently there is no shiny installation method. Checklist:
|
||||||
|
- Boot PC to live environment using PXE or USB
|
||||||
|
- Copy or download the Home Assistant OS image into your live environment
|
||||||
|
- unxz the image and dd to the local hard disk
|
||||||
|
- Reboot
|
26
Documentation/boards/hardkernel/README.md
Normal file
26
Documentation/boards/hardkernel/README.md
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
# ODROID
|
||||||
|
|
||||||
|
## Supported Hardware
|
||||||
|
|
||||||
|
| Device | Release Date | Support | Config |
|
||||||
|
|----------------|---------------|--------------|-----------|
|
||||||
|
| ODROID-XU4 | 2015 | yes | [odroid_xu4](../../../buildroot-external/configs/odroid_xu4_defconfig)|
|
||||||
|
| ODROID-C2 | 2016 | yes | [odroid_c2](../../../buildroot-external/configs/odroid_c2_defconfig) |
|
||||||
|
| ODROID-C4 | 2020 | experimental | [odroid_c4](../../../buildroot-external/configs/odroid_c4_defconfig) |
|
||||||
|
| ODROID-N2 | 2019 | yes | [odroid_n2](../../../buildroot-external/configs/odroid_n2_defconfig) |
|
||||||
|
|
||||||
|
See separate documentation for each board.
|
||||||
|
|
||||||
|
## Connectivity devices
|
||||||
|
|
||||||
|
### Wi-Fi
|
||||||
|
|
||||||
|
The following devices have been tested on Home Assistant OS 5.8:
|
||||||
|
|
||||||
|
- [Bluetooth Module 2](https://www.hardkernel.com/shop/bluetooth-module-2/)
|
||||||
|
- [WiFi Module 3](https://www.hardkernel.com/shop/wifi-module-3/)
|
||||||
|
|
||||||
|
The [WiFi Module 5A](https://www.hardkernel.com/shop/wifi-module-5a/) is not
|
||||||
|
recommended as there is no upstream driver support available. The driver
|
||||||
|
currently compatible with recent Linux kernel version seems to have issues
|
||||||
|
connecting to 5GHz networks.
|
16
Documentation/boards/hardkernel/odroid-c4.md
Normal file
16
Documentation/boards/hardkernel/odroid-c4.md
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
# Odroid-C4
|
||||||
|
|
||||||
|
## Experimental
|
||||||
|
|
||||||
|
Odroid-C4 support is based heavily on the Odroid-C2 and N2 configurations. Given the similarity of the SoCs, as well as the comparable level of support in the Linux kernel, the C4 should hopefully present few surprises. However, Home Assistant support should be regarded as experimental.
|
||||||
|
|
||||||
|
Please also refer to the documentation pages for the [Odroid-C2](./odroid-c2.md) and [Odroid-N2](./odroid-n2.md), as some of that information may apply to the C4 as well.
|
||||||
|
|
||||||
|
Common C4 issues that have been specifically tested and appear to be working:
|
||||||
|
- boot from SD
|
||||||
|
- boot from eMMC
|
||||||
|
- MAC address obtained from eFuse
|
||||||
|
|
||||||
|
## GPIO
|
||||||
|
|
||||||
|
Refer to [the odroid wiki](https://wiki.odroid.com/odroid-c4/hardware/expansion_connectors).
|
18
Documentation/boards/hardkernel/odroid-n2.md
Normal file
18
Documentation/boards/hardkernel/odroid-n2.md
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Odroid-N2
|
||||||
|
|
||||||
|
## eMMC
|
||||||
|
|
||||||
|
eMMC support is provided transparently. Just flash the image to the eMMC board as you would an SD card.
|
||||||
|
|
||||||
|
## Console
|
||||||
|
|
||||||
|
By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the AML0 console if you don't plan on using the serial adapter.
|
||||||
|
eg. `console=ttyAML0,115200n8 console=tty0`
|
||||||
|
|
||||||
|
## GPIO
|
||||||
|
|
||||||
|
Refer to [the odroid wiki](https://wiki.odroid.com/odroid-n2/hardware/expansion_connectors).
|
||||||
|
At this point not all functionality is supported by the upstream kernel used
|
||||||
|
by Home Assistant OS.
|
||||||
|
|
||||||
|
The GPIO on pin 11 is used as a low active power button input.
|
29
Documentation/boards/hardkernel/odroid-xu4.md
Normal file
29
Documentation/boards/hardkernel/odroid-xu4.md
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
# ODROID-XU4
|
||||||
|
|
||||||
|
## eMMC
|
||||||
|
|
||||||
|
The ODROID XU4 uses the eMMC boot partition to boot from. Typically eMMC readers can't write to this eMMC boot partition. There are a couple of possibilities:
|
||||||
|
|
||||||
|
1. **Working** e.g. the eMMC already had a working image before flashing HassOS:
|
||||||
|
- It will be booting to U-Boot (but no further).
|
||||||
|
- If you have the serial adapter, you should be able to enter `distro_bootcmd` at the uboot prompt to continue booting.
|
||||||
|
- If not, flash the HassOS image to an SD card and boot off that temporarily (while the eMMC is also plugged in).
|
||||||
|
- Once booted, login at the prompts and then enter `dd if=/dev/mmcblk0 of=/dev/mmcblk0boot0 bs=512 skip=63 seek=62 count=1440` at the linux prompt.
|
||||||
|
- Reboot with eMMC (don't forget to flip the boot switch to eMMC)
|
||||||
|
2. **Not Working** e.g. a clean/wiped/corruped eMMC boot partition:
|
||||||
|
- You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above.
|
||||||
|
- Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work..
|
||||||
|
|
||||||
|
If you are getting permissions issues when using the dd command, try disabling RO:
|
||||||
|
`echo 0 > /sys/block/mmcblk0boot0/force_ro`
|
||||||
|
to re-enable after running dd:
|
||||||
|
`echo 1 > /sys/block/mmcblk0boot0/force_ro`
|
||||||
|
|
||||||
|
## Console
|
||||||
|
|
||||||
|
By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the SAC2 console if you don't plan on using the serial adapter.
|
||||||
|
eg. `console=tty1 console=ttySAC2,115200`
|
||||||
|
|
||||||
|
## GPIO
|
||||||
|
|
||||||
|
Refer to [the odroid wiki](https://wiki.odroid.com/odroid-xu4/hardware/expansion_connectors).
|
@@ -1,50 +0,0 @@
|
|||||||
# Intel NUC
|
|
||||||
|
|
||||||
This board configuration supports the Intel NUC mini PCs and compatibles.
|
|
||||||
Probably most recent computers will work.
|
|
||||||
|
|
||||||
Requirements:
|
|
||||||
- x86-64 support
|
|
||||||
- UEFI boot
|
|
||||||
- SATA/AHCI storage
|
|
||||||
- Supported NIC:
|
|
||||||
- Intel Gigabit NIC (e1000, e1000e, igb)
|
|
||||||
- Realtek Gigabit NIC (r8169)
|
|
||||||
- Intel Wireless Wifi 802.11ac (iwlwifi, see below)
|
|
||||||
|
|
||||||
## Tested Hardware
|
|
||||||
|
|
||||||
| Device | Quirks |
|
|
||||||
|--------|-----------|
|
|
||||||
| Intel NUC5CPYH | |
|
|
||||||
| Gigabyte GB-BPCE-3455 | needs 'nomodeset' in cmdline.txt if you want a console |
|
|
||||||
|
|
||||||
|
|
||||||
## Wifi
|
|
||||||
|
|
||||||
The following cards are supported:
|
|
||||||
|
|
||||||
- Intel Wireless 3160
|
|
||||||
- Intel Wireless 7260
|
|
||||||
- Intel Wireless 7265
|
|
||||||
- Intel Wireless-AC 3165
|
|
||||||
- Intel Wireless-AC 3168
|
|
||||||
- Intel Wireless-AC 8260
|
|
||||||
- Intel Wireless-AC 8265
|
|
||||||
- Intel Wireless-AC 9260
|
|
||||||
- Intel Wireless-AC 9461
|
|
||||||
- Intel Wireless-AC 9462
|
|
||||||
- Intel Wireless-AC 9560
|
|
||||||
|
|
||||||
## Bluetooth
|
|
||||||
|
|
||||||
Bluetooth is untested.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
Currently there is no shiny installation method. Checklist:
|
|
||||||
- Boot PC to live-environment using PXE or USB
|
|
||||||
- Copy or download the hassos image into your live environment
|
|
||||||
- zcat the image to local harddisk
|
|
||||||
- Reboot
|
|
||||||
|
|
@@ -1,20 +0,0 @@
|
|||||||
# Raspberry PI
|
|
||||||
|
|
||||||
Supported Hardware:
|
|
||||||
|
|
||||||
| Device | Board |
|
|
||||||
|--------|-----------|
|
|
||||||
| Orange Pi Prime | opi-prime |
|
|
||||||
|
|
||||||
## Serial console
|
|
||||||
|
|
||||||
The serial port on the Orange Pi Prime is a 3 pin header located between the
|
|
||||||
power and reset buttons. The pins are labelled away from the board edge. Flow
|
|
||||||
control must be disabled in order to send data. The serial specs are 3.3V TTL,
|
|
||||||
115200,8,n,1
|
|
||||||
|
|
||||||
## I2C
|
|
||||||
|
|
||||||
Add `dtparam=i2c0=on` to `cmdline.txt`
|
|
||||||
|
|
||||||
[config]: ../configuration.md#automatic
|
|
@@ -1,16 +0,0 @@
|
|||||||
# OVA
|
|
||||||
|
|
||||||
OVA stands for Open Virtual Appliance. Currently we had remove the ova files and publish a vmdk virtual disk,
|
|
||||||
until we have better OVF template to generate our OVA. This VMDK work with (maybe you need convert the disk):
|
|
||||||
- HyperV
|
|
||||||
- VirtualBox
|
|
||||||
- VMware
|
|
||||||
|
|
||||||
## Virtual Machine
|
|
||||||
|
|
||||||
You can use this vmdk in a virtual machine with follow requirements:
|
|
||||||
- OS: Linux 64bit
|
|
||||||
- UEFI boot
|
|
||||||
- min. 1GB RAM
|
|
||||||
- 2x vcpu
|
|
||||||
- 1x Network
|
|
22
Documentation/boards/ova/README.md
Normal file
22
Documentation/boards/ova/README.md
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
# Virtual Machine
|
||||||
|
|
||||||
|
## Supported Hypervisors
|
||||||
|
|
||||||
|
| Hypervisor | Vendor | Support | Config |
|
||||||
|
|---------------------|-----------|-----------------|--------------------|
|
||||||
|
| HyperV | Microsoft | yes, via VMDK | [ova](../../../buildroot-external/configs/ova_defconfig) |
|
||||||
|
| VirtualBox | Oracle | yes, via VMDK | [ova](../../../buildroot-external/configs/ova_defconfig) |
|
||||||
|
| VMware | VMware | yes, via VMDK | [ova](../../../buildroot-external/configs/ova_defconfig) |
|
||||||
|
|
||||||
|
Currently we only publish a VMDK virtual disk due to issues with our previous OVA distribution. We are investigating our options to bring back the OVA distribution, however, the VMDK works for the hypervisors listed above.
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
Using this VMDK in a virtual machine requires the following:
|
||||||
|
|
||||||
|
- Operating system: Other 4.x or later Linux (64-bit)
|
||||||
|
- Enabled support for UEFI boot
|
||||||
|
- SATA disk controller
|
||||||
|
- Minimal of 1GB RAM
|
||||||
|
- At least 2x vCPU
|
||||||
|
- An assigned network
|
@@ -1,35 +0,0 @@
|
|||||||
# Raspberry PI
|
|
||||||
|
|
||||||
Supported Hardware:
|
|
||||||
|
|
||||||
| Device | Board |
|
|
||||||
|--------|-----------|
|
|
||||||
| Raspberry Pi A+/B/B+| rpi |
|
|
||||||
| Raspberry Pi Zero | rpi |
|
|
||||||
| Raspberry Pi Zero W | rpi0-w |
|
|
||||||
| Raspberry Pi 2 B | rpi2 |
|
|
||||||
| Raspberry Pi 3 B/B+ | rpi3 / rpi3-64 |
|
|
||||||
|
|
||||||
## Limitation 64bit
|
|
||||||
|
|
||||||
The 64bit version is under development by RPi-Team. It work very nice but it could have some impacts. Actual we see that the SDcard access with ext4 are a bit slower than on 32bit.
|
|
||||||
|
|
||||||
## Serial console
|
|
||||||
|
|
||||||
For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1`, `dtoverlay=pi3-disable-bt` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.
|
|
||||||
|
|
||||||
## I2C
|
|
||||||
|
|
||||||
Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`.
|
|
||||||
|
|
||||||
rpi-i2c.conf:
|
|
||||||
```
|
|
||||||
i2c-dev
|
|
||||||
i2c-bcm2708
|
|
||||||
```
|
|
||||||
|
|
||||||
## Tweaks
|
|
||||||
|
|
||||||
If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.
|
|
||||||
|
|
||||||
[config]: ../configuration.md#automatic
|
|
58
Documentation/boards/raspberrypi/README.md
Normal file
58
Documentation/boards/raspberrypi/README.md
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
# Raspberry PI
|
||||||
|
|
||||||
|
## Supported Hardware
|
||||||
|
|
||||||
|
| Device | Release Date | Support | Config |
|
||||||
|
|---------------------|---------------|-----------------|--------------------|
|
||||||
|
| Raspberry Pi B/B+/A+|2012/2014/2014 | not recommended | [rpi](../../../buildroot-external/configs/rpi_defconfig) |
|
||||||
|
| Raspberry Pi 2 B |2015 | not recommended | [rpi2](../../../buildroot-external/configs/rpi2_defconfig) |
|
||||||
|
| Raspberry Pi Zero |2015 | not recommended | [rpi](../../../buildroot-external/configs/rpi_defconfig) |
|
||||||
|
| Raspberry Pi Zero W |2017 | not recommended | [rpi0_w](../../../buildroot-external/configs/rpi0_w_defconfig) |
|
||||||
|
| Raspberry Pi 3 B/B+ |2016/2018 | yes | [rpi3](../../../buildroot-external/configs/rpi3_defconfig) / [rpi3_64](../../../buildroot-external/configs/rpi3_64_defconfig) |
|
||||||
|
| Raspberry Pi 4 B |2019 | yes* | [rpi4](../../../buildroot-external/configs/rpi4_defconfig) / [rpi4_64](../../../buildroot-external/configs/rpi4_64_defconfig) |
|
||||||
|
|
||||||
|
\*1,2 and 4 GiB versions of the Raspberry Pi 4 B are supported. Support for the 8 GiB version is coming soon is part of #740.
|
||||||
|
|
||||||
|
## Limitation 64bit
|
||||||
|
|
||||||
|
The 64bit version is under development by RPi-Team. It work very nice but it could have some impacts. Actual we see that the SDcard access with ext4 are a bit slower than on 32bit.
|
||||||
|
|
||||||
|
## Serial console
|
||||||
|
|
||||||
|
For access to terminal over serial console, add `console=ttyAMA0,115200` to `cmdline.txt` and `enable_uart=1`, `dtoverlay=pi3-disable-bt` into `config.txt`. GPIO pins are: 6 = GND / 8 = UART TXD / 10 = UART RXD.
|
||||||
|
|
||||||
|
## I2C
|
||||||
|
|
||||||
|
Add `dtparam=i2c1=on` and `dtparam=i2c_arm=on` to `config.txt`. After that we create a module file on host with [config usb stick][config] or direct into `/etc/modules-load.d`.
|
||||||
|
|
||||||
|
rpi-i2c.conf:
|
||||||
|
```
|
||||||
|
i2c-dev
|
||||||
|
i2c-bcm2708
|
||||||
|
```
|
||||||
|
|
||||||
|
## USB Boot
|
||||||
|
|
||||||
|
USB mass storage boot is available on Raspberry Pi 4 (64-bit only), 3B, 3B+, 3A+, and 2B v1.2.
|
||||||
|
|
||||||
|
For Raspberry 3B, 3A+ and 2B v1.2, to enable USB boot, add `program_usb_boot_mode=1` into `config.txt`. Note that this **permanently** alters the one-time programmable memory of the device.
|
||||||
|
|
||||||
|
For Raspberry 4
|
||||||
|
|
||||||
|
* Make sure to update the bootloader to a stable release supporting USB mass storage boot (see [bcm2711_bootloader_config.md](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md#usbmassstorageboot)).
|
||||||
|
* If no SD card is used add `sd_poll_once=on` to `dtparam` in `config.txt` (comma separated). This gets rid of `mmc0: timeout waiting for hardware interrupt` kernel errors.
|
||||||
|
* If install still fails, then your SSD likely needs quirks enabled to work correctly (see [Finding the VID and PID of your USB SSD](https://www.raspberrypi.org/forums/viewtopic.php?t=245931)). Once you find your adapter's ID, add the quirks parameter in `cmdline.txt`.
|
||||||
|
|
||||||
|
For more information see [RaspberryPi](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md).
|
||||||
|
|
||||||
|
### Caveats
|
||||||
|
|
||||||
|
* All bootable SD cards must be removed.
|
||||||
|
* Boot time can be significantly longer with USB. This is due to the boot process first attempting to boot from SD card, failing, and resorting to USB.
|
||||||
|
* Many USB drives simply do not work for boot. This is likely due to minimal driver support in uboot and will not be fixed. If you can't get it to boot on one drive, try a different brand/model. SanDisk Cruzer drives seem to have a higher rate of issues.
|
||||||
|
|
||||||
|
## Tweaks
|
||||||
|
|
||||||
|
If you don't need bluetooth, disabled it with add `dtoverlay=pi3-disable-bt` into `config.txt`.
|
||||||
|
|
||||||
|
[config]: ../../configuration.md#automatic
|
@@ -1,17 +0,0 @@
|
|||||||
# Tinker Board
|
|
||||||
|
|
||||||
Supported Hardware:
|
|
||||||
|
|
||||||
| Device | Board |
|
|
||||||
|--------|-----------|
|
|
||||||
| Tinker RK3288 | tinker |
|
|
||||||
| Tinker S RK3288 | tinker |
|
|
||||||
|
|
||||||
## EMMC
|
|
||||||
|
|
||||||
Actual we support only SD cards. The support for EMMC will follow.
|
|
||||||
|
|
||||||
## Serial console
|
|
||||||
|
|
||||||
For access to terminal over serial console, add `console=ttyS2,115200` to `cmdline.txt`. GPIO pins are: 34 = GND / 32 = UART TXD / 33 = UART RXD.
|
|
||||||
|
|
@@ -1,21 +0,0 @@
|
|||||||
# Building
|
|
||||||
|
|
||||||
Running `sudo ./enter.sh` will get you into the build Docker container.
|
|
||||||
`make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
|
|
||||||
|
|
||||||
## Scripts
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Helpers
|
|
||||||
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external xy_defconfig`
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external menuconfig`
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-menuconfig`
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-menuconfig`
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-menuconfig`
|
|
||||||
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external savedefconfig`
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external linux-update-defconfig`
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external barebox-update-defconfig`
|
|
||||||
- `make -C /build/buildroot BR2_EXTERNAL=/build/buildroot-external busybox-update-config`
|
|
@@ -3,26 +3,28 @@
|
|||||||
## Automatic
|
## Automatic
|
||||||
|
|
||||||
You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
|
You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
|
||||||
Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
|
Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG` (in all capitals). Alternative you can create a `CONFIG` folder inside the `boot` partition. Use the following directory structure within the USB drive:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
network/
|
network/
|
||||||
modules/
|
modules/
|
||||||
|
modprobe/
|
||||||
udev/
|
udev/
|
||||||
authorized_keys
|
authorized_keys
|
||||||
timesyncd.conf
|
timesyncd.conf
|
||||||
hassos-xy.raucb
|
hassos-xy.raucb
|
||||||
```
|
```
|
||||||
|
|
||||||
- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md].
|
- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md].
|
||||||
- The `modules` folder is for modules-load configuration files.
|
- The `modules` folder is for modules-load configuration files.
|
||||||
|
- The `modprobe` folder is for modules configuration files (/etc/modprobe.d)
|
||||||
- The `udev` folder is for udev rules files.
|
- The `udev` folder is for udev rules files.
|
||||||
- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio].
|
- The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Home Assistant][debug-homeassistant].
|
||||||
- The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
|
- The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers!
|
||||||
- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
|
- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
|
||||||
|
|
||||||
You can put this USB stick into the device and it will be read on startup. You can also trigger this process later over the
|
You can put this USB stick into the device and it will be read on startup and files written to the correct places. You can also trigger this process later over the
|
||||||
API/UI or by calling `systemctl restart hassos-config` on the host.
|
API/UI or by calling `systemctl restart hassos-config` on the host. *The USB Stick just needs to be inserted to the device during this setup process and can be disconnected afterwards.*
|
||||||
|
|
||||||
## Local
|
## Local
|
||||||
|
|
||||||
@@ -32,7 +34,7 @@ You can edit or create a `cmdline.txt` in your boot partition. That will be read
|
|||||||
|
|
||||||
### Kernel-Module
|
### Kernel-Module
|
||||||
|
|
||||||
The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules].
|
The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules]. You can add the modules configuration files in `/etc/modprobe.d` that is also persistent.
|
||||||
|
|
||||||
### Udev rules
|
### Udev rules
|
||||||
|
|
||||||
@@ -45,7 +47,9 @@ You can manual add, edit or remove connections configurations from `/etc/Network
|
|||||||
### NTP
|
### NTP
|
||||||
|
|
||||||
You can manual edit the systemd timesync file on `/etc/systemd/timesyncd.conf`.
|
You can manual edit the systemd timesync file on `/etc/systemd/timesyncd.conf`.
|
||||||
Our default ntp configuration look like:
|
|
||||||
|
Our default NTP configuration look like:
|
||||||
|
|
||||||
```
|
```
|
||||||
[Time]
|
[Time]
|
||||||
NTP=time1.google.com time2.google.com time3.google.com
|
NTP=time1.google.com time2.google.com time3.google.com
|
||||||
@@ -55,4 +59,4 @@ FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org
|
|||||||
[systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
|
[systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html
|
||||||
[network.md]: network.md
|
[network.md]: network.md
|
||||||
[hassos-release]: https://github.com/home-assistant/hassos/releases/
|
[hassos-release]: https://github.com/home-assistant/hassos/releases/
|
||||||
[debug-hassio]: https://developers.home-assistant.io/docs/en/hassio_debugging.html
|
[debug-homeassistant]: https://developers.home-assistant.io/docs/operating-system/debugging
|
||||||
|
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
We provide 3 different types of release builds:
|
We provide 3 different types of release builds:
|
||||||
|
|
||||||
- development (beta/dev)
|
- development (dev)
|
||||||
- staging (rc)
|
- staging (beta)
|
||||||
- production (stable)
|
- production (stable)
|
||||||
|
|
||||||
## Versioning
|
## Versioning
|
||||||
@@ -15,7 +15,7 @@ The development number they will be bump for the stable release version and the
|
|||||||
|
|
||||||
The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch contains the development version and from there we build a beta release.
|
The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch contains the development version and from there we build a beta release.
|
||||||
|
|
||||||
If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.
|
If we create a new productive/staging release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.
|
||||||
|
|
||||||
## Upload release files
|
## Upload release files
|
||||||
|
|
||||||
|
@@ -3,22 +3,58 @@
|
|||||||
## Boot system
|
## Boot system
|
||||||
|
|
||||||
`BOOT_SYS`:
|
`BOOT_SYS`:
|
||||||
|
|
||||||
- efi
|
- efi
|
||||||
- hyprid
|
- hybrid
|
||||||
- spl
|
|
||||||
- mbr
|
- mbr
|
||||||
|
|
||||||
HassOS is basicly used GPT. But for use GPT we need own the first 1024 of
|
HassOS is using GPT. But to use GPT we need own the first 1024 of boot drive. Is that's not possible, you can use MBR for your device. This also work with SPLs.
|
||||||
boot drive. Is that not possible, you can use MBR for your device, they work also with SPLs.
|
|
||||||
|
|
||||||
Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before.
|
Hybrid and SPL use both a hybrid MBR/GPT table but SPL move the GPT header 8 MB for give space to write SPL and boot images before.
|
||||||
|
|
||||||
|
`BOOT_SPL`:
|
||||||
|
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
|
||||||
|
Enable SPL update handling.
|
||||||
|
|
||||||
`BOOTLOADER`:
|
`BOOTLOADER`:
|
||||||
- uboot
|
|
||||||
|
- U-Boot
|
||||||
- barebox
|
- barebox
|
||||||
|
|
||||||
We support mainly uboot but for uefi system we can also use barebox. In future we hope to remove barebox with uboot also on uefi.
|
We support mainly U-Boot but for UEFI systems we can also use [barebox](https://barebox.org/). In the future, we hope to remove barebox with U-Boot also on UEFI.
|
||||||
|
|
||||||
`DISK_SIZE`:
|
`DISK_SIZE`:
|
||||||
|
|
||||||
Default 2. That is the size of end image in GB.
|
Default 2. That is the size of end image in GB.
|
||||||
|
|
||||||
|
## Supervisor
|
||||||
|
|
||||||
|
`SUPERVISOR_MACHINE`:
|
||||||
|
|
||||||
|
- intel-nuc
|
||||||
|
- odroid-c2
|
||||||
|
- odroid-c4
|
||||||
|
- odroid-n2
|
||||||
|
- odroid-xu
|
||||||
|
- qemuarm
|
||||||
|
- qemuarm-64
|
||||||
|
- qemux86
|
||||||
|
- qemux86-64
|
||||||
|
- raspberrypi
|
||||||
|
- raspberrypi2
|
||||||
|
- raspberrypi3
|
||||||
|
- raspberrypi4
|
||||||
|
- raspberrypi3-64
|
||||||
|
- raspberrypi4-64
|
||||||
|
- tinker
|
||||||
|
|
||||||
|
`SUPERVISOR_ARCH`:
|
||||||
|
|
||||||
|
- amd64
|
||||||
|
- i386
|
||||||
|
- armhf
|
||||||
|
- armv7
|
||||||
|
- aarch64
|
||||||
|
@@ -1,11 +1,10 @@
|
|||||||
Getting started with Hassos development using Docker on GNU/Linux
|
# Getting started with HassOS development using Docker on GNU/Linux
|
||||||
=================================================================
|
|
||||||
|
|
||||||
First, install **docker** for your distribution - I'd advise to use your distro's provided packages, since that will make sure permissions et al. are sanely set up for what you are about to run. You're also expected to have your current user properly set up in in your sudoers policy, so that this account may elevate to root and execute arbitrary commands as UID 0 (this is required, since at some point during the build process, a new loopback device-backed filesystem image will be mounted inside a docker container - which requires a "privileged" container to run, which can only be done as root).
|
First, install `docker-ce` for your distribution. I'd advise to use your distro's provided packages, since that will make sure permissions et al. are sanely set up for what you are about to run. You're also expected to have your current user properly set up in in your sudoers policy, so that this account may elevate to root and execute arbitrary commands as UID 0 (this is required, since at some point during the build process, a new loopback device-backed filesystem image will be mounted inside a Docker container - which requires a "privileged" container to run, which can only be done as root).
|
||||||
|
|
||||||
Next, make sure the docker daemon is running:
|
Next, make sure the Docker daemon is running:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
$ sudo systemctl status docker
|
$ sudo systemctl status docker
|
||||||
● docker.service - Docker Application Container Engine
|
● docker.service - Docker Application Container Engine
|
||||||
Loaded: loaded (/usr/lib/systemd/system/docker.service; disabled; vendor preset: disabled)
|
Loaded: loaded (/usr/lib/systemd/system/docker.service; disabled; vendor preset: disabled)
|
||||||
@@ -15,7 +14,7 @@ $ sudo systemctl status docker
|
|||||||
|
|
||||||
My desktop distro doesn't start newly installed services by default, which means I'll have to manually fire up the `docker` service:
|
My desktop distro doesn't start newly installed services by default, which means I'll have to manually fire up the `docker` service:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
$ sudo systemctl start docker
|
$ sudo systemctl start docker
|
||||||
$ sudo systemctl --no-pager status docker -n0
|
$ sudo systemctl --no-pager status docker -n0
|
||||||
● docker.service - Docker Application Container Engine
|
● docker.service - Docker Application Container Engine
|
||||||
@@ -30,10 +29,10 @@ $ sudo systemctl --no-pager status docker -n0
|
|||||||
└─1539 docker-containerd --config /var/run/docker/containerd/containerd.toml
|
└─1539 docker-containerd --config /var/run/docker/containerd/containerd.toml
|
||||||
```
|
```
|
||||||
|
|
||||||
Now, change your working directory to your hassos repo checkout (please adapt pathnames as needed), make sure your intended changes to the source tree are applied (and committed, ideally :)), and execute the `enter.sh` helper script:
|
Now, change your working directory to your home-assistant/operating-system repository checkout (please adapt path names as needed), make sure your intended changes to the source tree are applied (and committed, ideally :)), and execute the `enter.sh` helper script:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
$ cd ~/codebase/hassos/
|
$ cd ~/codebase/operating-system/
|
||||||
$ sudo scripts/enter.sh
|
$ sudo scripts/enter.sh
|
||||||
Sending build context to Docker daemon 30.48MB
|
Sending build context to Docker daemon 30.48MB
|
||||||
Step 1/6 : FROM ubuntu:18.04
|
Step 1/6 : FROM ubuntu:18.04
|
||||||
@@ -43,24 +42,24 @@ Successfully built 4dc25a21556b
|
|||||||
Successfully tagged hassbuildroot:latest
|
Successfully tagged hassbuildroot:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
Note that the current iteration of `enter.sh` will try to load the **overlayfs** kernel module, which is not strictly required for docker's operation, as far as I can tell. It's OK if loading that module fails; the shell script will continue executing. If everything works out, you will find yourself in an interactive login shell inside your docker container/build environment, where you can peek around:
|
Note that the current iteration of `enter.sh` will try to load the **overlayfs** kernel module, which is not strictly required for Docker's operation, as far as I can tell. It's OK if loading that module fails; the shell script will continue executing. If everything works out, you will find yourself in an interactive login shell inside your Docker container/build environment, where you can peek around:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
root@somehashinhex:/build#
|
root@somehashinhex:/build#
|
||||||
root@somehashinhex:/build# make help
|
root@somehashinhex:/build# make help
|
||||||
[...]
|
[...]
|
||||||
```
|
```
|
||||||
|
|
||||||
The _hassos_ developers provide a Makefile that will build hassos images for a (rather long!) list of targets. For example run the command below to start building the _ova_ variant, and go make a cup of tea. Or fifteen.
|
The HassOS developers provide a `Makefile` that will build HassOS images for a list of targets. For example run the command below to start building the _ova_ variant, and go make a cup of tea. Or fifteen.
|
||||||
|
|
||||||
```
|
```bash
|
||||||
root@0db6f7079872:/build# make ova
|
root@0db6f7079872:/build# make ova
|
||||||
[...]
|
[...]
|
||||||
```
|
```
|
||||||
|
|
||||||
That will result in a single VMDK image file at the very end of the build process. This image file is a compressed block device dump with a proper GPT partition table, prepared to ship into any OVA-compatible hypervisor's innards. For me, the end of the **ova** build steps looks like this:
|
That will result in a single VMDK image file at the very end of the build process. This image file is a compressed block device dump with a proper GPT partition table, prepared to ship into any OVA-compatible hypervisor's innards. For me, the end of the **ova** build steps looks like this:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
[...]
|
[...]
|
||||||
2097152+0 records out
|
2097152+0 records out
|
||||||
1073741824 bytes (1.1 GB, 1.0 GiB) copied, 12.2145 s, 87.9 MB/s
|
1073741824 bytes (1.1 GB, 1.0 GiB) copied, 12.2145 s, 87.9 MB/s
|
||||||
@@ -74,33 +73,29 @@ make: Leaving directory '/build/buildroot'
|
|||||||
|
|
||||||
The artifacts you just built are placed in the `target/` subdirectory:
|
The artifacts you just built are placed in the `target/` subdirectory:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
root@fd292c061896:/build# ls -lh release/
|
root@fd292c061896:/build# ls -lh release/
|
||||||
total 141M
|
total 141M
|
||||||
-rw-r--r-- 1 root root 141M Oct 10 20:22 hassos_ova-2.2.vmdk.gz
|
-rw-r--r-- 1 root root 141M Oct 10 20:22 hassos_ova-2.2.vmdk.gz
|
||||||
```
|
```
|
||||||
|
|
||||||
In order to be able to use this image file with the **qemu** hypervisor, you'll need to unpack it, and convert it to an image format that qemu can work with. Conveniently, the _hassos_ buildenv already provides all the tools we need for this conversion:
|
In order to be able to use this image file with the QEMU hypervisor, you'll need to unpack it, and convert it to an image format that QEMU can work with. Conveniently, the HassOS buildenv already provides all the tools we need for this conversion:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
root@fd292c061896:/build# gunzip release/hassos_ova-2.2.vmdk.gz
|
root@fd292c061896:/build# gunzip release/hassos_ova-2.2.qcow2.gz
|
||||||
root@fd292c061896:/build# qemu-img convert -O qcow2 release/hassos_ova-2.2.vmdk release/hassos_ova-2.2.qcow2
|
|
||||||
root@fd292c061896:/build# ls -lh release/
|
root@fd292c061896:/build# ls -lh release/
|
||||||
total 673M
|
total 673M
|
||||||
-rw-r--r-- 1 root root 337M Oct 10 20:25 hassos_ova-2.2.qcow2
|
-rw-r--r-- 1 root root 337M Oct 10 20:25 hassos_ova-2.2.qcow2
|
||||||
-rw-r--r-- 1 root root 337M Oct 10 20:22 hassos_ova-2.2.vmdk
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Now, exit the docker container's environment, and find the build artifacts in the `releases/` directory beneath your repository checkout dir. (The generated files will be owned by _root_; make sure to `chown` them to your user account, if needed.)
|
Now, exit the docker container's environment, and find the build artifacts in the `releases/` directory beneath your repository checkout dir. (The generated files will be owned by _root_; make sure to `chown` them to your user account, if needed.)
|
||||||
|
|
||||||
From there, qemu can try to boot it. Since the generated image assumes UEFI support in the host/hypervisor, this is slightly more tricky than with "classic"(/legacy) MBR-based images. On the *Debian* host I use to run my qemu virtual machine on, you'll need to install the **ovmf** package, which is described as providing "UEFI firmware for 64-bit x86 virtual machines". That package will install a _TianoCore_-derived qemu UEFI image build at `/usr/share/OVMF/OVMF_CODE.fd`, which we'll use with qemu to boot the generated qcow2 image. (Please adapt pathnames as necessary, for example if you have installed the ovmf firmware image at another location.)
|
From there, QEMU can try to boot it. Since the generated image assumes UEFI support in the host/hypervisor, this is slightly more tricky than with "classic"(/legacy) MBR-based images. On the *Debian* host I use to run my QEMU virtual machine on, you'll need to install the **ovmf** package which provides the "UEFI firmware for 64-bit x86 virtual machines". That package will install a **TianoCore**-derived QEMU UEFI image build at `/usr/share/OVMF/OVMF_CODE.fd`, which we'll use with QEMU to boot the generated qcow2 image. (Please adapt path names as necessary, for example if you have installed the ovmf firmware image at another location.)
|
||||||
|
|
||||||
```
|
```bash
|
||||||
$ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive file=release/hassos_ova-2.2.qcow2,index=0,media=disk,if=ide,cache=none,format=qcow2 -drive file=/usr/share/ovmf/x64/OVMF_CODE.fd,if=pflash,format=raw,readonly=on
|
$ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive file=release/hassos_ova-2.2.qcow2,index=0,media=disk,if=ide,cache=none,format=qcow2 -drive file=/usr/share/ovmf/x64/OVMF_CODE.fd,if=pflash,format=raw,readonly=on
|
||||||
```
|
```
|
||||||
|
|
||||||
This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader.
|
This should pop up QEMU's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying additional options and flags to QEMU for network access, keyboard layout et al. are left as an exercise for the reader.
|
||||||
|
|
||||||
After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *hassio>* shell prompt will yield a root shell in the host OS.
|
After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *ha>* shell prompt will yield a root shell in the host OS.
|
||||||
|
|
||||||
Happy hacking! :)
|
|
||||||
|
@@ -1,12 +1,19 @@
|
|||||||
|
|
||||||
# Kernel Version
|
# Kernel Version
|
||||||
|
|
||||||
|
Default Kernel tree: 5.10
|
||||||
|
|
||||||
| Board | Version |
|
| Board | Version |
|
||||||
|-------|---------|
|
|-------|---------|
|
||||||
| Open Virtual Applicance | 4.14.82 |
|
| Open Virtual Appliance | 5.10.75 |
|
||||||
| Raspberry Pi | 4.14.81 |
|
| Raspberry Pi | 5.10.17 |
|
||||||
| Tinker Board | 4.14.82 |
|
| Raspberry Pi 0-W | 5.10.17 |
|
||||||
| Odroid-C2 | 4.19.15 |
|
| Raspberry Pi 2 | 5.10.17 |
|
||||||
| Odroid-XU4 | 4.19.15 |
|
| Raspberry Pi 3 | 5.10.17 |
|
||||||
| Orangepi-Prime | 4.19.13 |
|
| Raspberry Pi 4 | 5.10.17 |
|
||||||
| Intel NUC | 4.14.82 |
|
| Tinker Board | 5.10.75 |
|
||||||
|
| Odroid-C2 | 5.10.75 |
|
||||||
|
| Odroid-C4 | 5.10.75 |
|
||||||
|
| Odroid-N2 | 5.10.75 |
|
||||||
|
| Odroid-XU4 | 5.10.75 |
|
||||||
|
| Generic x86-64 | 5.10.75 |
|
||||||
|
@@ -1,20 +1,52 @@
|
|||||||
# Network
|
# Network
|
||||||
|
|
||||||
HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently only a manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive and imported to the host as described in [Configuration][configuration-usb].
|
Home Assistant Operating System uses NetworkManager to control the host network.
|
||||||
|
|
||||||
## Configuration Examples
|
## Configure network
|
||||||
|
|
||||||
You can read the [Official Manual][keyfile] or find many configuration examples across the internet. The system is read-only, if you don't want the IP address to change on every boot, you should set the UUID property with a generic [UUID4][uuid]. Inside `\CONFIG\network\` on the USB or SD, create a file called `my-network` and add the appropriate contents below:
|
By default the device will be in DHCP state.
|
||||||
|
|
||||||
|
Basic network settings can be set through the Supervisor frontend in the System
|
||||||
|
tab. Advanced configurations such as VLAN are also available through the
|
||||||
|
`ha network` CLI command.
|
||||||
|
|
||||||
|
To restore the default configuration the `ha network` CLI command can be used as
|
||||||
|
well:
|
||||||
|
|
||||||
|
```
|
||||||
|
ha network update default --ipv4-method auto
|
||||||
|
```
|
||||||
|
|
||||||
|
If more advanced network settings are required network connection files can be
|
||||||
|
placed on a USB drive and imported to the host as described in
|
||||||
|
[Configuration][configuration-usb].
|
||||||
|
|
||||||
|
## Manual Network Configuration
|
||||||
|
|
||||||
|
If the frontend or `ha network` CLI cannot meet your use case, it is still
|
||||||
|
possible to configure the underlying NetworkManager manually.
|
||||||
|
|
||||||
|
You can read the [NetworkManager manual][nm-manual] or find many configuration
|
||||||
|
examples across the internet. Note that changes to `NetworkManager.conf` are
|
||||||
|
not supported currently, only connection keyfiles are supported. Keep in mind
|
||||||
|
that the system is read-only. If you don't want the IP address to change on
|
||||||
|
every boot, you should modify the UUID property to a generic [UUID4][uuid].
|
||||||
|
Inside the `\CONFIG\network\` directory on the USB drive or SD card, create a
|
||||||
|
file called `my-network` and add the appropriate contents below:
|
||||||
|
|
||||||
|
**NOTE: Please make sure to save this file with UNIX line endings (LF, and not Windows' default CRLF endings). You can do this using Notepad these days!**
|
||||||
|
|
||||||
### Default
|
### Default
|
||||||
|
|
||||||
We have a preinstalled connection profile:
|
A preinstalled connection profile for wired network is active by default:
|
||||||
|
|
||||||
```ini
|
```ini
|
||||||
[connection]
|
[connection]
|
||||||
id=HassOS default
|
id=Home Assistant OS default
|
||||||
uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
|
uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
|
||||||
type=802-3-ethernet
|
type=802-3-ethernet
|
||||||
|
llmnr=2
|
||||||
|
mdns=2
|
||||||
|
|
||||||
[ipv4]
|
[ipv4]
|
||||||
method=auto
|
method=auto
|
||||||
@@ -24,13 +56,15 @@ addr-gen-mode=stable-privacy
|
|||||||
method=auto
|
method=auto
|
||||||
```
|
```
|
||||||
|
|
||||||
### LAN
|
### Wired connection to the LAN
|
||||||
|
|
||||||
```ini
|
```ini
|
||||||
[connection]
|
[connection]
|
||||||
id=hassos-network
|
id=my-network
|
||||||
uuid=d55162b4-6152-4310-9312-8f4c54d86afa
|
uuid=d55162b4-6152-4310-9312-8f4c54d86afa
|
||||||
type=802-3-ethernet
|
type=802-3-ethernet
|
||||||
|
llmnr=2
|
||||||
|
mdns=2
|
||||||
|
|
||||||
[ipv4]
|
[ipv4]
|
||||||
method=auto
|
method=auto
|
||||||
@@ -40,11 +74,11 @@ addr-gen-mode=stable-privacy
|
|||||||
method=auto
|
method=auto
|
||||||
```
|
```
|
||||||
|
|
||||||
### Wireless WPA/PSK
|
### Wireless LAN WPA/PSK
|
||||||
|
|
||||||
```ini
|
```ini
|
||||||
[connection]
|
[connection]
|
||||||
id=hassos-network
|
id=my-network
|
||||||
uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
|
uuid=72111c67-4a5d-4d5c-925e-f8ee26efb3c3
|
||||||
type=802-11-wireless
|
type=802-11-wireless
|
||||||
|
|
||||||
@@ -74,71 +108,78 @@ Replace the following configuration:
|
|||||||
```ini
|
```ini
|
||||||
[ipv4]
|
[ipv4]
|
||||||
method=manual
|
method=manual
|
||||||
address=192.168.1.111/24,192.168.1.1
|
address=192.168.1.111/24;192.168.1.1
|
||||||
dns=8.8.8.8;8.8.4.4;
|
dns=8.8.8.8;8.8.4.4;
|
||||||
```
|
```
|
||||||
For address, the value before the comma is the IP address and subnet prefix bitlength; the second value is the IP address of the gateway.
|
|
||||||
|
For `address`, the value before the semicolon is the IP address and subnet prefix bitlength. The second value (after the semicolon) is the IP address of the local gateway.
|
||||||
|
|
||||||
## Tips
|
## Tips
|
||||||
|
|
||||||
### Reset network
|
### Reset network
|
||||||
|
|
||||||
If you want to reset the network configuration back to the default DHCP settings, use the following commands on the host:
|
If you want to reset the network configuration back to the default connection
|
||||||
|
profile using DHCP, use the following commands on the host console:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ rm /etc/NetworkManager/system-connections/*
|
# rm -r /mnt/overlay/etc/NetworkManager/system-connections
|
||||||
$ cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
|
# reboot
|
||||||
$ nmcli con reload
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Home Assistant OS will recreate the default connection profile during boot.
|
||||||
|
|
||||||
### Powersave
|
### Powersave
|
||||||
|
|
||||||
If you have trouble with powersave you can do following:
|
If you have trouble with powersave then apply the following changes:
|
||||||
|
|
||||||
```ini
|
```ini
|
||||||
[wifi]
|
[wifi]
|
||||||
# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
|
# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
|
||||||
powersave=0
|
powersave=0
|
||||||
```
|
```
|
||||||
## Using nmcli to set a static IPV4 address
|
|
||||||
|
|
||||||
Log into the HASSOS base system via a console:
|
## Using `nmcli` to set a static IPv4 address
|
||||||
|
|
||||||
|
Log into the the Home Assistant OS base system via a console:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
Welcome to Home Assistant
|
||||||
|
homeassistant login:
|
||||||
```
|
```
|
||||||
Welcome to HassOS
|
|
||||||
Hassio login:
|
- Login as `root` (no password needed). At the `ha >` prompt, type `login` (as instructed).
|
||||||
|
|
||||||
|
From there you use the `nmcli` configuration tool.
|
||||||
|
|
||||||
|
- `# nmcli con show` will list the "Home Assistant OS default" connection in use.
|
||||||
|
- `# nmcli con show "Home Assistant OS default"` will list all the properties of the connection.
|
||||||
|
|
||||||
|
To start editing the configuration setting for "Home Assistant OS default":
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# nmcli con edit "Home Assistant OS default"
|
||||||
```
|
```
|
||||||
Login as `root` (no password needed)
|
|
||||||
|
|
||||||
At the `hassio >` prompt, type `login` (as instructed).
|
|
||||||
|
|
||||||
From here you will use the `nmcli` configuration tool.
|
|
||||||
|
|
||||||
`# nmcli connection show` will list the “HassOS default” connection in use.
|
|
||||||
|
|
||||||
`# nmcli con show "HassOS default"` will list all the properties of the connection.
|
|
||||||
|
|
||||||
`# nmcli con edit "HassOS default"` will put you in a position to edit the connection.
|
|
||||||
|
|
||||||
`nmcli> print ipv4` will show you the ipv4 properties of this connection.
|
|
||||||
|
|
||||||
To add your static IP address (select 'yes' for manual method);
|
To add your static IP address (select 'yes' for manual method);
|
||||||
```
|
|
||||||
|
```bash
|
||||||
nmcli> set ipv4.addresses 192.168.100.10/24
|
nmcli> set ipv4.addresses 192.168.100.10/24
|
||||||
Do you also want to set 'ipv4.method' to 'manual'? [yes]:
|
Do you also want to set 'ipv4.method' to 'manual'? [yes]:
|
||||||
```
|
```
|
||||||
In addition I have found it is wise to set the dns server and the local gateway. For most home routers these will be the same address. If you are using Pi-Hole you can set the dns to that.
|
|
||||||
```
|
In addition, it's recommended to set the DNS server and the local gateway. For most home routers the DNS server will have the same IP address as the router itself. If you are using Pi-Hole or a third-party DNS system then you can set the DNS server to that.
|
||||||
|
|
||||||
|
```bash
|
||||||
nmcli> set ipv4.dns 192.168.100.1
|
nmcli> set ipv4.dns 192.168.100.1
|
||||||
nmcli> set ipv4.gateway 192.168.100.1
|
nmcli> set ipv4.gateway 192.168.100.1
|
||||||
nmcli> save
|
|
||||||
nmcli> quit
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`nmcli> print ipv4` will show you the IPv4 properties of this connection. With `nmcli> save` you will save the changes afterwards.
|
||||||
|
|
||||||
If you now view the default connection `cat /etc/NetworkManager/system-connections/default` you should see the method is manual and the address is set.
|
If you now view the default connection `cat /etc/NetworkManager/system-connections/default` you should see the method is manual and the address is set.
|
||||||
|
|
||||||
Doing a `nmcli con reload` does not always work so restart the VM.
|
Doing a `nmcli con reload` does not always work, so restart the virtual machine or the physical system.
|
||||||
|
|
||||||
[keyfile]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
|
[nm-manual]: https://developer.gnome.org/NetworkManager/stable/manpages.html
|
||||||
[configuration-usb]: configuration.md
|
[configuration-usb]: configuration.md
|
||||||
[uuid]: https://www.uuidgenerator.net/
|
[uuid]: https://www.uuidgenerator.net/
|
||||||
|
68
Documentation/partition.md
Normal file
68
Documentation/partition.md
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
# Partition
|
||||||
|
|
||||||
|
The partition layout is a bit different than the typical setup. We prefer GPT, if possible. With SoCs which don't support GPT, we use a hybrid GPT. For more details about this topic, please refer to the [development](development.md) documentation.
|
||||||
|
|
||||||
|
The system is designed to have as few write operations to the storage media as possible. This means that we only write during the OTA updates and 5-6 times per week on the overlay partition. The data partition receives the main I/O operations and for this reason is ideal for placing on a different drive.
|
||||||
|
|
||||||
|
A visual representation looks like this:
|
||||||
|
|
||||||
|
```text
|
||||||
|
-------------------------
|
||||||
|
| Bootloader |
|
||||||
|
-------------------------
|
||||||
|
| Kernel A |
|
||||||
|
-------------------------
|
||||||
|
| System A |
|
||||||
|
| |
|
||||||
|
-------------------------
|
||||||
|
| Kernel B |
|
||||||
|
-------------------------
|
||||||
|
| System B |
|
||||||
|
| |
|
||||||
|
-------------------------
|
||||||
|
| Bootstate |
|
||||||
|
-------------------------
|
||||||
|
| Overlay |
|
||||||
|
| |
|
||||||
|
...
|
||||||
|
|
||||||
|
-------------------------
|
||||||
|
| Data |
|
||||||
|
| |
|
||||||
|
-------------------------
|
||||||
|
```
|
||||||
|
|
||||||
|
Sometime the bootloader part can look different because there can be firmware or SPLs for boot the CPU on the SoC.
|
||||||
|
|
||||||
|
## Data disk
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
The data partition is the only partition with real I/O. It will be expanded automatically at boot to the full size of the disk.
|
||||||
|
|
||||||
|
|
||||||
|
## Using CLI to move the data partition.
|
||||||
|
|
||||||
|
In a Home Assistant OS installation, the data is stored on the `/mnt/data` partition of the boot storage (typically the SD card). This is the only read/write partition on the boot storage. Using the `datadisk` move command, this partition can be moved to an externally connected drive, leaving the rest of the read-only system on the boot storage.
|
||||||
|
|
||||||
|
The storage capacity of the external drive must be larger than the storage capacity of the existing disk.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ ha os datadisk move /dev/sdx
|
||||||
|
```
|
||||||
|
|
||||||
|
This will make a reboot which going significantly longer than usual; please be patient!
|
||||||
|
|
||||||
|
For getting a list of supported detected devices which can be used by `datadisk`:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
$ ha os datadisk list
|
||||||
|
```
|
||||||
|
|
||||||
|
## Using UI to move the data partition.
|
||||||
|
|
||||||
|
__follow__
|
||||||
|
|
||||||
|
|
||||||
|
## Check Power Supply Rating
|
||||||
|
Using an USB attached SSD can draw quite some power. For instance on Raspberry Pi 3 the official Raspberry Pi power supply (PSU) only provides 2.5A which can be too tight. Use a power supply which can at least provide 3.5A. Alternatively use a powered USB hub. Connect the Hub to one of the USB slots of your Raspberry Pi, and connect the SSD to the Hub. The power supply that came with the Hub will power the attached device(s).
|
BIN
Documentation/usb-disk.png
Normal file
BIN
Documentation/usb-disk.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 67 KiB |
20
Makefile
20
Makefile
@@ -1,12 +1,22 @@
|
|||||||
RELEASE_DIR = /build/release
|
BUILDDIR:=$(shell pwd)
|
||||||
|
RELEASE_DIR = $(BUILDDIR)/release
|
||||||
|
|
||||||
BUILDROOT=/build/buildroot
|
BUILDROOT=$(BUILDDIR)/buildroot
|
||||||
BUILDROOT_EXTERNAL=/build/buildroot-external
|
BUILDROOT_EXTERNAL=$(BUILDDIR)/buildroot-external
|
||||||
DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
|
DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs
|
||||||
|
VERSION_DATE := $(shell date --utc +'%Y%m%d')
|
||||||
|
VERSION_DEV := "dev$(VERSION_DATE)"
|
||||||
|
|
||||||
TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
|
TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
|
||||||
TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
|
TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig)))
|
||||||
|
|
||||||
|
# Set O variable if not already done on the command line
|
||||||
|
ifneq ("$(origin O)", "command line")
|
||||||
|
O := $(BUILDROOT)/output
|
||||||
|
else
|
||||||
|
override O := $(BUILDROOT)/$(O)
|
||||||
|
endif
|
||||||
|
|
||||||
.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all
|
.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all
|
||||||
|
|
||||||
.PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help
|
.PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help
|
||||||
@@ -22,8 +32,8 @@ $(TARGETS_CONFIG): %-config:
|
|||||||
|
|
||||||
$(TARGETS): %: $(RELEASE_DIR) %-config
|
$(TARGETS): %: $(RELEASE_DIR) %-config
|
||||||
@echo "build $@"
|
@echo "build $@"
|
||||||
$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL)
|
$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=$(BUILDROOT_EXTERNAL) VERSION_DEV=$(VERSION_DEV)
|
||||||
cp -f $(BUILDROOT)/output/images/hassos_* $(RELEASE_DIR)/
|
cp -f $(O)/images/haos_* $(RELEASE_DIR)/
|
||||||
|
|
||||||
# Do not clean when building for one target
|
# Do not clean when building for one target
|
||||||
ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)
|
ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1)
|
||||||
|
67
README.md
67
README.md
@@ -1,13 +1,58 @@
|
|||||||
# HassOS
|
# Home Assistant Operating System
|
||||||
Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of IoT hardware. It is also available as virtual appliance. The whole system is optimized for embedded system and security. You can update the system simple with OTA updates or offline updates.
|
|
||||||
|
|
||||||
## Focus
|
Home Assistant Operating System (formerly HassOS) is an operating system optimized for hosting [Home Assistant](https://www.home-assistant.io) and its [Add-ons](https://www.home-assistant.io/addons/).
|
||||||
|
|
||||||
- Barebox as bootloader on EFI
|
Home Assistant Operating System uses Docker as Container engine. It by default deploys the Home Assistant Supervisor as a container. Home Assistant Supervisor in turn uses the Docker container engine to control Home Assistant Core and Add-Ons in separate containers. Home Assistant Operating System is **not** based on a regular Linux distribution like Ubuntu. It is built using [buildroot](https://buildroot.org/) and it is optimized for running Home Assistant, especially on single board compute (SBC) devices like the Pi, ODROID, NUC and Tinker Board (see supported hardware below).
|
||||||
- U-Boot as bootloader on IoT
|
|
||||||
- RAUC for OTA updates
|
## Features
|
||||||
- SquashFS LZ4 as filesystem
|
|
||||||
- Docker 18.09.0
|
- Lightweight and memory-efficient
|
||||||
- AppArmor protected
|
- Minimized I/O
|
||||||
- ZRAM LZ4 for /tmp, /var, swap
|
- Over The Air (OTA) updates
|
||||||
- Run every supervisor
|
- Offline updates
|
||||||
|
- Modular using Docker
|
||||||
|
|
||||||
|
## Supported hardware
|
||||||
|
|
||||||
|
- Raspberry Pi
|
||||||
|
- Hardkernel ODROID
|
||||||
|
- Intel NUC
|
||||||
|
- Asus Tinker Board
|
||||||
|
- Virtual appliances
|
||||||
|
|
||||||
|
See the full list and specific models [here](./Documentation/boards/README.md)
|
||||||
|
|
||||||
|
## Getting Started
|
||||||
|
|
||||||
|
If you just want to use Home Assistant the official [getting started guide](https://www.home-assistant.io/getting-started/) and [installation instructions](https://www.home-assistant.io/hassio/installation/) take you through how to download Home Assistant Operating System and get it running on your machine.
|
||||||
|
|
||||||
|
If you're interested in finding out more about Home Assistant Operating System and how it works read on...
|
||||||
|
|
||||||
|
## HassOS components
|
||||||
|
|
||||||
|
- **Bootloader:**
|
||||||
|
- [Barebox](https://barebox.org/) for devices that support EFI
|
||||||
|
- [U-Boot](https://www.denx.de/wiki/U-Boot) for devices that don't support EFI
|
||||||
|
- **Operating System:**
|
||||||
|
- [Buildroot](https://buildroot.org/) LTS Linux
|
||||||
|
- **File Systems:**
|
||||||
|
- [SquashFS](https://www.kernel.org/doc/Documentation/filesystems/squashfs.txt) for read-only file systems (using LZ4 compression)
|
||||||
|
- [ZRAM](https://www.kernel.org/doc/Documentation/blockdev/zram.txt) for `/tmp`, `/var` and swap (using LZ4 compression)
|
||||||
|
- **Container Platform:**
|
||||||
|
- [Docker Engine](https://docs.docker.com/engine/) for running Home Assistant components in containers
|
||||||
|
- **Updates:**
|
||||||
|
- [RAUC](https://rauc.io/) for Over The Air (OTA) and USB updates
|
||||||
|
- **Security:**
|
||||||
|
- [AppArmor](https://apparmor.net/) Linux kernel security module
|
||||||
|
|
||||||
|
If you don't have experience with these, embedded systems, buildroot or the build process for Linux distributions, then please read up on these topics. The rest of the documentation in this project is for developers and assumes you have experience with embedded systems or a strong understanding of the internal workings of operating systems.
|
||||||
|
|
||||||
|
## Developer Documentation
|
||||||
|
|
||||||
|
All developer documentation is in the [Documentation](./Documentation) directory.
|
||||||
|
|
||||||
|
### Development builds
|
||||||
|
|
||||||
|
The Development build GitHub Action Workflow is a manually triggered workflow
|
||||||
|
which creates Home Assistant OS development builds. The development builds are
|
||||||
|
available at [os-builds.home-assistant.io](https://os-builds.home-assistant.io/).
|
||||||
|
@@ -1,6 +1,13 @@
|
|||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/hassos/Config.in"
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
|
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
|
||||||
source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/intel-e1000e/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8812au/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/eq3_char_loop/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/generic_raw_uart/Config.in"
|
||||||
|
source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"
|
||||||
|
@@ -7,22 +7,23 @@ function hassos_pre_image() {
|
|||||||
|
|
||||||
cp -t "${BOOT_DATA}" \
|
cp -t "${BOOT_DATA}" \
|
||||||
"${BINARIES_DIR}/boot.scr" \
|
"${BINARIES_DIR}/boot.scr" \
|
||||||
"${BINARIES_DIR}/rk3288-tinker.dtb"
|
"${BINARIES_DIR}/rk3288-tinker.dtb" \
|
||||||
|
"${BINARIES_DIR}/rk3288-tinker-s.dtb"
|
||||||
|
|
||||||
|
mkdir -p "${BOOT_DATA}/overlays"
|
||||||
|
cp "${BINARIES_DIR}"/*.dtbo "${BOOT_DATA}/overlays/"
|
||||||
|
cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/haos-config.txt"
|
||||||
|
|
||||||
echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
|
echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
|
||||||
|
|
||||||
# Create boot binary
|
|
||||||
rm -f "${BINARIES_DIR}/u-boot-spl-dtb.img"
|
|
||||||
mkimage -n rk3288 -T rksd -d "${BINARIES_DIR}/u-boot-spl-dtb.bin" "${BINARIES_DIR}/u-boot-spl-dtb.img"
|
|
||||||
cat "${BINARIES_DIR}/u-boot-dtb.bin" >> "${BINARIES_DIR}/u-boot-spl-dtb.img"
|
|
||||||
|
|
||||||
# SPL
|
# SPL
|
||||||
create_spl_image
|
create_spl_image
|
||||||
|
|
||||||
dd if="${BINARIES_DIR}/u-boot-spl-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
|
dd if="${BINARIES_DIR}/idbloader.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=64
|
||||||
|
dd if="${BINARIES_DIR}/u-boot-dtb.img" of="${SPL_IMG}" conv=notrunc bs=512 seek=8192
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function hassos_post_image() {
|
function hassos_post_image() {
|
||||||
convert_disk_image_gz
|
convert_disk_image_xz
|
||||||
}
|
}
|
||||||
|
2
buildroot-external/board/asus/tinker/boot-env.txt
Normal file
2
buildroot-external/board/asus/tinker/boot-env.txt
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# Uncomment this to enable GPIO support for RPI-RF-MOD/HM-MOD-RPI-PCB
|
||||||
|
#overlays=rpi-rf-mod
|
File diff suppressed because it is too large
Load Diff
@@ -3,5 +3,8 @@ BOARD_NAME="Asus TinkerBoard"
|
|||||||
CHASSIS=embedded
|
CHASSIS=embedded
|
||||||
BOOTLOADER=uboot
|
BOOTLOADER=uboot
|
||||||
KERNEL_FILE=zImage
|
KERNEL_FILE=zImage
|
||||||
BOOT_SYS=spl
|
BOOT_SYS=hyprid
|
||||||
|
BOOT_SPL=true
|
||||||
BOOT_ENV_SIZE=0x8000
|
BOOT_ENV_SIZE=0x8000
|
||||||
|
SUPERVISOR_MACHINE=tinker
|
||||||
|
SUPERVISOR_ARCH=armv7
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,64 @@
|
|||||||
|
From 2ae3821fd824560ef2db3c87cfbec985177911f6 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599249626.git.stefan@agner.ch>
|
||||||
|
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 5 Nov 2018 22:03:26 +0100
|
||||||
|
Subject: [PATCH 1/2] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins
|
||||||
|
|
||||||
|
The most essential being the RTS pin, which is clearly needed to
|
||||||
|
upload the initial configuration into the Realtek Bluetooth
|
||||||
|
chip, and make the Bluetooth chip work.
|
||||||
|
|
||||||
|
Now, the Bluetooth chip also needs 3 other GPIOS to be enabled.
|
||||||
|
I'll see how I do that through the DTS file in a near future.
|
||||||
|
|
||||||
|
The 3 GPIOS being :
|
||||||
|
Bluetooth Reset : <&gpio4 29 GPIO_ACTIVE_HIGH>
|
||||||
|
Bluetooth Wake : <&gpio4 26 GPIO_ACTIVE_HIGH>
|
||||||
|
Bluetooth Wake_Host_IRQ : <&gpio4 31 GPIO_ACTIVE_HIGH>
|
||||||
|
|
||||||
|
These are currently setup manually, through scripts. But it seems that
|
||||||
|
GPIO handling through /sys entries might not be possible in the long
|
||||||
|
term, the replacement being libgpio.
|
||||||
|
Anyway, if you're interesting in enabling the Bluetooth GPIO by hand,
|
||||||
|
here are the commands :
|
||||||
|
|
||||||
|
cd /sys/class/gpio &&
|
||||||
|
echo 146 > export &&
|
||||||
|
echo 149 > export &&
|
||||||
|
echo 151 > export &&
|
||||||
|
echo high > gpio146/direction &&
|
||||||
|
echo high > gpio149/direction &&
|
||||||
|
echo high > gpio151/direction
|
||||||
|
|
||||||
|
Resetting the chip is done like this :
|
||||||
|
|
||||||
|
echo "Resetting the Bluetooth chip"
|
||||||
|
cd /sys/class/gpio/gpio149 &&
|
||||||
|
echo 0 > value &&
|
||||||
|
sleep 1 &&
|
||||||
|
echo 1 > value &&
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
||||||
|
[move change to rk3288-tinker.dtsi]
|
||||||
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
index acfaa12ec239..284e7982925d 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
@@ -492,6 +492,8 @@ &tsadc {
|
||||||
|
};
|
||||||
|
|
||||||
|
&uart0 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
@@ -1,122 +0,0 @@
|
|||||||
From 7ba71967a2678e119bcd819ac92d08bd038e1879 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 17 Jul 2017 18:34:33 +0000
|
|
||||||
Subject: [PATCH 5/5] Mali midgard r19p0 fixes for 4.13 kernels
|
|
||||||
|
|
||||||
Mostly due to DMA structure members renamed, and some signatures
|
|
||||||
modifications done during the development of Linux 4.11.
|
|
||||||
|
|
||||||
* mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf
|
|
||||||
11bac80004499ea59f361ef2a5516c84b6eab675
|
|
||||||
v4.11-rc1
|
|
||||||
|
|
||||||
* sched/headers: Move task->mm handling methods to <linux/sched/mm.h>
|
|
||||||
68e21be2916b359fd8afb536c1911dc014cfd03e
|
|
||||||
v4.11-rc1
|
|
||||||
|
|
||||||
* sched/headers: Move task-stack related APIs from <linux/sched.h> to
|
|
||||||
<linux/sched/task_stack.h>
|
|
||||||
f3ac60671954c8d413532627b1be13a76f394c49
|
|
||||||
v4.11-rc1
|
|
||||||
|
|
||||||
* dma-fence: Introduce drm_fence_set_error() helper
|
|
||||||
a009e975da5c7d42a7f5eaadc54946eb5f76c9af
|
|
||||||
v4.11-rc1
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase.h | 4 ++++
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase_fence.h | 4 ++++
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase_mem_linux.c | 6 ++++++
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase_sync_file.c | 12 ++++++++++++
|
|
||||||
4 files changed, 26 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h
|
|
||||||
index d77f186..5ee47c4 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase.h
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase.h
|
|
||||||
@@ -35,6 +35,10 @@
|
|
||||||
#include <linux/mutex.h>
|
|
||||||
#include <linux/rwsem.h>
|
|
||||||
#include <linux/sched.h>
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
|
|
||||||
+#include <linux/sched/task_stack.h>
|
|
||||||
+#include <linux/sched/mm.h>
|
|
||||||
+#endif
|
|
||||||
#include <linux/slab.h>
|
|
||||||
#include <linux/spinlock.h>
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.h b/drivers/gpu/arm/midgard/mali_kbase_fence.h
|
|
||||||
index 8d39299..3c2e3a9 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase_fence.h
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase_fence.h
|
|
||||||
@@ -134,7 +134,11 @@ static inline bool kbase_fence_out_is_ours(struct kbase_jd_atom *katom)
|
|
||||||
static inline int kbase_fence_out_signal(struct kbase_jd_atom *katom,
|
|
||||||
int status)
|
|
||||||
{
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
|
||||||
katom->dma_fence.fence->status = status;
|
|
||||||
+#else
|
|
||||||
+ katom->dma_fence.fence->error = status;
|
|
||||||
+#endif
|
|
||||||
return dma_fence_signal(katom->dma_fence.fence);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
||||||
index b1f2c46..896aa35 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c
|
|
||||||
@@ -1788,8 +1788,14 @@ static void kbase_cpu_vm_close(struct vm_area_struct *vma)
|
|
||||||
KBASE_EXPORT_TEST_API(kbase_cpu_vm_close);
|
|
||||||
|
|
||||||
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
|
||||||
static int kbase_cpu_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
|
|
||||||
{
|
|
||||||
+#else
|
|
||||||
+static int kbase_cpu_vm_fault(struct vm_fault *vmf)
|
|
||||||
+{
|
|
||||||
+ struct vm_area_struct *vma = vmf->vma;
|
|
||||||
+#endif
|
|
||||||
struct kbase_cpu_mapping *map = vma->vm_private_data;
|
|
||||||
pgoff_t rel_pgoff;
|
|
||||||
size_t i;
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
|
|
||||||
index 4e1621c..d84a54e 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
|
|
||||||
@@ -161,8 +161,13 @@ static void kbase_fence_wait_callback(struct dma_fence *fence,
|
|
||||||
struct kbase_context *kctx = katom->kctx;
|
|
||||||
|
|
||||||
/* Cancel atom if fence is erroneous */
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
|
||||||
if (dma_fence_is_signaled(kcb->fence) && kcb->fence->status < 0)
|
|
||||||
katom->event_code = BASE_JD_EVENT_JOB_CANCELLED;
|
|
||||||
+#else
|
|
||||||
+ if (dma_fence_is_signaled(kcb->fence) && kcb->fence->error < 0)
|
|
||||||
+ katom->event_code = BASE_JD_EVENT_JOB_CANCELLED;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
if (kbase_fence_dep_count_dec_and_test(katom)) {
|
|
||||||
/* We take responsibility of handling this */
|
|
||||||
@@ -273,10 +278,17 @@ static void kbase_sync_fence_info_get(struct dma_fence *fence,
|
|
||||||
* 1 : signaled
|
|
||||||
*/
|
|
||||||
if (dma_fence_is_signaled(fence)) {
|
|
||||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0))
|
|
||||||
if (fence->status < 0)
|
|
||||||
info->status = fence->status; /* signaled with error */
|
|
||||||
else
|
|
||||||
info->status = 1; /* signaled with success */
|
|
||||||
+#else
|
|
||||||
+ if (fence->error < 0)
|
|
||||||
+ info->status = fence->error; /* signaled with error */
|
|
||||||
+ else
|
|
||||||
+ info->status = 1; /* signaled with success */
|
|
||||||
+#endif
|
|
||||||
} else {
|
|
||||||
info->status = 0; /* still active (unsignaled) */
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -0,0 +1,55 @@
|
|||||||
|
From 3f3c4cd047234fb94de4d6b701d05ff0450890cf Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <3f3c4cd047234fb94de4d6b701d05ff0450890cf.1613588152.git.stefan@agner.ch>
|
||||||
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
|
Date: Wed, 17 Feb 2021 19:55:41 +0100
|
||||||
|
Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for
|
||||||
|
RK3288"
|
||||||
|
|
||||||
|
This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962.
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288.dtsi | 8 --------
|
||||||
|
1 file changed, 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
index 8fa80facc8cd..8636d95c45e1 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||||
|
@@ -422,8 +422,6 @@ uart0: serial@ff180000 {
|
||||||
|
reg-io-width = <4>;
|
||||||
|
clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
|
||||||
|
clock-names = "baudclk", "apb_pclk";
|
||||||
|
- dmas = <&dmac_peri 1>, <&dmac_peri 2>;
|
||||||
|
- dma-names = "tx", "rx";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&uart0_xfer>;
|
||||||
|
status = "disabled";
|
||||||
|
@@ -437,8 +435,6 @@ uart1: serial@ff190000 {
|
||||||
|
reg-io-width = <4>;
|
||||||
|
clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
|
||||||
|
clock-names = "baudclk", "apb_pclk";
|
||||||
|
- dmas = <&dmac_peri 3>, <&dmac_peri 4>;
|
||||||
|
- dma-names = "tx", "rx";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&uart1_xfer>;
|
||||||
|
status = "disabled";
|
||||||
|
@@ -465,8 +461,6 @@ uart3: serial@ff1b0000 {
|
||||||
|
reg-io-width = <4>;
|
||||||
|
clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
|
||||||
|
clock-names = "baudclk", "apb_pclk";
|
||||||
|
- dmas = <&dmac_peri 7>, <&dmac_peri 8>;
|
||||||
|
- dma-names = "tx", "rx";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&uart3_xfer>;
|
||||||
|
status = "disabled";
|
||||||
|
@@ -480,8 +474,6 @@ uart4: serial@ff1c0000 {
|
||||||
|
reg-io-width = <4>;
|
||||||
|
clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
|
||||||
|
clock-names = "baudclk", "apb_pclk";
|
||||||
|
- dmas = <&dmac_peri 9>, <&dmac_peri 10>;
|
||||||
|
- dma-names = "tx", "rx";
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&uart4_xfer>;
|
||||||
|
status = "disabled";
|
||||||
|
--
|
||||||
|
2.30.1
|
||||||
|
|
@@ -0,0 +1,55 @@
|
|||||||
|
From fc25c993bf2feb6e66d55bf03eb725ec688e47eb Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <fc25c993bf2feb6e66d55bf03eb725ec688e47eb.1599250914.git.stefan@agner.ch>
|
||||||
|
In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 5 Nov 2018 22:15:14 +0100
|
||||||
|
Subject: [PATCH 2/3] ARM: DTS: rk3288-tinker: Defining the SPI interface
|
||||||
|
|
||||||
|
Taken from, and tested by @TonyMac32 .
|
||||||
|
|
||||||
|
Well, the original one was tested by him but I had to adapt the
|
||||||
|
registers definitions to the new 64-bits LPAE-compliant syntax.
|
||||||
|
|
||||||
|
Therefore that *might* break, along with a few other patches.
|
||||||
|
|
||||||
|
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
||||||
|
[move change to rk3288-tinker.dtsi]
|
||||||
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 19 +++++++++++++++++++
|
||||||
|
1 file changed, 19 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
index 284e7982925d..d6cc66ab5bb1 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
@@ -485,6 +485,25 @@ &sdio0 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&spi2 {
|
||||||
|
+ max-freq = <50000000>;
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ spidev@0 {
|
||||||
|
+ compatible = "rockchip,spi_tinker";
|
||||||
|
+ reg = <0x0 0>;
|
||||||
|
+ spi-max-frequency = <50000000>;
|
||||||
|
+ spi-cpha = <1>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ spidev@1 {
|
||||||
|
+ compatible = "rockchip,spi_tinker";
|
||||||
|
+ reg = <0x1>;
|
||||||
|
+ spi-max-frequency = <50000000>;
|
||||||
|
+ spi-cpha = <1>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&tsadc {
|
||||||
|
rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
|
||||||
|
rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
@@ -1,36 +0,0 @@
|
|||||||
From f76c9c58669a3bba0456191431be558ab8054f50 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 17 Jul 2017 11:43:00 +0000
|
|
||||||
Subject: [PATCH 3/5] Using the new header on 4.12 kernels for copy_*_user
|
|
||||||
|
|
||||||
These changes are due to :
|
|
||||||
* generic ...copy_..._user primitives
|
|
||||||
d597580d373774b1bdab84b3d26ff0b55162b916
|
|
||||||
Version : 4.12-rc1
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/base/ump/src/linux/ump_kernel_linux.c | 7 ++++++-
|
|
||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/base/ump/src/linux/ump_kernel_linux.c b/drivers/base/ump/src/linux/ump_kernel_linux.c
|
|
||||||
index d6c3c53..bb3a7f0 100644
|
|
||||||
--- a/drivers/base/ump/src/linux/ump_kernel_linux.c
|
|
||||||
+++ b/drivers/base/ump/src/linux/ump_kernel_linux.c
|
|
||||||
@@ -20,7 +20,12 @@
|
|
||||||
#include <linux/ump-ioctl.h>
|
|
||||||
#include <linux/ump.h>
|
|
||||||
|
|
||||||
-#include <asm/uaccess.h> /* copy_*_user */
|
|
||||||
+#include <linux/version.h>
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)
|
|
||||||
+#include <asm/uaccess.h> /* copy_*_user */
|
|
||||||
+#else
|
|
||||||
+#include <linux/uaccess.h> /* copy_*_user */
|
|
||||||
+#endif
|
|
||||||
#include <linux/compat.h>
|
|
||||||
#include <linux/module.h> /* kernel module definitions */
|
|
||||||
#include <linux/fs.h> /* file system operations */
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -0,0 +1,41 @@
|
|||||||
|
From 3a9d71847ae869ffdb2b0818aa86a36d57d96331 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <3a9d71847ae869ffdb2b0818aa86a36d57d96331.1599250914.git.stefan@agner.ch>
|
||||||
|
In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
|
Date: Fri, 4 Sep 2020 21:57:55 +0200
|
||||||
|
Subject: [PATCH 3/3] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
|
||||||
|
|
||||||
|
Enable I2C devices which are accessible via 40-pin header.
|
||||||
|
|
||||||
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
index d6cc66ab5bb1..7af5818ac77c 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
@@ -344,10 +344,18 @@ regulator-state-mem {
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+&i2c1 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&i2c2 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&i2c4 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&i2c5 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
@@ -1,46 +0,0 @@
|
|||||||
From 63c110cdebc2c692964e1250c6f74f9e8c47c85d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Tue, 10 Jan 2017 04:28:48 +0000
|
|
||||||
Subject: [PATCH 4/5] Adapt get_user_pages calls to use the new calling
|
|
||||||
procedure
|
|
||||||
|
|
||||||
These changes are due to this commit:
|
|
||||||
mm: replace get_user_pages_remote() write/force parameters with gup_flags
|
|
||||||
9beae1ea89305a9667ceaab6d0bf46a045ad71e7
|
|
||||||
Kernel: 4.9.0-rc
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/base/ump/src/linux/ump_kernel_linux_mem.c | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/base/ump/src/linux/ump_kernel_linux_mem.c b/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
|
||||||
index 9186dd0..def4c0e 100644
|
|
||||||
--- a/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
|
||||||
+++ b/drivers/base/ump/src/linux/ump_kernel_linux_mem.c
|
|
||||||
@@ -35,6 +35,10 @@
|
|
||||||
#include <ump_arch.h>
|
|
||||||
#include <common/ump_kernel_priv.h>
|
|
||||||
|
|
||||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0))
|
|
||||||
+#include <linux/pfn_t.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static void umpp_vm_close(struct vm_area_struct *vma)
|
|
||||||
{
|
|
||||||
umpp_cpu_mapping * mapping;
|
|
||||||
@@ -222,7 +226,11 @@ int umpp_linux_mmap(struct file * filp, struct vm_area_struct * vma)
|
|
||||||
paddr = alloc->block_array[block_idx].addr;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4,4,0))
|
|
||||||
err = vm_insert_mixed(vma, vma->vm_start + (i << PAGE_SHIFT), paddr >> PAGE_SHIFT);
|
|
||||||
+#else
|
|
||||||
+ err = vm_insert_mixed(vma, vma->vm_start + (i << PAGE_SHIFT), __pfn_to_pfn_t(paddr >> PAGE_SHIFT, PFN_DEV));
|
|
||||||
+#endif
|
|
||||||
paddr += PAGE_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 7c27055687c595e9f9eca484314f4fe3866a4260 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Tue, 18 Jul 2017 17:35:16 +0000
|
|
||||||
Subject: [PATCH 2/2] Don't be TOO severe when looking for the IRQ names
|
|
||||||
|
|
||||||
Using strncmp with an all caps result in the driver being unable to
|
|
||||||
initialize itself when using the mainlined RK3288 DTS files, since they
|
|
||||||
define the IRQ names as "job", "mmu" and "gpu" instead of "JOB", "MMU"
|
|
||||||
and "GPU".
|
|
||||||
|
|
||||||
strncmp calls have been replaced by strncasecmp calls in order to
|
|
||||||
avoid such issue.
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
index 0cccb0b..9cc65d2 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
@@ -938,11 +938,11 @@ static int assign_irqs(struct platform_device *pdev)
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_OF
|
|
||||||
- if (!strncmp(irq_res->name, "JOB", 4)) {
|
|
||||||
+ if (!strncasecmp(irq_res->name, "JOB", 4)) {
|
|
||||||
irqtag = JOB_IRQ_TAG;
|
|
||||||
- } else if (!strncmp(irq_res->name, "MMU", 4)) {
|
|
||||||
+ } else if (!strncasecmp(irq_res->name, "MMU", 4)) {
|
|
||||||
irqtag = MMU_IRQ_TAG;
|
|
||||||
- } else if (!strncmp(irq_res->name, "GPU", 4)) {
|
|
||||||
+ } else if (!strncasecmp(irq_res->name, "GPU", 4)) {
|
|
||||||
irqtag = GPU_IRQ_TAG;
|
|
||||||
} else {
|
|
||||||
dev_err(&pdev->dev, "Invalid irq res name: '%s'\n",
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -1,42 +0,0 @@
|
|||||||
From ef7689887c31d2b1336e14f2c089185e8f60a9f1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 7 Aug 2017 19:22:39 +0000
|
|
||||||
Subject: [PATCH] Added the new "compatible" list, mainly used by Rockchip
|
|
||||||
|
|
||||||
Because, you know, all the Mali Midgard GPU used to define the GPU
|
|
||||||
using the 'compatible = "arm,mali-midgard"' property, which worked fine.
|
|
||||||
|
|
||||||
But it was removed.
|
|
||||||
|
|
||||||
They replaced the "arm,mali-midgard" node by "arm,mali-tXXX" where XXX
|
|
||||||
is the GPU series, and added "arm,rk3288-mali" which is used by nothing.
|
|
||||||
|
|
||||||
Which broke the Mali Midgard GPL kernel driver.
|
|
||||||
|
|
||||||
This patch fixes this issue.
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
index 27dcd9c1..cc4932a4 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
@@ -4742,6 +4742,12 @@ static const struct dev_pm_ops kbase_pm_ops = {
|
|
||||||
static const struct of_device_id kbase_dt_ids[] = {
|
|
||||||
{ .compatible = "arm,malit6xx" },
|
|
||||||
{ .compatible = "arm,mali-midgard" },
|
|
||||||
+ { .compatible = "arm,mali-t720" },
|
|
||||||
+ { .compatible = "arm,mali-t760" },
|
|
||||||
+ { .compatible = "arm,mali-t820" },
|
|
||||||
+ { .compatible = "arm,mali-t830" },
|
|
||||||
+ { .compatible = "arm,mali-t860" },
|
|
||||||
+ { .compatible = "arm,mali-t880" },
|
|
||||||
{ /* sentinel */ }
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, kbase_dt_ids);
|
|
||||||
--
|
|
||||||
2.13.0
|
|
||||||
|
|
@@ -1,34 +0,0 @@
|
|||||||
From 9812105eb6220863af05fc72591118f0a48e1c4e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 21 May 2018 22:32:59 +0200
|
|
||||||
Subject: [PATCH] GPU: ARM: Midgard: Adapt to the new mmap call checks.
|
|
||||||
|
|
||||||
Now, I don't know if this driver is just one of these "buggy" drivers
|
|
||||||
Linus is talking about, or if this is just standard GPU procedure.
|
|
||||||
|
|
||||||
Anyway, this patch is due to this change by Linus Torvalds :
|
|
||||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=be83bbf806822b1b89e0a0f23cd87cddc409e429
|
|
||||||
|
|
||||||
And the fix is inspired by :
|
|
||||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76ef6b28ea4f81c3d511866a9b31392caa833126
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
index cc4932a4ead7..89b4cca27cf1 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
@@ -1087,6 +1087,7 @@ static int kbase_open(struct inode *inode, struct file *filp)
|
|
||||||
|
|
||||||
init_waitqueue_head(&kctx->event_queue);
|
|
||||||
filp->private_data = kctx;
|
|
||||||
+ filp->f_mode |= FMODE_UNSIGNED_OFFSET;
|
|
||||||
kctx->filp = filp;
|
|
||||||
|
|
||||||
if (kbdev->infinite_cache_active_default)
|
|
||||||
--
|
|
||||||
2.17.0
|
|
||||||
|
|
@@ -1,65 +0,0 @@
|
|||||||
From 7de25b73e152830587740d8f2ffaad94c72d90ac Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 17 Jul 2017 11:24:47 +0000
|
|
||||||
Subject: [PATCH 1/5] Integrating the Mali drivers
|
|
||||||
|
|
||||||
Changses required in order to select and compile the previously copied
|
|
||||||
Mali Midgard drivers.
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/base/Kconfig | 2 ++
|
|
||||||
drivers/base/Makefile | 1 +
|
|
||||||
drivers/gpu/Makefile | 2 +-
|
|
||||||
drivers/video/Kconfig | 1 +
|
|
||||||
4 files changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
|
|
||||||
index f046d21..b0982fc 100644
|
|
||||||
--- a/drivers/base/Kconfig
|
|
||||||
+++ b/drivers/base/Kconfig
|
|
||||||
@@ -348,3 +348,5 @@ config GENERIC_ARCH_TOPOLOGY
|
|
||||||
runtime.
|
|
||||||
|
|
||||||
endmenu
|
|
||||||
+
|
|
||||||
+source "drivers/base/ump/Kconfig"
|
|
||||||
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
|
|
||||||
index 397e5c3..251e0cf 100644
|
|
||||||
--- a/drivers/base/Makefile
|
|
||||||
+++ b/drivers/base/Makefile
|
|
||||||
@@ -24,6 +24,7 @@ obj-$(CONFIG_PINCTRL) += pinctrl.o
|
|
||||||
obj-$(CONFIG_DEV_COREDUMP) += devcoredump.o
|
|
||||||
obj-$(CONFIG_GENERIC_MSI_IRQ_DOMAIN) += platform-msi.o
|
|
||||||
obj-$(CONFIG_GENERIC_ARCH_TOPOLOGY) += arch_topology.o
|
|
||||||
+obj-$(CONFIG_UMP) += ump/
|
|
||||||
|
|
||||||
obj-y += test/
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
|
|
||||||
index e9ed439..66386b4 100644
|
|
||||||
--- a/drivers/gpu/Makefile
|
|
||||||
+++ b/drivers/gpu/Makefile
|
|
||||||
@@ -2,5 +2,5 @@
|
|
||||||
# taken to initialize them in the correct order. Link order is the only way
|
|
||||||
# to ensure this currently.
|
|
||||||
obj-$(CONFIG_TEGRA_HOST1X) += host1x/
|
|
||||||
-obj-y += drm/ vga/
|
|
||||||
+obj-y += drm/ vga/ arm/
|
|
||||||
obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/
|
|
||||||
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
|
|
||||||
index 3c20af9..041e15f 100644
|
|
||||||
--- a/drivers/video/Kconfig
|
|
||||||
+++ b/drivers/video/Kconfig
|
|
||||||
@@ -17,6 +17,7 @@ source "drivers/gpu/vga/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/gpu/host1x/Kconfig"
|
|
||||||
source "drivers/gpu/ipu-v3/Kconfig"
|
|
||||||
+source "drivers/gpu/arm/midgard/Kconfig"
|
|
||||||
|
|
||||||
source "drivers/gpu/drm/Kconfig"
|
|
||||||
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -1,50 +0,0 @@
|
|||||||
From e0c5a419cf5464cd02996431afa98e3b22dc6801 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 17 Jul 2017 23:14:48 +0000
|
|
||||||
Subject: [PATCH] clk: rockchip: add all known operating points to the allowed
|
|
||||||
CPU freqs
|
|
||||||
|
|
||||||
Patch from Willy Tarreau
|
|
||||||
|
|
||||||
Original commit message :
|
|
||||||
At least 1920 MHz runs stable on the MiQi even on openssl speed -multi 4,
|
|
||||||
which is by far the most intensive workload, and 1992/2016 work fine on
|
|
||||||
the CS-008 until it starts to heat too much. So add all of them so that
|
|
||||||
the device tree can simply manipulate them.
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/clk/rockchip/clk-rk3288.c | 17 +++++++++++++++++
|
|
||||||
1 file changed, 17 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
|
|
||||||
index 753c649..fd2058f 100644
|
|
||||||
--- a/drivers/clk/rockchip/clk-rk3288.c
|
|
||||||
+++ b/drivers/clk/rockchip/clk-rk3288.c
|
|
||||||
@@ -145,6 +145,23 @@ static struct rockchip_pll_rate_table rk3288_pll_rates[] = {
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct rockchip_cpuclk_rate_table rk3288_cpuclk_rates[] __initdata = {
|
|
||||||
+ RK3288_CPUCLK_RATE(2208000000U, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2184000000U, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2160000000U, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2136000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2112000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2088000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2064000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2040000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(2016000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1992000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1968000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1944000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1920000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1896000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1872000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1848000000, 1, 3, 1, 3, 3),
|
|
||||||
+ RK3288_CPUCLK_RATE(1824000000, 1, 3, 1, 3, 3),
|
|
||||||
RK3288_CPUCLK_RATE(1800000000, 1, 3, 1, 3, 3),
|
|
||||||
RK3288_CPUCLK_RATE(1704000000, 1, 3, 1, 3, 3),
|
|
||||||
RK3288_CPUCLK_RATE(1608000000, 1, 3, 1, 3, 3),
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -1,41 +0,0 @@
|
|||||||
From b82f540967f6a732a22bbd236457b864951aeda7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Sun, 14 May 2017 10:13:26 +0000
|
|
||||||
Subject: [PATCH] clk: rockchip: rk3288: prefer vdpu for vcodec clock source
|
|
||||||
|
|
||||||
Patch provided by Randy Li. The original commit message reads :
|
|
||||||
|
|
||||||
_______________
|
|
||||||
The RK3288 CRU system clock solution would suggest use
|
|
||||||
the vdpu clock source for the VPU(aclk_vpu and hclk_vpu).
|
|
||||||
|
|
||||||
Reading the registers of VPU(both VEPU and VDPU) would become all high
|
|
||||||
when the vepu is used as the clock source. It may be a bug in the SoC,
|
|
||||||
not sure whether it is fixed at RK3288W.
|
|
||||||
|
|
||||||
Signed-off-by: Randy Li <ayaka@soulik.info>
|
|
||||||
_______________
|
|
||||||
|
|
||||||
This also resolves a freeze when loading the OOT Video Codec driver
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/clk/rockchip/clk-rk3288.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
|
|
||||||
index 1227f74..f218256 100644
|
|
||||||
--- a/drivers/clk/rockchip/clk-rk3288.c
|
|
||||||
+++ b/drivers/clk/rockchip/clk-rk3288.c
|
|
||||||
@@ -215,7 +215,7 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" };
|
|
||||||
PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" };
|
|
||||||
PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" };
|
|
||||||
|
|
||||||
-PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vepu", "aclk_vdpu" };
|
|
||||||
+PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vdpu", "aclk_vepu" };
|
|
||||||
PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m",
|
|
||||||
"sclk_otgphy0_480m" };
|
|
||||||
PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" };
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -1,30 +0,0 @@
|
|||||||
From 239a5e3016b7f676bc3f56ea509ed172bf954001 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Sat, 22 Jul 2017 04:07:36 +0000
|
|
||||||
Subject: [PATCH] Remove the dependency to the clk_mali symbol.
|
|
||||||
|
|
||||||
Inspired by @wzzy2 patch
|
|
||||||
|
|
||||||
https://github.com/rockchip-linux/rockchip_forwardports/commit/359865c617129fe5fcc5530f4a88abcfaa6a5cb4
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
index 9cc65d2..27dcd9c 100644
|
|
||||||
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
|
|
||||||
@@ -3793,7 +3793,7 @@ static int power_control_init(struct platform_device *pdev)
|
|
||||||
}
|
|
||||||
#endif /* LINUX_VERSION_CODE >= 3, 12, 0 */
|
|
||||||
|
|
||||||
- kbdev->clock = clk_get(kbdev->dev, "clk_mali");
|
|
||||||
+ kbdev->clock = of_clk_get(kbdev->dev->of_node, 0);
|
|
||||||
if (IS_ERR_OR_NULL(kbdev->clock)) {
|
|
||||||
err = PTR_ERR(kbdev->clock);
|
|
||||||
kbdev->clock = NULL;
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
@@ -1,156 +0,0 @@
|
|||||||
From 1aeeeeaf10ad5888c1a5b3ab9b780be91c7dada9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 24 Jul 2017 23:09:31 +0000
|
|
||||||
Subject: [PATCH] Last try for the reboot hack
|
|
||||||
|
|
||||||
If this one does not work, get a refund for your CantRebootBoard.
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/mmc/host/dw_mmc-rockchip.c | 24 ++++++++++++++++++++++++
|
|
||||||
drivers/mmc/host/dw_mmc.c | 26 ++++++++++++++++++++++++++
|
|
||||||
include/linux/reboot.h | 3 +++
|
|
||||||
kernel/reboot.c | 1 +
|
|
||||||
4 files changed, 54 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
|
|
||||||
index aaed6f9b..71131020 100644
|
|
||||||
--- a/drivers/mmc/host/dw_mmc-rockchip.c
|
|
||||||
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
|
|
||||||
@@ -14,10 +14,12 @@
|
|
||||||
#include <linux/of_address.h>
|
|
||||||
#include <linux/mmc/slot-gpio.h>
|
|
||||||
#include <linux/pm_runtime.h>
|
|
||||||
+#include <linux/regulator/consumer.h> // Hack
|
|
||||||
#include <linux/slab.h>
|
|
||||||
|
|
||||||
#include "dw_mmc.h"
|
|
||||||
#include "dw_mmc-pltfm.h"
|
|
||||||
+#include "../core/core.h" // Hack
|
|
||||||
|
|
||||||
#define RK3288_CLKGEN_DIV 2
|
|
||||||
|
|
||||||
@@ -365,6 +367,27 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void dw_mci_rockchip_platfm_shutdown(struct platform_device *pdev)
|
|
||||||
+{
|
|
||||||
+ struct dw_mci *host = platform_get_drvdata(pdev);
|
|
||||||
+ struct mmc_host *mmc = host->slot->mmc;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ if(of_machine_is_compatible("asus,rk3288-tinker")){
|
|
||||||
+
|
|
||||||
+ mmc_power_off(mmc);
|
|
||||||
+
|
|
||||||
+ mdelay(20);
|
|
||||||
+
|
|
||||||
+ if (!IS_ERR(mmc->supply.vmmc))
|
|
||||||
+ ret = regulator_enable(mmc->supply.vmmc);
|
|
||||||
+
|
|
||||||
+ if (!IS_ERR(mmc->supply.vqmmc))
|
|
||||||
+ regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
static int dw_mci_rockchip_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
pm_runtime_get_sync(&pdev->dev);
|
|
||||||
@@ -385,6 +408,7 @@ static const struct dev_pm_ops dw_mci_rockchip_dev_pm_ops = {
|
|
||||||
static struct platform_driver dw_mci_rockchip_pltfm_driver = {
|
|
||||||
.probe = dw_mci_rockchip_probe,
|
|
||||||
.remove = dw_mci_rockchip_remove,
|
|
||||||
+ .shutdown = dw_mci_rockchip_platfm_shutdown,
|
|
||||||
.driver = {
|
|
||||||
.name = "dwmmc_rockchip",
|
|
||||||
.of_match_table = dw_mci_rockchip_match,
|
|
||||||
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
|
|
||||||
index a9dfb269..ee956a57 100644
|
|
||||||
--- a/drivers/mmc/host/dw_mmc.c
|
|
||||||
+++ b/drivers/mmc/host/dw_mmc.c
|
|
||||||
@@ -39,8 +39,10 @@
|
|
||||||
#include <linux/of.h>
|
|
||||||
#include <linux/of_gpio.h>
|
|
||||||
#include <linux/mmc/slot-gpio.h>
|
|
||||||
+#include <linux/reboot.h> // Hack
|
|
||||||
|
|
||||||
#include "dw_mmc.h"
|
|
||||||
+#include "../core/core.h" // Hack
|
|
||||||
|
|
||||||
/* Common flag combinations */
|
|
||||||
#define DW_MCI_DATA_ERROR_FLAGS (SDMMC_INT_DRTO | SDMMC_INT_DCRC | \
|
|
||||||
@@ -2687,6 +2689,28 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
|
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
|
||||||
|
|
||||||
+struct dw_mci *mSdhost;
|
|
||||||
+void setmmcEmergency() {
|
|
||||||
+ struct mmc_host *mmc;
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ printk(KERN_ERR "Emergency route taken.\n");
|
|
||||||
+ if (of_machine_is_compatible("asus,rk3288-tinker")) {
|
|
||||||
+ mmc = mSdhost->slot->mmc;
|
|
||||||
+
|
|
||||||
+ mmc_power_off(mmc);
|
|
||||||
+
|
|
||||||
+ mdelay(20);
|
|
||||||
+
|
|
||||||
+ if (!IS_ERR(mmc->supply.vmmc))
|
|
||||||
+ ret = regulator_enable(mmc->supply.vmmc);
|
|
||||||
+
|
|
||||||
+ if (!IS_ERR(mmc->supply.vqmmc))
|
|
||||||
+ regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL(setmmcEmergency);
|
|
||||||
+
|
|
||||||
static int dw_mci_init_slot(struct dw_mci *host)
|
|
||||||
{
|
|
||||||
struct mmc_host *mmc;
|
|
||||||
@@ -2718,6 +2742,8 @@ static int dw_mci_init_slot(struct dw_mci *host)
|
|
||||||
mmc->f_max = freq[1];
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (of_find_property(host->dev->of_node, "supports-sd", NULL))
|
|
||||||
+ mSdhost = host;
|
|
||||||
/*if there are external regulators, get them*/
|
|
||||||
ret = mmc_regulator_get_supply(mmc);
|
|
||||||
if (ret == -EPROBE_DEFER)
|
|
||||||
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
|
|
||||||
index a7ff409f..586e4504 100644
|
|
||||||
--- a/include/linux/reboot.h
|
|
||||||
+++ b/include/linux/reboot.h
|
|
||||||
@@ -72,12 +72,15 @@ extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN];
|
|
||||||
|
|
||||||
extern void orderly_poweroff(bool force);
|
|
||||||
extern void orderly_reboot(void);
|
|
||||||
+// Wonderful ASUS hack
|
|
||||||
+extern void setmmcEmergency(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Emergency restart, callable from an interrupt handler.
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern void emergency_restart(void);
|
|
||||||
+
|
|
||||||
#include <asm/emergency-restart.h>
|
|
||||||
|
|
||||||
#endif /* _LINUX_REBOOT_H */
|
|
||||||
diff --git a/kernel/reboot.c b/kernel/reboot.c
|
|
||||||
index bd30a973..9f99488f 100644
|
|
||||||
--- a/kernel/reboot.c
|
|
||||||
+++ b/kernel/reboot.c
|
|
||||||
@@ -61,6 +61,7 @@ void (*pm_power_off_prepare)(void);
|
|
||||||
void emergency_restart(void)
|
|
||||||
{
|
|
||||||
kmsg_dump(KMSG_DUMP_EMERG);
|
|
||||||
+ setmmcEmergency();
|
|
||||||
machine_emergency_restart();
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(emergency_restart);
|
|
||||||
--
|
|
||||||
2.13.0
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
@@ -1,59 +0,0 @@
|
|||||||
From c9f505dba7e4a3adc62054b852349e8bbae10326 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jacob Chen <jacob-chen@iotwrt.com>
|
|
||||||
Date: Mon, 26 Jun 2017 22:53:22 +0800
|
|
||||||
Subject: [PATCH 5/9] dt-bindings: Document the Rockchip RGA bindings
|
|
||||||
|
|
||||||
Add DT bindings documentation for Rockchip RGA
|
|
||||||
|
|
||||||
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
|
|
||||||
Signed-off-by: Jacob Chen <jacob-chen@iotwrt.com>
|
|
||||||
---
|
|
||||||
.../devicetree/bindings/media/rockchip-rga.txt | 36 ++++++++++++++++++++++
|
|
||||||
1 file changed, 36 insertions(+)
|
|
||||||
create mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.txt
|
|
||||||
|
|
||||||
diff --git a/Documentation/devicetree/bindings/media/rockchip-rga.txt b/Documentation/devicetree/bindings/media/rockchip-rga.txt
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..48a260e5
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/Documentation/devicetree/bindings/media/rockchip-rga.txt
|
|
||||||
@@ -0,0 +1,36 @@
|
|
||||||
+device-tree bindings for rockchip 2D raster graphic acceleration controller (RGA)
|
|
||||||
+
|
|
||||||
+RGA is a separate 2D raster graphic acceleration unit. It accelerates 2D
|
|
||||||
+graphics operations, such as point/line drawing, image scaling, rotation,
|
|
||||||
+BitBLT, alpha blending and image blur/sharpness.
|
|
||||||
+
|
|
||||||
+Required properties:
|
|
||||||
+- compatible: value should be one of the following
|
|
||||||
+ "rockchip,rk3228-rga";
|
|
||||||
+ "rockchip,rk3288-rga";
|
|
||||||
+ "rockchip,rk3399-rga";
|
|
||||||
+
|
|
||||||
+- interrupts: RGA interrupt number.
|
|
||||||
+
|
|
||||||
+- clocks: phandle to RGA sclk/hclk/aclk clocks
|
|
||||||
+
|
|
||||||
+- clock-names: should be "aclk" "hclk" and "sclk"
|
|
||||||
+
|
|
||||||
+- resets: Must contain an entry for each entry in reset-names.
|
|
||||||
+ See ../reset/reset.txt for details.
|
|
||||||
+- reset-names: should be "core" "axi" and "ahb"
|
|
||||||
+
|
|
||||||
+Example:
|
|
||||||
+SoC specific DT entry:
|
|
||||||
+ rga: rga@ff680000 {
|
|
||||||
+ compatible = "rockchip,rk3399-rga";
|
|
||||||
+ reg = <0xff680000 0x10000>;
|
|
||||||
+ interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ interrupt-names = "rga";
|
|
||||||
+ clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>;
|
|
||||||
+ clock-names = "aclk", "hclk", "sclk";
|
|
||||||
+
|
|
||||||
+ resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>;
|
|
||||||
+ reset-names = "core, "axi", "ahb";
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
--
|
|
||||||
2.13.0
|
|
||||||
|
|
@@ -1,83 +0,0 @@
|
|||||||
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
|
|
||||||
index 7b6eb0ad513b..96b6935dc0d7 100644
|
|
||||||
--- a/drivers/usb/dwc2/hcd.c
|
|
||||||
+++ b/drivers/usb/dwc2/hcd.c
|
|
||||||
@@ -2748,6 +2748,8 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
|
|
||||||
chan->xfer_len = urb->length - urb->actual_length;
|
|
||||||
chan->xfer_count = 0;
|
|
||||||
|
|
||||||
+ chan->csplit_nak = 0;
|
|
||||||
+
|
|
||||||
/* Set the split attributes if required */
|
|
||||||
if (qh->do_split)
|
|
||||||
dwc2_hc_init_split(hsotg, chan, qtd, urb);
|
|
||||||
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
|
|
||||||
index 78e9e01051b5..e54f1351225b 100644
|
|
||||||
--- a/drivers/usb/dwc2/hcd.h
|
|
||||||
+++ b/drivers/usb/dwc2/hcd.h
|
|
||||||
@@ -143,6 +143,7 @@ struct dwc2_host_chan {
|
|
||||||
u8 halt_pending;
|
|
||||||
u8 do_split;
|
|
||||||
u8 complete_split;
|
|
||||||
+ u8 csplit_nak;
|
|
||||||
u8 hub_addr;
|
|
||||||
u8 hub_port;
|
|
||||||
u8 xact_pos;
|
|
||||||
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
|
|
||||||
index 916d991b96b8..551cfacd2252 100644
|
|
||||||
--- a/drivers/usb/dwc2/hcd_intr.c
|
|
||||||
+++ b/drivers/usb/dwc2/hcd_intr.c
|
|
||||||
@@ -691,6 +691,7 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
|
||||||
enum dwc2_transaction_type tr_type;
|
|
||||||
u32 haintmsk;
|
|
||||||
int free_qtd = 0;
|
|
||||||
+ int continue_trans = 1;
|
|
||||||
|
|
||||||
if (dbg_hc(chan))
|
|
||||||
dev_vdbg(hsotg->dev, " %s: channel %d, halt_status %d\n",
|
|
||||||
@@ -719,6 +720,7 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
|
||||||
* deactivated. Don't want to do anything except release the
|
|
||||||
* host channel and try to queue more transfers.
|
|
||||||
*/
|
|
||||||
+ continue_trans = 0;
|
|
||||||
goto cleanup;
|
|
||||||
case DWC2_HC_XFER_PERIODIC_INCOMPLETE:
|
|
||||||
dev_vdbg(hsotg->dev, " Complete URB with I/O error\n");
|
|
||||||
@@ -730,6 +732,11 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (chan->csplit_nak) {
|
|
||||||
+ continue_trans = 0;
|
|
||||||
+ chan->csplit_nak = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
dwc2_deactivate_qh(hsotg, chan->qh, free_qtd);
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
@@ -767,9 +774,11 @@ static void dwc2_release_channel(struct dwc2_hsotg *hsotg,
|
|
||||||
dwc2_writel(haintmsk, hsotg->regs + HAINTMSK);
|
|
||||||
|
|
||||||
/* Try to queue more transfers now that there's a free channel */
|
|
||||||
- tr_type = dwc2_hcd_select_transactions(hsotg);
|
|
||||||
- if (tr_type != DWC2_TRANSACTION_NONE)
|
|
||||||
- dwc2_hcd_queue_transactions(hsotg, tr_type);
|
|
||||||
+ if (continue_trans) {
|
|
||||||
+ tr_type = dwc2_hcd_select_transactions(hsotg);
|
|
||||||
+ if (tr_type != DWC2_TRANSACTION_NONE)
|
|
||||||
+ dwc2_hcd_queue_transactions(hsotg, tr_type);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -1205,6 +1214,7 @@ static void dwc2_hc_nak_intr(struct dwc2_hsotg *hsotg,
|
|
||||||
if (chan->do_split) {
|
|
||||||
if (chan->complete_split)
|
|
||||||
qtd->error_count = 0;
|
|
||||||
+ chan->csplit_nak = 1;
|
|
||||||
qtd->complete_split = 0;
|
|
||||||
dwc2_halt_channel(hsotg, chan, qtd, DWC2_HC_XFER_NAK);
|
|
||||||
goto handle_nak_done;
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -0,0 +1,98 @@
|
|||||||
|
From d5d5c53173c484a13cda62a537cbf75a5df4b0e4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 5 Nov 2018 21:58:56 +0100
|
||||||
|
Subject: [PATCH] ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi
|
||||||
|
|
||||||
|
Adding the appropriate nodes in order to exploit the WiFi capabilities
|
||||||
|
of the board.
|
||||||
|
Since these capabilities are provided through SDIO, and the SDIO
|
||||||
|
nodes were not defined, these were added too.
|
||||||
|
|
||||||
|
These seems to depend on each other so they are added in one big
|
||||||
|
patch.
|
||||||
|
|
||||||
|
Split if necessary.
|
||||||
|
|
||||||
|
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dts | 62 +++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 62 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
index 1e43527aa..d4df13bed 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
||||||
|
@@ -6,8 +6,70 @@
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
#include "rk3288-tinker.dtsi"
|
||||||
|
+#include <dt-bindings/clock/rockchip,rk808.h>
|
||||||
|
|
||||||
|
/ {
|
||||||
|
model = "Rockchip RK3288 Asus Tinker Board";
|
||||||
|
compatible = "asus,rk3288-tinker", "rockchip,rk3288";
|
||||||
|
+
|
||||||
|
+ /* This is essential to get SDIO devices working.
|
||||||
|
+ The Wifi depends on SDIO ! */
|
||||||
|
+ sdio_pwrseq: sdio-pwrseq {
|
||||||
|
+ compatible = "mmc-pwrseq-simple";
|
||||||
|
+ clocks = <&rk808 RK808_CLKOUT1>;
|
||||||
|
+ clock-names = "ext_clock";
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>;
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * On the module itself this is one of these (depending
|
||||||
|
+ * on the actual card populated):
|
||||||
|
+ * - SDIO_RESET_L_WL_REG_ON
|
||||||
|
+ * - PDN (power down when low)
|
||||||
|
+ */
|
||||||
|
+ reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>, <&gpio4 27 GPIO_ACTIVE_LOW>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ wireless-wlan {
|
||||||
|
+ compatible = "wlan-platdata";
|
||||||
|
+ rockchip,grf = <&grf>;
|
||||||
|
+ sdio_vref = <1800>;
|
||||||
|
+ status = "okay";
|
||||||
|
+ wifi_chip_type = "8723bs";
|
||||||
|
+ WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&io_domains {
|
||||||
|
+ wifi-supply = <&vcc_18>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&pinctrl {
|
||||||
|
+ sdio-pwrseq {
|
||||||
|
+ wifi_enable_h: wifienable-h {
|
||||||
|
+ rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ chip_enable_h: chip-enable-h {
|
||||||
|
+ rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&sdio0 {
|
||||||
|
+ bus-width = <4>;
|
||||||
|
+ cap-sd-highspeed;
|
||||||
|
+ cap-sdio-irq;
|
||||||
|
+ clock-frequency = <50000000>;
|
||||||
|
+ clock-freq-min-max = <200000 50000000>;
|
||||||
|
+ disable-wp;
|
||||||
|
+ keep-power-in-suspend;
|
||||||
|
+ mmc-pwrseq = <&sdio_pwrseq>;
|
||||||
|
+ non-removable;
|
||||||
|
+ num-slots = <1>;
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
|
||||||
|
+ sd-uhs-sdr104;
|
||||||
|
+ status = "okay";
|
||||||
|
+ supports-sdio;
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.16.4
|
||||||
|
|
@@ -0,0 +1,28 @@
|
|||||||
|
From ebc29962ac27264772a4227f5abd6900cb72fa79 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 5 Nov 2018 20:16:05 +0100
|
||||||
|
Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage
|
||||||
|
|
||||||
|
Taken from the various patches provided by @TonyMac32 .
|
||||||
|
|
||||||
|
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
index aa107ee41..3da1c830f 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
@@ -164,7 +164,7 @@
|
||||||
|
regulator-always-on;
|
||||||
|
regulator-boot-on;
|
||||||
|
regulator-min-microvolt = <750000>;
|
||||||
|
- regulator-max-microvolt = <1400000>;
|
||||||
|
+ regulator-max-microvolt = <1450000>;
|
||||||
|
regulator-name = "vdd_arm";
|
||||||
|
regulator-ramp-delay = <6000>;
|
||||||
|
regulator-state-mem {
|
||||||
|
--
|
||||||
|
2.16.4
|
||||||
|
|
@@ -1,35 +0,0 @@
|
|||||||
From 604ea7fc311af2b3a41e7fe3b4fbde0ee03dfb9c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:09:50 +0200
|
|
||||||
Subject: [PATCH 04/28] dts: rk3288: miqi: Enabling the Mali GPU node
|
|
||||||
|
|
||||||
Why is the MiQi the only one left without a working mali GPU node ?
|
|
||||||
|
|
||||||
Seriously, is there a rk3288 chipset WITHOUT a mali GPU ? Couldn't
|
|
||||||
they enable it once in the DTSI, instead of defining it as "disabled"
|
|
||||||
and enabling it in every DTS file ?
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index 4d923aa6..3cd60674 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -149,6 +149,11 @@
|
|
||||||
status = "ok";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&gpu {
|
|
||||||
+ mali-supply = <&vdd_gpu>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&hdmi {
|
|
||||||
ddc-i2c-bus = <&i2c5>;
|
|
||||||
status = "okay";
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,45 +0,0 @@
|
|||||||
From 89e5763110ca77d68a4be00cd97a638adc2401d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Willy Tarreau <w@1wt.eu>
|
|
||||||
Date: Tue, 2 Aug 2016 08:31:00 +0200
|
|
||||||
Subject: [PATCH 05/28] ARM: dts: rockchip: fix the regulator's voltage range
|
|
||||||
on MiQi board
|
|
||||||
|
|
||||||
The board declared too narrow a voltage range for the CPU and GPU
|
|
||||||
regulators, preventing it from using the full CPU frequency range.
|
|
||||||
The regulators support 712500 to 1500000 microvolts.
|
|
||||||
|
|
||||||
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
||||||
(cherry picked from commit 95330e63a9295a2632cee8cce5db80677f01857a)
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index 3cd60674..a1c3cdaa 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -168,8 +168,8 @@
|
|
||||||
fcs,suspend-voltage-selector = <1>;
|
|
||||||
reg = <0x40>;
|
|
||||||
regulator-name = "vdd_cpu";
|
|
||||||
- regulator-min-microvolt = <850000>;
|
|
||||||
- regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1500000>;
|
|
||||||
regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
regulator-enable-ramp-delay = <300>;
|
|
||||||
@@ -182,8 +182,8 @@
|
|
||||||
fcs,suspend-voltage-selector = <1>;
|
|
||||||
reg = <0x41>;
|
|
||||||
regulator-name = "vdd_gpu";
|
|
||||||
- regulator-min-microvolt = <850000>;
|
|
||||||
- regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1500000>;
|
|
||||||
regulator-always-on;
|
|
||||||
vin-supply = <&vcc_sys>;
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,46 +0,0 @@
|
|||||||
From c27e445527e949f3ef46d5326066196969c17d23 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Sun, 12 Mar 2017 19:43:15 +0000
|
|
||||||
Subject: [PATCH 06/28] ARM: dts: rockchip: add the MiQi board's fan definition
|
|
||||||
|
|
||||||
The MiQi board is sold with an enclosure in which a fan is connected
|
|
||||||
to the second LED output, and configured by default in "heartbeat"
|
|
||||||
mode so that it rotates slowly and increases when the CPU load
|
|
||||||
increases, ensuring appropriate cooling by default. This LED output
|
|
||||||
is called "Fan" in the original kernel and connected to GPIO18
|
|
||||||
(gpiochip 0, pin 18). Here we called it "miqi:green:fan" to stay
|
|
||||||
consistent with the kernel's naming conventions.
|
|
||||||
|
|
||||||
It's worth noting that without this patch the fan doesn't work at
|
|
||||||
all, risking to make the board overheat.
|
|
||||||
|
|
||||||
Fixes: 162718c (v4.7)
|
|
||||||
Cc: Heiko Stuebner <heiko@sntech.de>
|
|
||||||
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index a1c3cdaa..0e383595 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -67,6 +67,13 @@
|
|
||||||
leds {
|
|
||||||
compatible = "gpio-leds";
|
|
||||||
|
|
||||||
+ fan {
|
|
||||||
+ gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ label = "miqi:green:fan";
|
|
||||||
+ linux,default-trigger = "heartbeat";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+
|
|
||||||
work {
|
|
||||||
gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
|
|
||||||
label = "miqi:green:user";
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,41 +0,0 @@
|
|||||||
From e7e092be197c51b4d222a3b4e6638318067b7e6a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Willy Tarreau <w@1wt.eu>
|
|
||||||
Date: Tue, 2 Aug 2016 08:20:53 +0200
|
|
||||||
Subject: [PATCH 07/28] ARM: dts: rockchip: add support for 1800 MHz operation
|
|
||||||
on MiQi board
|
|
||||||
|
|
||||||
This board happily supports 1800 MHz operations (and even more), so
|
|
||||||
let's enable it.
|
|
||||||
|
|
||||||
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
||||||
(cherry picked from commit a0b82a29e7873a81f49ac5f50be3df1c7d312a14)
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 12 ++++++++++++
|
|
||||||
1 file changed, 12 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index 0e383595..80603a3d 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -126,6 +126,18 @@
|
|
||||||
|
|
||||||
&cpu0 {
|
|
||||||
cpu0-supply = <&vdd_cpu>;
|
|
||||||
+ operating-points = <
|
|
||||||
+ /* KHz uV */
|
|
||||||
+ 1800000 1400000
|
|
||||||
+ 1704000 1350000
|
|
||||||
+ 1608000 1300000
|
|
||||||
+ 1512000 1250000
|
|
||||||
+ 1416000 1200000
|
|
||||||
+ 1200000 1100000
|
|
||||||
+ 1008000 1050000
|
|
||||||
+ 816000 1000000
|
|
||||||
+ 600000 900000
|
|
||||||
+ >;
|
|
||||||
};
|
|
||||||
|
|
||||||
&emmc {
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,170 +0,0 @@
|
|||||||
From de9dcd5ecab0686022eee243464f35d2c7a34c97 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 16 Jan 2017 12:44:56 +0000
|
|
||||||
Subject: [PATCH 08/28] Readapt: ARM: dts: rockchip: miqi: add turbo-mode
|
|
||||||
operating points
|
|
||||||
|
|
||||||
Readaptation of Willy Tarreau patch.
|
|
||||||
|
|
||||||
Here's the original commit message:
|
|
||||||
|
|
||||||
By switching to opp-v2 we can declare "turbo-mode" operating points
|
|
||||||
which are only enabled when /sys/devices/system/cpu/cpufreq/boost is
|
|
||||||
set. It is convenient because it allows to boot, set a safe powersave
|
|
||||||
governor, enable boost, limit scaling_max_freq to a safe value, then
|
|
||||||
change the governor to performance or ondemand, and the frequency can
|
|
||||||
then be manually adjusted by only touching scaling_max_freq.
|
|
||||||
|
|
||||||
New values are 1896, 1920, 1992, 2016, 2040 MHz, 2064, 2088, 2112,
|
|
||||||
2136, 2160, 2184, 2208. MiQi boards work fine up to 2112 with a very
|
|
||||||
good power supply (5.2V/3A real) and a strong heatsink. Higher
|
|
||||||
frequencies may randomly work. At least 1992 is rock solid for hours
|
|
||||||
using "openssl speed -multi 4". The other ones have only been tested
|
|
||||||
for a few minutes. Frequencies of 1896 and 1920 MHz use 1.425V.
|
|
||||||
1992 MHz uses 1.45V. 2016, 2040 and 2064 use 1.475V. 2088 and above
|
|
||||||
use 1.500V. 2160, 2184 and 2208 cause the lowest frequency to be
|
|
||||||
picked. It's obvious that it's a sign issue somewhere in the kernel
|
|
||||||
but this one was not found yet.
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 120 +++++++++++++++++++++++++++++++++-----
|
|
||||||
1 file changed, 107 insertions(+), 13 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index 80603a3d..d7fde483 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -122,22 +122,116 @@
|
|
||||||
regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
};
|
|
||||||
-};
|
|
||||||
|
|
||||||
+
|
|
||||||
+ cpu0_opp_table: opp_table0 {
|
|
||||||
+ compatible = "operating-points-v2";
|
|
||||||
+ opp-shared;
|
|
||||||
+
|
|
||||||
+ opp@600000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <600000000>;
|
|
||||||
+ opp-microvolt = <900000>;
|
|
||||||
+ };
|
|
||||||
+ opp@816000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <816000000>;
|
|
||||||
+ opp-microvolt = <1000000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1008000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1008000000>;
|
|
||||||
+ opp-microvolt = <1050000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1200000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1200000000>;
|
|
||||||
+ opp-microvolt = <1100000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1416000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1416000000>;
|
|
||||||
+ opp-microvolt = <1200000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1512000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1512000000>;
|
|
||||||
+ opp-microvolt = <1250000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1608000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1608000000>;
|
|
||||||
+ opp-microvolt = <1300000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1704000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1704000000>;
|
|
||||||
+ opp-microvolt = <1350000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1800000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1800000000>;
|
|
||||||
+ opp-microvolt = <1400000>;
|
|
||||||
+ };
|
|
||||||
+ /* boot-only frequencies below */
|
|
||||||
+ opp@1896000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1896000000>;
|
|
||||||
+ opp-microvolt = <1425000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@1920000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1920000000>;
|
|
||||||
+ opp-microvolt = <1425000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@1992000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1992000000>;
|
|
||||||
+ opp-microvolt = <1450000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2016000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2016000000>;
|
|
||||||
+ opp-microvolt = <1475000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2040000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2040000000>;
|
|
||||||
+ opp-microvolt = <1475000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2064000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2064000000>;
|
|
||||||
+ opp-microvolt = <1475000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2088000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2088000000>;
|
|
||||||
+ opp-microvolt = <1500000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2112000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2112000000>;
|
|
||||||
+ opp-microvolt = <1500000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2136000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2136000000>;
|
|
||||||
+ opp-microvolt = <1500000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2160000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2160000000>;
|
|
||||||
+ opp-microvolt = <1500000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2184000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2184000000>;
|
|
||||||
+ opp-microvolt = <1500000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2208000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2208000000>;
|
|
||||||
+ opp-microvolt = <1500000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&cpu0 {
|
|
||||||
cpu0-supply = <&vdd_cpu>;
|
|
||||||
- operating-points = <
|
|
||||||
- /* KHz uV */
|
|
||||||
- 1800000 1400000
|
|
||||||
- 1704000 1350000
|
|
||||||
- 1608000 1300000
|
|
||||||
- 1512000 1250000
|
|
||||||
- 1416000 1200000
|
|
||||||
- 1200000 1100000
|
|
||||||
- 1008000 1050000
|
|
||||||
- 816000 1000000
|
|
||||||
- 600000 900000
|
|
||||||
- >;
|
|
||||||
+
|
|
||||||
+ operating-points-v2 = <&cpu0_opp_table>;
|
|
||||||
};
|
|
||||||
|
|
||||||
&emmc {
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -0,0 +1,116 @@
|
|||||||
|
From 302cd9b8a9f1f8a7735fabea3b9a7645dc40f9cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
Date: Sun, 7 Jan 2018 01:52:44 +0100
|
||||||
|
Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot
|
||||||
|
|
||||||
|
On ASUS Tinkerboard systems, if the SDMMC hardware is shutdown before
|
||||||
|
rebooting, the system will be dead, as the SDMMC is the only way to
|
||||||
|
boot anything, and the hardware doesn't power up the SDMMC hardware
|
||||||
|
automatically when rebooting.
|
||||||
|
|
||||||
|
So, when using an ASUS Tinkerboard system, a new reboot handler is
|
||||||
|
installed. This reboot handler takes care of powering the SDMMC
|
||||||
|
hardware again before restarting the system, resolving the issue.
|
||||||
|
|
||||||
|
The code was inspired by the pwrseq_emmc.c, which seems to overcome
|
||||||
|
similar effects with eMMC hardware.
|
||||||
|
|
||||||
|
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||||
|
---
|
||||||
|
drivers/mmc/host/dw_mmc-rockchip.c | 66 ++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 66 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
|
||||||
|
index a3f1c2b30..7eac1f221 100644
|
||||||
|
--- a/drivers/mmc/host/dw_mmc-rockchip.c
|
||||||
|
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
|
||||||
|
@@ -16,6 +16,11 @@
|
||||||
|
#include <linux/pm_runtime.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
|
||||||
|
+#include <linux/regulator/consumer.h>
|
||||||
|
+#include <linux/reboot.h>
|
||||||
|
+#include <linux/delay.h>
|
||||||
|
+#include "../core/core.h"
|
||||||
|
+
|
||||||
|
#include "dw_mmc.h"
|
||||||
|
#include "dw_mmc-pltfm.h"
|
||||||
|
|
||||||
|
@@ -334,6 +339,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = {
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match);
|
||||||
|
|
||||||
|
+struct dw_mci_rockchip_broken_boards_data {
|
||||||
|
+ struct notifier_block reset_nb;
|
||||||
|
+ struct platform_device *pdev;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+/* This reboot handler handles cases where disabling the SDMMC on
|
||||||
|
+ * reboot will cause the hardware to be unable to start correctly
|
||||||
|
+ * after rebooting.
|
||||||
|
+ *
|
||||||
|
+ * This happens with Tinkerboard systems...
|
||||||
|
+ */
|
||||||
|
+static int dw_mci_rockchip_broken_boards_reset_nb(
|
||||||
|
+ struct notifier_block *this,
|
||||||
|
+ unsigned long mode, void *cmd)
|
||||||
|
+{
|
||||||
|
+ struct dw_mci_rockchip_broken_boards_data const *data =
|
||||||
|
+ container_of(this,
|
||||||
|
+ struct dw_mci_rockchip_broken_boards_data,
|
||||||
|
+ reset_nb);
|
||||||
|
+ struct dw_mci *host = platform_get_drvdata(data->pdev);
|
||||||
|
+ struct mmc_host *mmc = host->slot->mmc;
|
||||||
|
+
|
||||||
|
+ printk(KERN_ERR "Meow.\n");
|
||||||
|
+
|
||||||
|
+ mmc_power_off(mmc);
|
||||||
|
+
|
||||||
|
+ mdelay(20);
|
||||||
|
+
|
||||||
|
+ if (!IS_ERR(mmc->supply.vmmc))
|
||||||
|
+ regulator_enable(mmc->supply.vmmc);
|
||||||
|
+
|
||||||
|
+ if (!IS_ERR(mmc->supply.vqmmc))
|
||||||
|
+ regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
|
||||||
|
+
|
||||||
|
+ printk(KERN_ERR "woeM.\n");
|
||||||
|
+
|
||||||
|
+ return NOTIFY_DONE;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void dw_mci_rockchip_register_broken_boards_reboot_handler(
|
||||||
|
+ struct platform_device *pdev)
|
||||||
|
+{
|
||||||
|
+ struct dw_mci_rockchip_broken_boards_data *data;
|
||||||
|
+
|
||||||
|
+ if (!of_machine_is_compatible("asus,rk3288-tinker"))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
||||||
|
+
|
||||||
|
+ if (!data)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ data->reset_nb.notifier_call =
|
||||||
|
+ dw_mci_rockchip_broken_boards_reset_nb;
|
||||||
|
+ data->reset_nb.priority = 255;
|
||||||
|
+ register_restart_handler(&data->reset_nb);
|
||||||
|
+
|
||||||
|
+ data->pdev = pdev;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int dw_mci_rockchip_probe(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
const struct dw_mci_drv_data *drv_data;
|
||||||
|
@@ -361,6 +426,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
|
||||||
|
}
|
||||||
|
|
||||||
|
pm_runtime_put_autosuspend(&pdev->dev);
|
||||||
|
+ dw_mci_rockchip_register_broken_boards_reboot_handler(pdev);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@@ -1,61 +0,0 @@
|
|||||||
From 771bcfe1735e42650b763e52a042a9fd98b2fa5b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:20:43 +0200
|
|
||||||
Subject: [PATCH 09/28] ARM: DTSI: rk3288.dtsi: Missing GRF handles
|
|
||||||
|
|
||||||
Add missing GRF handles.
|
|
||||||
|
|
||||||
This patch is taken from the patches provided by the ARMbian team.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288.dtsi | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index 356ed1e6..5b789528 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -547,6 +547,7 @@
|
|
||||||
pinctrl-2 = <&otp_gpio>;
|
|
||||||
#thermal-sensor-cells = <1>;
|
|
||||||
rockchip,hw-tshut-temp = <95000>;
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -655,6 +656,7 @@
|
|
||||||
pinctrl-0 = <&pwm0_pin>;
|
|
||||||
clocks = <&cru PCLK_PWM>;
|
|
||||||
clock-names = "pwm";
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -666,6 +668,7 @@
|
|
||||||
pinctrl-0 = <&pwm1_pin>;
|
|
||||||
clocks = <&cru PCLK_PWM>;
|
|
||||||
clock-names = "pwm";
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -677,6 +680,7 @@
|
|
||||||
pinctrl-0 = <&pwm2_pin>;
|
|
||||||
clocks = <&cru PCLK_PWM>;
|
|
||||||
clock-names = "pwm";
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -688,6 +692,7 @@
|
|
||||||
pinctrl-0 = <&pwm3_pin>;
|
|
||||||
clocks = <&cru PCLK_PWM>;
|
|
||||||
clock-names = "pwm";
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,27 +0,0 @@
|
|||||||
From af8d73ec0df1dde1e2fe1674c5708d4c30385ba9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 5 Jun 2017 12:37:17 +0000
|
|
||||||
Subject: [PATCH 11/28] Added support for Tinkerboard's SPI interface
|
|
||||||
|
|
||||||
Imported from ARMbian
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
drivers/spi/spidev.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
|
|
||||||
index cda10719..a6287475 100644
|
|
||||||
--- a/drivers/spi/spidev.c
|
|
||||||
+++ b/drivers/spi/spidev.c
|
|
||||||
@@ -669,6 +669,7 @@ static const struct of_device_id spidev_dt_ids[] = {
|
|
||||||
{ .compatible = "lineartechnology,ltc2488" },
|
|
||||||
{ .compatible = "ge,achc" },
|
|
||||||
{ .compatible = "semtech,sx1301" },
|
|
||||||
+ { .compatible = "rockchip,spi_tinker" },
|
|
||||||
{},
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(of, spidev_dt_ids);
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,56 +0,0 @@
|
|||||||
From 7af8d2bf732cb3baab7d926ed8a7e061e7a09ad9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:39:00 +0200
|
|
||||||
Subject: [PATCH 13/28] ARM: DTSI: rk3288.dtsi: Adding cells addresses and
|
|
||||||
sizes of MMC nodes
|
|
||||||
|
|
||||||
Imported from the Rockchip 4.4 patches.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288.dtsi | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index be985f02..14ef8202 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -236,6 +236,8 @@
|
|
||||||
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
|
||||||
fifo-depth = <0x100>;
|
|
||||||
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
reg = <0x0 0xff0c0000 0x0 0x4000>;
|
|
||||||
resets = <&cru SRST_MMC0>;
|
|
||||||
reset-names = "reset";
|
|
||||||
@@ -250,6 +252,8 @@
|
|
||||||
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
|
||||||
fifo-depth = <0x100>;
|
|
||||||
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
reg = <0x0 0xff0d0000 0x0 0x4000>;
|
|
||||||
resets = <&cru SRST_SDIO0>;
|
|
||||||
reset-names = "reset";
|
|
||||||
@@ -264,6 +268,8 @@
|
|
||||||
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
|
||||||
fifo-depth = <0x100>;
|
|
||||||
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
reg = <0x0 0xff0e0000 0x0 0x4000>;
|
|
||||||
resets = <&cru SRST_SDIO1>;
|
|
||||||
reset-names = "reset";
|
|
||||||
@@ -278,6 +284,8 @@
|
|
||||||
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
|
||||||
fifo-depth = <0x100>;
|
|
||||||
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ #address-cells = <1>;
|
|
||||||
+ #size-cells = <0>;
|
|
||||||
reg = <0x0 0xff0f0000 0x0 0x4000>;
|
|
||||||
resets = <&cru SRST_EMMC>;
|
|
||||||
reset-names = "reset";
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,27 +0,0 @@
|
|||||||
From ac220d592aa38b9b717d36f7bb93f7be5a08f6b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:43:51 +0200
|
|
||||||
Subject: [PATCH 14/28] ARM: DTSI: rk3288.dtsi: Adding missing EDP power domain
|
|
||||||
|
|
||||||
Imported from Rockchip 4.4 kernel patches.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288.dtsi | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index 14ef8202..10ecebb4 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -1105,6 +1105,7 @@
|
|
||||||
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;
|
|
||||||
clock-names = "dp", "pclk";
|
|
||||||
+ power-domains = <&power RK3288_PD_VIO>;
|
|
||||||
phys = <&edp_phy>;
|
|
||||||
phy-names = "dp";
|
|
||||||
resets = <&cru SRST_EDP>;
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 3fe37d29b53e3d06c8f4314cfc113bfa679f67eb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:48:05 +0200
|
|
||||||
Subject: [PATCH 15/28] ARM: DTSI: rk3288.dtsi: Add the RGA node
|
|
||||||
|
|
||||||
Imported from @wzyy2 patches.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288.dtsi | 14 ++++++++++++++
|
|
||||||
1 file changed, 14 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index 10ecebb4..455446f6 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -1159,6 +1159,20 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+ rga: rga@ff920000 {
|
|
||||||
+ compatible = "rockchip,rk3288-rga";
|
|
||||||
+ reg = <0x0 0xff920000 0x0 0x180>;
|
|
||||||
+ interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ interrupt-names = "rga";
|
|
||||||
+ clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>;
|
|
||||||
+ clock-names = "aclk", "hclk", "sclk";
|
|
||||||
+ power-domains = <&power RK3288_PD_VIO>;
|
|
||||||
+ resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru SRST_RGA_AHB>;
|
|
||||||
+
|
|
||||||
+ reset-names = "core", "axi", "ahb";
|
|
||||||
+ status = "disabled";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
vpu_mmu: iommu@ff9a0800 {
|
|
||||||
compatible = "rockchip,iommu";
|
|
||||||
reg = <0x0 0xff9a0800 0x0 0x100>;
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,28 +0,0 @@
|
|||||||
From c5af6798c9a411b3f550f463182a4b4904a21ec2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:51:14 +0200
|
|
||||||
Subject: [PATCH 16/28] ARM: DTSI: rk3288.dtsi: Adding missing VOPB registers
|
|
||||||
|
|
||||||
Imported from @wzyy2 patches... I think...
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288.dtsi | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index 455446f6..125f8835 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -987,7 +987,7 @@
|
|
||||||
|
|
||||||
vopb: vop@ff930000 {
|
|
||||||
compatible = "rockchip,rk3288-vop";
|
|
||||||
- reg = <0x0 0xff930000 0x0 0x19c>;
|
|
||||||
+ reg = <0x0 0xff930000 0x0 0x19c>, <0x0 0xff931000 0x0 0x1000>;
|
|
||||||
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>;
|
|
||||||
clock-names = "aclk_vop", "dclk_vop", "hclk_vop";
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,31 +0,0 @@
|
|||||||
From a0602b2724893de7ac9b4190a7a6bb66458da2d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:54:37 +0200
|
|
||||||
Subject: [PATCH 17/28] ARM: DTSI: rk3288.dtsi: Fixed the SPDIF node address
|
|
||||||
|
|
||||||
Now, the typo is only in the name of the node itself, not in the
|
|
||||||
actual registers addresses definition.
|
|
||||||
|
|
||||||
Still, this ought to be fixed one day !
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288.dtsi | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index 125f8835..e5d3d3c9 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -922,7 +922,7 @@
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
- spdif: sound@ff88b0000 {
|
|
||||||
+ spdif: sound@ff8b0000 {
|
|
||||||
compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
|
|
||||||
reg = <0x0 0xff8b0000 0x0 0x10000>;
|
|
||||||
#sound-dai-cells = <0>;
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,165 +0,0 @@
|
|||||||
From 2715f4a9ab5c169c546029a61eebb0bde6619b0e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 22:12:48 +0200
|
|
||||||
Subject: [PATCH 18/28] ARM: DTS: rk3288-tinker.dts: Enabling SDIO, Wireless
|
|
||||||
and Bluetooth
|
|
||||||
|
|
||||||
Adding the appropriate nodes in order to exploit the WiFi capabilities
|
|
||||||
of the board.
|
|
||||||
Since these capabilities are provided through SDIO, and the SDIO
|
|
||||||
nodes were not defined, these were added too.
|
|
||||||
|
|
||||||
These seems to depend on each other so they are added in one big
|
|
||||||
patch.
|
|
||||||
|
|
||||||
Split if necessary.
|
|
||||||
|
|
||||||
Bluetooth and uart0 (AKA Bluetooth UART) definitions were also added
|
|
||||||
in order to deal with all the wireless techs in one patch.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 82 ++++++++++++++++++++++++++++++++++++-
|
|
||||||
1 file changed, 81 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 346b0d8b..c552fd95 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -44,6 +44,7 @@
|
|
||||||
|
|
||||||
#include "rk3288.dtsi"
|
|
||||||
#include <dt-bindings/input/input.h>
|
|
||||||
+#include <dt-bindings/clock/rockchip,rk808.h>
|
|
||||||
|
|
||||||
/ {
|
|
||||||
model = "Rockchip RK3288 Tinker Board";
|
|
||||||
@@ -114,6 +115,24 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+ /* This is essential to get SDIO devices working.
|
|
||||||
+ The Wifi depends on SDIO ! */
|
|
||||||
+ sdio_pwrseq: sdio-pwrseq {
|
|
||||||
+ compatible = "mmc-pwrseq-simple";
|
|
||||||
+ clocks = <&rk808 RK808_CLKOUT1>;
|
|
||||||
+ clock-names = "ext_clock";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&chip_enable_h>, <&wifi_enable_h>;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * On the module itself this is one of these (depending
|
|
||||||
+ * on the actual card populated):
|
|
||||||
+ * - SDIO_RESET_L_WL_REG_ON
|
|
||||||
+ * - PDN (power down when low)
|
|
||||||
+ */
|
|
||||||
+ reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>, <&gpio4 RK_PD3 GPIO_ACTIVE_LOW>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
vcc_sys: vsys-regulator {
|
|
||||||
compatible = "regulator-fixed";
|
|
||||||
regulator-name = "vcc_sys";
|
|
||||||
@@ -134,6 +153,28 @@
|
|
||||||
startup-delay-us = <100000>;
|
|
||||||
vin-supply = <&vcc_io>;
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+ wireless-wlan {
|
|
||||||
+ compatible = "wlan-platdata";
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
+ wifi_chip_type = "8723bs";
|
|
||||||
+ sdio_vref = <1800>;
|
|
||||||
+ WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ status = "okay";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ wireless-bluetooth {
|
|
||||||
+ compatible = "bluetooth-platdata";
|
|
||||||
+ uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
|
|
||||||
+ pinctrl-names = "default","rts_gpio";
|
|
||||||
+ pinctrl-0 = <&uart0_rts>;
|
|
||||||
+ pinctrl-1 = <&uart0_gpios>;
|
|
||||||
+ BT,reset_gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ BT,wake_gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ BT,wake_host_irq = <&gpio4 31 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ status = "okay";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
};
|
|
||||||
|
|
||||||
&cpu0 {
|
|
||||||
@@ -373,10 +414,30 @@
|
|
||||||
|
|
||||||
&io_domains {
|
|
||||||
status = "okay";
|
|
||||||
-
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
+ wifi-supply = <&vcc_18>;
|
|
||||||
sdcard-supply = <&vccio_sd>;
|
|
||||||
};
|
|
||||||
|
|
||||||
+&sdio0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+ clock-frequency = <50000000>;
|
|
||||||
+ clock-freq-min-max = <200000 50000000>;
|
|
||||||
+ bus-width = <4>;
|
|
||||||
+ cap-sd-highspeed;
|
|
||||||
+ cap-sdio-irq;
|
|
||||||
+ disable-wp;
|
|
||||||
+ keep-power-in-suspend;
|
|
||||||
+ mmc-pwrseq = <&sdio_pwrseq>;
|
|
||||||
+ non-removable;
|
|
||||||
+ num-slots = <1>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
|
|
||||||
+ sd-uhs-sdr104;
|
|
||||||
+ supports-sdio;
|
|
||||||
+
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&pinctrl {
|
|
||||||
pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
|
|
||||||
drive-strength = <8>;
|
|
||||||
@@ -422,6 +483,16 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+ sdio-pwrseq {
|
|
||||||
+ wifi_enable_h: wifienable-h {
|
|
||||||
+ rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ chip_enable_h: chip-enable-h {
|
|
||||||
+ rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
sdmmc {
|
|
||||||
sdmmc_bus4: sdmmc-bus4 {
|
|
||||||
rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up_drv_8ma>,
|
|
||||||
@@ -453,6 +524,13 @@
|
|
||||||
rockchip,pins = <7 8 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+ wireless-bluetooth {
|
|
||||||
+ uart0_gpios: uart0-gpios {
|
|
||||||
+ rockchip,pins = <4 19 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
};
|
|
||||||
|
|
||||||
&pwm0 {
|
|
||||||
@@ -485,6 +563,8 @@
|
|
||||||
|
|
||||||
&uart0 {
|
|
||||||
status = "okay";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&uart0_xfer>, <&uart0_cts>;
|
|
||||||
};
|
|
||||||
|
|
||||||
&uart1 {
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,40 +0,0 @@
|
|||||||
From 39e50ab508d8104a733771a8681908a66a300edd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 22:25:03 +0200
|
|
||||||
Subject: [PATCH 20/28] ARM: DTS: rk3288-tinker.dts: Setting up the SD
|
|
||||||
regulators
|
|
||||||
|
|
||||||
Some are needed and some are not. Playing with these parameters is
|
|
||||||
required to get reboot working on these boards.
|
|
||||||
|
|
||||||
I still can't believe that these boards can't soft reset correctly.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 4ce94698..90c1a251 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -333,6 +333,8 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
vccio_sd: LDO_REG5 {
|
|
||||||
+ regulator-always-on;
|
|
||||||
+ regulator-boot-on;
|
|
||||||
regulator-min-microvolt = <1800000>;
|
|
||||||
regulator-max-microvolt = <3300000>;
|
|
||||||
regulator-name = "vccio_sd";
|
|
||||||
@@ -379,7 +381,6 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
vcc33_sd: SWITCH_REG1 {
|
|
||||||
- regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
regulator-name = "vcc33_sd";
|
|
||||||
regulator-state-mem {
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,53 +0,0 @@
|
|||||||
From b0a552add28bf4590b979abb3530b14b6811eec1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 22:33:39 +0200
|
|
||||||
Subject: [PATCH 21/28] ARM: DTS: rk3288-tinker.dts: Defined the I2C interfaces
|
|
||||||
|
|
||||||
And all the hardware behind.
|
|
||||||
|
|
||||||
Taken from, and tested by @TonyMac32 .
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 23 +++++++++++++++++++++++
|
|
||||||
1 file changed, 23 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 90c1a251..67a3ce6f 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -400,8 +400,31 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+&i2c1 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&i2c2 {
|
|
||||||
status = "okay";
|
|
||||||
+
|
|
||||||
+ afc0:af-controller@0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+ compatible = "silicon touch,vm149C-v4l2-i2c-subdev";
|
|
||||||
+ reg = <0x0 0x0c>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ eeprom:m24c08@50 {
|
|
||||||
+ compatible = "at,24c08";
|
|
||||||
+ reg = <0x0 0x50>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c3 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c4 {
|
|
||||||
+ status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
&i2c5 {
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,35 +0,0 @@
|
|||||||
From 8ca607f3fe77c80a3367d8363703d5dc1d6781d4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 22:36:02 +0200
|
|
||||||
Subject: [PATCH 22/28] ARM: DTS: rk3288-tinker.dts: Add the MIPI DSI node
|
|
||||||
|
|
||||||
Taken from, and tested by @TonyMac32 .
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 67a3ce6f..6f4c0843 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -443,6 +443,15 @@
|
|
||||||
sdcard-supply = <&vccio_sd>;
|
|
||||||
};
|
|
||||||
|
|
||||||
+&mipi_dsi {
|
|
||||||
+ status = "okay";
|
|
||||||
+ mipi_panel: mipi-panel {
|
|
||||||
+ compatible ="asus,tc358762";
|
|
||||||
+ reg = <0x0 0>;
|
|
||||||
+ status = "okay";
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&sdio0 {
|
|
||||||
status = "okay";
|
|
||||||
clock-frequency = <50000000>;
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,49 +0,0 @@
|
|||||||
From 14f951ca2d354ad8fd068d0f3d8648d5c0d1e60e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 22:40:26 +0200
|
|
||||||
Subject: [PATCH 23/28] ARM: DTS: rk3288-tinker.dts: Defining the SPI interface
|
|
||||||
|
|
||||||
Taken from, and tested by @TonyMac32 .
|
|
||||||
|
|
||||||
Well, the original one was tested by him but I had to adapt the
|
|
||||||
registers definitions to the new 64-bits LPAE-compliant syntax.
|
|
||||||
|
|
||||||
Therefore that *might* break, along with a few other patches.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 18 ++++++++++++++++++
|
|
||||||
1 file changed, 18 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 6f4c0843..f4b4525c 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -471,6 +471,24 @@
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
+&spi2 {
|
|
||||||
+ status = "okay";
|
|
||||||
+ max-freq = <50000000>;
|
|
||||||
+ spidev@0 {
|
|
||||||
+ compatible = "rockchip,spi_tinker";
|
|
||||||
+ reg = <0x0 0>;
|
|
||||||
+ spi-max-frequency = <50000000>;
|
|
||||||
+ spi-cpha = <1>;
|
|
||||||
+ };
|
|
||||||
+ spidev@1 {
|
|
||||||
+ compatible = "rockchip,spi_tinker";
|
|
||||||
+ reg = <0x0 1>;
|
|
||||||
+ spi-max-frequency = <50000000>;
|
|
||||||
+ spi-cpha = <1>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
&pinctrl {
|
|
||||||
pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
|
|
||||||
drive-strength = <8>;
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,33 +0,0 @@
|
|||||||
From 58d72a1cc693c4c08391487476d0cd6d167a57cf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 22:48:36 +0200
|
|
||||||
Subject: [PATCH 24/28] ARM: DTS: rk3288-tinker.dts: Defining SDMMC properties
|
|
||||||
|
|
||||||
I never knew if these properties were required to fix the dreaded
|
|
||||||
reboot issue...
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index f4b4525c..a0663425 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -601,7 +601,12 @@
|
|
||||||
disable-wp; /* wp not hooked up */
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
|
|
||||||
+ sd-uhs-sdr12;
|
|
||||||
+ sd-uhs-sdr25;
|
|
||||||
+ sd-uhs-sdr50;
|
|
||||||
+ sd-uhs-sdr104;
|
|
||||||
status = "okay";
|
|
||||||
+ supports-sd;
|
|
||||||
vmmc-supply = <&vcc33_sd>;
|
|
||||||
vqmmc-supply = <&vccio_sd>;
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@@ -1,107 +0,0 @@
|
|||||||
From f4480cb8198085607c15e523b49aa21bc38cf62c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Tue, 21 Nov 2017 21:47:33 +0100
|
|
||||||
Subject: [PATCH 1/5] ARM: DTSI: rk3288.dtsi: Define the VPU services
|
|
||||||
|
|
||||||
Still, you will need appropriate drivers to use them.
|
|
||||||
|
|
||||||
Contrary to the previous versions of this patch, these services are :
|
|
||||||
* NOT enabled by default;
|
|
||||||
* MUST be activated in each individual DTS;
|
|
||||||
|
|
||||||
I currently do not own enough RK3288 boards to ensure that the
|
|
||||||
VPU and HEVC MMU + services can be activated without issues.
|
|
||||||
|
|
||||||
Still this patch does not generate issues like the previous one AND
|
|
||||||
still enable these services on boot, when activated properly in
|
|
||||||
individual DTS files.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288.dtsi | 63 +++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 63 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index 30b04257..bc3601ac 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -1182,6 +1182,27 @@
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
+ vpu_service: vpu-service@ff9a0000 {
|
|
||||||
+ compatible = "rockchip,vpu_service";
|
|
||||||
+ reg = <0x0 0xff9a0000 0x0 0x800>;
|
|
||||||
+ interrupts =
|
|
||||||
+ <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
+ <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ interrupt-names = "irq_enc", "irq_dec";
|
|
||||||
+ clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
|
|
||||||
+ clock-names = "aclk_vcodec", "hclk_vcodec";
|
|
||||||
+ power-domains = <&power RK3288_PD_VIDEO>;
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
+ resets = <&cru SRST_VCODEC_AXI>, <&cru SRST_VCODEC_AHB>;
|
|
||||||
+ reset-names = "video_a", "video_h";
|
|
||||||
+ iommus = <&vpu_mmu>;
|
|
||||||
+ iommu_enabled = <1>;
|
|
||||||
+ dev_mode = <0>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ /* 0 means ion, 1 means drm */
|
|
||||||
+ allocator = <1>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
hevc_mmu: iommu@ff9c0440 {
|
|
||||||
compatible = "rockchip,iommu";
|
|
||||||
reg = <0x0 0xff9c0440 0x0 0x40>, <0x0 0xff9c0480 0x0 0x40>;
|
|
||||||
@@ -1191,6 +1212,48 @@
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
+ hevc_service: hevc-service@ff9c0000 {
|
|
||||||
+ compatible = "rockchip,hevc_service";
|
|
||||||
+ reg = <0x0 0xff9c0000 0x0 0x400>;
|
|
||||||
+ interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
+ interrupt-names = "irq_dec";
|
|
||||||
+ clocks =
|
|
||||||
+ <&cru ACLK_HEVC>,
|
|
||||||
+ <&cru HCLK_HEVC>,
|
|
||||||
+ <&cru SCLK_HEVC_CORE>,
|
|
||||||
+ <&cru SCLK_HEVC_CABAC>;
|
|
||||||
+ clock-names =
|
|
||||||
+ "aclk_vcodec",
|
|
||||||
+ "hclk_vcodec",
|
|
||||||
+ "clk_core",
|
|
||||||
+ "clk_cabac";
|
|
||||||
+ /*
|
|
||||||
+ * The 4K hevc would also work well with 500/125/300/300,
|
|
||||||
+ * no more err irq and reset request.
|
|
||||||
+ */
|
|
||||||
+ assigned-clocks =
|
|
||||||
+ <&cru ACLK_HEVC>,
|
|
||||||
+ <&cru HCLK_HEVC>,
|
|
||||||
+ <&cru SCLK_HEVC_CORE>,
|
|
||||||
+ <&cru SCLK_HEVC_CABAC>;
|
|
||||||
+ assigned-clock-rates =
|
|
||||||
+ <400000000>,
|
|
||||||
+ <100000000>,
|
|
||||||
+ <300000000>,
|
|
||||||
+ <300000000>;
|
|
||||||
+
|
|
||||||
+ resets = <&cru SRST_HEVC>;
|
|
||||||
+ reset-names = "video";
|
|
||||||
+ power-domains = <&power RK3288_PD_HEVC>;
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
+ dev_mode = <1>;
|
|
||||||
+ iommus = <&hevc_mmu>;
|
|
||||||
+ iommu_enabled = <1>;
|
|
||||||
+ status = "disabled";
|
|
||||||
+ /* 0 means ion, 1 means drm */
|
|
||||||
+ allocator = <1>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
gpu: gpu@ffa30000 {
|
|
||||||
compatible = "rockchip,rk3288-mali", "arm,mali-t760";
|
|
||||||
reg = <0x0 0xffa30000 0x0 0x10000>;
|
|
||||||
--
|
|
||||||
2.14.1
|
|
||||||
|
|
@@ -1,57 +0,0 @@
|
|||||||
From 647d6012849191e9909a8acb0fc9ae5df1afc747 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Tue, 21 Nov 2017 21:51:31 +0100
|
|
||||||
Subject: [PATCH 2/5] ARM: DTS: rk3288-miqi.dts: Enable the Video encoding MMU
|
|
||||||
and services
|
|
||||||
|
|
||||||
Enable the :
|
|
||||||
* VPU MMU;
|
|
||||||
* VPU service;
|
|
||||||
* HEVC MMU;
|
|
||||||
* HEVC service;
|
|
||||||
on MiQi devices.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 18 +++++++++++++++++-
|
|
||||||
1 file changed, 17 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index d7fde483..dd785c70 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -124,7 +124,7 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
- cpu0_opp_table: opp_table0 {
|
|
||||||
+ cpu0_opp_table: opp_table {
|
|
||||||
compatible = "operating-points-v2";
|
|
||||||
opp-shared;
|
|
||||||
|
|
||||||
@@ -575,6 +575,22 @@
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&vpu_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&vpu_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&wdt {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.14.1
|
|
||||||
|
|
@@ -1,48 +0,0 @@
|
|||||||
From 092c26ead2eb4035a57217f8705c9deed3bfb927 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Tue, 21 Nov 2017 21:54:22 +0100
|
|
||||||
Subject: [PATCH 3/5] ARM: DTS: rk3288-tinker: Enable the Video encoding MMU
|
|
||||||
and services
|
|
||||||
|
|
||||||
Enable the :
|
|
||||||
* VPU MMU;
|
|
||||||
* VPU Service;
|
|
||||||
* HEVC MMU;
|
|
||||||
* HEVC Service;
|
|
||||||
for ASUS Tinkerboard devices.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index a0663425..07b4af4f 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -671,6 +671,22 @@
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&vpu_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&vpu_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&wdt {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.14.1
|
|
||||||
|
|
@@ -1,49 +0,0 @@
|
|||||||
From 2769b0e656d849c5d652c75db71ce0faff1c0551 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Tue, 21 Nov 2017 21:56:45 +0100
|
|
||||||
Subject: [PATCH 4/5] ARM: DTSI: rk3288-firefly: Enable the Video encoding MMU
|
|
||||||
and services
|
|
||||||
|
|
||||||
Enable the :
|
|
||||||
* VPU MMU;
|
|
||||||
* VPU Service;
|
|
||||||
* HEVC MMU;
|
|
||||||
* HEVC Service;
|
|
||||||
for RK3288 Firefly devices.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-firefly.dtsi | 17 +++++++++++++++++
|
|
||||||
1 file changed, 17 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
|
|
||||||
index b9e6f3a9..9961acce 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
|
|
||||||
@@ -606,6 +606,23 @@
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&vpu_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&vpu_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&wdt {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+
|
|
||||||
--
|
|
||||||
2.14.1
|
|
||||||
|
|
@@ -1,48 +0,0 @@
|
|||||||
From 4766516bcbf023813ad883c2d61c422316770d12 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Tue, 21 Nov 2017 21:58:22 +0100
|
|
||||||
Subject: [PATCH 5/5] ARM: DTSI: rk3288-veyron: Enable the Video encoding MMU
|
|
||||||
and services
|
|
||||||
|
|
||||||
Enable the :
|
|
||||||
* VPU MMU;
|
|
||||||
* VPU Service;
|
|
||||||
* HEVC MMU;
|
|
||||||
* HEVC Service;
|
|
||||||
for RK3288 Chromebook laptops.
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-veyron.dtsi | 16 ++++++++++++++++
|
|
||||||
1 file changed, 16 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
|
|
||||||
index 6e5bd897..517b9242 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
|
|
||||||
@@ -450,6 +450,22 @@
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&vpu_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&vpu_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_mmu {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&hevc_service {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&wdt {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.14.1
|
|
||||||
|
|
@@ -1,19 +0,0 @@
|
|||||||
diff --git a/sound/usb/card.c b/sound/usb/card.c
|
|
||||||
index 23d1d23..98610ae 100644
|
|
||||||
--- a/sound/usb/card.c
|
|
||||||
+++ b/sound/usb/card.c
|
|
||||||
@@ -434,6 +434,14 @@ static int snd_usb_audio_create(struct usb_interface *intf,
|
|
||||||
}
|
|
||||||
strim(card->shortname);
|
|
||||||
|
|
||||||
+ /* Tinker Board ALC4040 CODEC */
|
|
||||||
+
|
|
||||||
+ if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
|
|
||||||
+ USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
|
|
||||||
+ strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
/* retrieve the vendor and device strings as longname */
|
|
||||||
if (quirk && quirk->vendor_name && *quirk->vendor_name) {
|
|
||||||
len = strlcpy(card->longname, quirk->vendor_name, sizeof(card->longname));
|
|
@@ -1,30 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 07b4af4..7755426 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -162,7 +162,7 @@
|
|
||||||
WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
-
|
|
||||||
+/*
|
|
||||||
wireless-bluetooth {
|
|
||||||
compatible = "bluetooth-platdata";
|
|
||||||
uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
|
|
||||||
@@ -174,6 +174,7 @@
|
|
||||||
BT,wake_host_irq = <&gpio4 31 GPIO_ACTIVE_HIGH>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+*/
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -620,7 +621,7 @@
|
|
||||||
&uart0 {
|
|
||||||
status = "okay";
|
|
||||||
pinctrl-names = "default";
|
|
||||||
- pinctrl-0 = <&uart0_xfer>, <&uart0_cts>;
|
|
||||||
+ pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
|
|
||||||
};
|
|
||||||
|
|
||||||
&uart1 {
|
|
@@ -1,17 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 925b277..33b198e 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -100,6 +100,12 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+ rk3288-gpiomem {
|
|
||||||
+ compatible = "rockchip,rk3288-gpiomem";
|
|
||||||
+ reg = <0x0 0xff750000 0x0 0x1000>;
|
|
||||||
+ status = "okay";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
sound {
|
|
||||||
compatible = "simple-audio-card";
|
|
||||||
simple-audio-card,format = "i2s";
|
|
@@ -1,364 +0,0 @@
|
|||||||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
|
|
||||||
index c28dca0..d9df49d 100644
|
|
||||||
--- a/drivers/char/Kconfig
|
|
||||||
+++ b/drivers/char/Kconfig
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
menu "Character devices"
|
|
||||||
|
|
||||||
source "drivers/tty/Kconfig"
|
|
||||||
+source "drivers/char/rockchip/Kconfig"
|
|
||||||
|
|
||||||
config DEVMEM
|
|
||||||
bool "/dev/mem virtual device support"
|
|
||||||
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
|
|
||||||
index 7dc3abe..5d43b1d 100644
|
|
||||||
--- a/drivers/char/Makefile
|
|
||||||
+++ b/drivers/char/Makefile
|
|
||||||
@@ -60,3 +60,5 @@ js-rtc-y = rtc.o
|
|
||||||
obj-$(CONFIG_TILE_SROM) += tile-srom.o
|
|
||||||
obj-$(CONFIG_XILLYBUS) += xillybus/
|
|
||||||
obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o
|
|
||||||
+
|
|
||||||
+obj-$(CONFIG_RK_CHAR_DRIVERS) += rockchip/
|
|
||||||
diff --git a/drivers/char/rockchip/Kconfig b/drivers/char/rockchip/Kconfig
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..867d51e
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/char/rockchip/Kconfig
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+#
|
|
||||||
+# Broadcom char driver config
|
|
||||||
+#
|
|
||||||
+
|
|
||||||
+menuconfig RK_CHAR_DRIVERS
|
|
||||||
+ bool "Rockchip Char Drivers"
|
|
||||||
+ help
|
|
||||||
+ Rockchip's char drivers
|
|
||||||
+
|
|
||||||
+config RK3288_DEVGPIOMEM
|
|
||||||
+ tristate "/dev/gpiomem rootless GPIO access via mmap() on the RK3288"
|
|
||||||
+ default y
|
|
||||||
+ help
|
|
||||||
+ Provides users with root-free access to the GPIO registers
|
|
||||||
+ on the 3288. Calling mmap(/dev/gpiomem) will map the GPIO
|
|
||||||
+ register page to the user's pointer.
|
|
||||||
diff --git a/drivers/char/rockchip/Makefile b/drivers/char/rockchip/Makefile
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..e7df7f2
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/char/rockchip/Makefile
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+obj-$(CONFIG_RK3288_DEVGPIOMEM)+= rk3288-gpiomem.o
|
|
||||||
diff --git a/drivers/char/rockchip/rk3288-gpiomem.c b/drivers/char/rockchip/rk3288-gpiomem.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..c289041
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/char/rockchip/rk3288-gpiomem.c
|
|
||||||
@@ -0,0 +1,307 @@
|
|
||||||
+/**
|
|
||||||
+ * GPIO memory device driver
|
|
||||||
+ *
|
|
||||||
+ * Creates a chardev /dev/gpiomem which will provide user access to
|
|
||||||
+ * the rk3288's GPIO registers when it is mmap()'d.
|
|
||||||
+ * No longer need root for user GPIO access, but without relaxing permissions
|
|
||||||
+ * on /dev/mem.
|
|
||||||
+ *
|
|
||||||
+ * Written by Luke Wren <luke@raspberrypi.org>
|
|
||||||
+ * Copyright (c) 2015, Raspberry Pi (Trading) Ltd.
|
|
||||||
+ *
|
|
||||||
+ * Redistribution and use in source and binary forms, with or without
|
|
||||||
+ * modification, are permitted provided that the following conditions
|
|
||||||
+ * are met:
|
|
||||||
+ * 1. Redistributions of source code must retain the above copyright
|
|
||||||
+ * notice, this list of conditions, and the following disclaimer,
|
|
||||||
+ * without modification.
|
|
||||||
+ * 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
+ * notice, this list of conditions and the following disclaimer in the
|
|
||||||
+ * documentation and/or other materials provided with the distribution.
|
|
||||||
+ * 3. The names of the above-listed copyright holders may not be used
|
|
||||||
+ * to endorse or promote products derived from this software without
|
|
||||||
+ * specific prior written permission.
|
|
||||||
+ *
|
|
||||||
+ * ALTERNATIVELY, this software may be distributed under the terms of the
|
|
||||||
+ * GNU General Public License ("GPL") version 2, as published by the Free
|
|
||||||
+ * Software Foundation.
|
|
||||||
+ *
|
|
||||||
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
|
||||||
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
|
||||||
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Ported to rk3288 from Jörg Wolff, 2017
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/kernel.h>
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/of.h>
|
|
||||||
+#include <linux/platform_device.h>
|
|
||||||
+#include <linux/mm.h>
|
|
||||||
+#include <linux/slab.h>
|
|
||||||
+#include <linux/cdev.h>
|
|
||||||
+#include <linux/pagemap.h>
|
|
||||||
+#include <linux/io.h>
|
|
||||||
+
|
|
||||||
+#define DEVICE_NAME "rk3288-gpiomem"
|
|
||||||
+#define DRIVER_NAME "gpiomem-rk3288"
|
|
||||||
+#define DEVICE_MINOR 0
|
|
||||||
+
|
|
||||||
+struct rk3288_gpiomem_instance {
|
|
||||||
+ unsigned long gpio_regs_phys;
|
|
||||||
+ struct device *dev;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static struct cdev rk3288_gpiomem_cdev;
|
|
||||||
+static dev_t rk3288_gpiomem_devid;
|
|
||||||
+static struct class *rk3288_gpiomem_class;
|
|
||||||
+static struct device *rk3288_gpiomem_dev;
|
|
||||||
+static struct rk3288_gpiomem_instance *inst;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/****************************************************************************
|
|
||||||
+*
|
|
||||||
+* GPIO mem chardev file ops
|
|
||||||
+*
|
|
||||||
+***************************************************************************/
|
|
||||||
+
|
|
||||||
+static int rk3288_gpiomem_open(struct inode *inode, struct file *file)
|
|
||||||
+{
|
|
||||||
+ int dev = iminor(inode);
|
|
||||||
+ int ret = 0;
|
|
||||||
+
|
|
||||||
+ if (dev != DEVICE_MINOR) {
|
|
||||||
+ dev_err(inst->dev, "Unknown minor device: %d", dev);
|
|
||||||
+ ret = -ENXIO;
|
|
||||||
+ }
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int rk3288_gpiomem_release(struct inode *inode, struct file *file)
|
|
||||||
+{
|
|
||||||
+ int dev = iminor(inode);
|
|
||||||
+ int ret = 0;
|
|
||||||
+
|
|
||||||
+ if (dev != DEVICE_MINOR) {
|
|
||||||
+ dev_err(inst->dev, "Unknown minor device %d", dev);
|
|
||||||
+ ret = -ENXIO;
|
|
||||||
+ }
|
|
||||||
+ return ret;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static const struct vm_operations_struct rk3288_gpiomem_vm_ops = {
|
|
||||||
+#ifdef CONFIG_HAVE_IOREMAP_PROT
|
|
||||||
+ .access = generic_access_phys
|
|
||||||
+#endif
|
|
||||||
+};
|
|
||||||
+static int address_is_allowed(unsigned long pfn, unsigned long size)
|
|
||||||
+{
|
|
||||||
+ unsigned long address = pfn << PAGE_SHIFT;
|
|
||||||
+
|
|
||||||
+ dev_info(inst->dev, "address_is_allowed.pfn: 0x%08lx", address);
|
|
||||||
+
|
|
||||||
+ switch(address) {
|
|
||||||
+
|
|
||||||
+ case 0xff750000:
|
|
||||||
+ case 0xff760000:
|
|
||||||
+ case 0xff780000:
|
|
||||||
+ case 0xff790000:
|
|
||||||
+ case 0xff7a0000:
|
|
||||||
+ case 0xff7b0000:
|
|
||||||
+ case 0xff7c0000:
|
|
||||||
+ case 0xff7d0000:
|
|
||||||
+ case 0xff7e0000:
|
|
||||||
+ case 0xff7f0000:
|
|
||||||
+ case 0xff7f2000:
|
|
||||||
+ case 0xff770000:
|
|
||||||
+ case 0xff730000:
|
|
||||||
+ case 0xff680000:
|
|
||||||
+ dev_info(inst->dev, "address_is_allowed.return 1");
|
|
||||||
+ return 1;
|
|
||||||
+ break;
|
|
||||||
+ default :
|
|
||||||
+ dev_info(inst->dev, "address_is_allowed.return 0");
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int rk3288_gpiomem_mmap(struct file *file, struct vm_area_struct *vma)
|
|
||||||
+{
|
|
||||||
+
|
|
||||||
+ size_t size;
|
|
||||||
+
|
|
||||||
+ size = vma->vm_end - vma->vm_start;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ if (!address_is_allowed(vma->vm_pgoff, size))
|
|
||||||
+ return -EPERM;
|
|
||||||
+
|
|
||||||
+ vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
|
|
||||||
+ size,
|
|
||||||
+ vma->vm_page_prot);
|
|
||||||
+
|
|
||||||
+ vma->vm_ops = &rk3288_gpiomem_vm_ops;
|
|
||||||
+
|
|
||||||
+ /* Remap-pfn-range will mark the range VM_IO */
|
|
||||||
+ if (remap_pfn_range(vma,
|
|
||||||
+ vma->vm_start,
|
|
||||||
+ vma->vm_pgoff,
|
|
||||||
+ size,
|
|
||||||
+ vma->vm_page_prot)) {
|
|
||||||
+ return -EAGAIN;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static const struct file_operations
|
|
||||||
+rk3288_gpiomem_fops = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .open = rk3288_gpiomem_open,
|
|
||||||
+ .release = rk3288_gpiomem_release,
|
|
||||||
+ .mmap = rk3288_gpiomem_mmap,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int rk3288_gpiomem_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
||||||
+{
|
|
||||||
+ add_uevent_var(env, "DEVMODE=%#o", 0660);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+ /****************************************************************************
|
|
||||||
+*
|
|
||||||
+* Probe and remove functions
|
|
||||||
+*
|
|
||||||
+***************************************************************************/
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static int rk3288_gpiomem_probe(struct platform_device *pdev)
|
|
||||||
+{
|
|
||||||
+ int err;
|
|
||||||
+ void *ptr_err;
|
|
||||||
+ struct device *dev = &pdev->dev;
|
|
||||||
+ struct resource *ioresource;
|
|
||||||
+
|
|
||||||
+ /* Allocate buffers and instance data */
|
|
||||||
+
|
|
||||||
+ inst = kzalloc(sizeof(struct rk3288_gpiomem_instance), GFP_KERNEL);
|
|
||||||
+
|
|
||||||
+ if (!inst) {
|
|
||||||
+ err = -ENOMEM;
|
|
||||||
+ goto failed_inst_alloc;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ inst->dev = dev;
|
|
||||||
+
|
|
||||||
+ ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
||||||
+ if (ioresource) {
|
|
||||||
+ inst->gpio_regs_phys = ioresource->start;
|
|
||||||
+ } else {
|
|
||||||
+ dev_err(inst->dev, "failed to get IO resource");
|
|
||||||
+ err = -ENOENT;
|
|
||||||
+ goto failed_get_resource;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Create character device entries */
|
|
||||||
+
|
|
||||||
+ err = alloc_chrdev_region(&rk3288_gpiomem_devid,
|
|
||||||
+ DEVICE_MINOR, 1, DEVICE_NAME);
|
|
||||||
+ if (err != 0) {
|
|
||||||
+ dev_err(inst->dev, "unable to allocate device number");
|
|
||||||
+ goto failed_alloc_chrdev;
|
|
||||||
+ }
|
|
||||||
+ cdev_init(&rk3288_gpiomem_cdev, &rk3288_gpiomem_fops);
|
|
||||||
+ rk3288_gpiomem_cdev.owner = THIS_MODULE;
|
|
||||||
+ err = cdev_add(&rk3288_gpiomem_cdev, rk3288_gpiomem_devid, 1);
|
|
||||||
+ if (err != 0) {
|
|
||||||
+ dev_err(inst->dev, "unable to register device");
|
|
||||||
+ goto failed_cdev_add;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Create sysfs entries */
|
|
||||||
+
|
|
||||||
+ rk3288_gpiomem_class = class_create(THIS_MODULE, DEVICE_NAME);
|
|
||||||
+ ptr_err = rk3288_gpiomem_class;
|
|
||||||
+ if (IS_ERR(ptr_err))
|
|
||||||
+ goto failed_class_create;
|
|
||||||
+ rk3288_gpiomem_class->dev_uevent = rk3288_gpiomem_dev_uevent;
|
|
||||||
+ rk3288_gpiomem_dev = device_create(rk3288_gpiomem_class, NULL,
|
|
||||||
+ rk3288_gpiomem_devid, NULL,
|
|
||||||
+ "gpiomem");
|
|
||||||
+ ptr_err = rk3288_gpiomem_dev;
|
|
||||||
+ if (IS_ERR(ptr_err))
|
|
||||||
+ goto failed_device_create;
|
|
||||||
+
|
|
||||||
+ dev_info(inst->dev, "Initialised: Registers at 0x%08lx",
|
|
||||||
+ inst->gpio_regs_phys);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+failed_device_create:
|
|
||||||
+ class_destroy(rk3288_gpiomem_class);
|
|
||||||
+failed_class_create:
|
|
||||||
+ cdev_del(&rk3288_gpiomem_cdev);
|
|
||||||
+ err = PTR_ERR(ptr_err);
|
|
||||||
+failed_cdev_add:
|
|
||||||
+ unregister_chrdev_region(rk3288_gpiomem_devid, 1);
|
|
||||||
+failed_alloc_chrdev:
|
|
||||||
+failed_get_resource:
|
|
||||||
+ kfree(inst);
|
|
||||||
+failed_inst_alloc:
|
|
||||||
+ dev_err(inst->dev, "could not load rk3288_gpiomem");
|
|
||||||
+ return err;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int rk3288_gpiomem_remove(struct platform_device *pdev)
|
|
||||||
+{
|
|
||||||
+ struct device *dev = inst->dev;
|
|
||||||
+
|
|
||||||
+ kfree(inst);
|
|
||||||
+ device_destroy(rk3288_gpiomem_class, rk3288_gpiomem_devid);
|
|
||||||
+ class_destroy(rk3288_gpiomem_class);
|
|
||||||
+ cdev_del(&rk3288_gpiomem_cdev);
|
|
||||||
+ unregister_chrdev_region(rk3288_gpiomem_devid, 1);
|
|
||||||
+
|
|
||||||
+ dev_info(dev, "GPIO mem driver removed - OK");
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+ /****************************************************************************
|
|
||||||
+*
|
|
||||||
+* Register the driver with device tree
|
|
||||||
+*
|
|
||||||
+***************************************************************************/
|
|
||||||
+
|
|
||||||
+static const struct of_device_id rk3288_gpiomem_of_match[] = {
|
|
||||||
+ {.compatible = "rockchip,rk3288-gpiomem",},
|
|
||||||
+ { /* sentinel */ },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+MODULE_DEVICE_TABLE(of, rk3288_gpiomem_of_match);
|
|
||||||
+
|
|
||||||
+static struct platform_driver rk3288_gpiomem_driver = {
|
|
||||||
+ .probe = rk3288_gpiomem_probe,
|
|
||||||
+ .remove = rk3288_gpiomem_remove,
|
|
||||||
+ .driver = {
|
|
||||||
+ .name = DRIVER_NAME,
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .of_match_table = rk3288_gpiomem_of_match,
|
|
||||||
+ },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+module_platform_driver(rk3288_gpiomem_driver);
|
|
||||||
+
|
|
||||||
+MODULE_ALIAS("platform:gpiomem-rk3288");
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace");
|
|
||||||
+MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
|
|
@@ -1,32 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
index bc3601a..37ae378 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
||||||
@@ -467,13 +467,6 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
thermal-zones {
|
|
||||||
- reserve_thermal: reserve_thermal {
|
|
||||||
- polling-delay-passive = <1000>; /* milliseconds */
|
|
||||||
- polling-delay = <5000>; /* milliseconds */
|
|
||||||
-
|
|
||||||
- thermal-sensors = <&tsadc 0>;
|
|
||||||
- };
|
|
||||||
-
|
|
||||||
cpu_thermal: cpu_thermal {
|
|
||||||
polling-delay-passive = <100>; /* milliseconds */
|
|
||||||
polling-delay = <5000>; /* milliseconds */
|
|
||||||
@@ -539,6 +532,13 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+ reserve_thermal: reserve_thermal {
|
|
||||||
+ polling-delay-passive = <1000>; /* milliseconds */
|
|
||||||
+ polling-delay = <5000>; /* milliseconds */
|
|
||||||
+
|
|
||||||
+ thermal-sensors = <&tsadc 0>;
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
tsadc: tsadc@ff280000 {
|
|
@@ -0,0 +1,19 @@
|
|||||||
|
diff --git a/sound/usb/card.c b/sound/usb/card.c
|
||||||
|
index 2bfe4e80a..cea93aaf5 100644
|
||||||
|
--- a/sound/usb/card.c
|
||||||
|
+++ b/sound/usb/card.c
|
||||||
|
@@ -382,6 +382,14 @@ static void usb_audio_make_shortname(struct usb_device *dev,
|
||||||
|
}
|
||||||
|
|
||||||
|
strim(card->shortname);
|
||||||
|
+
|
||||||
|
+ /* Tinker Board ALC4040 CODEC */
|
||||||
|
+
|
||||||
|
+ if(USB_ID_VENDOR(chip->usb_id) == 0x0bda &&
|
||||||
|
+ USB_ID_PRODUCT(chip->usb_id) == 0x481a) {
|
||||||
|
+ strlcat(card->shortname, " OnBoard", sizeof(card->shortname));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
static void usb_audio_make_longname(struct usb_device *dev,
|
@@ -1,122 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 07b4af4..f71fa24
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -175,10 +175,83 @@
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+ cpu0_opp_table: opp_table {
|
|
||||||
+ compatible = "operating-points-v2";
|
|
||||||
+ opp-shared;
|
|
||||||
+
|
|
||||||
+ opp@600000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <600000000>;
|
|
||||||
+ opp-microvolt = <900000>;
|
|
||||||
+ };
|
|
||||||
+ opp@816000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <816000000>;
|
|
||||||
+ opp-microvolt = <1000000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1008000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1008000000>;
|
|
||||||
+ opp-microvolt = <1050000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1200000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1200000000>;
|
|
||||||
+ opp-microvolt = <1100000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1416000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1416000000>;
|
|
||||||
+ opp-microvolt = <1200000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1512000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1512000000>;
|
|
||||||
+ opp-microvolt = <1250000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1608000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1608000000>;
|
|
||||||
+ opp-microvolt = <1300000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1704000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1704000000>;
|
|
||||||
+ opp-microvolt = <1350000>;
|
|
||||||
+ };
|
|
||||||
+ opp@1800000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1800000000>;
|
|
||||||
+ opp-microvolt = <1400000>;
|
|
||||||
+ };
|
|
||||||
+ /* boot-only frequencies below */
|
|
||||||
+ opp@1896000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1896000000>;
|
|
||||||
+ opp-microvolt = <1425000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@1920000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1920000000>;
|
|
||||||
+ opp-microvolt = <1425000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@1992000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <1992000000>;
|
|
||||||
+ opp-microvolt = <1450000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2016000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2016000000>;
|
|
||||||
+ opp-microvolt = <1475000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2040000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2040000000>;
|
|
||||||
+ opp-microvolt = <1475000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ opp@2064000000 {
|
|
||||||
+ opp-hz = /bits/ 64 <2064000000>;
|
|
||||||
+ opp-microvolt = <1475000>;
|
|
||||||
+ turbo-mode;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
&cpu0 {
|
|
||||||
cpu0-supply = <&vdd_cpu>;
|
|
||||||
+ operating-points-v2 = <&cpu0_opp_table>;
|
|
||||||
};
|
|
||||||
|
|
||||||
&gmac {
|
|
||||||
@@ -345,8 +345,8 @@
|
|
||||||
vdd_cpu: DCDC_REG1 {
|
|
||||||
regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
- regulator-min-microvolt = <750000>;
|
|
||||||
- regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1500000>;
|
|
||||||
regulator-name = "vdd_arm";
|
|
||||||
regulator-ramp-delay = <6000>;
|
|
||||||
regulator-state-mem {
|
|
||||||
@@ -357,8 +357,8 @@
|
|
||||||
vdd_gpu: DCDC_REG2 {
|
|
||||||
regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
- regulator-min-microvolt = <850000>;
|
|
||||||
- regulator-max-microvolt = <1250000>;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1500000>;
|
|
||||||
regulator-name = "vdd_gpu";
|
|
||||||
regulator-ramp-delay = <6000>;
|
|
||||||
regulator-state-mem {
|
|
||||||
@@ -652,6 +755,11 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
&usb_otg {
|
|
||||||
+ /*
|
|
||||||
+ * The otg controller is the only system power source,
|
|
||||||
+ * so needs to always stay in device mode.
|
|
||||||
+ */
|
|
||||||
+ dr_mode = "peripheral";
|
|
||||||
status= "okay";
|
|
||||||
};
|
|
||||||
|
|
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c
|
|
||||||
index fa44e3901336..929b3fe289b0 100644
|
|
||||||
--- a/sound/soc/rockchip/rk3288_hdmi_analog.c
|
|
||||||
+++ b/sound/soc/rockchip/rk3288_hdmi_analog.c
|
|
||||||
@@ -155,7 +155,7 @@ static struct snd_soc_dai_link_component rk_codecs[] = {
|
|
||||||
{ },
|
|
||||||
{
|
|
||||||
.name = "hdmi-audio-codec.2.auto",
|
|
||||||
- .dai_name = "hdmi-hifi.0",
|
|
||||||
+ .dai_name = "i2s-hifi",
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
@@ -1,20 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
|
||||||
index eff87a3..58fade2 100644
|
|
||||||
--- a/arch/arm/boot/dts/Makefile
|
|
||||||
+++ b/arch/arm/boot/dts/Makefile
|
|
||||||
@@ -762,6 +762,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
|
|
||||||
rk3288-r89.dtb \
|
|
||||||
rk3288-rock2-square.dtb \
|
|
||||||
rk3288-tinker.dtb \
|
|
||||||
+ rk3288-miniarm.dtb \
|
|
||||||
rk3288-veyron-brain.dtb \
|
|
||||||
rk3288-veyron-jaq.dtb \
|
|
||||||
rk3288-veyron-jerry.dtb \
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts
|
|
||||||
new file mode 120000
|
|
||||||
index 0000000..830ab68
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miniarm.dts
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+rk3288-tinker.dts
|
|
||||||
\ No newline at end of file
|
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user