diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-26 13:11:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-26 13:11:33 -0700 |
| commit | d13e05c0fe9b23b174f6a3c2ebb362836e63b6d7 (patch) | |
| tree | 25d6ca29ec7251c6c790577353db224658dee3d9 | |
| parent | b91b30ccdb8267081be2c7d2f7cff3cfcfb7c2ac (diff) | |
| parent | 4c77f098d1939a214d9cec8a4ee420416f10e5f8 (diff) | |
| download | devicetree-rebasing-d13e05c0fe9b23b174f6a3c2ebb362836e63b6d7.tar.gz | |
Merge tag 'arc-6.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- Incorrect VIPT aliasing assumption
- Misc build warning fixes and some typos
* tag 'arc-6.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [plat-hsdk]: Remove misplaced interrupt-cells property
ARC: Fix typos
ARC: mm: fix new code about cache aliasing
ARC: Fix -Wmissing-prototypes warnings
[ upstream commit: c9e35b4aeb2f061390395033314898d07498da03 ]
| -rw-r--r-- | src/arc/axc003.dtsi | 4 | ||||
| -rw-r--r-- | src/arc/hsdk.dts | 1 | ||||
| -rw-r--r-- | src/arc/vdk_axs10x_mb.dtsi | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/arc/axc003.dtsi b/src/arc/axc003.dtsi index 3434c8131ecd5..c0a812674ce9e 100644 --- a/src/arc/axc003.dtsi +++ b/src/arc/axc003.dtsi @@ -119,9 +119,9 @@ /* * The DW APB ICTL intc on MB is connected to CPU intc via a * DT "invisible" DW APB GPIO block, configured to simply pass thru - * interrupts - setup accordinly in platform init (plat-axs10x/ax10x.c) + * interrupts - setup accordingly in platform init (plat-axs10x/ax10x.c) * - * So here we mimic a direct connection betwen them, ignoring the + * So here we mimic a direct connection between them, ignoring the * ABPG GPIO. Thus set "interrupts = <24>" (DW APB GPIO to core) * instead of "interrupts = <12>" (DW APB ICTL to DW APB GPIO) * diff --git a/src/arc/hsdk.dts b/src/arc/hsdk.dts index 6691f42550778..41b980df862b1 100644 --- a/src/arc/hsdk.dts +++ b/src/arc/hsdk.dts @@ -205,7 +205,6 @@ }; gmac: ethernet@8000 { - #interrupt-cells = <1>; compatible = "snps,dwmac"; reg = <0x8000 0x2000>; interrupts = <10>; diff --git a/src/arc/vdk_axs10x_mb.dtsi b/src/arc/vdk_axs10x_mb.dtsi index 90a412026e643..0e0e2d337bf87 100644 --- a/src/arc/vdk_axs10x_mb.dtsi +++ b/src/arc/vdk_axs10x_mb.dtsi @@ -113,7 +113,7 @@ /* * Embedded Vision subsystem UIO mappings; only relevant for EV VDK * - * This node is intentionally put outside of MB above becase + * This node is intentionally put outside of MB above because * it maps areas outside of MB's 0xez-0xfz. */ uio_ev: uio@d0000000 { |