Commit c9e35b4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bbacf717 61231eb8

arch/arc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
config ARC

	def_bool y

	select ARC_TIMERS

	select ARCH_HAS_CPU_CACHE_ALIASING

	select ARCH_HAS_CACHE_LINE_SIZE

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DMA_PREP_COHERENT

arch/arc/boot/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



# uImage build relies on mkimage being availble on your host for ARC target

# uImage build relies on mkimage being available on your host for ARC target

# You will need to build u-boot for ARC, rename mkimage to arc-elf32-mkimage

# and make sure it's reacable from your PATH

# and make sure it's reachable from your PATH



OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S

arch/arc/boot/dts/axc003.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -119,9 +119,9 @@ mmc@15000 { 
	/*

	 * 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)

	 *

arch/arc/boot/dts/hsdk.dts

+0 −1
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ dmac_cfg_clk: dmac-gpu-cfg-clk { 
		};



		gmac: ethernet@8000 {

			#interrupt-cells = <1>;

			compatible = "snps,dwmac";

			reg = <0x8000 0x2000>;

			interrupts = <10>;

arch/arc/boot/dts/vdk_axs10x_mb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ mmc@15000 { 
	/*

	 * 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 {