From d666933ee74a8729063104bf3068c037804485ed Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Fri, 10 Apr 2026 02:11:28 -0700 Subject: [PATCH] test: update testdata wrt 12e0765577d2e0d4c26267f3b8fd781aed84d365 --- ...f-15700f9e1c919a3f0c492415d982a09f5e8122cd | 2 +- ...f-1f7390f3999e80f775dbc0e62f1dcb071c3bed77 | 16 +- ...f-47ed809ce10bdfa99351c72935467c9afae47e36 | 14 +- ...f-8480815a00f341a9058a26bf86f34368184615d6 | 2 +- ...f-9feb6b667c77c187f547deaf10cd1f04e92fe192 | 18 +- ...f-a0482e3446cea426bf16571e0000423ed5b25af0 | 16 +- ...f-c37d23f45ae6bd0db6b072180d7b84566c7dc8a2 | 2 +- ...f-e90937e756938f03d37d4cae7c82316a3a425944 | 994 +++++++++--------- ...f-f2ccd4d1333aad1175550daf616b061388e1864f | 4 +- ...f-f58200e3f2967a06f343c9fc9dcae9de18def92a | 88 +- 10 files changed, 578 insertions(+), 578 deletions(-) diff --git a/testdata/diff-15700f9e1c919a3f0c492415d982a09f5e8122cd b/testdata/diff-15700f9e1c919a3f0c492415d982a09f5e8122cd index 3587818012a089ee5430e63afc52e491dcf07b63..6a6c992549bcf99c2c8bc79d3c8bd5658e9ca53f 100644 --- a/testdata/diff-15700f9e1c919a3f0c492415d982a09f5e8122cd +++ b/testdata/diff-15700f9e1c919a3f0c492415d982a09f5e8122cd @@ -1,5 +1,5 @@ :100644 100644 1e5a5a99eb7fe12e6ea2f48fb2ff3e8de186efa0 8aff424ddd2f434448b73c0bf62dca382e783be7 M test/images/demo-border.png diff --git a/test/images/demo-border.png b/test/images/demo-border.png -index 1e5a5a9..8aff424 100644 +index 1e5a5a99eb7fe12e6ea2f48fb2ff3e8de186efa0..8aff424ddd2f434448b73c0bf62dca382e783be7 100644 Binary files a/test/images/demo-border.png and b/test/images/demo-border.png differ diff --git a/testdata/diff-1f7390f3999e80f775dbc0e62f1dcb071c3bed77 b/testdata/diff-1f7390f3999e80f775dbc0e62f1dcb071c3bed77 index 925cf0ca78756aed631dd9108205fa310b2f76cd..b61ff49eee5c326c736d01257d2b8fd2985048f3 100644 --- a/testdata/diff-1f7390f3999e80f775dbc0e62f1dcb071c3bed77 +++ b/testdata/diff-1f7390f3999e80f775dbc0e62f1dcb071c3bed77 @@ -8,7 +8,7 @@ :000000 100644 0000000000000000000000000000000000000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 A test/standalone/issue_13970/test_root/empty.zig diff --git a/src/Compilation.zig b/src/Compilation.zig -index e09b8f18ab..8f265f9eb6 100644 +index e09b8f18abe0652043301349ece259daec0c6241..8f265f9eb61ae03e0b5ab80545fa1ce9aab961aa 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -1621,8 +1621,11 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { @@ -26,7 +26,7 @@ index e09b8f18ab..8f265f9eb6 100644 try Package.createWithDir( gpa, diff --git a/test/standalone.zig b/test/standalone.zig -index af972ccb86..81eb1b0042 100644 +index af972ccb8665085991070de3235a6da537423dc6..81eb1b00428e9e2c3ef5fdf8b532255ed2e66867 100644 --- a/test/standalone.zig +++ b/test/standalone.zig @@ -27,6 +27,7 @@ pub fn addCases(cases: *tests.StandaloneContext) void { @@ -39,7 +39,7 @@ index af972ccb86..81eb1b0042 100644 cases.addBuildFile("test/standalone/mix_o_files/build.zig", .{}); diff --git a/test/standalone/issue_13970/build.zig b/test/standalone/issue_13970/build.zig new file mode 100644 -index 0000000000..f5e07d8903 +index 0000000000000000000000000000000000000000..f5e07d8903268bec8527dd555c7c6955af5ff879 --- /dev/null +++ b/test/standalone/issue_13970/build.zig @@ -0,0 +1,21 @@ @@ -66,13 +66,13 @@ index 0000000000..f5e07d8903 +} diff --git a/test/standalone/issue_13970/empty.zig b/test/standalone/issue_13970/empty.zig new file mode 100644 -index 0000000000..e69de29bb2 +index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/standalone/issue_13970/src/empty.zig b/test/standalone/issue_13970/src/empty.zig new file mode 100644 -index 0000000000..e69de29bb2 +index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test/standalone/issue_13970/src/main.zig b/test/standalone/issue_13970/src/main.zig new file mode 100644 -index 0000000000..d71320d46a +index 0000000000000000000000000000000000000000..d71320d46a61a74ccc3e5908ab46c4d0a1fea69a --- /dev/null +++ b/test/standalone/issue_13970/src/main.zig @@ -0,0 +1,8 @@ @@ -86,11 +86,11 @@ index 0000000000..d71320d46a +} diff --git a/test/standalone/issue_13970/src/package.zig b/test/standalone/issue_13970/src/package.zig new file mode 100644 -index 0000000000..4f6037b38d +index 0000000000000000000000000000000000000000..4f6037b38dab0c9b800046b0477dc64f3c3b55e8 --- /dev/null +++ b/test/standalone/issue_13970/src/package.zig @@ -0,0 +1 @@ +pub const decl = 0; diff --git a/test/standalone/issue_13970/test_root/empty.zig b/test/standalone/issue_13970/test_root/empty.zig new file mode 100644 -index 0000000000..e69de29bb2 +index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/testdata/diff-47ed809ce10bdfa99351c72935467c9afae47e36 b/testdata/diff-47ed809ce10bdfa99351c72935467c9afae47e36 index 14ca60f8aee3d1c714280df5952407ec165da549..7d051c0f8fcb24866efd5daaa659f0885c62727b 100644 --- a/testdata/diff-47ed809ce10bdfa99351c72935467c9afae47e36 +++ b/testdata/diff-47ed809ce10bdfa99351c72935467c9afae47e36 @@ -7,14 +7,14 @@ :100644 100644 8885fcc94eca961702dc7e7f7dff2f67328dd3e1 9e2be559f6ca6d5c4e1ce86858587db3a68c5c27 M test/layout/demo-menubar.txt diff --git a/Cozette/.version b/Cozette/.version -index 6fee2fe..49e0a31 100644 +index 6fee2fedb0a46b84e4cbb6e32f9ca5af821b2b67..49e0a31d4964dca501ce61740340bf8058821781 100644 --- a/Cozette/.version +++ b/Cozette/.version @@ -1 +1 @@ -1.22.2 +1.23.1 diff --git a/Cozette/cozette.bdf b/Cozette/cozette.bdf -index 9371252..fdbcc86 100644 +index 9371252d0bfb5b2ee220f63dbd1431d11abe266a..fdbcc86d16227019361b52ab614b3d9667bd48f7 100644 --- a/Cozette/cozette.bdf +++ b/Cozette/cozette.bdf @@ -1,7 +1,7 @@ @@ -2284,7 +2284,7 @@ index 9371252..fdbcc86 100644 +ENDCHAR ENDFONT diff --git a/src/e/Label.zig b/src/e/Label.zig -index 1d2119c..8330936 100644 +index 1d2119c3c794f127a5b366d8db1015dcb6c21e1a..83309362d0d4efa1f7c4a70ef66f2c91d1606b97 100644 --- a/src/e/Label.zig +++ b/src/e/Label.zig @@ -113,7 +113,7 @@ pub fn handleMessage(app: *root.App, ele: mag.Element, msg: mag.Message, extra: @@ -2297,13 +2297,13 @@ index 1d2119c..8330936 100644 }, .enter => {}, diff --git a/test/images/demo-bdf-cozette.png b/test/images/demo-bdf-cozette.png -index 0110829..c669969 100644 +index 0110829e4de23a2c4f1ae0e66958dfe9ca0fe9ff..c669969722abb19329aca3b91037ecc6ae7965ef 100644 Binary files a/test/images/demo-bdf-cozette.png and b/test/images/demo-bdf-cozette.png differ diff --git a/test/images/demo-menubar.png b/test/images/demo-menubar.png -index dedbfa8..e0e4649 100644 +index dedbfa87fb441cf6f8aee13537b8654dc18ac38e..e0e46496176d0dc5aaa70a4d95837212dd2cf3d7 100644 Binary files a/test/images/demo-menubar.png and b/test/images/demo-menubar.png differ diff --git a/test/layout/demo-bdf-cozette.txt b/test/layout/demo-bdf-cozette.txt -index 94df342..5d33be2 100644 +index 94df3421d8f57f38e11f8dc592c6eb123f287d23..5d33be25f2c4e5950780859892cb73b6a3c31e23 100644 --- a/test/layout/demo-bdf-cozette.txt +++ b/test/layout/demo-bdf-cozette.txt @@ -1,13 +1,13 @@ @@ -2332,7 +2332,7 @@ index 94df342..5d33be2 100644 + 11 e.Label @ [352,448,167,180] margin=[0,0,0,0] border=[0,0,0,0] padding=[0,0,0,0] bounds=[352,448,167,180] bg_color=null + 12 e.Label @ [352,448,180,193] margin=[0,0,0,0] border=[0,0,0,0] padding=[0,0,0,0] bounds=[352,448,180,193] bg_color=null diff --git a/test/layout/demo-menubar.txt b/test/layout/demo-menubar.txt -index 8885fcc..9e2be55 100644 +index 8885fcc94eca961702dc7e7f7dff2f67328dd3e1..9e2be559f6ca6d5c4e1ce86858587db3a68c5c27 100644 --- a/test/layout/demo-menubar.txt +++ b/test/layout/demo-menubar.txt @@ -1,24 +1,24 @@ diff --git a/testdata/diff-8480815a00f341a9058a26bf86f34368184615d6 b/testdata/diff-8480815a00f341a9058a26bf86f34368184615d6 index 6b7c57d01b201833af27323fe2aefd45f2002a47..04ab0c1cec750997e49f0aaa536046ac6adb647c 100644 --- a/testdata/diff-8480815a00f341a9058a26bf86f34368184615d6 +++ b/testdata/diff-8480815a00f341a9058a26bf86f34368184615d6 @@ -1,7 +1,7 @@ :100644 100644 fef6239d0dfd8daafcfd62a17a137e3da9c2d8dd 9f1d9c9b30f503c1a0731f31c8b6892990b65746 M notes/potential apps.txt diff --git a/notes/potential apps.txt b/notes/potential apps.txt -index fef6239..9f1d9c9 100644 +index fef6239d0dfd8daafcfd62a17a137e3da9c2d8dd..9f1d9c9b30f503c1a0731f31c8b6892990b65746 100644 --- a/notes/potential apps.txt +++ b/notes/potential apps.txt @@ -116,10 +116,18 @@ system utilities diff --git a/testdata/diff-9feb6b667c77c187f547deaf10cd1f04e92fe192 b/testdata/diff-9feb6b667c77c187f547deaf10cd1f04e92fe192 index b71fbddee5028f1dd3beb22e174cde7bd3eab8b5..4fa702f17b630259bd1a842a95aaeb47539798d8 100644 --- a/testdata/diff-9feb6b667c77c187f547deaf10cd1f04e92fe192 +++ b/testdata/diff-9feb6b667c77c187f547deaf10cd1f04e92fe192 @@ -9,7 +9,7 @@ :100644 100644 1ce887547a4c312badf1429dc2afbfb2c5647776 e24cb55669911d7502b4e7e9add98995586834cf M zigmod.yml diff --git a/README.md b/README.md -index d49352c..5b519a3 100644 +index d49352c9c20cea1ca91beb90979e8d4a1670a01c..5b519a35eb2ea8842573d82f13ab965ca8724b69 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Source-Available, All rights reserved. (c) 2023 Meghan Denny @@ -22,7 +22,7 @@ index d49352c..5b519a3 100644 ## Building diff --git a/apps/Calculator/main.zig b/apps/Calculator/main.zig -index b301658..9c975af 100644 +index b301658a8bea70ef336e7f426c284017b6f48465..9c975af044191b87fcd54769c29bf94a22f9123f 100644 --- a/apps/Calculator/main.zig +++ b/apps/Calculator/main.zig @@ -201,7 +201,7 @@ pub const SquareButton = struct { @@ -98,7 +98,7 @@ index b301658..9c975af 100644 b.num1 = 0; b.num2 = 0; diff --git a/apps/ImageViewer/main.zig b/apps/ImageViewer/main.zig -index f6990ee..90c6e9a 100644 +index f6990eea8b8db29a2ab4113d5d3d422454108ec9..90c6e9a60ff739b96f9ba78b65e2c6584cbaa2fe 100644 --- a/apps/ImageViewer/main.zig +++ b/apps/ImageViewer/main.zig @@ -16,7 +16,7 @@ pub fn main() !void { @@ -111,7 +111,7 @@ index f6990ee..90c6e9a 100644 var app = try App.init(alloc, 300, 200, try std.fmt.allocPrintZ(alloc, "{s} — {s}", .{ file_name, build_options.name })); defer app.deinit(); diff --git a/build.zig b/build.zig -index 30850c5..cf55d58 100644 +index 30850c59cddc295497c3939b6076bb09c8d36de7..cf55d583ce85b9e026f94f6eabcf1490a450c9fb 100644 --- a/build.zig +++ b/build.zig @@ -3,6 +3,8 @@ const string = []const u8; @@ -124,7 +124,7 @@ index 30850c5..cf55d58 100644 const mode = b.option(std.builtin.Mode, "mode", "") orelse .Debug; const doall = b.option(bool, "all", "Build all apps, default only selected steps") orelse false; diff --git a/demos/7guis/1counter.zig b/demos/7guis/1counter.zig -index 731b5b1..c2d6942 100644 +index 731b5b15f743db7aa587fc5f8b8d98d16df106d8..c2d6942489853658391c971988c85317e0da07d2 100644 --- a/demos/7guis/1counter.zig +++ b/demos/7guis/1counter.zig @@ -72,7 +72,7 @@ pub const A = struct { @@ -137,7 +137,7 @@ index 731b5b1..c2d6942 100644 return 1; } diff --git a/demos/logl/hello-window.zig b/demos/logl/hello-window.zig -index c6121d7..da65c9c 100644 +index c6121d73b6adfe4e03889291ca323d0842187b22..da65c9ce2b7ba832d1b748e2ea0bbb6f363f94f4 100644 --- a/demos/logl/hello-window.zig +++ b/demos/logl/hello-window.zig @@ -167,7 +167,7 @@ fn WhitePixel(dpy: *c.Display, scr: c_int) c_ulong { @@ -150,7 +150,7 @@ index c6121d7..da65c9c 100644 return ScreenOfDisplay(dpy, scr).*.root; } diff --git a/src/main.zig b/src/main.zig -index 49c152d..13704da 100644 +index 49c152d836ca8470b153957ba90a4376aa2bbbf0..13704daad693cc0054559ff70f5f3e242ecad273 100644 --- a/src/main.zig +++ b/src/main.zig @@ -860,7 +860,7 @@ pub fn App2() type { @@ -163,7 +163,7 @@ index 49c152d..13704da 100644 pub fn bounds(self: *const Self, element: Element) Rectangle { diff --git a/zigmod.lock b/zigmod.lock -index 55ee6c7..8044e60 100644 +index 55ee6c75e23a130d4cca5825925c92438e3c3865..8044e605443388554cecc57cf4fb2b5c4f41987e 100644 --- a/zigmod.lock +++ b/zigmod.lock @@ -1,8 +1,8 @@ @@ -182,7 +182,7 @@ index 55ee6c7..8044e60 100644 +git https://github.com/ziglibs/known-folders commit-ab5cf5feb936fa3b72c95d3ad0c0c67791937ba1 git https://github.com/zigimg/zigimg commit-d9dbbe22b5f7b5f1f4772169ed93ffeed8e8124d diff --git a/zigmod.yml b/zigmod.yml -index 1ce8875..e24cb55 100644 +index 1ce887547a4c312badf1429dc2afbfb2c5647776..e24cb55669911d7502b4e7e9add98995586834cf 100644 --- a/zigmod.yml +++ b/zigmod.yml @@ -1,7 +1,7 @@ diff --git a/testdata/diff-a0482e3446cea426bf16571e0000423ed5b25af0 b/testdata/diff-a0482e3446cea426bf16571e0000423ed5b25af0 index b5c66737f55661eb5e44f0a27a98660d9e9819d0..d1f6b6a21eea042be831249fd01768166b862f24 100644 --- a/testdata/diff-a0482e3446cea426bf16571e0000423ed5b25af0 +++ b/testdata/diff-a0482e3446cea426bf16571e0000423ed5b25af0 @@ -7,7 +7,7 @@ :100644 100644 95057f7567db22226d9cb09a667a56e387a33a46 dd1132508a0db29a32ec977b30f64b20aa43e03d M tools/testing/selftests/vDSO/vdso_test_getrandom.c diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile -index 12a0614b9fd4..918a2caa070e 100644 +index 12a0614b9fd4983deffe5d6a7cfa06ba8d92a516..918a2caa070ebc681a9525f0518afffcf10f5ae3 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -12,7 +12,7 @@ TEST_GEN_PROGS += vdso_test_correctness @@ -20,7 +20,7 @@ index 12a0614b9fd4..918a2caa070e 100644 ifeq ($(CONFIG_X86_32),y) LDLIBS += -lgcc_s diff --git a/tools/testing/selftests/vDSO/vdso_config.h b/tools/testing/selftests/vDSO/vdso_config.h -index 722260f97561..5fdd0f362337 100644 +index 722260f9756198956f0dfccced907284b6851e76..5fdd0f36233742bc47ae79f23d2cfae5a0f56dee 100644 --- a/tools/testing/selftests/vDSO/vdso_config.h +++ b/tools/testing/selftests/vDSO/vdso_config.h @@ -58,6 +58,7 @@ @@ -41,7 +41,7 @@ index 722260f97561..5fdd0f362337 100644 "__kernel_gettimeofday", diff --git a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c deleted file mode 100644 -index 9ce795b806f0..000000000000 +index 9ce795b806f0992b83cef78c7e16fac0e54750da..0000000000000000000000000000000000000000 --- a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c +++ /dev/null @@ -1,58 +0,0 @@ @@ -105,14 +105,14 @@ index 9ce795b806f0..000000000000 -} diff --git a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c new file mode 120000 -index 000000000000..4d3d96f1e440 +index 0000000000000000000000000000000000000000..4d3d96f1e440c965474681a6f35375a60b3921be --- /dev/null +++ b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c @@ -0,0 +1 @@ +vdso_test_gettimeofday.c \ No newline at end of file diff --git a/tools/testing/selftests/vDSO/vdso_test_chacha.c b/tools/testing/selftests/vDSO/vdso_test_chacha.c -index 8757f738b0b1..0aad682b12c8 100644 +index 8757f738b0b1a76a48c83c5e5df79925a30c1bc7..0aad682b12c8836efabb49a65a47cf87466891a3 100644 --- a/tools/testing/selftests/vDSO/vdso_test_chacha.c +++ b/tools/testing/selftests/vDSO/vdso_test_chacha.c @@ -76,7 +76,8 @@ static void reference_chacha20_blocks(uint8_t *dst_bytes, const uint32_t *key, u @@ -126,7 +126,7 @@ index 8757f738b0b1..0aad682b12c8 100644 int main(int argc, char *argv[]) diff --git a/tools/testing/selftests/vDSO/vdso_test_clock_getres.c b/tools/testing/selftests/vDSO/vdso_test_clock_getres.c -index 38d46a8bf7cb..b5d5f59f725a 100644 +index 38d46a8bf7cba7a9b4a9b13b5eb17aa207972bd0..b5d5f59f725a703c357dfca91bfe170aaaeb42fa 100644 --- a/tools/testing/selftests/vDSO/vdso_test_clock_getres.c +++ b/tools/testing/selftests/vDSO/vdso_test_clock_getres.c @@ -13,7 +13,6 @@ @@ -138,7 +138,7 @@ index 38d46a8bf7cb..b5d5f59f725a 100644 #include #include diff --git a/tools/testing/selftests/vDSO/vdso_test_correctness.c b/tools/testing/selftests/vDSO/vdso_test_correctness.c -index 5fb97ad67eea..da651cf53c6c 100644 +index 5fb97ad67eeaf17b6cfa4f82783c57894f03e5c5..da651cf53c6ca4242085de109c7fc57bd807297c 100644 --- a/tools/testing/selftests/vDSO/vdso_test_correctness.c +++ b/tools/testing/selftests/vDSO/vdso_test_correctness.c @@ -108,7 +108,7 @@ static void *vsyscall_getcpu(void) @@ -151,7 +151,7 @@ index 5fb97ad67eea..da651cf53c6c 100644 void *vdso = dlopen("linux-vdso.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); diff --git a/tools/testing/selftests/vDSO/vdso_test_getrandom.c b/tools/testing/selftests/vDSO/vdso_test_getrandom.c -index 95057f7567db..dd1132508a0d 100644 +index 95057f7567db22226d9cb09a667a56e387a33a46..dd1132508a0db29a32ec977b30f64b20aa43e03d 100644 --- a/tools/testing/selftests/vDSO/vdso_test_getrandom.c +++ b/tools/testing/selftests/vDSO/vdso_test_getrandom.c @@ -21,7 +21,6 @@ diff --git a/testdata/diff-c37d23f45ae6bd0db6b072180d7b84566c7dc8a2 b/testdata/diff-c37d23f45ae6bd0db6b072180d7b84566c7dc8a2 index 2db33d584f2e7958fe09d99f8764c008ecf2af63..7ee7237021f2234f557925e8cf62c83f8089250e 100644 --- a/testdata/diff-c37d23f45ae6bd0db6b072180d7b84566c7dc8a2 +++ b/testdata/diff-c37d23f45ae6bd0db6b072180d7b84566c7dc8a2 @@ -2,4 +2,4 @@ diff --git a/crt.c b/crt.c deleted file mode 100644 -index e69de29bb2..0000000000 +index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/testdata/diff-e90937e756938f03d37d4cae7c82316a3a425944 b/testdata/diff-e90937e756938f03d37d4cae7c82316a3a425944 index e826de21032a223dc7d04ab65d855d894c7e5b35..1c76a1cb9556994046f3e96d15afc791243fcf6f 100644 --- a/testdata/diff-e90937e756938f03d37d4cae7c82316a3a425944 +++ b/testdata/diff-e90937e756938f03d37d4cae7c82316a3a425944 @@ -494,7 +494,7 @@ :000000 100644 0000000000000000000000000000000000000000 1f1b56e57346e3b939a4597b9242d2aacbcbc33d A include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt -index 520cdd2127cf..4e4bc0bae597 100644 +index 520cdd2127cf8e864cc7975b0aab505922d88b13..4e4bc0bae597ad27b488a74c7b83762e7cb51a88 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -1,6 +1,18 @@ @@ -517,7 +517,7 @@ index 520cdd2127cf..4e4bc0bae597 100644 Required root node property: compatible: "amlogic,meson6" diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt -index 9c97de23919a..3e3efa046ac5 100644 +index 9c97de23919ae4312c3c42085393baf2536a727d..3e3efa046ac57ab49cee7d706cfff3b2d93c6247 100644 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt @@ -42,6 +42,10 @@ Raspberry Pi Zero @@ -533,7 +533,7 @@ index 9c97de23919a..3e3efa046ac5 100644 compatible = "brcm,bcm2835"; diff --git a/Documentation/devicetree/bindings/arm/bhf.txt b/Documentation/devicetree/bindings/arm/bhf.txt new file mode 100644 -index 000000000000..886b503caf9c +index 0000000000000000000000000000000000000000..886b503caf9cc07b30c92f3027853e24ced181d2 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bhf.txt @@ -0,0 +1,6 @@ @@ -544,7 +544,7 @@ index 000000000000..886b503caf9c +Required root node properties: + - compatible = "bhf,cx9020", "fsl,imx53"; diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt -index a44253cad269..b92f12bd5244 100644 +index a44253cad2692e2c209e4fa1f148ccd89415496c..b92f12bd5244a7e6fe911f8000f7a37e499e0e40 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -200,6 +200,7 @@ described below. @@ -557,7 +557,7 @@ index a44253cad269..b92f12bd5244 100644 "marvell,armada-375-smp" diff --git a/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt b/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt new file mode 100644 -index 000000000000..f3e9624534c6 +index 0000000000000000000000000000000000000000..f3e9624534c6baf30cca4dc41fff5d65a1be129b --- /dev/null +++ b/Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt @@ -0,0 +1,15 @@ @@ -577,7 +577,7 @@ index 000000000000..f3e9624534c6 +compatible = "marvell,armada-8080-db", "marvell,armada-8080", + "marvell,armada-ap810-octa", "marvell,armada-ap810" diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt -index da7bd138e6f2..91d517849483 100644 +index da7bd138e6f2133bb43107e8b3cb8885f9791cb7..91d5178494834b57e2abe152bf5739a8930c0cd2 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.txt +++ b/Documentation/devicetree/bindings/arm/mediatek.txt @@ -1,12 +1,12 @@ @@ -631,7 +631,7 @@ index da7bd138e6f2..91d517849483 100644 Required root node properties: - compatible = "mediatek,mt8127-moose", "mediatek,mt8127"; diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt -index 9c6bebe43449..2ecc712bf707 100644 +index 9c6bebe434497479579460fce6bdbe2c2ca95853..2ecc712bf7075da21bd29104024a9c0fc15186f6 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -157,6 +157,9 @@ Boards: @@ -655,7 +655,7 @@ index 9c6bebe43449..2ecc712bf707 100644 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" diff --git a/Documentation/devicetree/bindings/arm/qcom.txt b/Documentation/devicetree/bindings/arm/qcom.txt -index 028d16e72186..0ed4d39d7fe1 100644 +index 028d16e721862effcf95ee4e9055856255e99879..0ed4d39d7fe1876ec439a713576dfc4bf8d18518 100644 --- a/Documentation/devicetree/bindings/arm/qcom.txt +++ b/Documentation/devicetree/bindings/arm/qcom.txt @@ -25,6 +25,7 @@ The 'SoC' element must be one of the following strings: @@ -675,7 +675,7 @@ index 028d16e72186..0ed4d39d7fe1 100644 The 'soc_version' and 'board_version' elements take the form of v. where the minor number may be omitted when it's zero, i.e. v1.0 is the same diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt -index 11c0ac4a2d56..b003148e2945 100644 +index 11c0ac4a2d56686d04bd969c44ea3c9c7efeabe2..b003148e2945129ef834feacb5b198813195484e 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.txt +++ b/Documentation/devicetree/bindings/arm/rockchip.txt @@ -134,6 +134,10 @@ Rockchip platforms device tree bindings @@ -705,7 +705,7 @@ index 11c0ac4a2d56..b003148e2945 100644 Required root node properties: - compatible = "tronsmart,orion-r68-meta", "rockchip,rk3368"; diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt -index 1a671e329864..ae75cb3b1331 100644 +index 1a671e3298643d9eaaec617b2b6183f77b380bed..ae75cb3b1331f82782c95a814d3a6bbda3f63857 100644 --- a/Documentation/devicetree/bindings/arm/shmobile.txt +++ b/Documentation/devicetree/bindings/arm/shmobile.txt @@ -39,6 +39,8 @@ SoCs: @@ -738,7 +738,7 @@ index 1a671e329864..ae75cb3b1331 100644 compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743" - iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven) diff --git a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt -index 207682647d33..b455c5aa9139 100644 +index 207682647d33a41fd6bbee805dfebe2e8b04ef83..b455c5aa9139edba0223ba9c25270255b60a0d86 100644 --- a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt +++ b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt @@ -16,18 +16,25 @@ Required Properties: @@ -769,7 +769,7 @@ index 207682647d33..b455c5aa9139 100644 diff --git a/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt b/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt -index cb7ffc58c564..b1a8929c2536 100644 +index cb7ffc58c564722a04e18c562e83155c2a051a57..b1a8929c2536cc324a1d34073dabc2fe2ddf53cf 100644 --- a/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt +++ b/Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt @@ -13,6 +13,7 @@ Required properties: @@ -781,7 +781,7 @@ index cb7ffc58c564..b1a8929c2536 100644 When compatible with generic versions, nodes must list the SoC-specific diff --git a/Documentation/devicetree/bindings/display/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt -index c6cb96a4fa93..4bbd1e9bf3be 100644 +index c6cb96a4fa939a5672b4770ba7f8673136cb0031..4bbd1e9bf3be40ee158be1e62a9be15167cec57c 100644 --- a/Documentation/devicetree/bindings/display/renesas,du.txt +++ b/Documentation/devicetree/bindings/display/renesas,du.txt @@ -36,8 +36,10 @@ Required Properties: @@ -862,7 +862,7 @@ index c6cb96a4fa93..4bbd1e9bf3be 100644 }; }; diff --git a/Documentation/devicetree/bindings/dma/ti-edma.txt b/Documentation/devicetree/bindings/dma/ti-edma.txt -index 33d9e386dc45..41f0c1a07c56 100644 +index 33d9e386dc45c457de837fe8d7209b4302d54003..41f0c1a07c562b754fd2324d7a41d9cb6df52158 100644 --- a/Documentation/devicetree/bindings/dma/ti-edma.txt +++ b/Documentation/devicetree/bindings/dma/ti-edma.txt @@ -9,7 +9,12 @@ execute the actual DMA tansfer. @@ -998,7 +998,7 @@ index 33d9e386dc45..41f0c1a07c56 100644 DEPRECATED binding, new DTS files must use the ti,edma3-tpcc/ti,edma3-tptc binding. diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt -index 5aa5926029ee..039219df05c5 100644 +index 5aa5926029ee7286c4cd2e41a446574c13102021..039219df05c5f69836a39bac48bac64ce33d476a 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt +++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt @@ -17,6 +17,7 @@ Required properties: @@ -1010,7 +1010,7 @@ index 5aa5926029ee..039219df05c5 100644 - reg : Physical base address of the device and length of the register area. diff --git a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt -index 11cc87aeb276..07bf0b9a5139 100644 +index 11cc87aeb276f0a25b869ba53ed2b6b9213888d8..07bf0b9a5139fed3d5297d495bab184111deb9f9 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt @@ -17,6 +17,7 @@ Required properties: @@ -1022,7 +1022,7 @@ index 11cc87aeb276..07bf0b9a5139 100644 - interrupt-controller : Identifies the node as an interrupt controller - #interrupt-cells : Use the same format as specified by GIC in arm,gic.txt. diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt -index 0e026c151c1c..3a4ac401e6f9 100644 +index 0e026c151c1c1a1aa3191129658dc5788f2ed4f2..3a4ac401e6f93a9d8ce3becd4d75410f95f1e50d 100644 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt @@ -1,33 +1,55 @@ @@ -1097,7 +1097,7 @@ index 0e026c151c1c..3a4ac401e6f9 100644 Examples: diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt -index 5a1d8b0c39e9..2d504256b0d8 100644 +index 5a1d8b0c39e97af6d3ef56589f0196541d912a51..2d504256b0d8e73183ebe114158f194a85e964d8 100644 --- a/Documentation/devicetree/bindings/net/can/c_can.txt +++ b/Documentation/devicetree/bindings/net/can/c_can.txt @@ -11,9 +11,20 @@ Required properties: @@ -1123,7 +1123,7 @@ index 5a1d8b0c39e9..2d504256b0d8 100644 RAMINIT register, register offset to the RAMINIT register and the CAN instance number (0 offset). diff --git a/Documentation/devicetree/bindings/net/mediatek-net.txt b/Documentation/devicetree/bindings/net/mediatek-net.txt -index 1d1168b805cc..214eaa9a6683 100644 +index 1d1168b805cc8ab2e9607be5dd1068d391d89ff2..214eaa9a6683861fd529d2af6fb84e361b27d80d 100644 --- a/Documentation/devicetree/bindings/net/mediatek-net.txt +++ b/Documentation/devicetree/bindings/net/mediatek-net.txt @@ -20,8 +20,10 @@ Required properties: @@ -1140,7 +1140,7 @@ index 1d1168b805cc..214eaa9a6683 100644 - mediatek,sgmiisys: phandle to the syscon node that handles the SGMII setup which is required for those SoCs equipped with SGMII such as MT7622 SoC. diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt -index 127ae1f53e5a..6173af6885f8 100644 +index 127ae1f53e5a2d5b4da6893efc7fba898a14fd27..6173af6885f86731a9e81182737afc0a185cd212 100644 --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt @@ -276,7 +276,7 @@ pcie-controller { @@ -1153,7 +1153,7 @@ index 127ae1f53e5a..6173af6885f8 100644 assigned-addresses = <0x82005000 0 0x82000 0 0x2000>; reg = <0x5000 0 0 0 0>; diff --git a/Documentation/devicetree/bindings/power/renesas,apmu.txt b/Documentation/devicetree/bindings/power/renesas,apmu.txt -index 84404c9edff7..af21502e939c 100644 +index 84404c9edff73d97df9384fb0ce801343d780b0b..af21502e939c4b1f6866e80f7325342833b133c0 100644 --- a/Documentation/devicetree/bindings/power/renesas,apmu.txt +++ b/Documentation/devicetree/bindings/power/renesas,apmu.txt @@ -1,12 +1,13 @@ @@ -1172,7 +1172,7 @@ index 84404c9edff7..af21502e939c 100644 - "renesas,r8a7791-apmu" (R-Car M2-W) - "renesas,r8a7792-apmu" (R-Car V2H) diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt -index b6cf384597e1..f73abff3de43 100644 +index b6cf384597e1dabc5f5e090982235f0e0c56128a..f73abff3de43bcdb0ecdaabc0f4f23a470d7268d 100644 --- a/Documentation/devicetree/bindings/serial/mtk-uart.txt +++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt @@ -3,6 +3,7 @@ @@ -1184,7 +1184,7 @@ index b6cf384597e1..f73abff3de43 100644 * "mediatek,mt6582-uart" for MT6582 compatible UARTS * "mediatek,mt6589-uart" for MT6589 compatible UARTS diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.txt b/Documentation/devicetree/bindings/soc/rockchip/grf.txt -index cc9f05d3cbc1..7dc5ce858a0e 100644 +index cc9f05d3cbc1a0b08a2a278364332b8114b027a3..7dc5ce858a0ee3a6659cc0be7a0d3194f7a6fa3e 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.txt +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.txt @@ -21,6 +21,7 @@ Required Properties: @@ -1205,7 +1205,7 @@ index cc9f05d3cbc1..7dc5ce858a0e 100644 region. diff --git a/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt b/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt -index c705db07d820..66e6265fb0aa 100644 +index c705db07d8206d74835c729cf6253d97a7227df0..66e6265fb0aa2f2af147c63a776c86bb9a52096f 100644 --- a/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt +++ b/Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt @@ -46,12 +46,13 @@ Required Properties: @@ -1226,7 +1226,7 @@ index c705db07d820..66e6265fb0aa 100644 }; diff --git a/Documentation/devicetree/bindings/sram/renesas,smp-sram.txt b/Documentation/devicetree/bindings/sram/renesas,smp-sram.txt new file mode 100644 -index 000000000000..712d05e3e15e +index 0000000000000000000000000000000000000000..712d05e3e15eeb65faaed7de21f6533ab6bcbb47 --- /dev/null +++ b/Documentation/devicetree/bindings/sram/renesas,smp-sram.txt @@ -0,0 +1,27 @@ @@ -1258,7 +1258,7 @@ index 000000000000..712d05e3e15e + }; + }; diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt -index 5a79aeb620b3..69183f0fbc78 100644 +index 5a79aeb620b3a206434bd45bf2410a7ed47db7cb..69183f0fbc7873f13e9b4516a34e3dde41686ab7 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -48,6 +48,7 @@ avic Shanghai AVIC Optoelectronics Co., Ltd. @@ -1270,7 +1270,7 @@ index 5a79aeb620b3..69183f0fbc78 100644 bosch Bosch Sensortec GmbH boundary Boundary Devices Inc. diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt -index 6a00939a059a..20ada673ab0c 100644 +index 6a00939a059a1185c5e4ece5bbcd388131bb4987..20ada673ab0c17a1647be7eeb80353aedea64ceb 100644 --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt @@ -3,9 +3,9 @@ Mediatek SoCs Watchdog timer @@ -1287,7 +1287,7 @@ index 6a00939a059a..20ada673ab0c 100644 - reg : Specifies base physical address and size of the registers. diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 4b17f35dc9a7..faf46abaa4a2 100644 +index 4b17f35dc9a7167bcce9b5c9c9b35b7375add15c..faf46abaa4a2773721a0c30b012a2ae52308daae 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -46,6 +46,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ @@ -1414,7 +1414,7 @@ index 4b17f35dc9a7..faf46abaa4a2 100644 mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi -index 1d154444dfef..48a15fc641f2 100644 +index 1d154444dfef245bf60e6336da038d1ff766512e..48a15fc641f22e40301c505625fc331efc4610e9 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -319,13 +319,10 @@ &tps { @@ -1432,7 +1432,7 @@ index 1d154444dfef..48a15fc641f2 100644 }; diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts -index d8769799772e..59431b235944 100644 +index d8769799772ea6cdacb0693427648cf61e0f0879..59431b23594489dd3f211c0be1a93c031d3c0c46 100644 --- a/arch/arm/boot/dts/am335x-chiliboard.dts +++ b/arch/arm/boot/dts/am335x-chiliboard.dts @@ -191,13 +191,10 @@ &tps { @@ -1450,7 +1450,7 @@ index d8769799772e..59431b235944 100644 }; }; diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts -index 1c37a7c1ea17..ddd897556e03 100644 +index 1c37a7c1ea17dd76fc2686c1bd9dd17acc250d99..ddd897556e035b6306306ca33eccc65c7ed45e3b 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -531,6 +531,7 @@ nand@0,0 { @@ -1463,7 +1463,7 @@ index 1c37a7c1ea17..ddd897556e03 100644 nand-bus-width = <8>; diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts new file mode 100644 -index 000000000000..f82233cd18e0 +index 0000000000000000000000000000000000000000..f82233cd18e0bf5b7ddd9c673a15bd28dd7d1994 --- /dev/null +++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts @@ -0,0 +1,525 @@ @@ -1993,7 +1993,7 @@ index 000000000000..f82233cd18e0 + }; +}; diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts -index 29a538ecd405..afb8eb0a0a16 100644 +index 29a538ecd405db81959e839768dc2731d10a63aa..afb8eb0a0a16ee63ea1ece64e694ac847c249067 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts @@ -149,6 +149,13 @@ sound0_master: simple-audio-card,codec { @@ -2033,7 +2033,7 @@ index 29a538ecd405..afb8eb0a0a16 100644 ti,elm-id = <&elm>; nand-bus-width = <8>; diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts -index 54f40f370011..9d276af7c539 100644 +index 54f40f370011c211664a6583a845146b50b996af..9d276af7c539f3dd1cb382f12d4bca7d9bd2fb3d 100644 --- a/arch/arm/boot/dts/am43x-epos-evm.dts +++ b/arch/arm/boot/dts/am43x-epos-evm.dts @@ -564,6 +564,7 @@ nand@0,0 { @@ -2045,7 +2045,7 @@ index 54f40f370011..9d276af7c539 100644 ti,elm-id = <&elm>; nand-bus-width = <8>; diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts -index 7b207835b2d1..debf9464403e 100644 +index 7b207835b2d161244fc8e09126fe384bf7eae9fa..debf9464403ef52a5c4b7e27135b1a5ed5778fd2 100644 --- a/arch/arm/boot/dts/am571x-idk.dts +++ b/arch/arm/boot/dts/am571x-idk.dts @@ -11,6 +11,7 @@ @@ -2102,7 +2102,7 @@ index 7b207835b2d1..debf9464403e 100644 + pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>; +}; diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts -index 9da6d83ca185..a578fe97ba3b 100644 +index 9da6d83ca185e52c79ea4ebd180fb1d21144280c..a578fe97ba3bd9ec210df3f1827cc936a748d2bd 100644 --- a/arch/arm/boot/dts/am572x-idk.dts +++ b/arch/arm/boot/dts/am572x-idk.dts @@ -12,6 +12,7 @@ @@ -2165,7 +2165,7 @@ index 9da6d83ca185..a578fe97ba3b 100644 }; diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi -index fdfe5b16b806..49aeecd312b4 100644 +index fdfe5b16b806298a1aac3a136a873dfc2ab891df..49aeecd312b4b10af2cb3badd68a4982fa8a921d 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi @@ -9,6 +9,7 @@ @@ -2226,7 +2226,7 @@ index fdfe5b16b806..49aeecd312b4 100644 }; diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts -index 39a92aff0a0d..5a77b334923d 100644 +index 39a92aff0a0dc5338d29c13949001e2558f17474..5a77b334923d051f6943730b8d51849fe6161596 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts @@ -19,8 +19,23 @@ &tpd12s015 { @@ -2256,7 +2256,7 @@ index 39a92aff0a0d..5a77b334923d 100644 /* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */ diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts b/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts new file mode 100644 -index 000000000000..17c41da3b55f +index 0000000000000000000000000000000000000000..17c41da3b55f1c7d94460f98647f0fdb084a9dbe --- /dev/null +++ b/arch/arm/boot/dts/am57xx-beagle-x15-revc.dts @@ -0,0 +1,39 @@ @@ -2300,7 +2300,7 @@ index 000000000000..17c41da3b55f + pinctrl-2 = <&mmc2_pins_ddr_rev20>; +}; diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts -index 19a60a11c198..d6689106d2a8 100644 +index 19a60a11c19890d49f608e12c4a4c3a5d3c822bc..d6689106d2a83935ea6ac98fd89f42ce06132879 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts @@ -20,9 +20,20 @@ &tpd12s015 { @@ -2325,7 +2325,7 @@ index 19a60a11c198..d6689106d2a8 100644 &phy1 { max-speed = <100>; diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi -index c536b2f5389f..97aa8e6a56da 100644 +index c536b2f5389f2786930a48eb0f7446311c622121..97aa8e6a56da8f7c8722f5243e01fca0e944f629 100644 --- a/arch/arm/boot/dts/am57xx-idk-common.dtsi +++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi @@ -399,6 +399,14 @@ &usb2 { @@ -2344,7 +2344,7 @@ index c536b2f5389f..97aa8e6a56da 100644 status = "okay"; vmmc-supply = <&v3_3d>; diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi -index f9cf1273f35e..b1cf5a26f3c2 100644 +index f9cf1273f35e0ae65dd4398037f9662bcf4ff28e..b1cf5a26f3c2a460b7b9d8fc41127c30cf2cc533 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -72,7 +72,7 @@ bootrom { @@ -2373,7 +2373,7 @@ index f9cf1273f35e..b1cf5a26f3c2 100644 interrupt-map = <0 0 0 0 &mpic 62>; marvell,pcie-port = <1>; diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi -index 50c5e8417802..7225c7ce9a8d 100644 +index 50c5e8417802cd42c3beee13bcf9a23b3a127791..7225c7ce9a8dbca5cb909c0c1b55376072c2e263 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi @@ -582,7 +582,7 @@ coredivclk: corediv-clock@e8250 { @@ -2402,7 +2402,7 @@ index 50c5e8417802..7225c7ce9a8d 100644 interrupt-map = <0 0 0 0 &gic GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; marvell,pcie-port = <0>; diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi -index e392f6036f39..132596fd0860 100644 +index e392f6036f3956a7b2494d7fb502f5b5a3a99349..132596fd08603e68d458cb264ae23ca48c0c7929 100644 --- a/arch/arm/boot/dts/armada-380.dtsi +++ b/arch/arm/boot/dts/armada-380.dtsi @@ -71,7 +71,7 @@ pinctrl@18000 { @@ -2439,7 +2439,7 @@ index e392f6036f39..132596fd0860 100644 interrupt-map = <0 0 0 0 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; marvell,pcie-port = <2>; diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts -index db5b9f6b615d..25d2d720dc0e 100644 +index db5b9f6b615d8f8ea430f7ae790bc82858add8e8..25d2d720dc0e2cacc98b402e609e0fe78eb01acb 100644 --- a/arch/arm/boot/dts/armada-385-db-ap.dts +++ b/arch/arm/boot/dts/armada-385-db-ap.dts @@ -209,7 +209,7 @@ bm-bppi { @@ -2452,7 +2452,7 @@ index db5b9f6b615d..25d2d720dc0e 100644 /* diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts -index be16ce39fb3d..06831e1e3f80 100644 +index be16ce39fb3d659f4833722063a26aa043bace11..06831e1e3f808b8419b299e72d8dfbd94568de3f 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -96,7 +96,7 @@ usb3@f8000 { @@ -2465,7 +2465,7 @@ index be16ce39fb3d..06831e1e3f80 100644 pcie@1,0 { diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi -index 7fcc4c4885cf..74863aff01c6 100644 +index 7fcc4c4885cffa9b51fe8c1c9911e4ea3cfcc138..74863aff01c6e0259576403ae22ece1cc12a7d4d 100644 --- a/arch/arm/boot/dts/armada-385.dtsi +++ b/arch/arm/boot/dts/armada-385.dtsi @@ -70,7 +70,7 @@ cpu@1 { @@ -2510,7 +2510,7 @@ index 7fcc4c4885cf..74863aff01c6 100644 interrupt-map = <0 0 0 0 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; marvell,pcie-port = <3>; diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts -index 0d5f1f062275..ee7b0089eff0 100644 +index 0d5f1f06227568389c072194bf7da8ae6957012d..ee7b0089eff035a7f0fda7ed43b6878183c6c53a 100644 --- a/arch/arm/boot/dts/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/armada-388-clearfog.dts @@ -62,7 +62,7 @@ usb3@f0000 { @@ -2523,7 +2523,7 @@ index 0d5f1f062275..ee7b0089eff0 100644 /* Port 2, Lane 0. CON2, nearest CPU. */ reset-gpios = <&expander0 2 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi -index 0f5938bede53..68acfc968706 100644 +index 0f5938bede53c30ce84f24a9a9b733517cc52118..68acfc9687069bf141c01309608b8806920bb446 100644 --- a/arch/arm/boot/dts/armada-388-clearfog.dtsi +++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi @@ -104,7 +104,7 @@ usb3@f8000 { @@ -2536,7 +2536,7 @@ index 0f5938bede53..68acfc968706 100644 /* * The two PCIe units are accessible through diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts -index 1ac923826445..a4ec1fa37529 100644 +index 1ac923826445495edd6f725b44ce9c2134a5382f..a4ec1fa3752979fd30a1c9870a072d217c374b18 100644 --- a/arch/arm/boot/dts/armada-388-db.dts +++ b/arch/arm/boot/dts/armada-388-db.dts @@ -172,7 +172,7 @@ bm-bppi { @@ -2549,7 +2549,7 @@ index 1ac923826445..a4ec1fa37529 100644 /* * The two PCIe units are accessible through diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts -index 563901e0ec07..f503955dbd3b 100644 +index 563901e0ec071f0c66a4590b17fe5c3f6cfcbd69..f503955dbd3b810db157344e3f9cf48dadd4b1ca 100644 --- a/arch/arm/boot/dts/armada-388-gp.dts +++ b/arch/arm/boot/dts/armada-388-gp.dts @@ -240,7 +240,7 @@ bm-bppi { @@ -2562,7 +2562,7 @@ index 563901e0ec07..f503955dbd3b 100644 /* * One PCIe units is accessible through diff --git a/arch/arm/boot/dts/armada-388-rd.dts b/arch/arm/boot/dts/armada-388-rd.dts -index af82f275eac2..9cc3ca0376b9 100644 +index af82f275eac248791a2286b49c87bfd7c536db08..9cc3ca0376b934e10c863735f3e9a14ee72c0ee1 100644 --- a/arch/arm/boot/dts/armada-388-rd.dts +++ b/arch/arm/boot/dts/armada-388-rd.dts @@ -117,7 +117,7 @@ usb3@f0000 { @@ -2575,7 +2575,7 @@ index af82f275eac2..9cc3ca0376b9 100644 /* * One PCIe units is accessible through diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi -index af31f5d6c0e5..7ff0811e61db 100644 +index af31f5d6c0e571f607fa47eb7aa00094d3ffdcb9..7ff0811e61db3ad73be8f0c9ea8f79ebde1681c7 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -154,6 +154,13 @@ scu@c000 { @@ -2593,7 +2593,7 @@ index af31f5d6c0e5..7ff0811e61db 100644 compatible = "arm,cortex-a9-twd-timer"; reg = <0xc600 0x20>; diff --git a/arch/arm/boot/dts/armada-390-db.dts b/arch/arm/boot/dts/armada-390-db.dts -index 2afed2ce4741..c718a5242595 100644 +index 2afed2ce47412dce518785bdc1092c27b08766fb..c718a5242595f4157215ea476fccc998372bbccf 100644 --- a/arch/arm/boot/dts/armada-390-db.dts +++ b/arch/arm/boot/dts/armada-390-db.dts @@ -123,7 +123,7 @@ usb3@f8000 { @@ -2606,7 +2606,7 @@ index 2afed2ce4741..c718a5242595 100644 /* CON30 */ diff --git a/arch/arm/boot/dts/armada-395-gp.dts b/arch/arm/boot/dts/armada-395-gp.dts -index 2cdbba804c1e..ef491b524fd6 100644 +index 2cdbba804c1eaedf2034902e038e1696850c42f3..ef491b524fd6c4c39b391d4c022210c4744f9e37 100644 --- a/arch/arm/boot/dts/armada-395-gp.dts +++ b/arch/arm/boot/dts/armada-395-gp.dts @@ -139,7 +139,7 @@ usb3@f0000 { @@ -2619,7 +2619,7 @@ index 2cdbba804c1e..ef491b524fd6 100644 /* diff --git a/arch/arm/boot/dts/armada-398-db.dts b/arch/arm/boot/dts/armada-398-db.dts -index e8604281c3c9..f0e0379f7619 100644 +index e8604281c3c9916522d496937c73c1b31c6f22c9..f0e0379f7619220d39defb0f72887623ba850768 100644 --- a/arch/arm/boot/dts/armada-398-db.dts +++ b/arch/arm/boot/dts/armada-398-db.dts @@ -118,7 +118,7 @@ usb3@f8000 { @@ -2632,7 +2632,7 @@ index e8604281c3c9..f0e0379f7619 100644 pcie@1,0 { diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi -index 60fbfd5907c7..ea657071e278 100644 +index 60fbfd5907c71049e75935cba303f795be38ad72..ea657071e27888c49294556e047f556d499f6300 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi @@ -442,7 +442,7 @@ thermal@e8078 { @@ -2677,7 +2677,7 @@ index 60fbfd5907c7..ea657071e278 100644 interrupt-map = <0 0 0 0 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; marvell,pcie-port = <3>; diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi -index be22ec5236ac..bdd4c7a45fbf 100644 +index be22ec5236acfe5f11626a7f50447944564fda60..bdd4c7a45fbf43995f899982c499d9e9c99da5c5 100644 --- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi +++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi @@ -91,7 +91,7 @@ bootrom { @@ -2698,7 +2698,7 @@ index be22ec5236ac..bdd4c7a45fbf 100644 interrupt-map = <0 0 0 0 &mpic 58>; marvell,pcie-port = <0>; diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts -index a33974254d8c..065282c21789 100644 +index a33974254d8cddb36ee6538bc1eec767c0ce756d..065282c217897fdfdab6ecb0dd365614a6478468 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts @@ -242,7 +242,7 @@ pcie@9,0 { @@ -2711,7 +2711,7 @@ index a33974254d8c..065282c21789 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts -index d62bf7bea1df..ac9eab8ac186 100644 +index d62bf7bea1df4db579d8d22311d40ef8f0eaa25e..ac9eab8ac186c78ba88e0e03907f429886953e04 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts @@ -227,7 +227,7 @@ pcie@9,0 { @@ -2724,7 +2724,7 @@ index d62bf7bea1df..ac9eab8ac186 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi -index 9f25814077f2..129738f7973d 100644 +index 9f25814077f2b446f9c54ab22ee277a10288fae6..129738f7973d4b4c90cdd79d14864b8e34de76db 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi @@ -86,7 +86,7 @@ soc { @@ -2777,7 +2777,7 @@ index 9f25814077f2..129738f7973d 100644 interrupt-map = <0 0 0 0 &mpic 62>; marvell,pcie-port = <1>; diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi -index 2bfe07aebf1a..e58d597e37b9 100644 +index 2bfe07aebf1aefae7611c2b7899b824c1527306a..e58d597e37b98a414aa430f4d2635c90315b3a82 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -87,7 +87,7 @@ soc { @@ -2862,7 +2862,7 @@ index 2bfe07aebf1a..e58d597e37b9 100644 interrupt-map = <0 0 0 0 &mpic 99>; marvell,pcie-port = <2>; diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi -index 6c33935f7074..a5c961cee7de 100644 +index 6c33935f7074730e193781173661ad717a202e32..a5c961cee7de3856d33046ca365d5d0f998d993c 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi @@ -104,7 +104,7 @@ soc { @@ -2964,7 +2964,7 @@ index 6c33935f7074..a5c961cee7de 100644 interrupt-map = <0 0 0 0 &mpic 103>; marvell,pcie-port = <3>; diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi -index 8a04c7e2d818..22b958537d31 100644 +index 8a04c7e2d8185c9a72ea7824785ac93009672561..22b958537d31ada6dac768be3de7e2eddf31bfdb 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -26,7 +26,7 @@ ahb { @@ -2987,7 +2987,7 @@ index 8a04c7e2d818..22b958537d31 100644 compatible = "aspeed,ast2400-spi"; diff --git a/arch/arm/boot/dts/at91-sama5d27_som1.dtsi b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi new file mode 100644 -index 000000000000..63a5af898165 +index 0000000000000000000000000000000000000000..63a5af8981659fb7f3162323be34e55dbcc345d6 --- /dev/null +++ b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi @@ -0,0 +1,102 @@ @@ -3095,7 +3095,7 @@ index 000000000000..63a5af898165 +}; diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts new file mode 100644 -index 000000000000..9c9088c99cc4 +index 0000000000000000000000000000000000000000..9c9088c99cc4cdb36d963c61e648216ee7fc4c4c --- /dev/null +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -0,0 +1,537 @@ @@ -3637,7 +3637,7 @@ index 000000000000..9c9088c99cc4 + }; +}; diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts -index 2e2c3d1a1fa2..c7e9ccf2bc87 100644 +index 2e2c3d1a1fa28a36111ae9725b68c4120a1b0609..c7e9ccf2bc8724304f44c574bc901b3e9b3999af 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -68,7 +68,7 @@ main_xtal { @@ -3744,7 +3744,7 @@ index 2e2c3d1a1fa2..c7e9ccf2bc87 100644 }; }; diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi -index a4808c4fbc05..64fa3f9a39d3 100644 +index a4808c4fbc05897983df72024fc0f7667d75fbac..64fa3f9a39d3353ea18eb806a62b2498045a4d81 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -455,6 +455,16 @@ pinctrl@fffff200 { @@ -3783,7 +3783,7 @@ index a4808c4fbc05..64fa3f9a39d3 100644 #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts -index 2522c3308305..94c52c555f83 100644 +index 2522c330830561989dd31d985b1349cc50062d27..94c52c555f832d69cab669b64204f614fd00bced 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -166,6 +166,10 @@ usb2: gadget@fff78000 { @@ -3798,7 +3798,7 @@ index 2522c3308305..94c52c555f83 100644 pinctrl-names = "default"; pinctrl-0 = < diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi -index bf8c83815753..7c957ea06c66 100644 +index bf8c838157539e697e3b5e875ac05f59325c3b3e..7c957ea06c66ce6b603277e452584dc8df05e5ef 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -55,6 +55,11 @@ cpu@0 { @@ -4013,7 +4013,7 @@ index bf8c83815753..7c957ea06c66 100644 }; }; diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi -index 7204d1def23d..dff66974feed 100644 +index 7204d1def23df1c5712bc9a559a599392ffef4b7..dff66974feeda575c06f38c38ddff3e4ecdf41ce 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -215,6 +215,7 @@ sdio: sdhci@21000 { @@ -4167,7 +4167,7 @@ index 7204d1def23d..dff66974feed 100644 msi-parent = <&msi2>; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts -index d0704540db6b..9f866491efdf 100644 +index d0704540db6b3cc136bd92dfb3038077d8083312..9f866491efdf5ac6c3bad1f785a9837fce33073c 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -99,3 +99,9 @@ i2s_alt0: i2s_alt0 { @@ -4181,7 +4181,7 @@ index d0704540db6b..9f866491efdf 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts -index 46d078e29017..4b1af06c8dc0 100644 +index 46d078e29017eeda2ea5d92c6d0c21d1ce9deccd..4b1af06c8dc03157113781ab27e9085346cd59d9 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 { @@ -4195,7 +4195,7 @@ index 46d078e29017..4b1af06c8dc0 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts -index 432088ebb0a1..a846f1e781d8 100644 +index 432088ebb0a19a97e5390a3c90f88af9f796476d..a846f1e781d8a30e2e0afeaed5e67c32005f9b97 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -101,3 +101,9 @@ i2s_alt0: i2s_alt0 { @@ -4209,7 +4209,7 @@ index 432088ebb0a1..a846f1e781d8 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts -index 4133bc2cd9be..e860964e39fa 100644 +index 4133bc2cd9be309a3885e6d002b767fe2c4d0458..e860964e39fa9ce61fee3f858924019df37fdf81 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -94,3 +94,9 @@ i2s_alt2: i2s_alt2 { @@ -4223,7 +4223,7 @@ index 4133bc2cd9be..e860964e39fa 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts -index 4d56fe3006b0..5d77f3f8c4c5 100644 +index 4d56fe3006b0c38b652d88b36af09306ea455b2e..5d77f3f8c4c58475fcf5948af3d5815f7b6cd728 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -89,3 +89,9 @@ &gpio { @@ -4238,7 +4238,7 @@ index 4d56fe3006b0..5d77f3f8c4c5 100644 +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts new file mode 100644 -index 000000000000..82651c3eb682 +index 0000000000000000000000000000000000000000..82651c3eb682a749652a31eadbb4f910961151f7 --- /dev/null +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -0,0 +1,139 @@ @@ -4382,7 +4382,7 @@ index 000000000000..82651c3eb682 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts -index 79a20d520931..70362405c595 100644 +index 79a20d5209310b2cfd912a9dbf1e67bc5b804b4d..70362405c59522fb7835a7b4b13ebb43592edfc4 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -103,3 +103,9 @@ i2s_alt0: i2s_alt0 { @@ -4396,7 +4396,7 @@ index 79a20d520931..70362405c595 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index e55b362b9d6e..e36c392a2b8f 100644 +index e55b362b9d6e92124a22d6e5718adf1f63be3818..e36c392a2b8fdfe36dab81b0128e85dfd422ab7b 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -39,7 +39,7 @@ gpioout: gpioout { @@ -4409,7 +4409,7 @@ index e55b362b9d6e..e36c392a2b8f 100644 }; }; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts -index bf19e8cfb9e6..e8de41444b68 100644 +index bf19e8cfb9e63cc9cd0a1c26e69a286b9a3c4bdf..e8de41444b68eed33efa16e92ddf29e3ace5fd1c 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -39,3 +39,9 @@ i2s_alt0: i2s_alt0 { @@ -4423,7 +4423,7 @@ index bf19e8cfb9e6..e8de41444b68 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi -index da3deeb42592..2c26d0be8b03 100644 +index da3deeb42592926f36b49770b50b549abcb6ece7..2c26d0be8b0316792188890ed677e87fc1fb13ea 100644 --- a/arch/arm/boot/dts/bcm2836.dtsi +++ b/arch/arm/boot/dts/bcm2836.dtsi @@ -36,6 +36,7 @@ timer { @@ -4435,7 +4435,7 @@ index da3deeb42592..2c26d0be8b03 100644 v7_cpu0: cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index c72a27d908b6..20725ca487f3 100644 +index c72a27d908b6f191b6be47c305221b2ee242e3be..20725ca487f30afd5e84059fbcb1513d3399cfa8 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -1 +1,51 @@ @@ -4493,7 +4493,7 @@ index c72a27d908b6..20725ca487f3 100644 +}; diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi new file mode 100644 -index 000000000000..bc1cca5cf43c +index 0000000000000000000000000000000000000000..bc1cca5cf43c41b8dad3902ce1a627b625883cb3 --- /dev/null +++ b/arch/arm/boot/dts/bcm2837.dtsi @@ -0,0 +1,87 @@ @@ -4585,7 +4585,7 @@ index 000000000000..bc1cca5cf43c + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -index 62e1427b3f10..8b64caabaad8 100644 +index 62e1427b3f1076072301e14b6c26aead71235bd4..8b64caabaad8401876706da9b2ebf521b3401e6c 100644 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts @@ -52,6 +52,10 @@ leds { @@ -4600,7 +4600,7 @@ index 62e1427b3f10..8b64caabaad8 100644 power0 { diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -index a5647efe4118..d7c34fa72b4b 100644 +index a5647efe41187eaa2e0dc70d9bfc125856562f45..d7c34fa72b4b7525303ba5e06b93e0c9c00b4b82 100644 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -48,6 +48,9 @@ power1 { @@ -4614,7 +4614,7 @@ index a5647efe4118..d7c34fa72b4b 100644 wireless { diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -index 19ee924d7d53..83a4c60bb431 100644 +index 19ee924d7d53fa0c1b86bbbbf0d3787ea8a0bbfa..83a4c60bb431233a715140e46db00548f1ce0a7d 100644 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts @@ -42,16 +42,22 @@ power-amber { @@ -4641,7 +4641,7 @@ index 19ee924d7d53..83a4c60bb431 100644 wps { diff --git a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -index a854a5174b7f..3ed8de42cb48 100644 +index a854a5174b7fd95e3ca00d585a7b0f630ead2981..3ed8de42cb4877bb78f022efd470640b43cef18f 100644 --- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts +++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts @@ -36,6 +36,8 @@ lan { @@ -4663,7 +4663,7 @@ index a854a5174b7f..3ed8de42cb48 100644 }; diff --git a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts -index 97aa5d59a1d8..ec4a50e440f6 100644 +index 97aa5d59a1d805f155846fad9fec15deaf6765b0..ec4a50e440f6bc4e831be87c2c5b848070925d26 100644 --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts @@ -46,11 +46,16 @@ wps { @@ -4684,7 +4684,7 @@ index 97aa5d59a1d8..ec4a50e440f6 100644 wan-blue { diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -index 51b0641b5f79..7cc7d344fe5b 100644 +index 51b0641b5f79c9f0a2cff8e1a9b94233d2fc4dac..7cc7d344fe5b69fd4699b946c5f62961dd2a9450 100644 --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts @@ -71,6 +71,9 @@ wan-amber { @@ -4698,7 +4698,7 @@ index 51b0641b5f79..7cc7d344fe5b 100644 2ghz { diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts -index 5f8621d00c50..bc1d1e10d4ac 100644 +index 5f8621d00c5003282eaf68608ab24d3c02d5b94e..bc1d1e10d4acc460f76953bc36d033b6610e567d 100644 --- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts +++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts @@ -59,6 +59,9 @@ lan2 { @@ -4712,7 +4712,7 @@ index 5f8621d00c50..bc1d1e10d4ac 100644 status { diff --git a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts -index 34417dac1cd0..19e61b5b066c 100644 +index 34417dac1cd0937292469da3b86b54f2e8cfff1c..19e61b5b066c574d8ee464a6fe91d564c1436e86 100644 --- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts +++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts @@ -26,6 +26,8 @@ leds { @@ -4725,7 +4725,7 @@ index 34417dac1cd0..19e61b5b066c 100644 wps { diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi -index 98647d22b291..045b9bb857f9 100644 +index 98647d22b291f100399290adf1d2ed67b31fe0e7..045b9bb857f9a030491bc3bdbf82ae67bb841b73 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -272,6 +272,19 @@ ehci: ehci@21000 { @@ -4784,7 +4784,7 @@ index 98647d22b291..045b9bb857f9 100644 }; diff --git a/arch/arm/boot/dts/bcm53573.dtsi b/arch/arm/boot/dts/bcm53573.dtsi -index eae623f76401..c698a565b8ae 100644 +index eae623f7640138abb794f52cfc2604321947308e..c698a565b8ae9e2134c36fc796e983159b686a67 100644 --- a/arch/arm/boot/dts/bcm53573.dtsi +++ b/arch/arm/boot/dts/bcm53573.dtsi @@ -138,10 +138,12 @@ ehci: ehci@4000 { @@ -4814,7 +4814,7 @@ index eae623f76401..c698a565b8ae 100644 }; }; diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts -index 000f5f19215e..53f990defd6a 100644 +index 000f5f19215e0cef9adea11ead762a3e027d5ed7..53f990defd6ae9f7af35eac9e1a04a16ae47c048 100644 --- a/arch/arm/boot/dts/bcm911360_entphn.dts +++ b/arch/arm/boot/dts/bcm911360_entphn.dts @@ -39,9 +39,12 @@ / { @@ -4834,7 +4834,7 @@ index 000f5f19215e..53f990defd6a 100644 gpio_keys { diff --git a/arch/arm/boot/dts/bcm947189acdbmr.dts b/arch/arm/boot/dts/bcm947189acdbmr.dts new file mode 100644 -index 000000000000..ef263412fea5 +index 0000000000000000000000000000000000000000..ef263412fea513068a67a11ef80dff18d863802a --- /dev/null +++ b/arch/arm/boot/dts/bcm947189acdbmr.dts @@ -0,0 +1,97 @@ @@ -4936,7 +4936,7 @@ index 000000000000..ef263412fea5 + vcc-gpio = <&chipcommon 8 GPIO_ACTIVE_HIGH>; +}; diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts -index f5c42962c201..f9dd342cc2ae 100644 +index f5c42962c20131dcb1c3bdeef6614c5a36456c36..f9dd342cc2ae499340529c4e842a0da6a1a133b6 100644 --- a/arch/arm/boot/dts/bcm958522er.dts +++ b/arch/arm/boot/dts/bcm958522er.dts @@ -170,3 +170,11 @@ partition@700000 { @@ -4952,7 +4952,7 @@ index f5c42962c201..f9dd342cc2ae 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts -index efcb1f67bdad..374508a9cfbf 100644 +index efcb1f67bdadf7abcb71f625ec7a12aec56e4d9d..374508a9cfbfb2820d503c65cfa527066163034c 100644 --- a/arch/arm/boot/dts/bcm958525er.dts +++ b/arch/arm/boot/dts/bcm958525er.dts @@ -182,3 +182,11 @@ &sata { @@ -4968,7 +4968,7 @@ index efcb1f67bdad..374508a9cfbf 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts -index b335ce02e32f..403250c5ad8e 100644 +index b335ce02e32f9cdda5282cd5180121daa33ea457..403250c5ad8e7b462198185a5add47b2b611e068 100644 --- a/arch/arm/boot/dts/bcm958525xmc.dts +++ b/arch/arm/boot/dts/bcm958525xmc.dts @@ -202,3 +202,11 @@ &sdio { @@ -4984,7 +4984,7 @@ index b335ce02e32f..403250c5ad8e 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts -index 16ab2d82a14b..fd8b8c689ffe 100644 +index 16ab2d82a14ba63bf98577786b844795e8a02ed9..fd8b8c689ffe99f3421ae6f02b1a46a2ee3c3b72 100644 --- a/arch/arm/boot/dts/bcm958622hr.dts +++ b/arch/arm/boot/dts/bcm958622hr.dts @@ -219,3 +219,11 @@ fixed-link { @@ -5000,7 +5000,7 @@ index 16ab2d82a14b..fd8b8c689ffe 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts -index 9b921c6aa8f8..3bc50849d013 100644 +index 9b921c6aa8f8de19807c9a29d8f72eb404af6a49..3bc50849d013ff0442f559dce24274972202f5f2 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -227,3 +227,11 @@ fixed-link { @@ -5016,7 +5016,7 @@ index 9b921c6aa8f8..3bc50849d013 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts -index 006b08e41a3b..d94d14b3c745 100644 +index 006b08e41a3ba0187412c99108e707df11380dd5..d94d14b3c745a0d01c031b6d9b9e6426e0e7b2ec 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -229,3 +229,11 @@ fixed-link { @@ -5032,7 +5032,7 @@ index 006b08e41a3b..d94d14b3c745 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts -index 64740f85cf4c..2cf2392483b2 100644 +index 64740f85cf4c906a9ea1d9397087c1515e3024db..2cf2392483b2af6269093f6edaf842bb4e12e776 100644 --- a/arch/arm/boot/dts/bcm958625k.dts +++ b/arch/arm/boot/dts/bcm958625k.dts @@ -264,3 +264,11 @@ &uart0 { @@ -5048,7 +5048,7 @@ index 64740f85cf4c..2cf2392483b2 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts -index 45983c04a8a7..413dbd5d9f64 100644 +index 45983c04a8a71e7967fb99b54e1a02a8602080d0..413dbd5d9f6442b8dae4b7f132b35e5f816cf798 100644 --- a/arch/arm/boot/dts/da850-lego-ev3.dts +++ b/arch/arm/boot/dts/da850-lego-ev3.dts @@ -249,6 +249,15 @@ battery_pins: pinmux_battery_pins { @@ -5090,7 +5090,7 @@ index 45983c04a8a7..413dbd5d9f64 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts -index f5f59bb5a534..e88ff83f1dec 100644 +index f5f59bb5a53464eb9bcaeb7d035a28236790abc1..e88ff83f1dec8eb6a67332aedbb4e46cd4c4d957 100644 --- a/arch/arm/boot/dts/dove-d3plug.dts +++ b/arch/arm/boot/dts/dove-d3plug.dts @@ -88,7 +88,7 @@ spi-flash@0 { @@ -5112,7 +5112,7 @@ index f5f59bb5a534..e88ff83f1dec 100644 reset-gpios = <&gpio0 25 1>; }; diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi -index 698d58cea20d..1475d3672e56 100644 +index 698d58cea20d2e8c1a3c7d8e7a4dadb717847624..1475d3672e56343e286f0883efbf1ed49fdb2e72 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -89,7 +89,7 @@ MBUS_ID(0x01, 0xfd) 0 0xf8000000 0x8000000 /* BootROM 128M */ @@ -5159,7 +5159,7 @@ index 698d58cea20d..1475d3672e56 100644 interrupt-map-mask = <0 0 0 0>; diff --git a/arch/arm/boot/dts/dra7-evm-common.dtsi b/arch/arm/boot/dts/dra7-evm-common.dtsi new file mode 100644 -index 000000000000..343e95f9a001 +index 0000000000000000000000000000000000000000..343e95f9a00144203b30e4e0beceee5e8bbbbbc7 --- /dev/null +++ b/arch/arm/boot/dts/dra7-evm-common.dtsi @@ -0,0 +1,258 @@ @@ -5422,7 +5422,7 @@ index 000000000000..343e95f9a001 + }; +}; diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts -index f47fc4daf062..aa426dabb6c3 100644 +index f47fc4daf0628a43278a5dcb4cdcf81c34fc56c9..aa426dabb6c349d9f1b5a4a0173ae30ad3b7cc58 100644 --- a/arch/arm/boot/dts/dra7-evm.dts +++ b/arch/arm/boot/dts/dra7-evm.dts @@ -8,9 +8,8 @@ @@ -5775,7 +5775,7 @@ index f47fc4daf062..aa426dabb6c3 100644 - }; }; diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi -index 0f0f6f58bd18..02a136a4661a 100644 +index 0f0f6f58bd187db819701d3bafcd68ae7bb7c46e..02a136a4661aa1ed172e4926a7a8dabad9e271b9 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -196,6 +196,7 @@ dra7_pmx_core: pinmux@1400 { @@ -5877,7 +5877,7 @@ index 0f0f6f58bd18..02a136a4661a 100644 mmu0_dsp1: mmu@40d01000 { diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts -index 9897e8fa6845..41c9132eb550 100644 +index 9897e8fa684516a245c63f435baa3e5855362218..41c9132eb550d07dd686a85eda0296bbfad0b6f7 100644 --- a/arch/arm/boot/dts/dra71-evm.dts +++ b/arch/arm/boot/dts/dra71-evm.dts @@ -7,6 +7,7 @@ @@ -5932,7 +5932,7 @@ index 9897e8fa6845..41c9132eb550 100644 &mac { diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi -index 85780549bc26..2e485a13dfd7 100644 +index 85780549bc26359269b5f5bd05023364b0143905..2e485a13dfd7e1fe470f071022ac4332e1445ea1 100644 --- a/arch/arm/boot/dts/dra72-evm-common.dtsi +++ b/arch/arm/boot/dts/dra72-evm-common.dtsi @@ -311,6 +311,7 @@ nand@0,0 { @@ -5961,7 +5961,7 @@ index 85780549bc26..2e485a13dfd7 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/dra72-evm-revc.dts b/arch/arm/boot/dts/dra72-evm-revc.dts -index 6f9b6f31437e..bf588d00728d 100644 +index 6f9b6f31437efeb3009825cd205d06630e5c74b1..bf588d00728d1973c3426f09421dc5c2bbb5bbe0 100644 --- a/arch/arm/boot/dts/dra72-evm-revc.dts +++ b/arch/arm/boot/dts/dra72-evm-revc.dts @@ -6,6 +6,7 @@ @@ -6015,7 +6015,7 @@ index 6f9b6f31437e..bf588d00728d 100644 + vmmc-supply = <&evm_1v8_sw>; +}; diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi -index e6df676886c0..57bfe5caf5e4 100644 +index e6df676886c0c35052921669039ae31fd446ccbf..57bfe5caf5e4f12c6468575abe646ca78e19a01e 100644 --- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi +++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi @@ -146,5 +146,5 @@ &dss { @@ -6026,7 +6026,7 @@ index e6df676886c0..57bfe5caf5e4 100644 + vqmmc-supply = <&ldo1_reg>; }; diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts -index cd9c4ff12654..c572693b1665 100644 +index cd9c4ff12654ce00ae443c654a888dc14b4a66c6..c572693b16657b69565b3581ac39c9bd8298cba2 100644 --- a/arch/arm/boot/dts/dra72-evm.dts +++ b/arch/arm/boot/dts/dra72-evm.dts @@ -6,6 +6,7 @@ @@ -6081,7 +6081,7 @@ index cd9c4ff12654..c572693b1665 100644 +}; diff --git a/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi new file mode 100644 -index 000000000000..088013c6dc6e +index 0000000000000000000000000000000000000000..088013c6dc6ed4bdb9665179ae267f84700dc272 --- /dev/null +++ b/arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi @@ -0,0 +1,350 @@ @@ -6437,7 +6437,7 @@ index 000000000000..088013c6dc6e +}; diff --git a/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi new file mode 100644 -index 000000000000..28ebb4eb884a +index 0000000000000000000000000000000000000000..28ebb4eb884a9450f51508c576e2b37d3d8a0808 --- /dev/null +++ b/arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi @@ -0,0 +1,647 @@ @@ -7090,7 +7090,7 @@ index 000000000000..28ebb4eb884a +}; diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts new file mode 100644 -index 000000000000..b024a65c6e27 +index 0000000000000000000000000000000000000000..b024a65c6e2711abb4beeb288556860841ea22c0 --- /dev/null +++ b/arch/arm/boot/dts/dra76-evm.dts @@ -0,0 +1,423 @@ @@ -7519,7 +7519,7 @@ index 000000000000..b024a65c6e27 +}; diff --git a/arch/arm/boot/dts/dra76x.dtsi b/arch/arm/boot/dts/dra76x.dtsi new file mode 100644 -index 000000000000..1c88c581ff18 +index 0000000000000000000000000000000000000000..1c88c581ff18879a4991f3a77634e3b998d56b3d --- /dev/null +++ b/arch/arm/boot/dts/dra76x.dtsi @@ -0,0 +1,19 @@ @@ -7543,7 +7543,7 @@ index 000000000000..1c88c581ff18 + ti,irqs-skip = <10 67 68 133 139 140>; +}; diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts -index 4bd2ee87124e..4cbfa09c6c4e 100644 +index 4bd2ee87124eab05014568fdbc24d308611bdf16..4cbfa09c6c4e46fb25bfea03996aee13dcddc662 100644 --- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts +++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts @@ -22,7 +22,6 @@ / { @@ -7555,7 +7555,7 @@ index 4bd2ee87124e..4cbfa09c6c4e 100644 disable-wp; vqmmc-supply = <&ldo3_reg>; diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi -index 59c89d7662a8..639c2e605f3c 100644 +index 59c89d7662a8004b03f52cbdab7d3f9903bf9326..639c2e605f3c99a4c5478b85c4ac69c236f8bfba 100644 --- a/arch/arm/boot/dts/exynos3250-artik5.dtsi +++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi @@ -304,7 +304,6 @@ buck5_reg: BUCK5 { @@ -7567,7 +7567,7 @@ index 59c89d7662a8..639c2e605f3c 100644 cap-mmc-highspeed; card-detect-delay = <200>; diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts -index accee81da266..bbdfcbc6e7d2 100644 +index accee81da266e3c1e9a3cb7e55998c658f1017a7..bbdfcbc6e7d29a5cdbb854ba030f1d77cae048ad 100644 --- a/arch/arm/boot/dts/exynos3250-monk.dts +++ b/arch/arm/boot/dts/exynos3250-monk.dts @@ -426,7 +426,6 @@ &i2s2 { @@ -7579,7 +7579,7 @@ index accee81da266..bbdfcbc6e7d2 100644 non-removable; cap-mmc-highspeed; diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts -index 443e0c98dc73..0b45467d77a8 100644 +index 443e0c98dc73089213ce3aca04a0bdb44dfc64ed..0b45467d77a8f53d5b21ce910cadfd2d1226565e 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts @@ -220,21 +220,6 @@ &dsi_0 { @@ -7626,7 +7626,7 @@ index 443e0c98dc73..0b45467d77a8 100644 non-removable; cap-mmc-highspeed; diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts -index 645feffb9239..7b6ab7265110 100644 +index 645feffb9239d2465782ea04989ce063b6ae2b97..7b6ab726511053d008789a3270d7eb84b421dbd1 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts @@ -202,21 +202,6 @@ &dsi_0 { @@ -7665,7 +7665,7 @@ index 645feffb9239..7b6ab7265110 100644 }; diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi -index 4cd62487bb16..14ce2c69bc0b 100644 +index 4cd62487bb16f28a2b1303ac4ce3486a552a7214..14ce2c69bc0b4972d4cb4817fcfaaca0b8b953d4 100644 --- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi +++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi @@ -466,7 +466,6 @@ &mshc_0 { @@ -7677,7 +7677,7 @@ index 4cd62487bb16..14ce2c69bc0b 100644 card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -index 219d587c5a85..102acd78be15 100644 +index 219d587c5a85059f9bd44ac69a794cae25a21bf7..102acd78be15a9a972a2334cb520021424045ba0 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -516,7 +516,6 @@ &mshc_0 { @@ -7689,7 +7689,7 @@ index 219d587c5a85..102acd78be15 100644 card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts -index 7a83e2df18a6..8a89eb893d64 100644 +index 7a83e2df18a606a8247859647aa0fa5f7e172236..8a89eb893d644d46ad79d7f3e7161edb2d0eccf0 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts @@ -488,7 +488,6 @@ &mshc_0 { @@ -7701,7 +7701,7 @@ index 7a83e2df18a6..8a89eb893d64 100644 card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts -index 35e9b94b86b8..bceb919ac637 100644 +index 35e9b94b86b8d6853e919574fec8d486543061c8..bceb919ac6379ad8d5034913b32ecdfd436a7030 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -390,21 +390,6 @@ &dsi_0 { @@ -7748,7 +7748,7 @@ index 35e9b94b86b8..bceb919ac637 100644 non-removable; card-detect-delay = <200>; diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts -index 6a432460eb77..18a7f396ac5f 100644 +index 6a432460eb77b910d58c3d174ae22c03b7adbae4..18a7f396ac5f727b4daa0c15b2723b3ca89035d2 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -518,7 +518,6 @@ &i2s0 { @@ -7768,7 +7768,7 @@ index 6a432460eb77..18a7f396ac5f 100644 samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts -index 6632f657394e..062cba4c2c31 100644 +index 6632f657394e6d4ee44774573487a77c08acae5b..062cba4c2c310b28846634d354b10fe4d07e786c 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -346,7 +346,6 @@ &i2s0 { @@ -7788,7 +7788,7 @@ index 6632f657394e..062cba4c2c31 100644 samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-sdr-timing = <2 3>; diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi -index e1d293dbbe5d..8788880e459d 100644 +index e1d293dbbe5d95623ddd8b26a951c5e3360afb24..8788880e459d3e1dde6bfddbe80ae3c631693d89 100644 --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi @@ -530,7 +530,6 @@ &i2s0 { @@ -7816,7 +7816,7 @@ index e1d293dbbe5d..8788880e459d 100644 cap-sdio-irq; keep-power-in-suspend; diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts -index 95c3bcace9dc..d53bfcbeb39c 100644 +index 95c3bcace9dcbe8fcc233a17d88320f3ffd73fd6..d53bfcbeb39c42f3789514953f152413418d0d49 100644 --- a/arch/arm/boot/dts/exynos5250-spring.dts +++ b/arch/arm/boot/dts/exynos5250-spring.dts @@ -427,7 +427,6 @@ &i2s0 { @@ -7836,7 +7836,7 @@ index 95c3bcace9dc..d53bfcbeb39c 100644 card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts -index d0cc300cfb4b..73b7cdd5f522 100644 +index d0cc300cfb4b6ae185677e9971e537f31f560559..73b7cdd5f5223cafaa99c7181d23586061f1b189 100644 --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts +++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts @@ -67,7 +67,6 @@ &uart3 { @@ -7856,7 +7856,7 @@ index d0cc300cfb4b..73b7cdd5f522 100644 card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts -index 6cc74d97daae..9cb7726ef8d0 100644 +index 6cc74d97daaea595d8b6d0ece1d10c773a71f720..9cb7726ef8d0dbc1f4bb6964acc64bc34abd566e 100644 --- a/arch/arm/boot/dts/exynos5410-smdk5410.dts +++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts @@ -41,7 +41,6 @@ firmware@02037000 { @@ -7876,7 +7876,7 @@ index 6cc74d97daae..9cb7726ef8d0 100644 card-detect-delay = <200>; samsung,dw-mshc-ciu-div = <3>; diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts -index f9a75bfd3f2b..683a4cfb4a23 100644 +index f9a75bfd3f2bfdc45575c5947f6107024d15e42a..683a4cfb4a23d469ba91670f414e27ea03d57f5a 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -699,7 +699,6 @@ &i2s0 { @@ -7904,7 +7904,7 @@ index f9a75bfd3f2b..683a4cfb4a23 100644 card-detect-delay = <200>; clock-frequency = <400000000>; diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi -index bc4954e69f7b..7a00be7ea6d7 100644 +index bc4954e69f7b148c3e33dd624e039726f0f0026a..7a00be7ea6d716e38bf979a6d9e4da7397f7dfd1 100644 --- a/arch/arm/boot/dts/exynos5440.dtsi +++ b/arch/arm/boot/dts/exynos5440.dtsi @@ -317,6 +317,7 @@ pcie_0: pcie@290000 { @@ -7924,7 +7924,7 @@ index bc4954e69f7b..7a00be7ea6d7 100644 interrupt-map-mask = <0 0 0 0>; interrupt-map = <0x0 0 &gic 56>; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts -index 953dc8677dc8..b2b95ff205e8 100644 +index 953dc8677dc888d21f4207d27de2d8268d812198..b2b95ff205e81ba9248f3f29416001459e3c3d77 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -667,7 +667,6 @@ &i2s0 { @@ -7953,7 +7953,7 @@ index 953dc8677dc8..b2b95ff205e8 100644 clock-frequency = <400000000>; diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts new file mode 100644 -index 000000000000..e75e2d44371c +index 0000000000000000000000000000000000000000..e75e2d44371cdd7bf719ab8ac2504717f1a742b3 --- /dev/null +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -0,0 +1,246 @@ @@ -8204,7 +8204,7 @@ index 000000000000..e75e2d44371c + }; +}; diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts -index 55f6a4f1f801..b4fc58c8cf8d 100644 +index 55f6a4f1f8016754274af65ed6895b7e8ab47a3f..b4fc58c8cf8d7b855a5a686beb2dfedede1add50 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -33,6 +33,7 @@ button@29 { @@ -8271,7 +8271,7 @@ index 55f6a4f1f801..b4fc58c8cf8d 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts -index 7b920bfbda32..3613b264f45f 100644 +index 7b920bfbda32cfcf01b63e022c8787cff60cdcba..3613b264f45faff79459cb5d9daf76f158406e08 100644 --- a/arch/arm/boot/dts/gemini-rut1xx.dts +++ b/arch/arm/boot/dts/gemini-rut1xx.dts @@ -33,6 +33,7 @@ button@28 { @@ -8340,7 +8340,7 @@ index 7b920bfbda32..3613b264f45f 100644 }; }; diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts -index 4d200f0bcd45..7cfa9caf47d4 100644 +index 4d200f0bcd451ac780b23ec1f181c056befcc057..7cfa9caf47d4e642031a2315bd41f743ace7a75b 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -33,6 +33,7 @@ button@18 { @@ -8420,7 +8420,7 @@ index 4d200f0bcd45..7cfa9caf47d4 100644 status = "okay"; interrupt-map-mask = <0xf800 0 0 7>; diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts -index 63b756e3bf5a..38a49e750478 100644 +index 63b756e3bf5a2fcdd42eb8a3fe6760e36878be85..38a49e7504785077bd809a078d082fd51a2f4dbf 100644 --- a/arch/arm/boot/dts/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini-wbd111.dts @@ -33,6 +33,7 @@ button@5 { @@ -8485,7 +8485,7 @@ index 63b756e3bf5a..38a49e750478 100644 }; }; diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts -index 9747f5a47807..f77e34e0df0b 100644 +index 9747f5a47807b4679f7cdd8476c9da58c5b78b9c..f77e34e0df0bcdead3b341dd1e155deaee10b37b 100644 --- a/arch/arm/boot/dts/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini-wbd222.dts @@ -33,6 +33,7 @@ button@5 { @@ -8550,7 +8550,7 @@ index 9747f5a47807..f77e34e0df0b 100644 }; }; diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi -index 141d8d3a1d07..c68e8d430234 100644 +index 141d8d3a1d07bfab1c0df4e5f559ac2075828793..c68e8d430234c3824198d46b336f0d689cf38611 100644 --- a/arch/arm/boot/dts/gemini.dtsi +++ b/arch/arm/boot/dts/gemini.dtsi @@ -5,6 +5,8 @@ @@ -8846,7 +8846,7 @@ index 141d8d3a1d07..c68e8d430234 100644 /* Bus interface AHB1 (AHB0) is totally tilted */ lli-bus-interface-ahb2; diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi -index 0ade3619f3c3..09ce8b81fafa 100644 +index 0ade3619f3c3f1332b8d89c8d06ed4a67f29025b..09ce8b81fafa477b7d04a0e382dee57125088b20 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -452,6 +452,13 @@ scc: crypto@53fac000 { @@ -8865,7 +8865,7 @@ index 0ade3619f3c3..09ce8b81fafa 100644 reg = <0x53fb4000 0x4000>; diff --git a/arch/arm/boot/dts/imx53-cx9020.dts b/arch/arm/boot/dts/imx53-cx9020.dts new file mode 100644 -index 000000000000..4f54fd4418a3 +index 0000000000000000000000000000000000000000..4f54fd4418a33e05bafbbca05827ca554d9b8feb --- /dev/null +++ b/arch/arm/boot/dts/imx53-cx9020.dts @@ -0,0 +1,297 @@ @@ -9167,7 +9167,7 @@ index 000000000000..4f54fd4418a3 + }; +}; diff --git a/arch/arm/boot/dts/imx53-pinfunc.h b/arch/arm/boot/dts/imx53-pinfunc.h -index aec406bc65eb..59f9c29e3fe2 100644 +index aec406bc65eb70ce2a0980a9779d7e6e6913e26f..59f9c29e3fe2ff37a626a2bdf51bdbff44d844cf 100644 --- a/arch/arm/boot/dts/imx53-pinfunc.h +++ b/arch/arm/boot/dts/imx53-pinfunc.h @@ -524,6 +524,7 @@ @@ -9203,7 +9203,7 @@ index aec406bc65eb..59f9c29e3fe2 100644 #define MX53_PAD_EIM_D29__IPU_DISPB0_SER_RS 0x150 0x498 0x000 0x3 0x0 #define MX53_PAD_EIM_D29__CSPI_SS0 0x150 0x498 0x78c 0x4 0x2 diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi -index 2e516f4985e4..8bf0d89cdd35 100644 +index 2e516f4985e4cd2e470f8ddb0195a34821a1d09d..8bf0d89cdd355cf0c9484335476e08fb0fca1b5e 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -433,6 +433,15 @@ gpt: timer@53fa0000 { @@ -9223,7 +9223,7 @@ index 2e516f4985e4..8bf0d89cdd35 100644 compatible = "fsl,imx53-iomuxc"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/imx6dl-gw52xx.dts b/arch/arm/boot/dts/imx6dl-gw52xx.dts -index a2e0b73fdd4a..5f9f8948100d 100644 +index a2e0b73fdd4a78440aac51149d9b251fc04707af..5f9f8948100deb2440ccf487d022d2ec75f1b736 100644 --- a/arch/arm/boot/dts/imx6dl-gw52xx.dts +++ b/arch/arm/boot/dts/imx6dl-gw52xx.dts @@ -17,3 +17,61 @@ / { @@ -9289,7 +9289,7 @@ index a2e0b73fdd4a..5f9f8948100d 100644 + }; +}; diff --git a/arch/arm/boot/dts/imx6dl-gw53xx.dts b/arch/arm/boot/dts/imx6dl-gw53xx.dts -index 6844b708d2f8..9bfc620d37bd 100644 +index 6844b708d2f89ec09b6da02f0965fad905ed0b3d..9bfc620d37bd0601d925b0dc7faa9e9d0aa3f032 100644 --- a/arch/arm/boot/dts/imx6dl-gw53xx.dts +++ b/arch/arm/boot/dts/imx6dl-gw53xx.dts @@ -17,3 +17,61 @@ / { @@ -9355,7 +9355,7 @@ index 6844b708d2f8..9bfc620d37bd 100644 + }; +}; diff --git a/arch/arm/boot/dts/imx6dl-gw54xx.dts b/arch/arm/boot/dts/imx6dl-gw54xx.dts -index be915412f852..b909bdf9a2ef 100644 +index be915412f852ea5af34121808ecc22b04c592b4e..b909bdf9a2efcc2c1e8ff89a0a57fc79638e1f14 100644 --- a/arch/arm/boot/dts/imx6dl-gw54xx.dts +++ b/arch/arm/boot/dts/imx6dl-gw54xx.dts @@ -17,3 +17,61 @@ / { @@ -9421,7 +9421,7 @@ index be915412f852..b909bdf9a2ef 100644 + }; +}; diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts -index 29b45f2e64e0..275c6c05219d 100644 +index 29b45f2e64e0ad1073a9289588601cbcfb358719..275c6c05219dbdc54ba4c994459a45506608e65b 100644 --- a/arch/arm/boot/dts/imx6dl-riotboard.dts +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts @@ -101,6 +101,51 @@ &fec { @@ -9478,7 +9478,7 @@ index 29b45f2e64e0..275c6c05219d 100644 status = "okay"; diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts new file mode 100644 -index 000000000000..4bbfe3d61027 +index 0000000000000000000000000000000000000000..4bbfe3d6102756178a14e76a4b60b1c02dfead96 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -0,0 +1,278 @@ @@ -9762,7 +9762,7 @@ index 000000000000..4bbfe3d61027 +}; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts new file mode 100644 -index 000000000000..a35c7a54ad3b +index 0000000000000000000000000000000000000000..a35c7a54ad3b5484be85987024d771e42fb01bb1 --- /dev/null +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -0,0 +1,291 @@ @@ -10058,7 +10058,7 @@ index 000000000000..a35c7a54ad3b + }; +}; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts -index 88cc7f51a4e9..60d33e99de76 100644 +index 88cc7f51a4e902fb323a7c8956acaee442d2e425..60d33e99de76037cf546c8000ade4304c959c1c6 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -1,5 +1,5 @@ @@ -10136,7 +10136,7 @@ index 88cc7f51a4e9..60d33e99de76 100644 pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 diff --git a/arch/arm/boot/dts/imx6q-b850v3.dts b/arch/arm/boot/dts/imx6q-b850v3.dts -index 2c1e98e0cf7b..46bdc6722715 100644 +index 2c1e98e0cf7bf469593f0d28f9a830b73deb35bb..46bdc67227157cfd146986d0237abdf4c5cf2226 100644 --- a/arch/arm/boot/dts/imx6q-b850v3.dts +++ b/arch/arm/boot/dts/imx6q-b850v3.dts @@ -57,7 +57,7 @@ &clks { @@ -10149,7 +10149,7 @@ index 2c1e98e0cf7b..46bdc6722715 100644 <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>, <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi -index c90b26f00e24..1015e55ca8f7 100644 +index c90b26f00e24c8395b3ebd2d0d20f1a2481e0a33..1015e55ca8f7bd9eaa2edf68ed499f577fbac083 100644 --- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi +++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi @@ -111,6 +111,11 @@ m25_eeprom: m25p80@0 { @@ -10209,7 +10209,7 @@ index c90b26f00e24..1015e55ca8f7 100644 pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; diff --git a/arch/arm/boot/dts/imx6q-gw52xx.dts b/arch/arm/boot/dts/imx6q-gw52xx.dts -index a12c47e5ee05..0b8ae007ad73 100644 +index a12c47e5ee059fbf45216ee6a9e65ce06f2f97b0..0b8ae007ad73fc08640c72a8cde3e902bf74d1a4 100644 --- a/arch/arm/boot/dts/imx6q-gw52xx.dts +++ b/arch/arm/boot/dts/imx6q-gw52xx.dts @@ -18,6 +18,64 @@ / { @@ -10278,7 +10278,7 @@ index a12c47e5ee05..0b8ae007ad73 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-gw53xx.dts b/arch/arm/boot/dts/imx6q-gw53xx.dts -index d76aaa83dad0..a56ef77eff3f 100644 +index d76aaa83dad070ade4861a599dee1168da69c5cf..a56ef77eff3f9fb0aa2706aa027825311d14dece 100644 --- a/arch/arm/boot/dts/imx6q-gw53xx.dts +++ b/arch/arm/boot/dts/imx6q-gw53xx.dts @@ -18,6 +18,64 @@ / { @@ -10347,7 +10347,7 @@ index d76aaa83dad0..a56ef77eff3f 100644 + }; +}; diff --git a/arch/arm/boot/dts/imx6q-gw54xx.dts b/arch/arm/boot/dts/imx6q-gw54xx.dts -index 6e8f53e92a2d..56e5b5050fcf 100644 +index 6e8f53e92a2d24d49d4d1fb15788a4237fe08890..56e5b5050fcfcc2e5f093593c95c5f7c944e1ad1 100644 --- a/arch/arm/boot/dts/imx6q-gw54xx.dts +++ b/arch/arm/boot/dts/imx6q-gw54xx.dts @@ -18,6 +18,64 @@ / { @@ -10416,7 +10416,7 @@ index 6e8f53e92a2d..56e5b5050fcf 100644 + }; +}; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi -index ba01dd76d887..ea339fa58f4a 100644 +index ba01dd76d8874fc6df4a87efa48c3bcc5ddff163..ea339fa58f4a5a99f1834778e926ce022f139cdd 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -1,5 +1,5 @@ @@ -10519,7 +10519,7 @@ index ba01dd76d887..ea339fa58f4a 100644 MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071 MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17071 diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi -index e8c1edc82e6e..885556260bd0 100644 +index e8c1edc82e6ef122a7fb68ee568d50d0f59a3d11..885556260bd0737b2164967dcad8af83d44ef066 100644 --- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi @@ -231,6 +231,37 @@ &i2c3 { @@ -10598,7 +10598,7 @@ index e8c1edc82e6e..885556260bd0 100644 fsl,pins = < MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi -index 91991d63a69c..115d706228ef 100644 +index 91991d63a69c9a9af6aac4772be2b21014a8a493..115d706228eff5067f6a536e049e07183a778631 100644 --- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi @@ -377,7 +377,6 @@ &ssi1 { @@ -10610,7 +10610,7 @@ index 91991d63a69c..115d706228ef 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi -index 5bc6ed1a5b35..24be7965056c 100644 +index 5bc6ed1a5b35ad1240cd7e6ae560c6d2f666a267..24be7965056c13d898d026eb852ba30db284b206 100644 --- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi @@ -368,7 +368,6 @@ &ssi1 { @@ -10622,7 +10622,7 @@ index 5bc6ed1a5b35..24be7965056c 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi -index 66fcf838e964..4594b2279169 100644 +index 66fcf838e964502329391f457a2c5e9801ace1a4..4594b22791695436df2cd9ff372f332db74ad5c4 100644 --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi @@ -416,7 +416,6 @@ &ssi2 { @@ -10634,7 +10634,7 @@ index 66fcf838e964..4594b2279169 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi -index 57374dddf98d..1a0faa1a14c8 100644 +index 57374dddf98d129c8019b4e0b14d63acd546766c..1a0faa1a14c8a4942d72ed1e3b1f6ef97a9b6c48 100644 --- a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi @@ -261,6 +261,37 @@ &i2c3 { @@ -10713,7 +10713,7 @@ index 57374dddf98d..1a0faa1a14c8 100644 fsl,pins = < MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0 diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi -index 5fab5be414fe..7ca291e9dbdb 100644 +index 5fab5be414feb729fb3458fab43852c2644d0969..7ca291e9dbdb234b253d09b72fd1cb2a3f5aac71 100644 --- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi +++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi @@ -184,7 +184,6 @@ &pcie { @@ -10725,7 +10725,7 @@ index 5fab5be414fe..7ca291e9dbdb 100644 }; diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi -index f22e5879340b..d309a4d0eb08 100644 +index f22e5879340bc41c7f722c9d3314a41935070a11..d309a4d0eb08b38c0ba551ee3652549421538eb5 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi @@ -108,6 +108,18 @@ reg_wlan_vmmc: regulator@4 { @@ -10769,7 +10769,7 @@ index f22e5879340b..d309a4d0eb08 100644 }; diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi -index afe7449c47da..756c5054f047 100644 +index afe7449c47da2d0b67ffc2628d323feaa4e00ea5..756c5054f047724f7e12a1fad1ca98fde09f50c2 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi @@ -123,6 +123,18 @@ reg_2p8v: regulator@6 { @@ -10813,7 +10813,7 @@ index afe7449c47da..756c5054f047 100644 }; diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi -index 5d94b5ee6aa0..eeb7679fd348 100644 +index 5d94b5ee6aa0c992cdfc09bc0a4fe1a3a7a9aa2a..eeb7679fd348a4932d123a8bd7ec76fb5107cc63 100644 --- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi @@ -59,6 +59,14 @@ mdio1: mdio { @@ -10955,7 +10955,7 @@ index 5d94b5ee6aa0..eeb7679fd348 100644 fsl,pins = < MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x10 diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi -index a9723b94bafa..8884b4a3cafb 100644 +index a9723b94bafa2e1eae8bad3206d79c76ffc0397a..8884b4a3cafb6f979189ba4be89295ad3777bfee 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -769,6 +769,7 @@ snvs_poweroff: snvs-poweroff { @@ -10967,7 +10967,7 @@ index a9723b94bafa..8884b4a3cafb 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi -index 3243af4a9984..3f76f980947e 100644 +index 3243af4a99844b30075f2c3e2ac7c2872d7a9310..3f76f980947ed6ecd88cb5a8b48cbfc3dc5bd63b 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -655,6 +655,7 @@ snvs_poweroff: snvs-poweroff { @@ -10979,7 +10979,7 @@ index 3243af4a9984..3f76f980947e 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi -index f16b9df9d0c6..6c7eb54be9e2 100644 +index f16b9df9d0c60a7f17c35627c458ab43906424aa..6c7eb54be9e2a4912d27cd4dcc2803a338390323 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -710,6 +710,7 @@ snvs_poweroff: snvs-poweroff { @@ -10991,7 +10991,7 @@ index f16b9df9d0c6..6c7eb54be9e2 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts -index d2be8aa3370b..9c23e017d86a 100644 +index d2be8aa3370b7840e014964c147a4742d5ca87e8..9c23e017d86ad9194d48d7ef3bdb767210fd8dee 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts @@ -22,7 +22,7 @@ memory { @@ -11066,7 +11066,7 @@ index d2be8aa3370b..9c23e017d86a 100644 diff --git a/arch/arm/boot/dts/imx6ul-geam-kit.dts b/arch/arm/boot/dts/imx6ul-geam-kit.dts deleted file mode 100644 -index 142e60cab65f..000000000000 +index 142e60cab65f509e14909033822645785dea17b2..0000000000000000000000000000000000000000 --- a/arch/arm/boot/dts/imx6ul-geam-kit.dts +++ /dev/null @@ -1,101 +0,0 @@ @@ -11173,7 +11173,7 @@ index 142e60cab65f..000000000000 -}; diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts new file mode 100644 -index 000000000000..571eea7f1c6b +index 0000000000000000000000000000000000000000..571eea7f1c6b47a962d66142adf5e954b5ac604d --- /dev/null +++ b/arch/arm/boot/dts/imx6ul-geam.dts @@ -0,0 +1,480 @@ @@ -11659,7 +11659,7 @@ index 000000000000..571eea7f1c6b +}; diff --git a/arch/arm/boot/dts/imx6ul-geam.dtsi b/arch/arm/boot/dts/imx6ul-geam.dtsi deleted file mode 100644 -index eb94d956808b..000000000000 +index eb94d956808bb21d05d190d11a6a652bb9f84ff9..0000000000000000000000000000000000000000 --- a/arch/arm/boot/dts/imx6ul-geam.dtsi +++ /dev/null @@ -1,406 +0,0 @@ @@ -12071,7 +12071,7 @@ index eb94d956808b..000000000000 -}; diff --git a/arch/arm/boot/dts/imx6ul-isiot-common.dtsi b/arch/arm/boot/dts/imx6ul-isiot-common.dtsi deleted file mode 100644 -index 2beaab6e272e..000000000000 +index 2beaab6e272e51df5e71a602eeceaa6bdd185ccf..0000000000000000000000000000000000000000 --- a/arch/arm/boot/dts/imx6ul-isiot-common.dtsi +++ /dev/null @@ -1,141 +0,0 @@ @@ -12217,7 +12217,7 @@ index 2beaab6e272e..000000000000 - }; -}; diff --git a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts -index 73a1d0f0b9d5..f5b422898e61 100644 +index 73a1d0f0b9d543b18d498a0c4c38becef68831b9..f5b422898e61dd22ed1c13a3357a62fb2209f8f1 100644 --- a/arch/arm/boot/dts/imx6ul-isiot-emmc.dts +++ b/arch/arm/boot/dts/imx6ul-isiot-emmc.dts @@ -43,7 +43,6 @@ @@ -12229,7 +12229,7 @@ index 73a1d0f0b9d5..f5b422898e61 100644 / { model = "Engicam Is.IoT MX6UL eMMC Starter kit"; diff --git a/arch/arm/boot/dts/imx6ul-isiot-nand.dts b/arch/arm/boot/dts/imx6ul-isiot-nand.dts -index da29a86eb6a8..de15e1c75dd1 100644 +index da29a86eb6a8f83dc9e3fc64bf50f4b6d0cd2b74..de15e1c75dd1ddf606976d0f3571fdf6bb1c10e7 100644 --- a/arch/arm/boot/dts/imx6ul-isiot-nand.dts +++ b/arch/arm/boot/dts/imx6ul-isiot-nand.dts @@ -43,7 +43,6 @@ @@ -12241,7 +12241,7 @@ index da29a86eb6a8..de15e1c75dd1 100644 / { model = "Engicam Is.IoT MX6UL NAND Starter kit"; diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi -index ea30380ad7a4..950fb28b630a 100644 +index ea30380ad7a4bef0e1261bdc7788b9257579b2ec..950fb28b630a4dc88ee1f28840dab90317f01c83 100644 --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi @@ -69,6 +69,68 @@ backlight { @@ -12470,7 +12470,7 @@ index ea30380ad7a4..950fb28b630a 100644 fsl,pins = < MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1 diff --git a/arch/arm/boot/dts/imx6ul-liteboard.dts b/arch/arm/boot/dts/imx6ul-liteboard.dts -index ed1d891d6a89..1d863a16bcf0 100644 +index ed1d891d6a8953dde12c99e0b675bf033471e948..1d863a16bcf09c54ed76650edf2591b1be56ac52 100644 --- a/arch/arm/boot/dts/imx6ul-liteboard.dts +++ b/arch/arm/boot/dts/imx6ul-liteboard.dts @@ -124,6 +124,10 @@ ethphy0: ethernet-phy@0 { @@ -12485,7 +12485,7 @@ index ed1d891d6a89..1d863a16bcf0 100644 pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi -index 6da2b77edd46..f11a241a340d 100644 +index 6da2b77edd460ff7a6b592d887c98ccb3449f8c8..f11a241a340d52b6cf95b184b69696e13e29c88d 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -614,6 +614,7 @@ snvs_poweroff: snvs-poweroff { @@ -12497,7 +12497,7 @@ index 6da2b77edd46..f11a241a340d 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi -index d7753f79937a..0a3915868aa3 100644 +index d7753f79937a7f543148dd982dbc8ae3931a1c8f..0a3915868aa328fc4bafa4650ecf9085ce85b8df 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -106,6 +106,15 @@ &fec1 { @@ -12517,7 +12517,7 @@ index d7753f79937a..0a3915868aa3 100644 clock-frequency = <100000>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts -index 0a24d1bf3c39..44637cabcc56 100644 +index 0a24d1bf3c393463148919e685a879df39af58ef..44637cabcc566d402847992607984f9736db5a27 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -117,6 +117,37 @@ reg_brcm: regulator-brcm { @@ -12673,7 +12673,7 @@ index 0a24d1bf3c39..44637cabcc56 100644 }; }; diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi -index 4cf6c458b583..82ad26e766eb 100644 +index 4cf6c458b583f68a45e78301734b317db39bbac5..82ad26e766eb71b7191afd9b7334ea4ac3b80480 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -540,6 +540,7 @@ snvs_poweroff: snvs-poweroff { @@ -12722,7 +12722,7 @@ index 4cf6c458b583..82ad26e766eb 100644 }; }; diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts -index ae1ebe7ee021..f1f32c54e72f 100644 +index ae1ebe7ee0217e8a44d0e607149ced326a6070dc..f1f32c54e72fe7846d09de647a0d5ea8703f5f74 100644 --- a/arch/arm/boot/dts/keystone-k2e-evm.dts +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts @@ -16,6 +16,19 @@ / { @@ -12755,7 +12755,7 @@ index ae1ebe7ee021..f1f32c54e72f 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi -index 0dd4cdd6d40c..819ab8345916 100644 +index 0dd4cdd6d40c8afe9f15f355b8ec493844154d0f..819ab83459163963a80c9471c1b61c7eca422311 100644 --- a/arch/arm/boot/dts/keystone-k2e.dtsi +++ b/arch/arm/boot/dts/keystone-k2e.dtsi @@ -45,6 +45,10 @@ cpu@3 { @@ -12793,7 +12793,7 @@ index 0dd4cdd6d40c..819ab8345916 100644 compatible = "ti,keystone-pcie","snps,dw-pcie"; clocks = <&clkpcie1>; diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts -index 61883cb969d2..f462f1043531 100644 +index 61883cb969d2131323f0c191a5c938b9c9f3923e..f462f1043531682f2c00dcc9f287dad5df8dd03e 100644 --- a/arch/arm/boot/dts/keystone-k2g-evm.dts +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts @@ -25,6 +25,26 @@ memory@800000000 { @@ -12886,7 +12886,7 @@ index 61883cb969d2..f462f1043531 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/keystone-k2g-ice.dts b/arch/arm/boot/dts/keystone-k2g-ice.dts -index d820d37b5148..78692745e0af 100644 +index d820d37b5148ec9f83985e55604b9f3ed2014d6d..78692745e0af2e5562f0f215b879e73f1c6df678 100644 --- a/arch/arm/boot/dts/keystone-k2g-ice.dts +++ b/arch/arm/boot/dts/keystone-k2g-ice.dts @@ -17,6 +17,19 @@ memory@800000000 { @@ -12919,7 +12919,7 @@ index d820d37b5148..78692745e0af 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi -index a789f75a1ed5..826b286665e6 100644 +index a789f75a1ed522e57b8a23f5306674d19e4db6ee..826b286665e62491bc85dccf65f0528cc425512c 100644 --- a/arch/arm/boot/dts/keystone-k2g.dtsi +++ b/arch/arm/boot/dts/keystone-k2g.dtsi @@ -15,6 +15,7 @@ @@ -13161,7 +13161,7 @@ index a789f75a1ed5..826b286665e6 100644 }; }; diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts -index 2156ff92d08f..6dd13b98aaba 100644 +index 2156ff92d08f1a93608ef33a5c129b44775689a0..6dd13b98aababd4f10676f9f49ce647c607c9e17 100644 --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts @@ -16,6 +16,19 @@ / { @@ -13229,7 +13229,7 @@ index 2156ff92d08f..6dd13b98aaba 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi -index 69d449430511..31dc00e4e5fd 100644 +index 69d449430511a45b2d2d242771b1ac9b7402792a..31dc00e4e5fd8ce1124c48e575b9772804a0798f 100644 --- a/arch/arm/boot/dts/keystone-k2hk.dtsi +++ b/arch/arm/boot/dts/keystone-k2hk.dtsi @@ -45,6 +45,17 @@ cpu@3 { @@ -13386,7 +13386,7 @@ index 69d449430511..31dc00e4e5fd 100644 compatible = "ti,keystone_mdio", "ti,davinci_mdio"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts -index 056b42f99d7a..528667618db4 100644 +index 056b42f99d7acabdf531af6654d282979ddebae7..528667618db45ee625916eb6d72d116a8e9e4aed 100644 --- a/arch/arm/boot/dts/keystone-k2l-evm.dts +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts @@ -16,6 +16,19 @@ / { @@ -13434,7 +13434,7 @@ index 056b42f99d7a..528667618db4 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi -index 148650406cf7..4431310bc922 100644 +index 148650406cf701cd7ffc5ac92d9054d606e97bfd..4431310bc922bf3c6e4de97f4bcd0dc2ee262056 100644 --- a/arch/arm/boot/dts/keystone-k2l.dtsi +++ b/arch/arm/boot/dts/keystone-k2l.dtsi @@ -33,6 +33,13 @@ cpu@1 { @@ -13523,7 +13523,7 @@ index 148650406cf7..4431310bc922 100644 compatible = "ti,keystone_mdio", "ti,davinci_mdio"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/kirkwood-6192.dtsi b/arch/arm/boot/dts/kirkwood-6192.dtsi -index d573e03f3134..f003f3f1bd65 100644 +index d573e03f3134b709f8d6c8ef6ca37c4d7dc9b9c4..f003f3f1bd659d39139f03890565162cc6e321b6 100644 --- a/arch/arm/boot/dts/kirkwood-6192.dtsi +++ b/arch/arm/boot/dts/kirkwood-6192.dtsi @@ -1,6 +1,6 @@ @@ -13543,7 +13543,7 @@ index d573e03f3134..f003f3f1bd65 100644 interrupt-map = <0 0 0 0 &intc 9>; marvell,pcie-port = <0>; diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi -index 748d0b62f233..47d4b3d3d9e9 100644 +index 748d0b62f233348f4e0c01216053087932a327b0..47d4b3d3d9e969ee5ca47dd32fb0c53035c8e700 100644 --- a/arch/arm/boot/dts/kirkwood-6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi @@ -1,6 +1,6 @@ @@ -13563,7 +13563,7 @@ index 748d0b62f233..47d4b3d3d9e9 100644 interrupt-map = <0 0 0 0 &intc 9>; marvell,pcie-port = <0>; diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi -index bb63d2d50fc5..a13dad0a7c08 100644 +index bb63d2d50fc533f9f264b16ef7fe8b6b3ba441ac..a13dad0a7c080b84db015d36d949daa544bcb05f 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi @@ -1,6 +1,6 @@ @@ -13591,7 +13591,7 @@ index bb63d2d50fc5..a13dad0a7c08 100644 interrupt-map = <0 0 0 0 &intc 10>; marvell,pcie-port = <1>; diff --git a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi -index 720c210d491d..90d4d71b6683 100644 +index 720c210d491dc80e25241dac26506dd52533010e..90d4d71b6683cbaa196a9fe16581dce41ef44ea1 100644 --- a/arch/arm/boot/dts/kirkwood-98dx4122.dtsi +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi @@ -1,6 +1,6 @@ @@ -13611,7 +13611,7 @@ index 720c210d491d..90d4d71b6683 100644 interrupt-map = <0 0 0 0 &intc 9>; marvell,pcie-port = <0>; diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts -index 43e9364083de..b4575bbaf085 100644 +index 43e9364083de84383a34815c04a6bd1021b3baa0..b4575bbaf0852a4cfff98f5bae93f8eb93c4d6ef 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts @@ -192,7 +192,7 @@ &mmc1 { @@ -13624,7 +13624,7 @@ index 43e9364083de..b4575bbaf085 100644 bus-width = <4>; cap-power-off-card; diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi -index 15204e44161d..cd6ad072e72c 100644 +index 15204e44161da6c98e8528488c8bf2be3a46ca6a..cd6ad072e72c17ebe287b72d3f26657a402a97ba 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -86,14 +86,14 @@ hwrng: rng@8100 { @@ -13698,7 +13698,7 @@ index 15204e44161d..cd6ad072e72c 100644 }; }; /* end of / */ diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi -index 8557b6117a4b..ef281d290052 100644 +index 8557b6117a4b97f23bf2359d585d1e6c2c787d49..ef281d2900527703af28b49f425df50415d1bd2d 100644 --- a/arch/arm/boot/dts/meson6.dtsi +++ b/arch/arm/boot/dts/meson6.dtsi @@ -70,9 +70,37 @@ cpu@201 { @@ -13740,7 +13740,7 @@ index 8557b6117a4b..ef281d290052 100644 + clock-names = "xtal", "pclk", "baud"; +}; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi -index cada35828931..b98d44fde6b6 100644 +index cada35828931e49a4e37d750bfbe837064488262..b98d44fde6b60bc9301a3b23cb65f2ccd0d8e64c 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -168,10 +168,18 @@ mux { @@ -13778,7 +13778,7 @@ index cada35828931..b98d44fde6b6 100644 compatible = "amlogic,meson8-saradc", "amlogic,meson-saradc"; clocks = <&clkc CLKID_XTAL>, diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi -index 72e4f425f190..bc278da7df0d 100644 +index 72e4f425f190d03902713831eb8ba5b1a6373c77..bc278da7df0d93b260eb36d0080b64de2711c592 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -119,6 +119,7 @@ mux { @@ -13847,7 +13847,7 @@ index 72e4f425f190..bc278da7df0d 100644 + compatible = "amlogic,meson8b-wdt"; +}; diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi -index 1eb5da1dc8f0..4d61e5b1334a 100644 +index 1eb5da1dc8f0a9fd2ee02195678b56aa67ddf23a..4d61e5b1334a632b984016bada159e94ce34e1a2 100644 --- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi +++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi @@ -255,5 +255,6 @@ vaudio: VAUDIO { @@ -13858,7 +13858,7 @@ index 1eb5da1dc8f0..4d61e5b1334a 100644 }; }; diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi -index f1efdc63656a..afe12e5b51f9 100644 +index f1efdc63656a52bb271aa3d8ac554aede0e74d68..afe12e5b51f95374e2f8f5f91b91f2bbc189e193 100644 --- a/arch/arm/boot/dts/mt2701.dtsi +++ b/arch/arm/boot/dts/mt2701.dtsi @@ -13,6 +13,7 @@ @@ -14010,7 +14010,7 @@ index f1efdc63656a..afe12e5b51f9 100644 reg = <0 0x1c000000 0 0x1000>; diff --git a/arch/arm/boot/dts/mt6323.dtsi b/arch/arm/boot/dts/mt6323.dtsi new file mode 100644 -index 000000000000..7c783d6c750e +index 0000000000000000000000000000000000000000..7c783d6c750e31e232828276471844340be111a4 --- /dev/null +++ b/arch/arm/boot/dts/mt6323.dtsi @@ -0,0 +1,241 @@ @@ -14257,7 +14257,7 @@ index 000000000000..7c783d6c750e +}; diff --git a/arch/arm/boot/dts/mt7623-evb.dts b/arch/arm/boot/dts/mt7623-evb.dts deleted file mode 100644 -index b60b41cad592..000000000000 +index b60b41cad592e66655b9ee5127f4e0174a86aa65..0000000000000000000000000000000000000000 --- a/arch/arm/boot/dts/mt7623-evb.dts +++ /dev/null @@ -1,33 +0,0 @@ @@ -14295,7 +14295,7 @@ index b60b41cad592..000000000000 - status = "okay"; -}; diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi -index d81158b2b02f..ec8a07415cb3 100644 +index d81158b2b02f00cba1446bbba3e62139481f0d89..ec8a07415cb38816db5990aa240744b9d9b27e64 100644 --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -21,36 +21,99 @@ @@ -14627,7 +14627,7 @@ index d81158b2b02f..ec8a07415cb3 100644 mediatek,pctl = <&syscfg_pctl_a>; diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts new file mode 100644 -index 000000000000..688a86378cee +index 0000000000000000000000000000000000000000..688a86378ceef8148526c5f1c68ed0f87c99b967 --- /dev/null +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -0,0 +1,487 @@ @@ -15120,7 +15120,7 @@ index 000000000000..688a86378cee + diff --git a/arch/arm/boot/dts/mt7623n-rfb-nand.dts b/arch/arm/boot/dts/mt7623n-rfb-nand.dts new file mode 100644 -index 000000000000..17c578f0d261 +index 0000000000000000000000000000000000000000..17c578f0d261b255c34e45930d90911aba26932e --- /dev/null +++ b/arch/arm/boot/dts/mt7623n-rfb-nand.dts @@ -0,0 +1,111 @@ @@ -15237,7 +15237,7 @@ index 000000000000..17c578f0d261 +}; diff --git a/arch/arm/boot/dts/mt7623n-rfb.dtsi b/arch/arm/boot/dts/mt7623n-rfb.dtsi new file mode 100644 -index 000000000000..256c5fd947bf +index 0000000000000000000000000000000000000000..256c5fd947bf4344bc6fbd42156ca523a52c3489 --- /dev/null +++ b/arch/arm/boot/dts/mt7623n-rfb.dtsi @@ -0,0 +1,92 @@ @@ -15334,7 +15334,7 @@ index 000000000000..256c5fd947bf + status = "okay"; +}; diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts -index 673cee2234b2..683b96a8f73e 100644 +index 673cee2234b2979f4102236b3296b13fb9aed244..683b96a8f73e01248349440d1caab8fd7ffeb7cc 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -299,7 +299,7 @@ &i2c3 { @@ -15347,7 +15347,7 @@ index 673cee2234b2..683b96a8f73e 100644 }; diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts -index 4be85ce59dd1..4d2eaf843fa9 100644 +index 4be85ce59dd14eea19c95dc0cea5ff12748177bc..4d2eaf843fa960190514dffb06b24d46056adb3e 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts @@ -283,7 +283,7 @@ &i2c3 { @@ -15360,7 +15360,7 @@ index 4be85ce59dd1..4d2eaf843fa9 100644 }; diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts -index 53ae04f9104d..3d293b345e99 100644 +index 53ae04f9104d6b92f6bce75c337d5fba1c77ae53..3d293b345e9940e31f525f38ea46153a170aa50b 100644 --- a/arch/arm/boot/dts/omap3-cm-t3517.dts +++ b/arch/arm/boot/dts/omap3-cm-t3517.dts @@ -129,7 +129,7 @@ &mmc2 { @@ -15373,7 +15373,7 @@ index 53ae04f9104d..3d293b345e99 100644 bus-width = <4>; cap-power-off-card; diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts -index 2294f5b0aa10..bdf4b7fdda39 100644 +index 2294f5b0aa102d9195aa93b33a9e298ac91cba26..bdf4b7fdda39c1c64e2493ecd8d00cfc4f106985 100644 --- a/arch/arm/boot/dts/omap3-cm-t3730.dts +++ b/arch/arm/boot/dts/omap3-cm-t3730.dts @@ -69,7 +69,7 @@ &mmc2 { @@ -15386,7 +15386,7 @@ index 2294f5b0aa10..bdf4b7fdda39 100644 bus-width = <4>; cap-power-off-card; diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi -index 82aa9c4a0f1c..0c0bb1b01b0b 100644 +index 82aa9c4a0f1c331f54c70409993ee17bdc493d00..0c0bb1b01b0ba004af0afbb5c5b4fca099a57055 100644 --- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi +++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi @@ -149,7 +149,7 @@ &i2c3 { @@ -15399,7 +15399,7 @@ index 82aa9c4a0f1c..0c0bb1b01b0b 100644 }; diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi -index 2b1d6977a535..ff35803088e3 100644 +index 2b1d6977a53572ead16e74ff97310fbd3cf7fcc3..ff35803088e3455b2fa116e4e7e41872590f053b 100644 --- a/arch/arm/boot/dts/omap3-evm-common.dtsi +++ b/arch/arm/boot/dts/omap3-evm-common.dtsi @@ -115,7 +115,7 @@ tsc2046@0 { @@ -15412,7 +15412,7 @@ index 2b1d6977a535..ff35803088e3 100644 }; diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts -index 49f37084e435..26c20e1167b9 100644 +index 49f37084e43507b1f2b87b11d79eecacfe0599dc..26c20e1167b9531ca1fde008787a714856b67c62 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -144,6 +144,15 @@ battery: n900-battery { @@ -15547,7 +15547,7 @@ index 49f37084e435..26c20e1167b9 100644 non-removable; no-sdio; diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi -index cd220342a805..f25e158e7163 100644 +index cd220342a805aa2844613b171a31279a651407b1..f25e158e7163b23201ca8e643f557b3965fc959d 100644 --- a/arch/arm/boot/dts/omap3-overo-base.dtsi +++ b/arch/arm/boot/dts/omap3-overo-base.dtsi @@ -181,7 +181,7 @@ &mmc2 { @@ -15560,7 +15560,7 @@ index cd220342a805..f25e158e7163 100644 cap-sdio-irq; non-removable; diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi -index 06ac0f80bcf0..9a601d15247b 100644 +index 06ac0f80bcf083ad0b4ed6a0cb30bcf64b22e7c5..9a601d15247bef5da1519db88b1680b119381b6d 100644 --- a/arch/arm/boot/dts/omap3-tao3530.dtsi +++ b/arch/arm/boot/dts/omap3-tao3530.dtsi @@ -223,7 +223,7 @@ &mmc1 { @@ -15573,7 +15573,7 @@ index 06ac0f80bcf0..9a601d15247b 100644 bus-width = <8>; }; diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts -index 45e2ce0803de..96d0301a336a 100644 +index 45e2ce0803dec8a01d20c92a98a3b1f3b95735d1..96d0301a336a9b819828c9f0aef3cfe34d8bb5af 100644 --- a/arch/arm/boot/dts/omap3-zoom3.dts +++ b/arch/arm/boot/dts/omap3-zoom3.dts @@ -174,7 +174,7 @@ &twl_gpio { @@ -15586,7 +15586,7 @@ index 45e2ce0803de..96d0301a336a 100644 pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi -index a3ff4933dbc1..bdaf30c8c405 100644 +index a3ff4933dbc173936bbec5a222aba6642e70564d..bdaf30c8c405716ad2f1e434ac8abbd40bcdb786 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -713,14 +713,12 @@ usbhshost: usbhshost@48064000 { @@ -15621,7 +15621,7 @@ index a3ff4933dbc1..bdaf30c8c405 100644 <70>; }; diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts -index abd6921143be..908951eb5943 100644 +index abd6921143beb328aad5e84d60d209d98147854f..908951eb5943ec4f938ee294f811fc0577236890 100644 --- a/arch/arm/boot/dts/omap3430-sdp.dts +++ b/arch/arm/boot/dts/omap3430-sdp.dts @@ -33,7 +33,7 @@ twl: twl@48 { @@ -15634,7 +15634,7 @@ index abd6921143be..908951eb5943 100644 * S6-3 must be in ON position for 8 bit mode to function * Else, use 4 bit mode diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts -index 10ca1c174995..8b93d37310f2 100644 +index 10ca1c174995280f33facc0ffabdaf7514c481f4..8b93d37310f28ba4c10ad81d35f8419914ef4633 100644 --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts @@ -129,6 +129,34 @@ touchscreen_reset { @@ -15701,7 +15701,7 @@ index 10ca1c174995..8b93d37310f2 100644 &uart3 { diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts -index 1b825128a7b9..a9a584b5b955 100644 +index 1b825128a7b952568610e0b283415eebd3320724..a9a584b5b9558d737c337806ae7f2d2f34840c7d 100644 --- a/arch/arm/boot/dts/omap4-duovero-parlor.dts +++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts @@ -100,7 +100,7 @@ OMAP4_IOPAD(0x070, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_a24.gpio_48: amdix enab @@ -15714,7 +15714,7 @@ index 1b825128a7b9..a9a584b5b955 100644 OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_ddc_sda.hdmi_ddc_sda */ >; diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi -index edbc4090297d..2b48e51c372a 100644 +index edbc4090297ddcd3d5e7cf035261156898271196..2b48e51c372ab70122e13ee13d4f4a11722cd632 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -267,7 +267,7 @@ OMAP4_IOPAD(0x184, PIN_OUTPUT | MUX_MODE3) /* gpio_0 */ @@ -15727,7 +15727,7 @@ index edbc4090297d..2b48e51c372a 100644 OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_sda.hdmi_sda */ >; diff --git a/arch/arm/boot/dts/omap4-sdp-es23plus.dts b/arch/arm/boot/dts/omap4-sdp-es23plus.dts -index b4d19a7ae393..3d3140fd9659 100644 +index b4d19a7ae39304e93c2d741a2bbd4830674eb663..3d3140fd9659463829e979069dcf81cb9c169055 100644 --- a/arch/arm/boot/dts/omap4-sdp-es23plus.dts +++ b/arch/arm/boot/dts/omap4-sdp-es23plus.dts @@ -10,7 +10,7 @@ @@ -15740,7 +15740,7 @@ index b4d19a7ae393..3d3140fd9659 100644 OMAP4_IOPAD(0x09e, PIN_INPUT | MUX_MODE0) /* hdmi_sda.hdmi_sda */ >; diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts -index d728ec963111..280d92d42bf1 100644 +index d728ec96311114cd71c0c1bd752be925d14c995f..280d92d42bf13b12983fca36e7786c13eadaa8cd 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -290,7 +290,7 @@ OMAP4_IOPAD(0x138, PIN_INPUT | MUX_MODE0) /* mcspi1_cs0.mcspi1_cs0 */ @@ -15753,7 +15753,7 @@ index d728ec963111..280d92d42bf1 100644 OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_sda.hdmi_sda */ >; diff --git a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi -index 74940b6d7719..676d8dd0624a 100644 +index 74940b6d7719ed28ed6f2a34cf83f033bb18aa72..676d8dd0624a63dc56513e68edb35358c49cac2b 100644 --- a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi +++ b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi @@ -122,7 +122,7 @@ OMAP4_IOPAD(0x1d4, PIN_OUTPUT | MUX_MODE5) /* dispc2_data0 */ @@ -15766,7 +15766,7 @@ index 74940b6d7719..676d8dd0624a 100644 OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_sda.hdmi_sda */ >; diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi -index 4caadb253249..7824b2631cb6 100644 +index 4caadb25324977e67c40d4ebde2929cd6782cbf8..7824b2631cb6b3f93ffaedbaff5ebc65d6064292 100644 --- a/arch/arm/boot/dts/omap5-board-common.dtsi +++ b/arch/arm/boot/dts/omap5-board-common.dtsi @@ -290,7 +290,7 @@ OMAP5_IOPAD(0x1b6, PIN_OUTPUT | MUX_MODE0) /* uart5_cts.uart5_rts */ @@ -15779,7 +15779,7 @@ index 4caadb253249..7824b2631cb6 100644 OMAP5_IOPAD(0x142, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_sda.hdmi_ddc_sda */ >; diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts -index 78397f66d0b2..552a5c4c5942 100644 +index 78397f66d0b2d5611cf665ffbf72f2ac02035413..552a5c4c594254aceecbc36281edd0bcdfeebd0a 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -266,7 +266,7 @@ OMAP5_IOPAD(0x00b6, PIN_OUTPUT | MUX_MODE6) /* hsi2_acdata.gpio3_83 */ @@ -15792,7 +15792,7 @@ index 78397f66d0b2..552a5c4c5942 100644 OMAP5_IOPAD(0x0142, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_sda */ >; diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi -index b9457dd21a69..e413b21ee331 100644 +index b9457dd21a695ddca61268a4262cae05fdd0aa58..e413b21ee3319be02927dca42aeef0c837698d00 100644 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi @@ -20,27 +20,12 @@ / { @@ -15841,7 +15841,7 @@ index b9457dd21a69..e413b21ee331 100644 }; }; diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi -index 4b7d97275c62..10d112a4078e 100644 +index 4b7d97275c621af5a219856d38f489a3e704b2e7..10d112a4078ecef3c1a70dc3482de7a7511e599b 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -96,6 +96,21 @@ sleep_clk: sleep_clk { @@ -15974,7 +15974,7 @@ index 4b7d97275c62..10d112a4078e 100644 }; }; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi -index c5ee68a3f7f5..a39207625354 100644 +index c5ee68a3f7f5c28f4fe02f842f4a89a9134252e6..a39207625354cb947ba3ab509552034c76afba19 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -779,7 +779,7 @@ tpiu_in: endpoint { @@ -15987,7 +15987,7 @@ index c5ee68a3f7f5..a39207625354 100644 clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts -index 52a7b586bac7..cd4d5ff7749e 100644 +index 52a7b586bac72277f411ccb306fe0c0d719aaa5d..cd4d5ff7749eaf535f5e72d43238d9778d07a8b7 100644 --- a/arch/arm/boot/dts/r7s72100-genmai.dts +++ b/arch/arm/boot/dts/r7s72100-genmai.dts @@ -11,6 +11,8 @@ @@ -16095,7 +16095,7 @@ index 52a7b586bac7..cd4d5ff7749e 100644 }; diff --git a/arch/arm/boot/dts/r7s72100-rskrza1.dts b/arch/arm/boot/dts/r7s72100-rskrza1.dts -index 72df20a04320..5dcaaf131d27 100644 +index 72df20a04320e7ac61dccde306f5799bdf1bd78c..5dcaaf131d2788ac55be89d3d4d9f9ced9beac9e 100644 --- a/arch/arm/boot/dts/r7s72100-rskrza1.dts +++ b/arch/arm/boot/dts/r7s72100-rskrza1.dts @@ -10,6 +10,8 @@ @@ -16199,7 +16199,7 @@ index 72df20a04320..5dcaaf131d27 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi -index 5cf53e9943af..4ed12a4d9d51 100644 +index 5cf53e9943af705726572c5504e37da7cbd7d45d..4ed12a4d9d51382143357585358f20081e216b35 100644 --- a/arch/arm/boot/dts/r7s72100.dtsi +++ b/arch/arm/boot/dts/r7s72100.dtsi @@ -207,6 +207,84 @@ cpu@0 { @@ -16288,7 +16288,7 @@ index 5cf53e9943af..4ed12a4d9d51 100644 compatible = "renesas,scif-r7s72100", "renesas,scif"; reg = <0xe8007000 64>; diff --git a/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts b/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts -index 9b54783cc2a5..081af0192851 100644 +index 9b54783cc2a53977546c61ebaf1a4d3722178c13..081af01928519e333deef4ac6ab1e579419aa08a 100644 --- a/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts +++ b/arch/arm/boot/dts/r8a7743-iwg20d-q7.dts @@ -17,9 +17,40 @@ / { @@ -16333,7 +16333,7 @@ index 9b54783cc2a5..081af0192851 100644 + }; +}; diff --git a/arch/arm/boot/dts/r8a7743-iwg20m.dtsi b/arch/arm/boot/dts/r8a7743-iwg20m.dtsi -index 001ca9144f4b..ff7993818637 100644 +index 001ca9144f4b0dc951fd97ce5d97285ccdcb341b..ff799381863763decedb115e645980670d973b5b 100644 --- a/arch/arm/boot/dts/r8a7743-iwg20m.dtsi +++ b/arch/arm/boot/dts/r8a7743-iwg20m.dtsi @@ -22,8 +22,34 @@ memory@200000000 { @@ -16372,7 +16372,7 @@ index 001ca9144f4b..ff7993818637 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts b/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts -index 3a22538208f2..3d918d106593 100644 +index 3a22538208f25117ea008e45a45d52c03c9b4ba5..3d918d106593d2684eaa7e6e8f95de8695c3efbc 100644 --- a/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts +++ b/arch/arm/boot/dts/r8a7743-sk-rzg1m.dts @@ -1,7 +1,7 @@ @@ -16420,7 +16420,7 @@ index 3a22538208f2..3d918d106593 100644 renesas,ether-link-active-low; status = "okay"; diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi -index 0ddac81742e4..14222c72f0e0 100644 +index 0ddac81742e4cdc7dc93be53fd019db00de98faa..14222c72f0e0f7d5ad95a46d68b310df76fff6cc 100644 --- a/arch/arm/boot/dts/r8a7743.dtsi +++ b/arch/arm/boot/dts/r8a7743.dtsi @@ -1,7 +1,7 @@ @@ -16793,7 +16793,7 @@ index 0ddac81742e4..14222c72f0e0 100644 /* External root clock */ diff --git a/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts b/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts -index 97840b340197..b4d679b04ad6 100644 +index 97840b3401976095c5dbecc7928773756551b648..b4d679b04ad618a98337b9839b314a2d6ace4474 100644 --- a/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts +++ b/arch/arm/boot/dts/r8a7745-sk-rzg1e.dts @@ -1,7 +1,7 @@ @@ -16841,7 +16841,7 @@ index 97840b340197..b4d679b04ad6 100644 renesas,ether-link-active-low; status = "okay"; diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi -index 2feb0084bb3b..aff90dfb8b32 100644 +index 2feb0084bb3b1b5149afe1efd3f50aeeb6984117..aff90dfb8b32169c1cf0c4cf98adc7a090ce5419 100644 --- a/arch/arm/boot/dts/r8a7745.dtsi +++ b/arch/arm/boot/dts/r8a7745.dtsi @@ -1,7 +1,7 @@ @@ -16896,7 +16896,7 @@ index 2feb0084bb3b..aff90dfb8b32 100644 compatible = "renesas,ether-r8a7745"; reg = <0 0xee700000 0 0x400>; diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi -index 2805a8608d4b..16358bf8d1db 100644 +index 2805a8608d4ba007693b129dddb4d5d1600fa353..16358bf8d1dbffdceceeb53124bf45dea8ae31ec 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -830,6 +830,24 @@ hscif1: serial@e62c8000 { @@ -16979,7 +16979,7 @@ index 2805a8608d4b..16358bf8d1db 100644 interrupts = ; clocks = <&mstp8_clks R8A7790_CLK_VIN3>; diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts -index 001e6116c47c..0ce0b278e1cb 100644 +index 001e6116c47c7c3bd9a22eb0106e369e47dedcae..0ce0b278e1cbe2bf44113586460953edd6ab5f7d 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -642,11 +642,19 @@ adv7180: endpoint { @@ -17012,7 +17012,7 @@ index 001e6116c47c..0ce0b278e1cb 100644 pagesize = <16>; }; diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi -index bd93f699ad84..f1d1a9772153 100644 +index bd93f699ad84098762e99082cfa027dfa4abc088..f1d1a977215308e6cc831a6062780810c150b8a8 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -890,6 +890,24 @@ hscif2: serial@e62d0000 { @@ -17086,7 +17086,7 @@ index bd93f699ad84..f1d1a9772153 100644 interrupts = ; clocks = <&mstp8_clks R8A7791_CLK_VIN2>; diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi -index 0efecb232ee5..2623f39bed2b 100644 +index 0efecb232ee52ce0d75c189b1e378fbb274cc836..2623f39bed2b73bb6f180a72e89586702a90f2cc 100644 --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi @@ -465,6 +465,24 @@ hscif1: serial@e62c8000 { @@ -17115,7 +17115,7 @@ index 0efecb232ee5..2623f39bed2b 100644 compatible = "renesas,sdhi-r8a7792"; reg = <0 0xee100000 0 0x328>; diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi -index 13b980f27bbc..497716b6fbe2 100644 +index 13b980f27bbc885f2a36b26361562e941fe9291a..497716b6fbe2416423b53b2fd3be3303bc60c92c 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -848,6 +848,24 @@ hscif2: serial@e62d0000 { @@ -17144,7 +17144,7 @@ index 13b980f27bbc..497716b6fbe2 100644 compatible = "renesas,ether-r8a7793"; reg = <0 0xee700000 0 0x400>; diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi -index 7d9a81d970d8..26535414203a 100644 +index 7d9a81d970d87c6b0ebae4df4bd460305fb0cfa5..26535414203a0b1e43bab73a12ec16238c8b3b1b 100644 --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -588,6 +588,24 @@ hscif2: serial@e62d0000 { @@ -17191,7 +17191,7 @@ index 7d9a81d970d8..26535414203a 100644 interrupts = ; clocks = <&mstp8_clks R8A7794_CLK_VIN1>; diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts -index 5726135b7f8a..fdb1570bc7d3 100644 +index 5726135b7f8a89e1ff0620205c667baaef7f5ea7..fdb1570bc7d3137fcfed7acf2fb970ca4ff1a75a 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -357,7 +357,6 @@ &sdio { @@ -17211,7 +17211,7 @@ index 5726135b7f8a..fdb1570bc7d3 100644 pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; }; diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi -index ec91325d3b6e..4916c65e0ace 100644 +index ec91325d3b6ebeb50da67b44607c600a88cf64bc..4916c65e0ace7ca0b9ec68cddaca34b55c39d932 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -287,7 +287,6 @@ emmc: dwmmc@1021c000 { @@ -17232,7 +17232,7 @@ index ec91325d3b6e..4916c65e0ace 100644 }; diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts -index e1f5198723b2..ef1eabf2512c 100644 +index e1f5198723b22de9dc2cb47a9b46a1a72f11a134..ef1eabf2512c5eec210b8694ca50e1072ba85960 100644 --- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts +++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts @@ -190,7 +190,6 @@ vcc28_cif: regulator@12 { @@ -17252,7 +17252,7 @@ index e1f5198723b2..ef1eabf2512c 100644 non-removable; diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts -index 7ca1cf5241e0..13e285c53def 100644 +index 7ca1cf5241e036c9a5b56f8b6988bef1fd043c0a..13e285c53defd633967f3058b4b3ce12e673dfa7 100644 --- a/arch/arm/boot/dts/rk3066a-mk808.dts +++ b/arch/arm/boot/dts/rk3066a-mk808.dts @@ -132,7 +132,6 @@ &mmc0 { @@ -17272,7 +17272,7 @@ index 7ca1cf5241e0..13e285c53def 100644 pinctrl-names = "default"; vmmc-supply = <&vcc_wifi>; diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts -index 8907deaab18e..400cbf9609e3 100644 +index 8907deaab18e30038fc094607bfcc1b6faf1044f..400cbf9609e3707b7792139bba326c947df81fe8 100644 --- a/arch/arm/boot/dts/rk3066a-rayeager.dts +++ b/arch/arm/boot/dts/rk3066a-rayeager.dts @@ -185,7 +185,6 @@ &emmc { @@ -17300,7 +17300,7 @@ index 8907deaab18e..400cbf9609e3 100644 pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>; vmmc-supply = <&vccio_wl>; diff --git a/arch/arm/boot/dts/rk3188-px3-evb.dts b/arch/arm/boot/dts/rk3188-px3-evb.dts -index 5b2a0b6885cd..8ba9e06062f3 100644 +index 5b2a0b6885cd0790d663ab3ba2d87927b9b32742..8ba9e06062f3e05434cf954fa1027146abbdb3d6 100644 --- a/arch/arm/boot/dts/rk3188-px3-evb.dts +++ b/arch/arm/boot/dts/rk3188-px3-evb.dts @@ -89,7 +89,6 @@ &emmc { @@ -17320,7 +17320,7 @@ index 5b2a0b6885cd..8ba9e06062f3 100644 pinctrl-names = "default"; pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>; diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts -index ca0a1c4bc15c..53d6fc2fdbce 100644 +index ca0a1c4bc15cdd3fea84d305eba5cf219969a00f..53d6fc2fdbce89fb2118c30e2115c05bc29eebcd 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts @@ -296,7 +296,6 @@ vcc28: REG12 { @@ -17332,7 +17332,7 @@ index ca0a1c4bc15c..53d6fc2fdbce 100644 pinctrl-names = "default"; pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>; diff --git a/arch/arm/boot/dts/rk3229-evb.dts b/arch/arm/boot/dts/rk3229-evb.dts -index 1b55192b7d04..73e384585755 100644 +index 1b55192b7d04683ce464eb824f45cee43fd4c486..73e38458575541d4571758989d4ecb073eac7d23 100644 --- a/arch/arm/boot/dts/rk3229-evb.dts +++ b/arch/arm/boot/dts/rk3229-evb.dts @@ -40,7 +40,8 @@ @@ -17512,7 +17512,7 @@ index 1b55192b7d04..73e384585755 100644 }; diff --git a/arch/arm/boot/dts/rk3229.dtsi b/arch/arm/boot/dts/rk3229.dtsi new file mode 100644 -index 000000000000..6fe6c15fc13a +index 0000000000000000000000000000000000000000..6fe6c15fc13a348369ad9358f3940621538c0ab8 --- /dev/null +++ b/arch/arm/boot/dts/rk3229.dtsi @@ -0,0 +1,89 @@ @@ -17606,7 +17606,7 @@ index 000000000000..6fe6c15fc13a + }; +}; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi -index f3e4ffd9f818..06814421eed2 100644 +index f3e4ffd9f8180bfaade6a9ecfb0e7abaa502f0d1..06814421eed2ef9c41fd5db803bc60f91ee85bed 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -55,6 +55,7 @@ aliases { @@ -17915,7 +17915,7 @@ index f3e4ffd9f818..06814421eed2 100644 otp_gpio: otp-gpio { rockchip,pins = <0 24 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi -index 0dec94c3583b..39b61dce97ad 100644 +index 0dec94c3583b4523d44defc903821beaa810116f..39b61dce97ad344e0884a02f87ff66c6155eb51d 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -45,7 +45,44 @@ @@ -18002,7 +18002,7 @@ index 0dec94c3583b..39b61dce97ad 100644 ddc-i2c-bus = <&i2c5>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts -index 61d1c1028317..41405974253a 100644 +index 61d1c1028317818e1e8b59ac2007f1197a00f8c4..41405974253a4ba945362ecac43d8eb61484538c 100644 --- a/arch/arm/boot/dts/rk3288-fennec.dts +++ b/arch/arm/boot/dts/rk3288-fennec.dts @@ -47,7 +47,7 @@ / { @@ -18035,7 +18035,7 @@ index 61d1c1028317..41405974253a 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi -index 813496618d08..5f05815f47e0 100644 +index 813496618d08ecaad55b250e40cf472efd10b84c..5f05815f47e09278bdc9eb7870d25ab0c504e549 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi @@ -47,7 +47,7 @@ @@ -18056,7 +18056,7 @@ index 813496618d08..5f05815f47e0 100644 pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_pwr>, <&emmc_bus8>; vmmc-supply = <&vcc_io>; diff --git a/arch/arm/boot/dts/rk3288-firefly-reload.dts b/arch/arm/boot/dts/rk3288-firefly-reload.dts -index b11a282c334c..7da0947ababb 100644 +index b11a282c334c4d03cc1fdc1e1665029fc0f1de18..7da0947ababbc4a1cda11e6f5b4190ee9f803a88 100644 --- a/arch/arm/boot/dts/rk3288-firefly-reload.dts +++ b/arch/arm/boot/dts/rk3288-firefly-reload.dts @@ -269,7 +269,6 @@ &sdmmc { @@ -18076,7 +18076,7 @@ index b11a282c334c..7da0947ababb 100644 pinctrl-0 = <&sdio0_bus4>, <&sdio0_cmd>, <&sdio0_clk>, <&sdio0_int>; sd-uhs-sdr12; diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi -index 32dabae12e67..b9e6f3a97240 100644 +index 32dabae12e673778303e1e91f7fed02af4eeee08..b9e6f3a97240c4a8e422cc44052604e05893fcdc 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi @@ -46,7 +46,7 @@ @@ -18113,7 +18113,7 @@ index 32dabae12e67..b9e6f3a97240 100644 pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; vmmc-supply = <&vcc_sd>; diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts -index 30e93f694ae8..4d923aa6ed11 100644 +index 30e93f694ae86699194fb830a45f7d5644d6d23f..4d923aa6ed1196395897cd6abefa56dc557ff5a4 100644 --- a/arch/arm/boot/dts/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rk3288-miqi.dts @@ -54,7 +54,7 @@ chosen { @@ -18142,7 +18142,7 @@ index 30e93f694ae8..4d923aa6ed11 100644 pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; vmmc-supply = <&vcc_sd>; diff --git a/arch/arm/boot/dts/rk3288-phycore-rdk.dts b/arch/arm/boot/dts/rk3288-phycore-rdk.dts -index 3dda79579b51..1241cbcfc16f 100644 +index 3dda79579b5192402f3ecc37f2969bbb2706af82..1241cbcfc16fae404a269917abe86f03b8f17c0f 100644 --- a/arch/arm/boot/dts/rk3288-phycore-rdk.dts +++ b/arch/arm/boot/dts/rk3288-phycore-rdk.dts @@ -263,7 +263,6 @@ &sdmmc { @@ -18154,7 +18154,7 @@ index 3dda79579b51..1241cbcfc16f 100644 pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vdd_io_sd>; diff --git a/arch/arm/boot/dts/rk3288-phycore-som.dtsi b/arch/arm/boot/dts/rk3288-phycore-som.dtsi -index 26cd3ad45160..99cfae875e12 100644 +index 26cd3ad45160714351993413a4180107ff670339..99cfae875e12e6e3ec9e333c7534a058bbe0a3e8 100644 --- a/arch/arm/boot/dts/rk3288-phycore-som.dtsi +++ b/arch/arm/boot/dts/rk3288-phycore-som.dtsi @@ -55,7 +55,7 @@ / { @@ -18175,7 +18175,7 @@ index 26cd3ad45160..99cfae875e12 100644 pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; vmmc-supply = <&vdd_3v3_io>; diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts -index aa1f9ecff231..f084e0c8dcb3 100644 +index aa1f9ecff23109b7671e81d0afd62f217a563b18..f084e0c8dcb350726949d698cd8021c0168d8a9e 100644 --- a/arch/arm/boot/dts/rk3288-popmetal.dts +++ b/arch/arm/boot/dts/rk3288-popmetal.dts @@ -50,7 +50,7 @@ / { @@ -18204,7 +18204,7 @@ index aa1f9ecff231..f084e0c8dcb3 100644 pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; sd-uhs-sdr12; diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts -index 1145b62edde7..e95215c9788b 100644 +index 1145b62edde7fb8ddf3aee9b1674dad07afb1568..e95215c9788b38376a78cc8d2567798662d0d51f 100644 --- a/arch/arm/boot/dts/rk3288-r89.dts +++ b/arch/arm/boot/dts/rk3288-r89.dts @@ -50,7 +50,7 @@ / { @@ -18225,7 +18225,7 @@ index 1145b62edde7..e95215c9788b 100644 pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vcc_sdmmc>; diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi -index 749a9b86e6e2..b9c471fcbd42 100644 +index 749a9b86e6e27c9a1d7d5e50786022d6804d24e5..b9c471fcbd42b080305e2c89318dd2bea4036603 100644 --- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi +++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi @@ -43,7 +43,7 @@ @@ -18246,7 +18246,7 @@ index 749a9b86e6e2..b9c471fcbd42 100644 pinctrl-names = "default"; pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts -index 8ed25e9f60bc..0e084b8a86ac 100644 +index 8ed25e9f60bc480309765ab26c10426a5965e2cd..0e084b8a86acb01fb53fa2aca461fc727d6c7544 100644 --- a/arch/arm/boot/dts/rk3288-rock2-square.dts +++ b/arch/arm/boot/dts/rk3288-rock2-square.dts @@ -147,7 +147,6 @@ &sdio0 { @@ -18266,7 +18266,7 @@ index 8ed25e9f60bc..0e084b8a86ac 100644 pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vcc_sd>; diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts -index f601c78386a9..346b0d8b474d 100644 +index f601c78386a92f67e780b18a7aaf6c08cf4f25bd..346b0d8b474d9995f000d0dd3fedca46cff755cf 100644 --- a/arch/arm/boot/dts/rk3288-tinker.dts +++ b/arch/arm/boot/dts/rk3288-tinker.dts @@ -50,7 +50,7 @@ / { @@ -18299,7 +18299,7 @@ index f601c78386a9..346b0d8b474d 100644 pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi -index aef07101e9ab..95e9bee8bca2 100644 +index aef07101e9abaa549cc6e2fa3c311c4f5dbd47b2..95e9bee8bca2bd0c6c619dcd58670a298661548c 100644 --- a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi @@ -117,7 +117,6 @@ &sdmmc { @@ -18311,7 +18311,7 @@ index aef07101e9ab..95e9bee8bca2 100644 sd-uhs-sdr25; sd-uhs-sdr50; diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi -index d709fa1847f9..6e5bd8974f22 100644 +index d709fa1847f9a8ca2f435a95ecc7b78536af1ffb..6e5bd8974f22dc9aac0fdf7daeeae8ca490f82d0 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -49,7 +49,7 @@ @@ -18340,7 +18340,7 @@ index d709fa1847f9..6e5bd8974f22 100644 pinctrl-0 = <&sdio0_clk &sdio0_cmd &sdio0_bus4>; sd-uhs-sdr12; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi -index 858e1fed762a..356ed1e62452 100644 +index 858e1fed762a1df80f33bac4576b5d900e021bcf..356ed1e624525224c8e797da0990f83a75823008 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -49,8 +49,8 @@ @@ -19079,7 +19079,7 @@ index 858e1fed762a..356ed1e62452 100644 clocks = <&cru PCLK_GPIO8>; diff --git a/arch/arm/boot/dts/rv1108-evb.dts b/arch/arm/boot/dts/rv1108-evb.dts -index 58cf4ac079c3..86a57f823616 100644 +index 58cf4ac079c3dea6b307148bca9311bda36162a3..86a57f823616185a14ede94aebdcf853e6edfa16 100644 --- a/arch/arm/boot/dts/rv1108-evb.dts +++ b/arch/arm/boot/dts/rv1108-evb.dts @@ -54,6 +54,184 @@ memory@60000000 { @@ -19284,7 +19284,7 @@ index 58cf4ac079c3..86a57f823616 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/rv1108.dtsi b/arch/arm/boot/dts/rv1108.dtsi -index 437098b556eb..e7cd1315db1b 100644 +index 437098b556eb8b9119f2fbbda79f35ce664e7920..e7cd1315db1b7bc08c688867dd77c4687396fe92 100644 --- a/arch/arm/boot/dts/rv1108.dtsi +++ b/arch/arm/boot/dts/rv1108.dtsi @@ -52,6 +52,10 @@ / { @@ -19737,7 +19737,7 @@ index 437098b556eb..e7cd1315db1b 100644 sdmmc_clk: sdmmc-clk { rockchip,pins = <3 RK_PC4 RK_FUNC_1 &pcfg_pull_none_drv_4ma>; diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi -index 60e69aeacbdb..38d2216c7ead 100644 +index 60e69aeacbdbf4dff78923f227f96f8bc49c1fbc..38d2216c7ead9ff422cce1e740a820e47977a700 100644 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@ -416,6 +416,17 @@ hlcdc_pwm: hlcdc-pwm { @@ -19863,7 +19863,7 @@ index 60e69aeacbdb..38d2216c7ead 100644 compatible = "bosch,m_can"; reg = <0xfc050000 0x4000>, <0x210000 0x4000>; diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi -index 54bc6d3cf290..40f4ad3c34c6 100644 +index 54bc6d3cf2903e8d710aaa0ea178232d3be09942..40f4ad3c34c6e5e496622a99936c0b3bdfc1830c 100644 --- a/arch/arm/boot/dts/spear1310.dtsi +++ b/arch/arm/boot/dts/spear1310.dtsi @@ -98,6 +98,7 @@ pcie0: pcie@b1000000 { @@ -19891,7 +19891,7 @@ index 54bc6d3cf290..40f4ad3c34c6 100644 }; diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi -index df2232d767ed..5f347054527d 100644 +index df2232d767ed2ea7ffca8383e258cecb768dc679..5f347054527def7bc99e5a62575e986d0d5b067a 100644 --- a/arch/arm/boot/dts/spear1340.dtsi +++ b/arch/arm/boot/dts/spear1340.dtsi @@ -63,6 +63,7 @@ pcie0: pcie@b1000000 { @@ -19903,7 +19903,7 @@ index df2232d767ed..5f347054527d 100644 }; diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi -index 6c5affe2d0f5..2310a4e97768 100644 +index 6c5affe2d0f556eab1d3415718bd5e8fcf36842a..2310a4e97768c222ca19fe8f125c5aede36be8d1 100644 --- a/arch/arm/boot/dts/ste-dbx5x0.dtsi +++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi @@ -37,6 +37,14 @@ CPU0: cpu@300 { @@ -19936,7 +19936,7 @@ index 6c5affe2d0f5..2310a4e97768 100644 compatible = "stericsson,db8500-thermal"; reg = <0x801573c0 0x40>; diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts -index dcda0bbefe5b..97b1c2321ba9 100644 +index dcda0bbefe5b5a532df6a00f9c8a1083747acefe..97b1c2321ba9dd4f7791213b47beaeb740d6542f 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -55,7 +55,7 @@ / { @@ -19949,7 +19949,7 @@ index dcda0bbefe5b..97b1c2321ba9 100644 }; diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts -index ae47cde7952f..c66d617e4245 100644 +index ae47cde7952f6bb16fe13b435a0f704cda7fbc8a..c66d617e4245b4c7b83f45e2266480c1ac64759d 100644 --- a/arch/arm/boot/dts/stm32f429-disco.dts +++ b/arch/arm/boot/dts/stm32f429-disco.dts @@ -54,7 +54,7 @@ / { @@ -19962,7 +19962,7 @@ index ae47cde7952f..c66d617e4245 100644 }; diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi -index a8113dc879cf..dd7e99b1f43b 100644 +index a8113dc879cfeed36a67eb32417764374cfd23e1..dd7e99b1f43bc78111f0de584849367a8f07cf8a 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -361,6 +361,31 @@ i2c1: i2c@40005400 { @@ -19998,7 +19998,7 @@ index a8113dc879cf..dd7e99b1f43b 100644 compatible = "st,stm32-usart", "st,stm32-uart"; reg = <0x40007800 0x400>; diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts -index 75470c34b92c..6ae1f037f3f0 100644 +index 75470c34b92cb36c5f1f6eb61c3c0f31e94a84bf..6ae1f037f3f0e5065eb80a6159a8bfb1d5eb3ba1 100644 --- a/arch/arm/boot/dts/stm32f469-disco.dts +++ b/arch/arm/boot/dts/stm32f469-disco.dts @@ -53,7 +53,7 @@ / { @@ -20011,7 +20011,7 @@ index 75470c34b92c..6ae1f037f3f0 100644 }; diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi -index 4506eb97a4ab..5633860037d2 100644 +index 4506eb97a4ab47baf45cda13f851083a951cb440..5633860037d23397379b092a4cf5bba353abb367 100644 --- a/arch/arm/boot/dts/stm32f746.dtsi +++ b/arch/arm/boot/dts/stm32f746.dtsi @@ -167,6 +167,15 @@ usart5: serial@40005000 { @@ -20087,7 +20087,7 @@ index 4506eb97a4ab..5633860037d2 100644 }; diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts -index 166728aeb166..4463ca13a740 100644 +index 166728aeb16669f5a1086e9ace525a1d17490328..4463ca13a740e8ce0c568a6d0e8ece07f962d80c 100644 --- a/arch/arm/boot/dts/stm32f769-disco.dts +++ b/arch/arm/boot/dts/stm32f769-disco.dts @@ -63,6 +63,12 @@ aliases { @@ -20104,7 +20104,7 @@ index 166728aeb166..4463ca13a740 100644 clock-frequency = <25000000>; }; diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi -index 36a99db0a3b4..58ec2275181e 100644 +index 36a99db0a3b4cd08a1e8388ad5c8d832efeb8781..58ec2275181ef7c196087ba8ba2ac6d05da6524a 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -59,6 +59,45 @@ timer_clk: timer-clk { @@ -20254,7 +20254,7 @@ index 36a99db0a3b4..58ec2275181e 100644 }; }; diff --git a/arch/arm/boot/dts/stm32h743i-eval.dts b/arch/arm/boot/dts/stm32h743i-eval.dts -index c6effbb36e4a..6c07786e7ddb 100644 +index c6effbb36e4a8983131998ef00780b465c6327ff..6c07786e7ddb9195fc88108d5d1906deb13f6c12 100644 --- a/arch/arm/boot/dts/stm32h743i-eval.dts +++ b/arch/arm/boot/dts/stm32h743i-eval.dts @@ -60,6 +60,24 @@ memory { @@ -20283,7 +20283,7 @@ index c6effbb36e4a..6c07786e7ddb 100644 &clk_hse { diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi -index aebc3f9dc7b6..b147cb0dc14b 100644 +index aebc3f9dc7b679da02f85e96a26f74719182ead4..b147cb0dc14b26ce92db7ea70bba2a8f77bd0d38 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -1155,11 +1155,11 @@ rtc: rtc@01f00000 { @@ -20302,7 +20302,7 @@ index aebc3f9dc7b6..b147cb0dc14b 100644 }; diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index bb510187602c..852a0aa24dce 100644 +index bb510187602c1c2e43c01d43a210430f3317b70b..852a0aa24dcee6c577b167c9d36d9c01b9a59403 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -271,6 +271,10 @@ &ac_power_supply { @@ -20317,7 +20317,7 @@ index bb510187602c..852a0aa24dce 100644 regulator-always-on; regulator-min-microvolt = <1000000>; diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi -index a8b978d0f35b..ea50dda75adc 100644 +index a8b978d0f35b5f68b6621fa5e4ac71c3e3395dce..ea50dda75adceba97c0d9f16ff4f90eab366c3d9 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -519,11 +519,11 @@ rtc: rtc@01f00000 { @@ -20336,7 +20336,7 @@ index a8b978d0f35b..ea50dda75adc 100644 }; diff --git a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts -index aecdeeb368ed..1f0d60afb25b 100644 +index aecdeeb368ed85e0c5e59c47f7aeebcd5cbf9a70..1f0d60afb25b695c44523c70d80677f1dd753ecb 100644 --- a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts +++ b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts @@ -43,6 +43,7 @@ @@ -20442,7 +20442,7 @@ index aecdeeb368ed..1f0d60afb25b 100644 +}; diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts new file mode 100644 -index 000000000000..2bafd7e99ef7 +index 0000000000000000000000000000000000000000..2bafd7e99ef7f2d0d83cfcd155240492059e5d91 --- /dev/null +++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts @@ -0,0 +1,148 @@ @@ -20595,7 +20595,7 @@ index 000000000000..2bafd7e99ef7 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts -index cff33454fc24..716a205c6dbb 100644 +index cff33454fc2458bf0e1fee5110ab8dd86c88cc21..716a205c6dbbeca282efbe4498742634205ad8bd 100644 --- a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts +++ b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts @@ -44,6 +44,7 @@ @@ -20725,7 +20725,7 @@ index cff33454fc24..716a205c6dbb 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi -index 19a8f4fcfab5..f996bd343e50 100644 +index 19a8f4fcfab50ef5300360d980f1738d99345a94..f996bd343e50ca156830b373048f3d51a0234116 100644 --- a/arch/arm/boot/dts/sun8i-a83t.dtsi +++ b/arch/arm/boot/dts/sun8i-a83t.dtsi @@ -47,6 +47,7 @@ @@ -20940,7 +20940,7 @@ index 19a8f4fcfab5..f996bd343e50 100644 }; }; diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts -index e7fae65eb5d3..10da56e86ab8 100644 +index e7fae65eb5d3dd88b478c4e4f81050c1790e5568..10da56e86ab800809e9f28b72bd9b94edf02a547 100644 --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts @@ -100,6 +100,10 @@ spdif_out: spdif-out { @@ -20992,7 +20992,7 @@ index e7fae65eb5d3..10da56e86ab8 100644 }; diff --git a/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts new file mode 100644 -index 000000000000..eaf09666720d +index 0000000000000000000000000000000000000000..eaf09666720dcadfb2a008c590eaa4daf355ee04 --- /dev/null +++ b/arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts @@ -0,0 +1,321 @@ @@ -21318,7 +21318,7 @@ index 000000000000..eaf09666720d + status = "okay"; +}; diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts -index 1444fbd543e7..5af4dd321952 100644 +index 1444fbd543e724e367b0091669a7642724023ed1..5af4dd3219520d265f4046d84b9c8cb64c73a000 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -1122,6 +1122,16 @@ sdhci@78000600 { @@ -21339,7 +21339,7 @@ index 1444fbd543e7..5af4dd321952 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts -index 7bacb2954f58..61873d642a45 100644 +index 7bacb2954f586357bb689dbbd4c51895a4f5653d..61873d642a45b207ef33c885b76469f9d9ed084b 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1722,7 +1722,7 @@ usb2 { @@ -21369,7 +21369,7 @@ index 7bacb2954f58..61873d642a45 100644 usb@7d004000 { status = "okay"; diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi -index 1b10b14a6abd..8baf00b89efb 100644 +index 1b10b14a6abdff8af2442412c87738c0eca85d27..8baf00b89efb98d1693505aa3a8251f1e0a10ac8 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -87,6 +87,7 @@ host1x@50000000 { @@ -21381,7 +21381,7 @@ index 1b10b14a6abd..8baf00b89efb 100644 #address-cells = <2>; #size-cells = <2>; diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts -index b4bfa5586c23..bfa9421fcf94 100644 +index b4bfa5586c233a48b3aeba14b53c3187e245b753..bfa9421fcf94a0ea433c4f2ec2da08665a5193f1 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -452,7 +452,9 @@ pmc@7000e400 { @@ -21395,7 +21395,7 @@ index b4bfa5586c23..bfa9421fcf94 100644 usb-phy@c5000000 { diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts -index 4f41b18d9547..3e104ddeb220 100644 +index 4f41b18d95476b7e2db95b3cd9148bf0d8e6626a..3e104ddeb220528c1ec984c428d4f64688e84b00 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -1927,6 +1927,16 @@ sdhci@78000600 { @@ -21416,7 +21416,7 @@ index 4f41b18d9547..3e104ddeb220 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi -index 02de56b55823..399baaa0a2ab 100644 +index 02de56b55823e78fd82fa6d4ad39d103a8e28fa1..399baaa0a2abe1d3e17bac5d8543f29d06fc6b42 100644 --- a/arch/arm/boot/dts/tps65217.dtsi +++ b/arch/arm/boot/dts/tps65217.dtsi @@ -18,11 +18,14 @@ &tps { @@ -21435,7 +21435,7 @@ index 02de56b55823..399baaa0a2ab 100644 }; diff --git a/arch/arm/boot/dts/uniphier-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts -index 4817ebb28eb2..b3aaab354f3e 100644 +index 4817ebb28eb2ef81ab2ae92888e003fac77557db..b3aaab354f3e0e8ff842db3549f865e7c1c60e10 100644 --- a/arch/arm/boot/dts/uniphier-ld4-ref.dts +++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts @@ -8,9 +8,9 @@ @@ -21460,7 +21460,7 @@ index 4817ebb28eb2..b3aaab354f3e 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi -index fb2fd9605b9d..79183db5b386 100644 +index fb2fd9605b9de640c8caed33a0ecfeb7f7f57814..79183db5b386895781b21635407bce3fa7efb8ac 100644 --- a/arch/arm/boot/dts/uniphier-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi @@ -270,6 +270,13 @@ intc: interrupt-controller@60001000 { @@ -21498,7 +21498,7 @@ index fb2fd9605b9d..79183db5b386 100644 -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts -index 96db4abc02c3..2188d114d79b 100644 +index 96db4abc02c3eb1835e76db9a018680c2a4d0c7c..2188d114d79b06c9b9b1bfde5d8cee1bc82e02df 100644 --- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts @@ -8,9 +8,9 @@ @@ -21523,7 +21523,7 @@ index 96db4abc02c3..2188d114d79b 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ld6b.dtsi -index 8b9a79731bd3..9a7b25cc8233 100644 +index 8b9a79731bd33cf5f75ac03e626de878efed3542..9a7b25cc8233accb08c4720d66cfb792ebfb8bbb 100644 --- a/arch/arm/boot/dts/uniphier-ld6b.dtsi +++ b/arch/arm/boot/dts/uniphier-ld6b.dtsi @@ -12,7 +12,7 @@ @@ -21536,7 +21536,7 @@ index 8b9a79731bd3..9a7b25cc8233 100644 / { compatible = "socionext,uniphier-ld6b"; diff --git a/arch/arm/boot/dts/uniphier-pinctrl.dtsi b/arch/arm/boot/dts/uniphier-pinctrl.dtsi -index 246f35ffb638..be82cddc4072 100644 +index 246f35ffb638119fc81c9e159afe870fb7e72a48..be82cddc407245b82cfde6b02cbcc970576e6e0d 100644 --- a/arch/arm/boot/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/boot/dts/uniphier-pinctrl.dtsi @@ -4,51 +4,35 @@ @@ -21613,7 +21613,7 @@ index 246f35ffb638..be82cddc4072 100644 groups = "i2c0"; function = "i2c0"; diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts -index 11690b57931c..089419cee273 100644 +index 11690b57931cef20c2e34ef0ae328ada08c9d35b..089419cee273ea29341d9d0878afe5c0bf1bbffd 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ace.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts @@ -8,7 +8,7 @@ @@ -21626,7 +21626,7 @@ index 11690b57931c..089419cee273 100644 / { model = "UniPhier Pro4 Ace Board"; diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts -index 4cf539245f2e..903df6348e77 100644 +index 4cf539245f2e75c40c3cdeeb5ea24ea6a4182307..903df6348e77db51d2bcc86d2aa1d32a0cf3dece 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ref.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts @@ -8,9 +8,9 @@ @@ -21651,7 +21651,7 @@ index 4cf539245f2e..903df6348e77 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts -index 2763cebcd76a..adef212b45b2 100644 +index 2763cebcd76ace8f0c8e4570c7c0d5f15b73b65a..adef212b45b2b01c21cf4098fb9762924c72d198 100644 --- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts @@ -8,7 +8,7 @@ @@ -21664,7 +21664,7 @@ index 2763cebcd76a..adef212b45b2 100644 / { model = "UniPhier Pro4 Sanji Board"; diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi -index 37400becf4ba..b3dbbd9b6e39 100644 +index 37400becf4baaafa1e39bf4767de74daa540f5d2..b3dbbd9b6e3955f3330cb3cb4bb5d71c617f4f9a 100644 --- a/arch/arm/boot/dts/uniphier-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi @@ -268,6 +268,13 @@ pinctrl: pinctrl { @@ -21702,7 +21702,7 @@ index 37400becf4ba..b3dbbd9b6e39 100644 -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi -index 9577769a0add..b026bcd42a06 100644 +index 9577769a0add6cfe9fd39e68fb1110a90602e31f..b026bcd42a069351b1786959be0af090eaef21d3 100644 --- a/arch/arm/boot/dts/uniphier-pro5.dtsi +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi @@ -4,43 +4,7 @@ @@ -21794,7 +21794,7 @@ index 9577769a0add..b026bcd42a06 100644 -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts -index 81560f75bfa7..7dfae2667f50 100644 +index 81560f75bfa79511c3957405698db2ebc9d6bc35..7dfae2667f5066baa2b5e4424157a85411399166 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts @@ -8,7 +8,7 @@ @@ -21807,7 +21807,7 @@ index 81560f75bfa7..7dfae2667f50 100644 / { model = "UniPhier PXs2 Gentil Board"; diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts -index dc2d0579c666..0cf615463a82 100644 +index dc2d0579c666126ce61a14fcf6b602d80bd19256..0cf615463a82fcbc20941410bb99cfa55b614caf 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts @@ -8,7 +8,7 @@ @@ -21820,7 +21820,7 @@ index dc2d0579c666..0cf615463a82 100644 / { model = "UniPhier PXs2 Vodka Board"; diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi -index bace751d4023..90b020c95083 100644 +index bace751d40239e9a477d5af51f11161664c7df06..90b020c950837d5d0c9d2a43d74d4a2c208b7463 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi @@ -276,7 +276,7 @@ smpctrl@59801000 { @@ -21868,7 +21868,7 @@ index bace751d4023..90b020c95083 100644 +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-sld3-ref.dts b/arch/arm/boot/dts/uniphier-sld3-ref.dts deleted file mode 100644 -index 70cda39a3dd2..000000000000 +index 70cda39a3dd2d41962160a47f6266d2e9e4330c1..0000000000000000000000000000000000000000 --- a/arch/arm/boot/dts/uniphier-sld3-ref.dts +++ /dev/null @@ -1,75 +0,0 @@ @@ -21949,7 +21949,7 @@ index 70cda39a3dd2..000000000000 -}; diff --git a/arch/arm/boot/dts/uniphier-sld3.dtsi b/arch/arm/boot/dts/uniphier-sld3.dtsi deleted file mode 100644 -index 408287936613..000000000000 +index 408287936613c78684a719a9af8596c78338c4d6..0000000000000000000000000000000000000000 --- a/arch/arm/boot/dts/uniphier-sld3.dtsi +++ /dev/null @@ -1,260 +0,0 @@ @@ -22214,7 +22214,7 @@ index 408287936613..000000000000 - }; -}; diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts -index 4536d5b71297..5accd3cc76e4 100644 +index 4536d5b7129796f188dd95c0f68a28aca3cb2b5f..5accd3cc76e4aaee7471f0ce7542bfc7eb6d1ac9 100644 --- a/arch/arm/boot/dts/uniphier-sld8-ref.dts +++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts @@ -8,9 +8,9 @@ @@ -22239,7 +22239,7 @@ index 4536d5b71297..5accd3cc76e4 100644 + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi -index 9fb9167f2db4..b08390332971 100644 +index 9fb9167f2db43d9e8a99adc679003847d38646e5..b0839033297169272ed3688cb352385920a41ea1 100644 --- a/arch/arm/boot/dts/uniphier-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi @@ -270,6 +270,13 @@ intc: interrupt-controller@60001000 { @@ -22277,7 +22277,7 @@ index 9fb9167f2db4..b08390332971 100644 -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts -index 06e2331f666d..9abe26028c8b 100644 +index 06e2331f666d45fb2a2432ac1ef5401c3c50e37d..9abe26028c8b835b987892445157d148f0b24c57 100644 --- a/arch/arm/boot/dts/versatile-pb.dts +++ b/arch/arm/boot/dts/versatile-pb.dts @@ -39,7 +39,7 @@ gpio3: gpio@101e7000 { @@ -22290,7 +22290,7 @@ index 06e2331f666d..9abe26028c8b 100644 device_type = "pci"; reg = <0x10001000 0x1000 diff --git a/arch/arm/boot/dts/zx296702-ad1.dts b/arch/arm/boot/dts/zx296702-ad1.dts -index 081f980cfbe6..b0183c3a1d7c 100644 +index 081f980cfbe628426e1d2c6b5efb8a272fe766e8..b0183c3a1d7c4627b008278e6290fbe908d0c6df 100644 --- a/arch/arm/boot/dts/zx296702-ad1.dts +++ b/arch/arm/boot/dts/zx296702-ad1.dts @@ -18,7 +18,6 @@ memory { @@ -22310,7 +22310,7 @@ index 081f980cfbe6..b0183c3a1d7c 100644 non-removable; disable-wp; diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi -index f3ac9bfe580e..0f79fe1ccd9d 100644 +index f3ac9bfe580ea27a1e82a3d360c05f89490c3161..0f79fe1ccd9d99e5fae27d275e94ae3c214ef77a 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -42,6 +42,14 @@ cpu1: cpu@1 { @@ -22329,7 +22329,7 @@ index f3ac9bfe580e..0f79fe1ccd9d 100644 compatible = "arm,cortex-a9-pmu"; interrupts = <0 5 4>, <0 6 4>; diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts -index 64a6390fc501..0144acfa9793 100644 +index 64a6390fc5017bdd111a88947e736fd1364b85ef..0144acfa97936e1c829c539d6c148df3d423ce3d 100644 --- a/arch/arm/boot/dts/zynq-parallella.dts +++ b/arch/arm/boot/dts/zynq-parallella.dts @@ -34,7 +34,7 @@ memory@0 { @@ -22350,7 +22350,7 @@ index 64a6390fc501..0144acfa9793 100644 <0x3 0x11 0xfff0 0xa>; }; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts -index 0cdad2cc8b78..34e8277fce0d 100644 +index 0cdad2cc8b78678c63b1ca06a5dec22f76527ae0..34e8277fce0d36a875cccb1278a9c016236b53d0 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -12,7 +12,7 @@ @@ -22402,7 +22402,7 @@ index 0cdad2cc8b78..34e8277fce0d 100644 #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts -index ad4bb06dba25..7ebc8c5ae39d 100644 +index ad4bb06dba251d15bd282b9d7ee7a04185c7d201..7ebc8c5ae39dce63ce99add3fea8e4eea121d924 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -12,7 +12,7 @@ @@ -22454,7 +22454,7 @@ index ad4bb06dba25..7ebc8c5ae39d 100644 #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts -index 325379f7983c..5e44dc12fd60 100644 +index 325379f7983cd386af42aeafb758a1c22895d622..5e44dc12fd60a5d00a622d079e6776d100de05dd 100644 --- a/arch/arm/boot/dts/zynq-zed.dts +++ b/arch/arm/boot/dts/zynq-zed.dts @@ -12,7 +12,7 @@ @@ -22484,7 +22484,7 @@ index 325379f7983c..5e44dc12fd60 100644 }; diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts -index 590ec24b8749..e40cafc5ee5b 100644 +index 590ec24b8749649d1d4e6660c887e2d3448161af..e40cafc5ee5b638c7371709d51241bc5d8a1c5fe 100644 --- a/arch/arm/boot/dts/zynq-zybo.dts +++ b/arch/arm/boot/dts/zynq-zybo.dts @@ -12,7 +12,7 @@ @@ -22514,7 +22514,7 @@ index 590ec24b8749..e40cafc5ee5b 100644 }; diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms -index b65a7e876a26..6b54ee8c1262 100644 +index b65a7e876a268a668099aecb4001ce41e62d0b88..6b54ee8c1262dd1587b9081ef8894166b0c14211 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -184,6 +184,12 @@ config ARCH_R8A7796 @@ -22531,7 +22531,7 @@ index b65a7e876a26..6b54ee8c1262 100644 bool "Altera's Stratix 10 SoCFPGA Family" help diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile -index 108f12ce6d1d..19c3fbd75eda 100644 +index 108f12ce6d1d0706900d46533b9dd3cb33bb368f..19c3fbd75eda663b9a3ed61993ed353bf465cc0f 100644 --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile @@ -1,4 +1,6 @@ @@ -22543,7 +22543,7 @@ index 108f12ce6d1d..19c3fbd75eda 100644 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi new file mode 100644 -index 000000000000..ff8af52743ff +index 0000000000000000000000000000000000000000..ff8af52743ff4c2e714e233d5fd21e38d4c2d9f9 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi @@ -0,0 +1,150 @@ @@ -22698,7 +22698,7 @@ index 000000000000..ff8af52743ff + }; +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts -index 6872135d7f84..d347f52e27f6 100644 +index 6872135d7f849b1df7e0529b9b95d2b0d9c86478..d347f52e27f6070ebf79a5f6fe890feecee2a94b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts @@ -59,14 +59,16 @@ chosen { @@ -22888,7 +22888,7 @@ index 6872135d7f84..d347f52e27f6 100644 +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts new file mode 100644 -index 000000000000..2beef9e6cb88 +index 0000000000000000000000000000000000000000..2beef9e6cb885c0cfd6774175910735e9faa78f7 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts @@ -0,0 +1,207 @@ @@ -23101,7 +23101,7 @@ index 000000000000..2beef9e6cb88 +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts new file mode 100644 -index 000000000000..338e786155b1 +index 0000000000000000000000000000000000000000..338e786155b1f77f4bd206d30c02445125c5967e --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts @@ -0,0 +1,199 @@ @@ -23305,7 +23305,7 @@ index 000000000000..338e786155b1 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts -index 7c533b6d4ba9..caf8b6fbe5e3 100644 +index 7c533b6d4ba9abb3c48ae7ce04e1e5fac0e647c3..caf8b6fbe5e350de2095d16489f19ce734ca4bc3 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -107,6 +107,118 @@ &ohci1 { @@ -23428,7 +23428,7 @@ index 7c533b6d4ba9..caf8b6fbe5e3 100644 &uart0 { pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts -index d891a1a27f6c..17ccc12b58df 100644 +index d891a1a27f6c56f7a1d1a9a09fba0d27012fa1a3..17ccc12b58df7057ebf695b8c3e4696c7dbbd868 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -95,6 +95,28 @@ &ohci1 { @@ -23461,7 +23461,7 @@ index d891a1a27f6c..17ccc12b58df 100644 pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi -index 475518b031dd..a5da18a6f286 100644 +index 475518b031dd811269c2e1c1616056f877197af8..a5da18a6f2866d34537c55dcc5d3288daf6c8331 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi @@ -63,3 +63,89 @@ &mmc0 { @@ -23555,7 +23555,7 @@ index 475518b031dd..a5da18a6f286 100644 + regulator-name = "vcc-rtc"; +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index 68aadc9b96dc..8c8db1b057df 100644 +index 68aadc9b96dc1ea2e7c26e658e0056d4f38ba4f9..8c8db1b057dfc687aa5bcabce4732cc3653bebbd 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -467,6 +467,15 @@ rtc: rtc@1f00000 { @@ -23575,7 +23575,7 @@ index 68aadc9b96dc..8c8db1b057df 100644 compatible = "allwinner,sun50i-a64-r-ccu"; reg = <0x01f01400 0x100>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index dc478d094c11..c89010e56488 100644 +index dc478d094c113a3b9ce1a7dd13d4352cbd1a4353..c89010e564888ee76f0f2764a10592fb59ab7672 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -121,6 +121,13 @@ hdmi_connector_in: endpoint { @@ -23593,7 +23593,7 @@ index dc478d094c11..c89010e56488 100644 cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index 738ed689ff69..f175db846286 100644 +index 738ed689ff692b0f16b9add648f9f32dd514d010..f175db84628612044517ad32987aadb3f2cf2d45 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -225,7 +225,7 @@ reset: reset-controller@4404 { @@ -23696,7 +23696,7 @@ index 738ed689ff69..f175db846286 100644 status = "disabled"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -index fa462831ccaf..9697a7a79464 100644 +index fa462831ccaf45b86dd6625961d8d1928537eaff..9697a7a794644bdfd5e7dbedfa6f71dcd8451e24 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -175,6 +175,64 @@ &ir { @@ -23765,7 +23765,7 @@ index fa462831ccaf..9697a7a79464 100644 status = "okay"; pinctrl-0 = <&pwm_e_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts -index a1078b3e1c76..9c59c3c6d1b6 100644 +index a1078b3e1c760d2a1eeb7d8a70c906d25ca5a23e..9c59c3c6d1b6a5d2e3d8cd9d234caef971b352c3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -171,6 +171,13 @@ cvbs_vdac_out: endpoint { @@ -23783,7 +23783,7 @@ index a1078b3e1c76..9c59c3c6d1b6 100644 status = "okay"; pinctrl-0 = <ð_rmii_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi -index d904deb1018c..81ffc689a5bf 100644 +index d904deb1018cefa602764167219d5ee3a82a385a..81ffc689a5bf42532f25706545b1f84cb5dcdbac 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -84,6 +84,9 @@ vddio_card: gpio-regulator { @@ -23811,7 +23811,7 @@ index d904deb1018c..81ffc689a5bf 100644 cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts -index e76ac313fef9..f7144fd5e03f 100644 +index e76ac313fef9cfb1ea97d4dc5c131d559a12d883..f7144fd5e03f43aa29288178980f75ab49c08d6e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts @@ -108,6 +108,12 @@ hdmi_connector_in: endpoint { @@ -23828,7 +23828,7 @@ index e76ac313fef9..f7144fd5e03f 100644 &cvbs_vdac_port { cvbs_vdac_out: endpoint { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index 17d3efdf1469..52f1687e7a09 100644 +index 17d3efdf146968b9ea60a47ec10045e49be6a4d8..52f1687e7a099af5789ed97e3597b727a8ee4d82 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -307,6 +307,15 @@ spifc: spi@8c80 { @@ -23880,7 +23880,7 @@ index 17d3efdf1469..52f1687e7a09 100644 compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts -index 3e0c023d6abd..6827f235d7cf 100644 +index 3e0c023d6abde14afa98381e02c3f1dec0c271e4..6827f235d7cfe9a94fe5fe872e01dc1256077637 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts @@ -97,6 +97,13 @@ hdmi_connector_in: endpoint { @@ -23906,7 +23906,7 @@ index 3e0c023d6abd..6827f235d7cf 100644 status = "okay"; pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index 94567eb17875..edc512ad0bac 100644 +index 94567eb178759c18162c276baa4ba481f903c064..edc512ad0bac3d5794d669dc0d21da6e266afda5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -67,6 +67,13 @@ hdmi_connector_in: endpoint { @@ -23987,7 +23987,7 @@ index 94567eb17875..edc512ad0bac 100644 status = "okay"; pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts -index 266fbcf3e47f..69ca14ac10fa 100644 +index 266fbcf3e47f5640b565c09fae289003b7b9e679..69ca14ac10fa097633562cb96db4f088e543ebd9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -101,6 +101,13 @@ vddio_boot: regulator-vddio_boot { @@ -24069,7 +24069,7 @@ index 266fbcf3e47f..69ca14ac10fa 100644 &sd_emmc_b { status = "okay"; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts -index 6633a5d8fdd3..4c2ac7650fcd 100644 +index 6633a5d8fdd39193be747582e8facc8a581a9486..4c2ac7650fcd3317a673efdd7308891a154272d8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts @@ -140,6 +140,13 @@ hdmi_connector_in: endpoint { @@ -24087,7 +24087,7 @@ index 6633a5d8fdd3..4c2ac7650fcd 100644 cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts -index 6ab17c1eeefd..6e2bf858291c 100644 +index 6ab17c1eeefdc198f7e4417baa780935b885c6c5..6e2bf858291c5f58b0268200c1a014554d24a59d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts @@ -71,6 +71,13 @@ hdmi_connector_in: endpoint { @@ -24105,7 +24105,7 @@ index 6ab17c1eeefd..6e2bf858291c 100644 cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -index 8d4f3160a0ee..d6876e64979e 100644 +index 8d4f3160a0eefa1220e48541eb8e117441ed6c42..d6876e64979e7a5c5d539dc3eba7006fe4d79315 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -43,6 +43,7 @@ @@ -24165,7 +24165,7 @@ index 8d4f3160a0ee..d6876e64979e 100644 compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts -index 5f626d683088..9b10c5f4f8c0 100644 +index 5f626d6830883466b80b9364547efcf066f6317b..9b10c5f4f8c0311af38380f7d5c4c2a0e709e747 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts @@ -113,6 +113,13 @@ hdmi_connector_in: endpoint { @@ -24183,7 +24183,7 @@ index 5f626d683088..9b10c5f4f8c0 100644 cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi -index fe451cce93e7..19a798d2ae2f 100644 +index fe451cce93e783ce12b857117ab6c3eaa84a9108..19a798d2ae2fdd61a2c3e708dea2b1d59f71e061 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi @@ -117,6 +117,10 @@ cpu7: cpu@103 { @@ -24198,7 +24198,7 @@ index fe451cce93e7..19a798d2ae2f 100644 compatible = "amlogic,meson-gxm-saradc", "amlogic,meson-saradc"; }; diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi -index 72720e9132a1..c9ffffb96e43 100644 +index 72720e9132a1de4b85a53f55e5a85a95eb4c423a..c9ffffb96e431ec8d4ed875e40c33f901466b7d4 100644 --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi @@ -626,6 +626,7 @@ pcie0: pcie@1f2b0000 { @@ -24218,7 +24218,7 @@ index 72720e9132a1..c9ffffb96e43 100644 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x16 0x4 0x0 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x17 0x4 diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi -index 63be8e51eaa8..c09a36fed917 100644 +index 63be8e51eaa8624e4006e1fceda8387d61fd7ce4..c09a36fed91701be7407d6ec42584d88ad511144 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -626,6 +626,7 @@ pcie0: pcie@1f2b0000 { @@ -24262,7 +24262,7 @@ index 63be8e51eaa8..c09a36fed917 100644 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xda 0x4 0x0 0x0 0x0 0x2 &gic 0x0 0xdb 0x4 diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi -index 7cfa8e414e7f..8ecdd4331980 100644 +index 7cfa8e414e7f5111d9c676ee3bc9c6c2fbe8941d..8ecdd4331980e448f6a5c23ad2785cbfd19a9a10 100644 --- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi +++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi @@ -226,7 +226,7 @@ v2m_serial3: uart@0c0000 { @@ -24275,7 +24275,7 @@ index 7cfa8e414e7f..8ecdd4331980 100644 reg = <0x130000 0x200>; interrupts = <42>; diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi -index e8b7413ec890..fbafe62d6b22 100644 +index e8b7413ec890b8fc88f1fb62d691d7ffcdae8570..fbafe62d6b22deaf3bc22b361c80d38a876f8d34 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -201,7 +201,7 @@ stm_out_port: endpoint { @@ -24342,7 +24342,7 @@ index e8b7413ec890..fbafe62d6b22 100644 clocks = <&soc_smc50mhz>; diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi -index 161ac98418a3..528875c75598 100644 +index 161ac98418a301ef11eafb7dd3539280cad4e9d9..528875c7559871720d0577867737f3c0987ff1f7 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi @@ -219,7 +219,7 @@ panel-timing { @@ -24355,7 +24355,7 @@ index 161ac98418a3..528875c75598 100644 reg = <0x130000 0x200>; interrupts = <42>; diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index f11bdd6689ea..3eaef3895d66 100644 +index f11bdd6689ea96b2fce04404ae2166349c7d2c26..3eaef3895d663b150fcbe4b2974c8548620cbf12 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -1,7 +1,7 @@ @@ -24370,14 +24370,14 @@ index f11bdd6689ea..3eaef3895d66 100644 clean-files := *.dtb diff --git a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi deleted file mode 120000 -index 3937b77cb310..000000000000 +index 3937b77cb310335840d92e4d0d9e085b63d32ecb..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/bcm2835-rpi.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts -index 972f14db28ac..699d340a3437 100644 +index 972f14db28accd1f25e5d5cd9d7ce2854c9976c8..699d340a3437eaaca7b56d4124706c1533d1eacf 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts @@ -1,41 +1 @@ @@ -24425,7 +24425,7 @@ index 972f14db28ac..699d340a3437 100644 +#include "arm/bcm2837-rpi-3-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/bcm2837.dtsi deleted file mode 100644 -index 2d5de6f0f78d..000000000000 +index 2d5de6f0f78d5be78559477f18f0940bba3e5a15..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi +++ /dev/null @@ -1,86 +0,0 @@ @@ -24517,7 +24517,7 @@ index 2d5de6f0f78d..000000000000 -}; diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi deleted file mode 120000 -index dca7c057d5a5..000000000000 +index dca7c057d5a573f572da3cd91ee61df988aa95a0..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi +++ /dev/null @@ -1 +0,0 @@ @@ -24525,7 +24525,7 @@ index dca7c057d5a5..000000000000 \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi deleted file mode 120000 -index cbeebe312ff8..000000000000 +index cbeebe312ff89553fe25ac55a6589331de79399f..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi +++ /dev/null @@ -1 +0,0 @@ @@ -24533,7 +24533,7 @@ index cbeebe312ff8..000000000000 \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x.dtsi deleted file mode 120000 -index 5f54e4cab99b..000000000000 +index 5f54e4cab99bb3253634be7907e6706ab2d9bd67..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi +++ /dev/null @@ -1 +0,0 @@ @@ -24541,7 +24541,7 @@ index 5f54e4cab99b..000000000000 \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/northstar2/Makefile b/arch/arm64/boot/dts/broadcom/northstar2/Makefile new file mode 100644 -index 000000000000..e01a1485b813 +index 0000000000000000000000000000000000000000..e01a1485b813ea5cf57ab12efb9875d77ee58724 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/northstar2/Makefile @@ -0,0 +1,6 @@ @@ -24553,7 +24553,7 @@ index 000000000000..e01a1485b813 +clean-files := *.dtb diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi new file mode 100644 -index 000000000000..99009fdf10a4 +index 0000000000000000000000000000000000000000..99009fdf10a4830b1f4854b2570681b88cfac3f7 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi @@ -0,0 +1,105 @@ @@ -24664,7 +24664,7 @@ index 000000000000..99009fdf10a4 + }; diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts new file mode 100644 -index 000000000000..ec19fbf928a1 +index 0000000000000000000000000000000000000000..ec19fbf928a142db6d9e853fee7e98f1e31d66b2 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts @@ -0,0 +1,236 @@ @@ -24906,7 +24906,7 @@ index 000000000000..ec19fbf928a1 +}; diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts new file mode 100644 -index 000000000000..ab4ae1a32fab +index 0000000000000000000000000000000000000000..ab4ae1a32fabd48527694b384f6622ccd125107d --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts @@ -0,0 +1,191 @@ @@ -25103,7 +25103,7 @@ index 000000000000..ab4ae1a32fab +}; diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi new file mode 100644 -index 000000000000..35c8457e3d1f +index 0000000000000000000000000000000000000000..35c8457e3d1f23d32c3db46cbf43f95a3e1ef795 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -0,0 +1,765 @@ @@ -25874,7 +25874,7 @@ index 000000000000..35c8457e3d1f +}; diff --git a/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi b/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi deleted file mode 100644 -index 99009fdf10a4..000000000000 +index 99009fdf10a4830b1f4854b2570681b88cfac3f7..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi +++ /dev/null @@ -1,105 +0,0 @@ @@ -25985,7 +25985,7 @@ index 99009fdf10a4..000000000000 - }; diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/ns2-svk.dts deleted file mode 100644 -index ec19fbf928a1..000000000000 +index ec19fbf928a142db6d9e853fee7e98f1e31d66b2..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts +++ /dev/null @@ -1,236 +0,0 @@ @@ -26227,7 +26227,7 @@ index ec19fbf928a1..000000000000 -}; diff --git a/arch/arm64/boot/dts/broadcom/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/ns2-xmc.dts deleted file mode 100644 -index ab4ae1a32fab..000000000000 +index ab4ae1a32fabd48527694b384f6622ccd125107d..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/ns2-xmc.dts +++ /dev/null @@ -1,191 +0,0 @@ @@ -26424,7 +26424,7 @@ index ab4ae1a32fab..000000000000 -}; diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi deleted file mode 100644 -index 35c8457e3d1f..000000000000 +index 35c8457e3d1f23d32c3db46cbf43f95a3e1ef795..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/broadcom/ns2.dtsi +++ /dev/null @@ -1,765 +0,0 @@ @@ -27194,7 +27194,7 @@ index 35c8457e3d1f..000000000000 - }; -}; diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi -index 5dca7d10253b..8862ec907fd8 100644 +index 5dca7d10253bb15bd1657f199889fb48cee76c02..8862ec907fd8e9564aa9d8e5ed4aba173f6a2623 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi @@ -72,6 +72,78 @@ &memory { /* Default DRAM banks */ @@ -27290,7 +27290,7 @@ index 5dca7d10253b..8862ec907fd8 100644 status = "ok"; nandcs@0 { diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts b/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts -index 5671669ba348..eb6f08cdbd79 100644 +index 5671669ba34876588f6fae34fd5a711686d1d038..eb6f08cdbd796c3d764393f9e2e70db2129b0e28 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts @@ -39,6 +39,10 @@ / { @@ -27305,7 +27305,7 @@ index 5671669ba348..eb6f08cdbd79 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts b/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts -index 6ebe399fda6a..5084b037320f 100644 +index 6ebe399fda6a7fa01091e8d6b6cb78b2d6c122af..5084b037320fd9cb65133ca929517062a245af3b 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts +++ b/arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts @@ -38,3 +38,7 @@ / { @@ -27318,7 +27318,7 @@ index 6ebe399fda6a..5084b037320f 100644 +}; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi new file mode 100644 -index 000000000000..8bf1dc6b46ca +index 0000000000000000000000000000000000000000..8bf1dc6b46caf303bcae63f2f1fde856127f3a94 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi @@ -0,0 +1,118 @@ @@ -27442,7 +27442,7 @@ index 000000000000..8bf1dc6b46ca + }; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi new file mode 100644 -index 000000000000..a774709388df +index 0000000000000000000000000000000000000000..a774709388df34dfdfb214b0736d7ebd00b0cad3 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi @@ -0,0 +1,278 @@ @@ -27725,7 +27725,7 @@ index 000000000000..a774709388df + }; + }; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi -index 49933cf16c92..e6f75c633623 100644 +index 49933cf16c92c5be6e138eff6110910395a4b287..e6f75c633623cf45b9efc67844149551eb343e83 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi @@ -152,6 +152,12 @@ scr { @@ -27900,7 +27900,7 @@ index 49933cf16c92..e6f75c633623 100644 compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x00360000 0x600>, diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi -index 105b2938082f..297597442c44 100644 +index 105b2938082fb68539e607b003a0980a05184681..297597442c44217e0f366995314f6c458ca3c7a1 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -307,20 +307,6 @@ &dsi { @@ -27952,7 +27952,7 @@ index 105b2938082f..297597442c44 100644 &usbdrd30_phy { diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi -index 727f36abf3d4..7fe994b750da 100644 +index 727f36abf3d478d1bd2b86fe09fbe535705401ff..7fe994b750dab050b5a5c834259812acff641705 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -1367,7 +1367,7 @@ usbdrd30: usbdrd { @@ -27974,7 +27974,7 @@ index 727f36abf3d4..7fe994b750da 100644 reg = <0x15a00000 0x10000>; interrupts = ; diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts -index e5892bb0ae6e..4a8b1fb51243 100644 +index e5892bb0ae6e55ccf5ba0cc7b30b7b616fea6413..4a8b1fb51243c4a628fd3a27dd7b82ec9ecb3e78 100644 --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts @@ -359,7 +359,6 @@ pmic_irq: pmic-irq { @@ -27994,7 +27994,7 @@ index e5892bb0ae6e..4a8b1fb51243 100644 card-detect-delay = <200>; clock-frequency = <400000000>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi -index b1554cbd2c54..df83915d6ea6 100644 +index b1554cbd2c54f4ca08be37f7add0370758b288d9..df83915d6ea629509b829d82061bd7c6019e790c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi @@ -444,6 +444,15 @@ edma0: edma@2c00000 { @@ -28028,7 +28028,7 @@ index b1554cbd2c54..df83915d6ea6 100644 }; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts -index 213abb72de93..0f6fcda36b9e 100644 +index 213abb72de93e90891b42263adf06854fa1f9fdd..0f6fcda36b9e03279a6a232d4b47d2a31633291b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts @@ -49,7 +49,7 @@ @@ -28041,7 +28041,7 @@ index 213abb72de93..0f6fcda36b9e 100644 }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi -index c144d06a6e33..33797b373674 100644 +index c144d06a6e33150c313580b7144d6ededa08cf06..33797b3736744bbeee590014a3342b514758a0b8 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi @@ -52,6 +52,10 @@ / { @@ -28187,7 +28187,7 @@ index c144d06a6e33..33797b373674 100644 }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts -index ed209cd57283..3c99608b9b45 100644 +index ed209cd57283b66cc8d69640e696d9b3a6ee2935..3c99608b9b45d25b0b2f03ccb0bf4b69cfd3c9de 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts @@ -55,11 +55,6 @@ / { @@ -28203,7 +28203,7 @@ index ed209cd57283..3c99608b9b45 100644 stdout-path = "serial0:115200n8"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts -index 67ec3f9c81a1..a4e7de9f70d8 100644 +index 67ec3f9c81a14848255bed4d2f90dc00581d59f7..a4e7de9f70d8553a05a567589bdf0be6098a674c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts @@ -55,11 +55,6 @@ / { @@ -28219,7 +28219,7 @@ index 67ec3f9c81a1..a4e7de9f70d8 100644 stdout-path = "serial1:115200n8"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts b/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts -index 3ee718f0aaf8..fbbb73e571c0 100644 +index 3ee718f0aaf85577866203e30189420934f8c5f9..fbbb73e571c06f0db11909372958fa3ba0a6d334 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts @@ -52,11 +52,6 @@ / { @@ -28235,7 +28235,7 @@ index 3ee718f0aaf8..fbbb73e571c0 100644 compatible = "smsc,lan91c111"; reg = <0x0 0x2210000 0x0 0x100>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi -index d789c6814e6a..8d739301e7b8 100644 +index d789c6814e6a57fd6e7b0d1e8e4700fd8ce2e7a7..8d739301e7b8acbb34951d2b843553bcc101f1e8 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi @@ -53,6 +53,7 @@ cpu0: cpu@0 { @@ -28319,7 +28319,7 @@ index d789c6814e6a..8d739301e7b8 100644 &pcie1 { diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts -index 4a1df5ce3229..eaee5b1c3a44 100644 +index 4a1df5ce3229c55d3f8ab62622792d6f9bf88219..eaee5b1c3a448ac95952b6548c6a2d5ac5ddfc26 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts @@ -54,11 +54,6 @@ / { @@ -28335,7 +28335,7 @@ index 4a1df5ce3229..eaee5b1c3a44 100644 stdout-path = "serial0:115200n8"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts -index a76d4b4debd1..c411442cac62 100644 +index a76d4b4debd16cf7ff887f1d5d5f08213a4ea767..c411442cac62cb2e1309a9759d5959050d247659 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts @@ -54,11 +54,6 @@ / { @@ -28351,7 +28351,7 @@ index a76d4b4debd1..c411442cac62 100644 stdout-path = "serial1:115200n8"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi -index 5c695c658056..6aa319dae396 100644 +index 5c695c6580566020a647f7bbe80efef7df227131..6aa319dae396ffffc135b4e9af9e893029dd1ba7 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi @@ -53,6 +53,7 @@ cpu0: cpu@0 { @@ -28435,7 +28435,7 @@ index 5c695c658056..6aa319dae396 100644 &pcie1 { diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi -index 94cdd3045037..4fb9a0966a84 100644 +index 94cdd30450371ada8dec5dd0fd1ef398b30d30d0..4fb9a0966a84f2db6c51861c5087ccb5346c49c9 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -46,6 +46,7 @@ @@ -28518,7 +28518,7 @@ index 94cdd3045037..4fb9a0966a84 100644 compatible = "fsl,qoriq-mc"; reg = <0x00000008 0x0c000000 0 0x40>, /* MC portal base */ diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts -index 6609b0fe7a8b..fd4705c451e2 100644 +index 6609b0fe7a8b48ec02dba0a537731fa02b8061f5..fd4705c451e2697716daea41ff606aabb3bd39fc 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -39,6 +39,34 @@ memory@0 { @@ -28580,7 +28580,7 @@ index 6609b0fe7a8b..fd4705c451e2 100644 }; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi -index c6a1961e8d55..b7a90d632959 100644 +index c6a1961e8d55ecb9bdb07e8696fe9a755c8d21e8..b7a90d632959d95b0dee0cc93e37037700194b2d 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -58,6 +58,8 @@ cpu0: cpu@0 { @@ -28804,7 +28804,7 @@ index c6a1961e8d55..b7a90d632959 100644 }; }; diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi -index eacbe0db5bc2..02a3aa4b2165 100644 +index eacbe0db5bc2acebe98c16dd36d22fc996a59d7b..02a3aa4b2165d07e8af616998611923f60256ff9 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -262,6 +262,12 @@ pm_ctrl: pm_ctrl@f7032000 { @@ -28831,7 +28831,7 @@ index eacbe0db5bc2..02a3aa4b2165 100644 }; diff --git a/arch/arm64/boot/dts/hisilicon/hip07-d05.dts b/arch/arm64/boot/dts/hisilicon/hip07-d05.dts -index f5d7f0889b41..fe7c16c36025 100644 +index f5d7f0889b41db47ad784f668845b3e5218c6b84..fe7c16c3602593a9b572fef58bba730dbd1a9c73 100644 --- a/arch/arm64/boot/dts/hisilicon/hip07-d05.dts +++ b/arch/arm64/boot/dts/hisilicon/hip07-d05.dts @@ -84,3 +84,7 @@ ð3 { @@ -28843,7 +28843,7 @@ index f5d7f0889b41..fe7c16c36025 100644 + status = "ok"; +}; diff --git a/arch/arm64/boot/dts/hisilicon/hip07.dtsi b/arch/arm64/boot/dts/hisilicon/hip07.dtsi -index 283d7b532e16..2c01a21c3665 100644 +index 283d7b532e161742c3d1be58e5e6621f21bae51a..2c01a21c36656f9e55f110ec31ee4060724879c1 100644 --- a/arch/arm64/boot/dts/hisilicon/hip07.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hip07.dtsi @@ -1534,5 +1534,27 @@ sas2: sas@a3000000 { @@ -28875,7 +28875,7 @@ index 283d7b532e16..2c01a21c3665 100644 }; }; diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile -index 3e6ce6c15a74..6cff81eeaae2 100644 +index 3e6ce6c15a7449aefd8bf753675de3a2e70ead39..6cff81eeaae2833829391a2b829115ede9a7860f 100644 --- a/arch/arm64/boot/dts/marvell/Makefile +++ b/arch/arm64/boot/dts/marvell/Makefile @@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb @@ -28887,7 +28887,7 @@ index 3e6ce6c15a74..6cff81eeaae2 100644 always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts -index e3a136ed77b0..2ce52ba74f73 100644 +index e3a136ed77b00ce1d1a0f690c05426cb62783eb2..2ce52ba74f73bac47244aaa5896f29ed4b56596a 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts @@ -45,6 +45,7 @@ @@ -28949,7 +28949,7 @@ index e3a136ed77b0..2ce52ba74f73 100644 switch0: switch0@1 { compatible = "marvell,mv88e6085"; diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi -index 51763d674050..8c0cf7efac65 100644 +index 51763d674050cb27c32b0909c62a62724d5d429d..8c0cf7efac65242a50a8ac2b201f351c8c0ce2a6 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -81,6 +81,11 @@ timer { @@ -28978,7 +28978,7 @@ index 51763d674050..8c0cf7efac65 100644 }; diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts -index 92c761c380d3..9c3bdf87e543 100644 +index 92c761c380d33c37f5d6070729b02c23a6d93752..9c3bdf87e5433f2a800eae0a2a1e32c8c924dd88 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts @@ -44,6 +44,7 @@ @@ -29053,7 +29053,7 @@ index 92c761c380d3..9c3bdf87e543 100644 }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts -index 1e8f7242ed6f..0d7b2ae46610 100644 +index 1e8f7242ed6ff97f7fe153ee7dc26fa1e950def4..0d7b2ae4661002e7443297f680511950c87bfd8f 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts @@ -44,6 +44,7 @@ @@ -29162,7 +29162,7 @@ index 1e8f7242ed6f..0d7b2ae46610 100644 }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts -index 4968e731de61..acf5c7d16d79 100644 +index 4968e731de612e3f781bed2760a0131cb5b42d55..acf5c7d16d79b2f07eedf4691a1fc820073c7ffc 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts @@ -46,11 +46,17 @@ @@ -29359,7 +29359,7 @@ index 4968e731de61..acf5c7d16d79 100644 spi-flash@0 { diff --git a/arch/arm64/boot/dts/marvell/armada-8080-db.dts b/arch/arm64/boot/dts/marvell/armada-8080-db.dts new file mode 100644 -index 000000000000..707af833832b +index 0000000000000000000000000000000000000000..707af833832be2039fa82af404e7ac3357b6b38d --- /dev/null +++ b/arch/arm64/boot/dts/marvell/armada-8080-db.dts @@ -0,0 +1,67 @@ @@ -29432,7 +29432,7 @@ index 000000000000..707af833832b +}; diff --git a/arch/arm64/boot/dts/marvell/armada-8080.dtsi b/arch/arm64/boot/dts/marvell/armada-8080.dtsi new file mode 100644 -index 000000000000..d5535b716735 +index 0000000000000000000000000000000000000000..d5535b7167350e135df059ef68b05b83d88a8a32 --- /dev/null +++ b/arch/arm64/boot/dts/marvell/armada-8080.dtsi @@ -0,0 +1,53 @@ @@ -29491,7 +29491,7 @@ index 000000000000..d5535b716735 +}; diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi new file mode 100644 -index 000000000000..bf1b22b70384 +index 0000000000000000000000000000000000000000..bf1b22b70384ceee5c1284bba316d3298fd21268 --- /dev/null +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0-octa-core.dtsi @@ -0,0 +1,104 @@ @@ -29601,7 +29601,7 @@ index 000000000000..bf1b22b70384 +}; diff --git a/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi new file mode 100644 -index 000000000000..7e6f039f0f80 +index 0000000000000000000000000000000000000000..7e6f039f0f80073ba8fce1dc6413f9e9eaa19bee --- /dev/null +++ b/arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi @@ -0,0 +1,163 @@ @@ -29769,7 +29769,7 @@ index 000000000000..7e6f039f0f80 + }; +}; diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi -index 4c68605675a8..8263a8a504a8 100644 +index 4c68605675a83db1639c0efed23788379c4d9e17..8263a8a504a8fd11896da6aebc99eabdd4be928a 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -65,25 +65,44 @@ cpm_ethernet: ethernet@0 { @@ -29919,7 +29919,7 @@ index 4c68605675a8..8263a8a504a8 100644 compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; reg = <0x760000 0x7d>; diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi -index 923f354b02f0..b71ee6c83668 100644 +index 923f354b02f00d199db276f60adffb013d688186..b71ee6c83668e8900a4a889614ed83e97e718f85 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -60,37 +60,49 @@ config-space@f4000000 { @@ -30075,7 +30075,7 @@ index 923f354b02f0..b71ee6c83668 100644 compatible = "marvell,armada-8k-rng", "inside-secure,safexcel-eip76"; reg = <0x760000 0x7d>; diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile -index 015eb072ddef..151723b5c733 100644 +index 015eb072ddef78ca3eeae9aff539c4233690898e..151723b5c733d7f3ee91953098ab363ede6f8ff3 100644 --- a/arch/arm64/boot/dts/mediatek/Makefile +++ b/arch/arm64/boot/dts/mediatek/Makefile @@ -1,6 +1,8 @@ @@ -30089,7 +30089,7 @@ index 015eb072ddef..151723b5c733 100644 always := $(dtb-y) diff --git a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts new file mode 100644 -index 000000000000..8c804df3da4e +index 0000000000000000000000000000000000000000..8c804df3da4e85d6a6597b0529ca8e33b42c4957 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts @@ -0,0 +1,32 @@ @@ -30127,7 +30127,7 @@ index 000000000000..8c804df3da4e + diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi new file mode 100644 -index 000000000000..57d0396b7faa +index 0000000000000000000000000000000000000000..57d0396b7faaf6fbdffa00d446616bf10213e90a --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi @@ -0,0 +1,171 @@ @@ -30303,7 +30303,7 @@ index 000000000000..57d0396b7faa +}; + diff --git a/arch/arm64/boot/dts/mediatek/mt6797.dtsi b/arch/arm64/boot/dts/mediatek/mt6797.dtsi -index 31088a9f71de..4beaa71107d7 100644 +index 31088a9f71dea04966a5db22567f0a5b4be899fd..4beaa71107d7d507af80b8a3248a55715224d463 100644 --- a/arch/arm64/boot/dts/mediatek/mt6797.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt6797.dtsi @@ -108,13 +108,6 @@ clk26m: oscillator@0 { @@ -30334,7 +30334,7 @@ index 31088a9f71de..4beaa71107d7 100644 reg = <0 0x1000c000 0 0x1000>; diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts new file mode 100644 -index 000000000000..c08309df2cc7 +index 0000000000000000000000000000000000000000..c08309df2cc7ff61f746f78a0c972c589d86300d --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts @@ -0,0 +1,27 @@ @@ -30367,7 +30367,7 @@ index 000000000000..c08309df2cc7 +}; diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi new file mode 100644 -index 000000000000..b111fec2ed9d +index 0000000000000000000000000000000000000000..b111fec2ed9d11996606e6b06d2e72b25f980728 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi @@ -0,0 +1,110 @@ @@ -30482,7 +30482,7 @@ index 000000000000..b111fec2ed9d + }; +}; diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile -index cc0f02d9dd02..ff81d7e5805e 100644 +index cc0f02d9dd02fe43315c96474e73d3b905723c8c..ff81d7e5805e8b9dc4ab8eb886836b28c25ddbfc 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -1,5 +1,6 @@ @@ -30493,7 +30493,7 @@ index cc0f02d9dd02..ff81d7e5805e 100644 dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi -index d94640812194..790b7775b901 100644 +index d9464081219467b4ef224d3ebbeddc2a7792773c..790b7775b9016c899228a5be17ebb3fdbe5f4ab8 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi @@ -17,6 +17,7 @@ pinconf { @@ -30505,7 +30505,7 @@ index d94640812194..790b7775b901 100644 }; diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi -index bd310ac1967a..1d63e6b879de 100644 +index bd310ac1967ab5a07f565bcbeead67a482d2e1b3..1d63e6b879de7cc51784077be9b138f9f5635c8e 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -88,6 +88,8 @@ adv_bridge: bridge@39 { @@ -30555,7 +30555,7 @@ index bd310ac1967a..1d63e6b879de 100644 compatible = "hdmi-connector"; type = "a"; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi -index b1142c45fdc9..8e379782597a 100644 +index b1142c45fdc983151e24fa2ff084dec82852a0d5..8e379782597a258f84d934ef19a54ab6e6176e26 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi @@ -24,4 +24,28 @@ pinconf { @@ -30588,7 +30588,7 @@ index b1142c45fdc9..8e379782597a 100644 + }; }; diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi -index d2196fc6d739..789f3e87321e 100644 +index d2196fc6d7397d09b9a9b9c702a45fca08709423..789f3e87321e2d47e51d5af9346441addd385413 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -13,6 +13,7 @@ @@ -30810,7 +30810,7 @@ index d2196fc6d739..789f3e87321e 100644 }; diff --git a/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts new file mode 100644 -index 000000000000..6a838b5d321e +index 0000000000000000000000000000000000000000..6a838b5d321e31c408674f642698fb7168b9ca93 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/ipq8074-hk01.dts @@ -0,0 +1,52 @@ @@ -30868,7 +30868,7 @@ index 000000000000..6a838b5d321e +}; diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi new file mode 100644 -index 000000000000..2bc5dec5614d +index 0000000000000000000000000000000000000000..2bc5dec5614dec40962e987e0646321a888d4549 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi @@ -0,0 +1,194 @@ @@ -31067,7 +31067,7 @@ index 000000000000..2bc5dec5614d + }; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi -index 039991f80831..dc3817593e14 100644 +index 039991f808317027822148650831c3509b7d349c..dc3817593e144708a514a5605491801056e662ab 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -88,6 +88,11 @@ wcnss_mem: wcnss@89300000 { @@ -31233,7 +31233,7 @@ index 039991f80831..dc3817593e14 100644 smd { diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi -index 8f085716e258..887b61c872dd 100644 +index 8f085716e25898a19a4efb8ad493aaf60963eef9..887b61c872dd15b697e4d1969b26be5010a18d4e 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -276,12 +276,83 @@ smem { @@ -31592,7 +31592,7 @@ index 8f085716e258..887b61c872dd 100644 compatible = "qcom,smp2p"; qcom,smem = <481>, <430>; diff --git a/arch/arm64/boot/dts/qcom/pmi8994.dtsi b/arch/arm64/boot/dts/qcom/pmi8994.dtsi -index d3879a4e8076..57673f92805d 100644 +index d3879a4e8076d53a4bdcd9d2b81d343797c637a2..57673f92805d00346559dc65e2c4d01fc17bc5dd 100644 --- a/arch/arm64/boot/dts/qcom/pmi8994.dtsi +++ b/arch/arm64/boot/dts/qcom/pmi8994.dtsi @@ -8,6 +8,23 @@ pmic@2 { @@ -31620,7 +31620,7 @@ index d3879a4e8076..57673f92805d 100644 pmic@3 { diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile -index acc4bb30d485..381928bc1358 100644 +index acc4bb30d485b6bc55fa50926ae678d73bdcac92..381928bc1358fd9c97995109143cc72282bda1d4 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -2,6 +2,7 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb @@ -31632,7 +31632,7 @@ index acc4bb30d485..381928bc1358 100644 always := $(dtb-y) clean-files := *.dtb diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts -index 95fe207cb6a3..dd4f9b6a4254 100644 +index 95fe207cb6a3fd2fcb168e8557e38327d6041ae4..dd4f9b6a42546defb7b1161ce4e589c25f739d5c 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts @@ -9,8 +9,6 @@ @@ -31645,7 +31645,7 @@ index 95fe207cb6a3..dd4f9b6a4254 100644 #include "r8a7795-es1.dtsi" #include "ulcb.dtsi" diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts -index b84c156ed696..3f7d5f51e428 100644 +index b84c156ed6969947bc64d602fefb8da9a55ad030..3f7d5f51e42878cb8550402dbb851411c6399492 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts @@ -8,8 +8,6 @@ @@ -31658,7 +31658,7 @@ index b84c156ed696..3f7d5f51e428 100644 #include "r8a7795-es1.dtsi" #include "salvator-x.dtsi" diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi -index a0ba7bd21ea3..aaa5e67a963e 100644 +index a0ba7bd21ea3aa185bb725ee43c4a4638609e02b..aaa5e67a963ea9ff1b0dddc3a18d46b3e8ae2031 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi @@ -21,6 +21,14 @@ xhci1: usb@ee0400000 { @@ -31684,7 +31684,7 @@ index a0ba7bd21ea3..aaa5e67a963e 100644 vsps = <&vspd0 &vspd1 &vspd2 &vspd3>; }; diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts -index 0426f41765f0..0afe777973de 100644 +index 0426f41765f0bc68f426e5284d84a354c686dbd8..0afe777973dec8b7e8fa41b1d521652ba450914a 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts @@ -9,8 +9,6 @@ @@ -31715,7 +31715,7 @@ index 0426f41765f0..0afe777973de 100644 + "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3"; +}; diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts -index 684fb3b9d154..17953070f38d 100644 +index 684fb3b9d154559eb31d85c401303f4bc52f9f4e..17953070f38dff8d1a4e3e3050f1259fe802240a 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -8,8 +8,6 @@ @@ -31728,7 +31728,7 @@ index 684fb3b9d154..17953070f38d 100644 #include "r8a7795.dtsi" #include "salvator-x.dtsi" diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts -index de354957144b..7675de5d4f2c 100644 +index de354957144b4822479a25894656028f9f1085c1..7675de5d4f2cb13902ecd325654ece89db098741 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts @@ -8,8 +8,6 @@ @@ -31756,7 +31756,7 @@ index de354957144b..7675de5d4f2c 100644 &ehci2 { diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi -index e31c1b660b3f..2938195b9571 100644 +index e31c1b660b3fe78f370a01e1cc67e8c81d24ee97..2938195b9571dd6cd2f568737679770202bc1a3f 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -12,6 +12,8 @@ @@ -32177,7 +32177,7 @@ index e31c1b660b3f..2938195b9571 100644 ports { diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts -index 38b58b7fca4b..daee1f1a3f68 100644 +index 38b58b7fca4bf0e9a309a1f9a27f91cb26d9e785..daee1f1a3f68951b4a7615305d219bd4fa990469 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts @@ -9,8 +9,6 @@ @@ -32206,7 +32206,7 @@ index 38b58b7fca4b..daee1f1a3f68 100644 + "dclkin.0", "dclkin.1", "dclkin.2"; +}; diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts -index db4f162d6bdd..b317be03306e 100644 +index db4f162d6bdd2c42e13af8057b866498c0bf6c39..b317be03306e69f8ae7357f310c4764b395b1787 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts @@ -8,8 +8,6 @@ @@ -32252,7 +32252,7 @@ index db4f162d6bdd..b317be03306e 100644 + remote-endpoint = <&rcar_dw_hdmi0_out>; +}; diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -index 1f6710912045..369092e17e34 100644 +index 1f671091204524e84600c66e697bc57a07d704d6..369092e17e3412914d3204d7f308d57fed3cb152 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -12,6 +12,8 @@ @@ -32744,7 +32744,7 @@ index 1f6710912045..369092e17e34 100644 }; diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts new file mode 100644 -index 000000000000..d144370051d5 +index 0000000000000000000000000000000000000000..d144370051d559fc9b43fd6ab01f2a5e546d94ce --- /dev/null +++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts @@ -0,0 +1,46 @@ @@ -32796,7 +32796,7 @@ index 000000000000..d144370051d5 +}; diff --git a/arch/arm64/boot/dts/renesas/r8a77995.dtsi b/arch/arm64/boot/dts/renesas/r8a77995.dtsi new file mode 100644 -index 000000000000..d0f95b78c022 +index 0000000000000000000000000000000000000000..d0f95b78c022de07bed57a2df667c743dbc43814 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/r8a77995.dtsi @@ -0,0 +1,155 @@ @@ -32956,7 +32956,7 @@ index 000000000000..d0f95b78c022 + }; +}; diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi -index f903957da504..4786c67b5e65 100644 +index f903957da504a9e02fa910243b60388dc85ec959..4786c67b5e6527fd99d27aa969ef0b2d4274b4ad 100644 --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi @@ -268,10 +268,6 @@ endpoint { @@ -32971,7 +32971,7 @@ index f903957da504..4786c67b5e65 100644 }; diff --git a/arch/arm64/boot/dts/renesas/salvator-xs.dtsi b/arch/arm64/boot/dts/renesas/salvator-xs.dtsi -index 81227e3c2c6f..bf4d200fb546 100644 +index 81227e3c2c6f1e2d3899e3ea0c824413c3a537a6..bf4d200fb54635eaa448688af444045145a18a96 100644 --- a/arch/arm64/boot/dts/renesas/salvator-xs.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-xs.dtsi @@ -18,3 +18,13 @@ / { @@ -32989,7 +32989,7 @@ index 81227e3c2c6f..bf4d200fb546 100644 + }; +}; diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi -index d1a3f3b7a0ab..1b868df2393f 100644 +index d1a3f3b7a0ab0b97aff29a898813a023a7d5bd3d..1b868df2393ffa3dd07ac2ab6c221e9c5c4c9898 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -34,6 +34,16 @@ audio_clkout: audio-clkout { @@ -33072,7 +33072,7 @@ index d1a3f3b7a0ab..1b868df2393f 100644 status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile -index bcfa53b1e6b7..f1c9b13cea5c 100644 +index bcfa53b1e6b7ef7e310ba731c090c10fac657bfc..f1c9b13cea5c21ce89efec347c61593e092a681e 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -1,4 +1,5 @@ @@ -33091,7 +33091,7 @@ index bcfa53b1e6b7..f1c9b13cea5c 100644 always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts -index b9f36dad17e6..8e6a65431756 100644 +index b9f36dad17e6dda378c486e98e202aaac00234ab..8e6a6543175673d6fd9e3d7e5d370b29ac7a2c50 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts @@ -51,6 +51,25 @@ chosen { @@ -33274,7 +33274,7 @@ index b9f36dad17e6..8e6a65431756 100644 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts new file mode 100644 -index 000000000000..d4f80786e7c2 +index 0000000000000000000000000000000000000000..d4f80786e7c20c0a46bacb9636f8defc7ef137b4 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts @@ -0,0 +1,333 @@ @@ -33612,7 +33612,7 @@ index 000000000000..d4f80786e7c2 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index d48bf5d9f8bd..6d615cb6e64d 100644 +index d48bf5d9f8bd04c03d21b9f2d7be42a654b0c15f..6d615cb6e64d07cebcfa0a7ecebf04b8afb152b2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -47,6 +47,7 @@ @@ -34112,7 +34112,7 @@ index d48bf5d9f8bd..6d615cb6e64d 100644 otp_gpio: otp-gpio { rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi -index 4772917c5f7e..a37220a9387c 100644 +index 4772917c5f7e6067a79cd22080741156329f215c..a37220a9387c325a1caf7e2c735ee5c776af4982 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi @@ -156,7 +156,6 @@ &emmc { @@ -34124,7 +34124,7 @@ index 4772917c5f7e..a37220a9387c 100644 pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>; status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts -index e631d424f08e..5e4d3a7015f5 100644 +index e631d424f08ea64991b6d00d748819ce5328ae9c..5e4d3a7015f52de883c2a43ce38da7f5c5421993 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts @@ -117,7 +117,6 @@ &emmc { @@ -34136,7 +34136,7 @@ index e631d424f08e..5e4d3a7015f5 100644 vqmmc-supply = <&vcc18_flash>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts -index fac116acc12f..d3f6c8e0d206 100644 +index fac116acc12fa0f65755fe3897a87347cf75fded..d3f6c8e0d206d0fcf28ade6612499fec212dcc6a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts @@ -203,7 +203,6 @@ &emmc { @@ -34156,7 +34156,7 @@ index fac116acc12f..d3f6c8e0d206 100644 pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vcc_sd>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts -index ff48edd8e348..13a9e22f5d2d 100644 +index ff48edd8e3482bcafcf4920ecdf1b93995bd5a5b..13a9e22f5d2d2caa3604a4315be98879ba069bbd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts @@ -86,12 +86,10 @@ &emmc { @@ -34181,7 +34181,7 @@ index ff48edd8e348..13a9e22f5d2d 100644 sd-uhs-sdr25; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts -index 7134181f1dc2..b3510d56517a 100644 +index 7134181f1dc27190ee2c3be5f1161288a864d3c8..b3510d56517a63a39506e3434ce7969cc708a2d7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts @@ -189,7 +189,6 @@ &emmc { @@ -34201,7 +34201,7 @@ index 7134181f1dc2..b3510d56517a 100644 pinctrl-0 = <&sdio0_clk &sdio0_cmd &sdio0_bus4>; vmmc-supply = <&vcc_io>; diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi -index 6d5dc0587e59..e0518b4bc6c2 100644 +index 6d5dc0587e599dd768ed00d0df92145a862dce1b..e0518b4bc6c2a018963787d0096077ab540b78e8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -113,7 +113,8 @@ cpu_l0: cpu@0 { @@ -34422,7 +34422,7 @@ index 6d5dc0587e59..e0518b4bc6c2 100644 spi0_clk: spi0-clk { rockchip,pins = <1 29 RK_FUNC_2 &pcfg_pull_up>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts -index 42033bcc614c..56533c344ef2 100644 +index 42033bcc614cbb05b9615538bb66728ca11416df..56533c344ef2caa5d237e61aff438caf068d96e3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts @@ -199,7 +199,7 @@ &pcie0 { @@ -34435,7 +34435,7 @@ index 42033bcc614c..56533c344ef2 100644 }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts -index ba1d9810ad1e..7fd4bfcaa38e 100644 +index ba1d9810ad1e29916809dc1075359c6d0244d4e7..7fd4bfcaa38e33c8b58ef60dc7adb99772b04cc1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -43,6 +43,7 @@ @@ -34478,7 +34478,7 @@ index ba1d9810ad1e..7fd4bfcaa38e 100644 mmc-hs400-enhanced-strobe; non-removable; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts -index 7bd31066399b..a3d3cea7dc4f 100644 +index 7bd31066399b5859a053570a35281cec23d1d888..a3d3cea7dc4f60578e5901e13546ad36fa497f41 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts @@ -264,6 +264,50 @@ touchscreen@4b { @@ -34533,7 +34533,7 @@ index 7bd31066399b..a3d3cea7dc4f 100644 status = "okay"; vref-supply = <&pp1800_ap_io>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi -index eb5059344023..199a5118b20d 100644 +index eb505934402311f8b6b4621bb1d79b8965b0648e..199a5118b20dab39f744dfc21814b1a9dafb166f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -164,14 +164,9 @@ pp5000: pp5000 { @@ -34744,7 +34744,7 @@ index eb5059344023..199a5118b20d 100644 <0 7 RK_FUNC_1 &pcfg_pull_none>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi -index be7fe635f7c1..d8a120f945c8 100644 +index be7fe635f7c15f0e1aac3e7e716305bfd1ee715a..d8a120f945c803ee91e4fdd5a7afa3a8b68ed28a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi @@ -118,6 +118,35 @@ opp08 { @@ -34792,7 +34792,7 @@ index be7fe635f7c1..d8a120f945c8 100644 + operating-points-v2 = <&gpu_opp_table>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi -index c83460db130a..81617bcf2522 100644 +index c83460db130ab35fcf4a37b9c9998de6be87f7d8..81617bcf252272313163f9dc48ef35c077981559 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi @@ -110,6 +110,35 @@ opp07 { @@ -34841,7 +34841,7 @@ index c83460db130a..81617bcf2522 100644 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts new file mode 100644 -index 000000000000..9a7486058455 +index 0000000000000000000000000000000000000000..9a7486058455fe3c4b39b1bf68cf5434ab444d0a --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -0,0 +1,228 @@ @@ -35075,7 +35075,7 @@ index 000000000000..9a7486058455 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi new file mode 100644 -index 000000000000..53ff3d191a1d +index 0000000000000000000000000000000000000000..53ff3d191a1d176cc0d7c6d380894b48e42ec7da --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -0,0 +1,547 @@ @@ -35628,7 +35628,7 @@ index 000000000000..53ff3d191a1d +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts new file mode 100644 -index 000000000000..b7bd88fb3ae3 +index 0000000000000000000000000000000000000000..b7bd88fb3ae3bff4287f0df1d47593d4cfac316f --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts @@ -0,0 +1,240 @@ @@ -35874,7 +35874,7 @@ index 000000000000..b7bd88fb3ae3 +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi new file mode 100644 -index 000000000000..6c30bb02210d +index 0000000000000000000000000000000000000000..6c30bb02210d80a2d78843cccaca7a3d83f971cd --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -0,0 +1,644 @@ @@ -36523,7 +36523,7 @@ index 000000000000..6c30bb02210d + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 5b78ce16a87e..d79e9b3265b9 100644 +index 5b78ce16a87e75ad355895777e2de8a1e8f1e12b..d79e9b3265b98cbe0955c8139950627d2af09492 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -110,6 +110,7 @@ cpu_l0: cpu@0 { @@ -36947,7 +36947,7 @@ index 5b78ce16a87e..d79e9b3265b9 100644 rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile -index 4a13a3a97101..4bc091b365fd 100644 +index 4a13a3a971010e7c09f7919b6dacc796c1e3efa4..4bc091b365fd1563999c5dc4fd62f16e64acce80 100644 --- a/arch/arm64/boot/dts/socionext/Makefile +++ b/arch/arm64/boot/dts/socionext/Makefile @@ -2,7 +2,8 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ @@ -36961,7 +36961,7 @@ index 4a13a3a97101..4bc091b365fd 100644 always := $(dtb-y) clean-files := *.dtb diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts -index 115357018ef7..2452b2243f42 100644 +index 115357018ef7c73b81c20901badfbab4da71b243..2452b2243f42465476b65891d6a0df6bc5ffda37 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts @@ -9,7 +9,7 @@ @@ -36982,7 +36982,7 @@ index 115357018ef7..2452b2243f42 100644 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts -index cc8ebe34c27c..ffb473ad2e0f 100644 +index cc8ebe34c27cd35e131e7a05f66a5c5a63dca7e4..ffb473ad2e0fdbad76e43e50ddcaf3eb32f30c72 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts @@ -8,9 +8,9 @@ @@ -36999,7 +36999,7 @@ index cc8ebe34c27c..ffb473ad2e0f 100644 / { model = "UniPhier LD11 Reference Board"; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi -index bdce5b89baec..ee4aff53a5f5 100644 +index bdce5b89baece0b53738deb8ff76c18f142f986b..ee4aff53a5f5dc8063bf0779e23da47fe5f4e522 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -150,6 +150,17 @@ serial3: serial@54006b00 { @@ -37060,7 +37060,7 @@ index bdce5b89baec..ee4aff53a5f5 100644 -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts -index 9f620d4101b5..fc2bc9d75d35 100644 +index 9f620d4101b54fa0a1d2aecee398813598891c41..fc2bc9d75d35e6f410a6f012b461cdcac03d6282 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -9,7 +9,7 @@ @@ -37081,7 +37081,7 @@ index 9f620d4101b5..fc2bc9d75d35 100644 + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts -index 494166aee24c..1ca0c8620dc5 100644 +index 494166aee24ce3c304045075c1a0938f6fdf43f2..1ca0c8620dc5ac33118a72beb5b586ab8ff0ce2f 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts @@ -8,9 +8,9 @@ @@ -37098,7 +37098,7 @@ index 494166aee24c..1ca0c8620dc5 100644 / { model = "UniPhier LD20 Reference Board"; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi -index de1e75362817..a29c279b6e8e 100644 +index de1e7536281718f59617bc3b7be83c7e9ea53ace..a29c279b6e8e4c484b14c77047d1b8436103f6b3 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -219,6 +219,17 @@ serial3: serial@54006b00 { @@ -37169,7 +37169,7 @@ index de1e75362817..a29c279b6e8e 100644 +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi deleted file mode 120000 -index f42fb6f38bd3..000000000000 +index f42fb6f38bd35ae90d23fa1b10edabb0a6ef35df..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi +++ /dev/null @@ -1 +0,0 @@ @@ -37177,14 +37177,14 @@ index f42fb6f38bd3..000000000000 \ No newline at end of file diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi new file mode 100644 -index 000000000000..9caabbb8bae3 +index 0000000000000000000000000000000000000000..9caabbb8bae3fdd1d1e17ad8d63b99979aef971d --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi @@ -0,0 +1 @@ +#include diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts new file mode 100644 -index 000000000000..d65f746a3f9d +index 0000000000000000000000000000000000000000..d65f746a3f9d7843761f057840786236fc8a3abd --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3-ref.dts @@ -0,0 +1,62 @@ @@ -37252,7 +37252,7 @@ index 000000000000..d65f746a3f9d +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi new file mode 100644 -index 000000000000..384729fa740f +index 0000000000000000000000000000000000000000..384729fa740f0b3b8863e1c7c47ddfe50fb9160c --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi @@ -0,0 +1,367 @@ @@ -37625,7 +37625,7 @@ index 000000000000..384729fa740f +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi deleted file mode 120000 -index 4685a8d89cba..000000000000 +index 4685a8d89cba2b56bcdc24e399c79a850d799491..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi +++ /dev/null @@ -1 +0,0 @@ @@ -37633,14 +37633,14 @@ index 4685a8d89cba..000000000000 \ No newline at end of file diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi new file mode 100644 -index 000000000000..e66d999d9f5d +index 0000000000000000000000000000000000000000..e66d999d9f5d3a1ab87fc398ef611ef4cf048be2 --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi @@ -0,0 +1 @@ +#include diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi deleted file mode 120000 -index 1246db9be2a1..000000000000 +index 1246db9be2a1914221d74871b1e6f303884731c6..0000000000000000000000000000000000000000 --- a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi +++ /dev/null @@ -1 +0,0 @@ @@ -37648,13 +37648,13 @@ index 1246db9be2a1..000000000000 \ No newline at end of file diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi new file mode 100644 -index 000000000000..28c5b4ed1d95 +index 0000000000000000000000000000000000000000..28c5b4ed1d9500fb283876ba766d826a81c44a8d --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi @@ -0,0 +1 @@ +#include diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi -index cdc6a437dcc7..b87b8316f4ac 100644 +index cdc6a437dcc73d33c0aaedb28df523cda333891a..b87b8316f4acaecab6e5a243f2cce8ae2f1c7d31 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi @@ -11,7 +11,7 @@ @@ -37728,7 +37728,7 @@ index cdc6a437dcc7..b87b8316f4ac 100644 clocks = <&misc_clk>, <&misc_clk>, <&misc_clk>; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts -index ef1b9e573af0..bf552674a834 100644 +index ef1b9e573af0f5bd2ed6792ba5c9450a64ecaa45..bf552674a834140c0d574fe8b2fd3b0613c17798 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts @@ -13,13 +13,15 @@ @@ -37797,7 +37797,7 @@ index ef1b9e573af0..bf552674a834 100644 reg = <0x0 0x100000>; }; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi -index 54dc28351c8c..7665fbddff28 100644 +index 54dc28351c8cb85a0abbd4bbad554d56dbcbac79..7665fbddff280fcb4be412470e551d9409d1575e 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -20,33 +20,84 @@ cpus { @@ -38152,7 +38152,7 @@ index 54dc28351c8c..7665fbddff28 100644 interrupt-parent = <&gic>; interrupts = <0 22 4>; diff --git a/arch/arm64/boot/dts/zte/Makefile b/arch/arm64/boot/dts/zte/Makefile -index 667806620f59..d86c4def6bc9 100644 +index 667806620f59273bf0720e121cc033bc2fc235c7..d86c4def6bc98ebac49c49b23d7294b59cf9da07 100644 --- a/arch/arm64/boot/dts/zte/Makefile +++ b/arch/arm64/boot/dts/zte/Makefile @@ -1,4 +1,5 @@ @@ -38162,7 +38162,7 @@ index 667806620f59..d86c4def6bc9 100644 always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/zte/zx296718-evb.dts b/arch/arm64/boot/dts/zte/zx296718-evb.dts -index bb900d2bbcfb..cb2519ecd724 100644 +index bb900d2bbcfb5e6b9ca88187fc491142f359ed31..cb2519ecd724b526ff7f342b385d026f4c5808c0 100644 --- a/arch/arm64/boot/dts/zte/zx296718-evb.dts +++ b/arch/arm64/boot/dts/zte/zx296718-evb.dts @@ -57,16 +57,28 @@ memory@40000000 { @@ -38258,7 +38258,7 @@ index bb900d2bbcfb..cb2519ecd724 100644 &uart0 { diff --git a/arch/arm64/boot/dts/zte/zx296718-pcbox.dts b/arch/arm64/boot/dts/zte/zx296718-pcbox.dts new file mode 100644 -index 000000000000..e02509f7082b +index 0000000000000000000000000000000000000000..e02509f7082b1d69ac918e4145b43c6dc598523d --- /dev/null +++ b/arch/arm64/boot/dts/zte/zx296718-pcbox.dts @@ -0,0 +1,143 @@ @@ -38406,7 +38406,7 @@ index 000000000000..e02509f7082b + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi -index d83bf789c864..6eef64761009 100644 +index d83bf789c8641b73f9c973e7aa0e1bdb41a62017..6eef64761009491ba768fa69919497e24d14f384 100644 --- a/arch/arm64/boot/dts/zte/zx296718.dtsi +++ b/arch/arm64/boot/dts/zte/zx296718.dtsi @@ -53,6 +53,13 @@ / { @@ -38675,7 +38675,7 @@ index d83bf789c864..6eef64761009 100644 compatible = "zte,zx296702-spdif"; reg = <0x1488000 0x1000>; diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c -index a7ea5f3da89d..964489b39f6a 100644 +index a7ea5f3da89d5357c2332f8a7fe4afa609cb9997..964489b39f6a0ed6e1a98ed28f26c676db52d0d8 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -1188,6 +1188,7 @@ static struct clk_hw_onecell_data gxbb_hw_onecell_data = { @@ -38695,7 +38695,7 @@ index a7ea5f3da89d..964489b39f6a 100644 .num = NR_CLKS, }; diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h -index d63e77e8433d..5b1d4b374d1c 100644 +index d63e77e8433d1f73fbcf52ce0122b6350c0dd15d..5b1d4b374d1c21dfa9ded8167b5e9d32bad95b77 100644 --- a/drivers/clk/meson/gxbb.h +++ b/drivers/clk/meson/gxbb.h @@ -167,130 +167,33 @@ @@ -38844,7 +38844,7 @@ index d63e77e8433d..5b1d4b374d1c 100644 #endif /* __GXBB_H */ diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c -index 6ec512ad2598..cb60a516ca82 100644 +index 6ec512ad259805c34b57be3ee96eddef149599ee..cb60a516ca82bcf85d3b8334306696531ab6a597 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -590,6 +590,7 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = { @@ -38856,7 +38856,7 @@ index 6ec512ad2598..cb60a516ca82 100644 .num = CLK_NR_CLKS, }; diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h -index a687e02547dc..c139bb3273ca 100644 +index a687e02547dcc9280d7bdf3bee07efd2db110e8f..c139bb3273ca74a557605c987694e53980a5fb62 100644 --- a/drivers/clk/meson/meson8b.h +++ b/drivers/clk/meson/meson8b.h @@ -60,107 +60,12 @@ @@ -38972,7 +38972,7 @@ index a687e02547dc..c139bb3273ca 100644 /* include the CLKIDs that have been made part of the stable DT binding */ diff --git a/include/dt-bindings/clock/gxbb-aoclkc.h b/include/dt-bindings/clock/gxbb-aoclkc.h -index 31751482d13c..9d15e2221fdb 100644 +index 31751482d13cb498fb4989a41cb336e8c7e92e13..9d15e2221fdb7fd5f732eaa5a800f7b66112f8a5 100644 --- a/include/dt-bindings/clock/gxbb-aoclkc.h +++ b/include/dt-bindings/clock/gxbb-aoclkc.h @@ -62,5 +62,6 @@ @@ -38983,7 +38983,7 @@ index 31751482d13c..9d15e2221fdb 100644 #endif diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h -index e3e9f7919c31..c04a76d8facf 100644 +index e3e9f7919c318baed4063fc7199def1a6d684018..c04a76d8facff42319d708830c985bf342427627 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -5,37 +5,96 @@ @@ -39094,7 +39094,7 @@ index e3e9f7919c31..c04a76d8facf 100644 #endif /* __GXBB_CLKC_H */ diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h -index e29227fb52a1..a9c0306330b6 100644 +index e29227fb52a18c66b6aba5773f38fc0c872ea97d..a9c0306330b6a78e910fb5b1fb9fd3dfd107b01e 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h @@ -21,15 +21,85 @@ @@ -39184,7 +39184,7 @@ index e29227fb52a1..a9c0306330b6 100644 #endif /* __MESON8B_CLKC_H */ diff --git a/include/dt-bindings/clock/rv1108-cru.h b/include/dt-bindings/clock/rv1108-cru.h -index ae26f8105914..f269d833e41a 100644 +index ae26f81059142867a009197e1c37c8e00d3dbd21..f269d833e41a32851af31a81cf09a9ff8c2ae1b8 100644 --- a/include/dt-bindings/clock/rv1108-cru.h +++ b/include/dt-bindings/clock/rv1108-cru.h @@ -43,12 +43,73 @@ @@ -39389,7 +39389,7 @@ index ae26f8105914..f269d833e41a 100644 #define PRST_PMU_GRF 179 diff --git a/include/dt-bindings/genpd/k2g.h b/include/dt-bindings/genpd/k2g.h deleted file mode 100644 -index 1f31f17e19eb..000000000000 +index 1f31f17e19ebca5e528ad9498047ec9bd973d3c4..0000000000000000000000000000000000000000 --- a/include/dt-bindings/genpd/k2g.h +++ /dev/null @@ -1,90 +0,0 @@ @@ -39484,7 +39484,7 @@ index 1f31f17e19eb..000000000000 - -#endif diff --git a/include/dt-bindings/pinctrl/dra.h b/include/dt-bindings/pinctrl/dra.h -index 5c75e80915fc..18ec5df5a581 100644 +index 5c75e80915fcdc5b4411984cd57b8308eb388bfb..18ec5df5a5812a9f037247b6c95de1d15fba2546 100644 --- a/include/dt-bindings/pinctrl/dra.h +++ b/include/dt-bindings/pinctrl/dra.h @@ -73,5 +73,8 @@ @@ -39498,7 +39498,7 @@ index 5c75e80915fc..18ec5df5a581 100644 diff --git a/include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h b/include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h new file mode 100644 -index 000000000000..1f1b56e57346 +index 0000000000000000000000000000000000000000..1f1b56e57346e3b939a4597b9242d2aacbcbc33d --- /dev/null +++ b/include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h @@ -0,0 +1,27 @@ diff --git a/testdata/diff-f2ccd4d1333aad1175550daf616b061388e1864f b/testdata/diff-f2ccd4d1333aad1175550daf616b061388e1864f index 215af12aebc721b68c0738a1f713658961729794..37ea0b27516bcc1c7f14002f20df89b1773eee11 100644 --- a/testdata/diff-f2ccd4d1333aad1175550daf616b061388e1864f +++ b/testdata/diff-f2ccd4d1333aad1175550daf616b061388e1864f @@ -3,7 +3,7 @@ diff --git a/src/x11.Keysym.zig b/src/x11.Keysym.zig new file mode 100644 -index 0000000..e237a22 +index 0000000000000000000000000000000000000000..e237a22bbc214f03dfa0a99ecd3368eee2bbc22c --- /dev/null +++ b/src/x11.Keysym.zig @@ -0,0 +1,2141 @@ @@ -2149,7 +2149,7 @@ index 0000000..e237a22 + XK_Sinh_kunddaliya = 0x1000df4, // U+0DF4 SINHALA PUNCTUATION KUNDDALIYA +}; diff --git a/src/x11.zig b/src/x11.zig -index 9b8cbd2..a0a2cf4 100644 +index 9b8cbd2d7cee62cdec69e8febc75ff090cefdd8c..a0a2cf47cd45489c5630a351b553aaeae5efad87 100644 --- a/src/x11.zig +++ b/src/x11.zig @@ -37,3 +37,5 @@ pub const EventType = enum(c_int) { diff --git a/testdata/diff-f58200e3f2967a06f343c9fc9dcae9de18def92a b/testdata/diff-f58200e3f2967a06f343c9fc9dcae9de18def92a index edbbee493d584bf1faea926fb70f95bf218017b1..316bded8d2135abc7b2f18b4a027837f2d9d0a53 100644 --- a/testdata/diff-f58200e3f2967a06f343c9fc9dcae9de18def92a +++ b/testdata/diff-f58200e3f2967a06f343c9fc9dcae9de18def92a @@ -45,7 +45,7 @@ :100644 100644 5c5d3329750eadc813f892bce6e05234ad563242 3bcae1cd211281cc29d4b970240174c40613fdd6 M test/incremental/type_becomes_comptime_only diff --git a/CMakeLists.txt b/CMakeLists.txt -index 41bc62cead..d21ea2791c 100644 +index 41bc62cead176f9307835337b00615e2e1f74f6b..d21ea2791c62f3b912f586e56882346c00321647 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -583,6 +583,7 @@ set(ZIG_STAGE2_SOURCES @@ -65,7 +65,7 @@ index 41bc62cead..d21ea2791c 100644 src/link/StringTable.zig src/link/Wasm.zig diff --git a/build.zig b/build.zig -index 0466b79bf2..e8d54cc0cd 100644 +index 0466b79bf2dbeb803d653eff2f2a48880da3669b..e8d54cc0cd314cc8a7e8e2cf2fb1c20106b33078 100644 --- a/build.zig +++ b/build.zig @@ -202,6 +202,7 @@ pub fn build(b: *std.Build) !void { @@ -80,7 +80,7 @@ diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh old mode 100644 new mode 100755 diff --git a/lib/compiler_rt/fma.zig b/lib/compiler_rt/fma.zig -index 578139c5ac..79a120d5a2 100644 +index 578139c5ac08a4d7eb4e298ea3354e4b9c1ee72d..79a120d5a2ccdde4c037297e677420b065a24b04 100644 --- a/lib/compiler_rt/fma.zig +++ b/lib/compiler_rt/fma.zig @@ -203,7 +203,7 @@ fn add_adjusted(a: f64, b: f64) f64 { @@ -120,7 +120,7 @@ index 578139c5ac..79a120d5a2 100644 } } diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig -index dad60b725b..0f47a0b647 100644 +index dad60b725bc267a906e5c88abeb1ee342f818160..0f47a0b64781e423ec680cb162eb33e3ec51eddb 100644 --- a/lib/std/Build/Step/Compile.zig +++ b/lib/std/Build/Step/Compile.zig @@ -192,6 +192,7 @@ want_lto: ?bool = null, @@ -148,7 +148,7 @@ index dad60b725b..0f47a0b647 100644 if (compile.root_module.resolved_target.?.query.ofmt) |ofmt| { try zig_args.append(try std.fmt.allocPrint(arena, "-ofmt={s}", .{@tagName(ofmt)})); diff --git a/lib/std/elf.zig b/lib/std/elf.zig -index bef80d782b..43b542c09e 100644 +index bef80d782b20e759701c73a3fe85909985415f42..43b542c09e047ff0ae723f710750f396e18bbf08 100644 --- a/lib/std/elf.zig +++ b/lib/std/elf.zig @@ -323,6 +323,8 @@ pub const PT_LOPROC = 0x70000000; @@ -919,7 +919,7 @@ index bef80d782b..43b542c09e 100644 /// Member file name, sometimes / terminated. ar_name: [16]u8, diff --git a/lib/std/zig/system.zig b/lib/std/zig/system.zig -index b2116c1a74..55f1fd14cb 100644 +index b2116c1a7429b5791d8e39d66dd7e66ad64337e0..55f1fd14cb6cfa8421a142a142802710c9944bd5 100644 --- a/lib/std/zig/system.zig +++ b/lib/std/zig/system.zig @@ -516,15 +516,15 @@ pub fn abiAndDynamicLinkerFromFile( @@ -961,7 +961,7 @@ index b2116c1a74..55f1fd14cb 100644 elf.ELFCLASS64 => true, else => return error.InvalidElfClass, diff --git a/src/Compilation.zig b/src/Compilation.zig -index 34953ed11a..bf7246b8d8 100644 +index 34953ed11a12e334a1ecd995de399421a896a5bb..bf7246b8d8b8fe3df2c4ac1c4fb6124fe55e134b 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -177,7 +177,6 @@ debug_compiler_runtime_libs: bool, @@ -1107,7 +1107,7 @@ index 34953ed11a..bf7246b8d8 100644 defer update_zir_refs_node.end(); try pt.updateZirRefs(); diff --git a/src/Compilation/Config.zig b/src/Compilation/Config.zig -index d8751251da..45f7e509de 100644 +index d8751251da9e24db98c79f7964e0ea1a9bde78c8..45f7e509de609a4ab10651d27e49a1cb645eb2b6 100644 --- a/src/Compilation/Config.zig +++ b/src/Compilation/Config.zig @@ -49,6 +49,8 @@ use_lib_llvm: bool, @@ -1170,7 +1170,7 @@ index d8751251da..45f7e509de 100644 .export_memory = export_memory, .shared_memory = shared_memory, diff --git a/src/InternPool.zig b/src/InternPool.zig -index 9965497742..f4344af86d 100644 +index 996549774294455b642ef3286d3d20be0bd404f5..f4344af86d46be017beacf31e90c581493517b0f 100644 --- a/src/InternPool.zig +++ b/src/InternPool.zig @@ -6424,14 +6424,25 @@ pub const Alignment = enum(u6) { @@ -1204,7 +1204,7 @@ index 9965497742..f4344af86d 100644 }; diff --git a/src/Sema.zig b/src/Sema.zig -index 946e890ea3..d0576de33d 100644 +index 946e890ea3566e0cc1ab2aae453d389ecfab702b..d0576de33d4d3077f7fa177ba4e0b8e9b438ee69 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -3032,7 +3032,7 @@ fn zirStructDecl( @@ -1280,7 +1280,7 @@ index 946e890ea3..d0576de33d 100644 const gop = try sema.dependencies.getOrPut(sema.gpa, dependee); if (gop.found_existing) return; diff --git a/src/Value.zig b/src/Value.zig -index 8de5621761..381eacf45a 100644 +index 8de562176107ae28fb15ce2e6ed241aa7f176e16..381eacf45ab2389c950aad0dd9f0ed886e9a8bcb 100644 --- a/src/Value.zig +++ b/src/Value.zig @@ -23,7 +23,7 @@ pub fn format(val: Value, writer: *std.Io.Writer) !void { @@ -1293,7 +1293,7 @@ index 8de5621761..381eacf45a 100644 } diff --git a/src/Zcu.zig b/src/Zcu.zig -index 706bdb5165..8e9e9c2902 100644 +index 706bdb51655409a6e2c23e36d580d0c81c01f350..8e9e9c29025c4e82af1d14ece0eca9b7d9bd06e4 100644 --- a/src/Zcu.zig +++ b/src/Zcu.zig @@ -3166,7 +3166,7 @@ fn markTransitiveDependersPotentiallyOutdated(zcu: *Zcu, maybe_outdated: AnalUni @@ -1306,7 +1306,7 @@ index 706bdb5165..8e9e9c2902 100644 if (zcu.outdated.count() == 0) { // Any units in `potentially_outdated` must just be stuck in loops with one another: none of those diff --git a/src/Zcu/PerThread.zig b/src/Zcu/PerThread.zig -index 77cddb204e..32782e7e89 100644 +index 77cddb204e82eeeba3b349b0ed2216974d06f14c..32782e7e8952462d2991ff0b3bf3bbe8e0b72c64 100644 --- a/src/Zcu/PerThread.zig +++ b/src/Zcu/PerThread.zig @@ -1815,7 +1815,7 @@ fn createFileRootStruct( @@ -1319,7 +1319,7 @@ index 77cddb204e..32782e7e89 100644 } diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig -index 7b13cfc90d..fe40ba4bbb 100644 +index 7b13cfc90d68b760251c236bd43890858a088dd9..fe40ba4bbb16ffcbcc2768af9a6f8a57600c1e4f 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -858,9 +858,11 @@ pub fn generateLazy( @@ -1346,7 +1346,7 @@ index 7b13cfc90d..fe40ba4bbb 100644 .prev_di_line = undefined, // no debug info yet .prev_di_column = undefined, // no debug info yet diff --git a/src/arch/riscv64/Emit.zig b/src/arch/riscv64/Emit.zig -index 2e72aff941..64a476007c 100644 +index 2e72aff941072c7e5d7164eace99b5d919dc4ece..64a476007cf9881e5101c5c945158252b1ba5b86 100644 --- a/src/arch/riscv64/Emit.zig +++ b/src/arch/riscv64/Emit.zig @@ -3,7 +3,7 @@ @@ -1412,7 +1412,7 @@ index 2e72aff941..64a476007c 100644 .none => {}, } diff --git a/src/arch/riscv64/Mir.zig b/src/arch/riscv64/Mir.zig -index 6fb8e23a98..204ab6a3c0 100644 +index 6fb8e23a98c3b0e89ee5139429fc11626fb2ecc7..204ab6a3c06226635b1619b60c205f02f8447884 100644 --- a/src/arch/riscv64/Mir.zig +++ b/src/arch/riscv64/Mir.zig @@ -109,9 +109,11 @@ pub fn emit( @@ -1439,7 +1439,7 @@ index 6fb8e23a98..204ab6a3c0 100644 .prev_di_line = func.lbrace_line, .prev_di_column = func.lbrace_column, diff --git a/src/arch/sparc64/Emit.zig b/src/arch/sparc64/Emit.zig -index d41f1cdf07..26282b09ab 100644 +index d41f1cdf07aa54b3c55a9917826a7b55a7da23b0..26282b09ab4f5c831cea32e9c9dbf8d6e0b2256a 100644 --- a/src/arch/sparc64/Emit.zig +++ b/src/arch/sparc64/Emit.zig @@ -21,7 +21,7 @@ debug_output: link.File.DebugInfoOutput, @@ -1510,7 +1510,7 @@ index d41f1cdf07..26282b09ab 100644 + try emit.w.writeInt(u32, instruction.toU32(), .big); } diff --git a/src/arch/sparc64/Mir.zig b/src/arch/sparc64/Mir.zig -index 842ac10fed..41d135eb83 100644 +index 842ac10fed1af8fbaeadb7b2c0404a20f806abc0..41d135eb831fefe51afd3fde7925596fce9d441b 100644 --- a/src/arch/sparc64/Mir.zig +++ b/src/arch/sparc64/Mir.zig @@ -380,9 +380,11 @@ pub fn emit( @@ -1537,7 +1537,7 @@ index 842ac10fed..41d135eb83 100644 .prev_di_line = func.lbrace_line, .prev_di_column = func.lbrace_column, diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig -index b5760c95ac..1827b50d61 100644 +index b5760c95ac2b54f5e03c32e3d61a4c32e01f3a46..1827b50d61a06e05f525461fb8261922f36920bf 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -550,9 +550,9 @@ pub const MCValue = union(enum) { @@ -1595,7 +1595,7 @@ index b5760c95ac..1827b50d61 100644 else => unreachable, } diff --git a/src/arch/x86_64/Emit.zig b/src/arch/x86_64/Emit.zig -index 84bb325322..c2b38d8e6d 100644 +index 84bb325322ac20c100da1e85c715a99f7e251deb..c2b38d8e6d45b3439d2f8bb6cf9e518ac17784cc 100644 --- a/src/arch/x86_64/Emit.zig +++ b/src/arch/x86_64/Emit.zig @@ -6,7 +6,7 @@ pt: Zcu.PerThread, @@ -1866,7 +1866,7 @@ index 84bb325322..c2b38d8e6d 100644 .none => {}, } diff --git a/src/arch/x86_64/Mir.zig b/src/arch/x86_64/Mir.zig -index e70018850d..caf41ffb39 100644 +index e70018850d621aff1a360044014f1ea1e8516a44..caf41ffb392d07b8a455f09181c77ffb8a679d7e 100644 --- a/src/arch/x86_64/Mir.zig +++ b/src/arch/x86_64/Mir.zig @@ -1976,7 +1976,8 @@ pub fn emit( @@ -1933,7 +1933,7 @@ index e70018850d..caf41ffb39 100644 .prev_di_loc = undefined, .prev_di_pc = undefined, diff --git a/src/arch/x86_64/bits.zig b/src/arch/x86_64/bits.zig -index 835093d11a..0504810933 100644 +index 835093d11ab8d38f622252233101c1a3c9d8904d..05048109335e0256d91c5f350d7fa900ce08e402 100644 --- a/src/arch/x86_64/bits.zig +++ b/src/arch/x86_64/bits.zig @@ -727,6 +727,14 @@ pub const FrameIndex = enum(u32) { @@ -1952,7 +1952,7 @@ index 835093d11a..0504810933 100644 pub const FrameAddr = struct { index: FrameIndex, off: i32 = 0 }; diff --git a/src/arch/x86_64/encoder.zig b/src/arch/x86_64/encoder.zig -index 03ff7134f6..1d9c67175e 100644 +index 03ff7134f62d04025081f06b50248545433130ec..1d9c67175ef204933a5463393cad189d0e59e7fa 100644 --- a/src/arch/x86_64/encoder.zig +++ b/src/arch/x86_64/encoder.zig @@ -259,7 +259,7 @@ pub const Instruction = struct { @@ -1965,7 +1965,7 @@ index 03ff7134f6..1d9c67175e 100644 .rip_inst => |inst_index| try w.print("RipInst({d})", .{inst_index}), .nav => |nav| try w.print("Nav({d})", .{@intFromEnum(nav)}), diff --git a/src/codegen.zig b/src/codegen.zig -index 56e6e7c99f..4cbf3f5616 100644 +index 56e6e7c99fb3bd8208ce92e912c03f3d2404f2c1..4cbf3f56169ec9227f961a72720898cc23df3f96 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -6,7 +6,6 @@ const link = @import("link.zig"); @@ -2673,7 +2673,7 @@ index 56e6e7c99f..4cbf3f5616 100644 const zo = macho_file.getZigObject().?; switch (linkage) { diff --git a/src/codegen/aarch64/Mir.zig b/src/codegen/aarch64/Mir.zig -index 318a51da95..be6478eae8 100644 +index 318a51da95bfe1c047447f96cde8a83f993c9f80..be6478eae896f3d70d874e609d3c3d263946872a 100644 --- a/src/codegen/aarch64/Mir.zig +++ b/src/codegen/aarch64/Mir.zig @@ -56,13 +56,13 @@ pub fn emit( @@ -2842,7 +2842,7 @@ index 318a51da95..be6478eae8 100644 .tag = .@"extern", .offset = offset, diff --git a/src/dev.zig b/src/dev.zig -index ac30cedecd..266796a2dc 100644 +index ac30cedecd8318da8f38e96e45d763fc2d70bc1f..266796a2dc2dda022bd7c4c3027c950a446d9dc9 100644 --- a/src/dev.zig +++ b/src/dev.zig @@ -97,6 +97,7 @@ pub const Env = enum { @@ -2878,7 +2878,7 @@ index ac30cedecd..266796a2dc 100644 c_linker, wasm_linker, diff --git a/src/link.zig b/src/link.zig -index 27cd6620e3..277013efb3 100644 +index 27cd6620e359284f0a6398aa23a5f8ade66446d7..277013efb3094cee331db13b15fd1e5d2d08d7e4 100644 --- a/src/link.zig +++ b/src/link.zig @@ -219,6 +219,7 @@ pub const Diags = struct { @@ -3092,7 +3092,7 @@ index 27cd6620e3..277013efb3 100644 /// Provided by the CLI, processed into `LinkInput` instances at the start of /// the compilation pipeline. diff --git a/src/link/Coff.zig b/src/link/Coff.zig -index e016473531..f3e3b3d0b5 100644 +index e016473531aede3998c41f42a85745fbf017c63c..f3e3b3d0b530d498f1b8d4518c1d9c06d4a69baa 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -953,7 +953,7 @@ fn writeOffsetTableEntry(coff: *Coff, index: usize) !void { @@ -3268,7 +3268,7 @@ index e016473531..f3e3b3d0b5 100644 try coff.resolveGlobalSymbol(sym_loc); } diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig -index f4af5f4148..595e3583d5 100644 +index f4af5f4148ad11f2eeb0688ccd11a39120404d6b..595e3583d5d540bdd0fe0ce1727d0a25eed72f50 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -2126,19 +2126,22 @@ pub const WipNav = struct { @@ -3310,7 +3310,7 @@ index f4af5f4148..595e3583d5 100644 const Allocator = std.mem.Allocator; diff --git a/src/link/Elf/LinkerDefined.zig b/src/link/Elf/LinkerDefined.zig -index b74406c368..d7e3cf62f3 100644 +index b74406c368d5cc4eb3da41365236bc79387bf7c2..d7e3cf62f3a378970682797fb538227d9c70795d 100644 --- a/src/link/Elf/LinkerDefined.zig +++ b/src/link/Elf/LinkerDefined.zig @@ -47,7 +47,7 @@ fn newSymbolAssumeCapacity(self: *LinkerDefined, name_off: u32, elf_file: *Elf) @@ -3323,7 +3323,7 @@ index b74406c368..d7e3cf62f3 100644 .st_shndx = elf.SHN_ABS, .st_value = 0, diff --git a/src/link/Elf/SharedObject.zig b/src/link/Elf/SharedObject.zig -index 8c79def16b..4dce40e370 100644 +index 8c79def16bff14a9878ab22cea2ee6e1aca7c160..4dce40e37094e9a48db41d35ce189af38b63c287 100644 --- a/src/link/Elf/SharedObject.zig +++ b/src/link/Elf/SharedObject.zig @@ -105,7 +105,7 @@ pub fn parseHeader( @@ -3336,7 +3336,7 @@ index 8c79def16b..4dce40e370 100644 if (target.toElfMachine() != ehdr.e_machine) diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig -index bf65d04e4a..a3ede11dc4 100644 +index bf65d04e4a13b3980749bfcc1af24f52d4ac3b49..a3ede11dc4003cd0f9d1f671dfccc5c095b16a82 100644 --- a/src/link/Elf/ZigObject.zig +++ b/src/link/Elf/ZigObject.zig @@ -277,8 +277,8 @@ pub fn flush(self: *ZigObject, elf_file: *Elf, tid: Zcu.PerThread.Id) !void { @@ -3496,7 +3496,7 @@ index bf65d04e4a..a3ede11dc4 100644 const local_esym = &self.symtab.items(.elf_sym)[local_sym.esym_index]; diff --git a/src/link/Elf2.zig b/src/link/Elf2.zig new file mode 100644 -index 0000000000..e43ebf2639 +index 0000000000000000000000000000000000000000..e43ebf2639ad88db8d125d2a79877173d771f73d --- /dev/null +++ b/src/link/Elf2.zig @@ -0,0 +1,2036 @@ @@ -5537,7 +5537,7 @@ index 0000000000..e43ebf2639 +const Value = @import("../Value.zig"); +const Zcu = @import("../Zcu.zig"); diff --git a/src/link/MachO/ZigObject.zig b/src/link/MachO/ZigObject.zig -index b1fc6528d5..5a0a71f380 100644 +index b1fc6528d5808663942b0428869f0c72efda1931..5a0a71f380c8a83c66b4f4e5391e4ec54469033e 100644 --- a/src/link/MachO/ZigObject.zig +++ b/src/link/MachO/ZigObject.zig @@ -784,22 +784,26 @@ pub fn updateFunc( @@ -5662,7 +5662,7 @@ index b1fc6528d5..5a0a71f380 100644 .code => macho_file.zig_text_sect_index.?, diff --git a/src/link/MappedFile.zig b/src/link/MappedFile.zig new file mode 100644 -index 0000000000..d04a8d533a +index 0000000000000000000000000000000000000000..d04a8d533a03f8934a8546311007b867bde353d0 --- /dev/null +++ b/src/link/MappedFile.zig @@ -0,0 +1,929 @@ @@ -6596,7 +6596,7 @@ index 0000000000..d04a8d533a +const std = @import("std"); +const windows = std.os.windows; diff --git a/src/link/Queue.zig b/src/link/Queue.zig -index 9f4535e1fe..742b4664f1 100644 +index 9f4535e1fe4ef7c6458ee94b571b4157ba422dc8..742b4664f178955b4668f130ebbacab0b9ac2550 100644 --- a/src/link/Queue.zig +++ b/src/link/Queue.zig @@ -22,17 +22,17 @@ prelink_wait_count: u32, @@ -6741,7 +6741,7 @@ index 9f4535e1fe..742b4664f1 100644 } diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig -index a125a70aae..d60b91c30f 100644 +index a125a70aae790e7b750c96304bae1bdb3c86376c..d60b91c30f93695076b8299c7e92d8f734812d32 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -4257,7 +4257,14 @@ fn lowerZcuData(wasm: *Wasm, pt: Zcu.PerThread, ip_index: InternPool.Index) !Zcu @@ -6761,7 +6761,7 @@ index a125a70aae..d60b91c30f 100644 const code_len: u32 = @intCast(wasm.string_bytes.items.len - code_start); const relocs_len: u32 = @intCast(wasm.out_relocs.len - relocs_start); diff --git a/src/main.zig b/src/main.zig -index 26d44c4463..9d43e47ea2 100644 +index 26d44c4463be802e0e7dea899980b28010b8ffc7..9d43e47ea2dbd949122ab7abfdf285ade21bc987 100644 --- a/src/main.zig +++ b/src/main.zig @@ -904,7 +904,6 @@ fn buildOutputType( @@ -6822,7 +6822,7 @@ index 26d44c4463..9d43e47ea2 100644 } diff --git a/src/target.zig b/src/target.zig -index e999d2ae22..1cf5c9b082 100644 +index e999d2ae22663bcd84a9eb1fc112a317b12a9c02..1cf5c9b08274a55f6cd956ae433e4fb7141e1abd 100644 --- a/src/target.zig +++ b/src/target.zig @@ -231,6 +231,13 @@ pub fn hasLldSupport(ofmt: std.Target.ObjectFormat) bool { @@ -6840,7 +6840,7 @@ index e999d2ae22..1cf5c9b082 100644 /// Used to select between LLVM backend and self-hosted backend when compiling in /// debug mode. A given target should only return true here if it is passing greater diff --git a/test/incremental/change_exports b/test/incremental/change_exports -index 01605bdeeb..e492930031 100644 +index 01605bdeeb36e4d51e986526e94c9a36e2cf07fa..e492930031e7fb5d22d68402bc3e59299a084402 100644 --- a/test/incremental/change_exports +++ b/test/incremental/change_exports @@ -1,4 +1,4 @@ @@ -6850,7 +6850,7 @@ index 01605bdeeb..e492930031 100644 #target=x86_64-windows-cbe diff --git a/test/incremental/change_panic_handler b/test/incremental/change_panic_handler -index 3e400b854e..699134100e 100644 +index 3e400b854eb60b4a81a3c9b2f0e3511e11ec3b26..699134100eec6942bc2414d29ab7188332f3a45a 100644 --- a/test/incremental/change_panic_handler +++ b/test/incremental/change_panic_handler @@ -1,3 +1,4 @@ @@ -6859,7 +6859,7 @@ index 3e400b854e..699134100e 100644 #target=x86_64-windows-cbe #update=initial version diff --git a/test/incremental/change_panic_handler_explicit b/test/incremental/change_panic_handler_explicit -index 9f7eb6c12f..2d068d593e 100644 +index 9f7eb6c12f10b42d80e998f352ac9a0a1d5d0842..2d068d593eeb77a07b9c249fc0d7542f1cee4c6c 100644 --- a/test/incremental/change_panic_handler_explicit +++ b/test/incremental/change_panic_handler_explicit @@ -1,3 +1,4 @@ @@ -6868,7 +6868,7 @@ index 9f7eb6c12f..2d068d593e 100644 #target=x86_64-windows-cbe #update=initial version diff --git a/test/incremental/change_struct_same_fields b/test/incremental/change_struct_same_fields -index 97049a1fc0..f3bfbbdd69 100644 +index 97049a1fc03ae2d9dfbdd07e6c06a9e756f133aa..f3bfbbdd6922a0266e42c41f8e92cc96e15bc9fc 100644 --- a/test/incremental/change_struct_same_fields +++ b/test/incremental/change_struct_same_fields @@ -1,4 +1,4 @@ @@ -6878,7 +6878,7 @@ index 97049a1fc0..f3bfbbdd69 100644 #target=x86_64-windows-cbe #target=wasm32-wasi-selfhosted diff --git a/test/incremental/type_becomes_comptime_only b/test/incremental/type_becomes_comptime_only -index 5c5d332975..3bcae1cd21 100644 +index 5c5d3329750eadc813f892bce6e05234ad563242..3bcae1cd211281cc29d4b970240174c40613fdd6 100644 --- a/test/incremental/type_becomes_comptime_only +++ b/test/incremental/type_becomes_comptime_only @@ -1,3 +1,4 @@ -- 2.54.0