Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a1e31c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC updates from Vineet Gupta:

 - AXS10x platform clk updates for I2S, PGU

 - add region based cache flush operation for ARCv2 cores

 - enforce PAE40 dependency on HIGHMEM

 - ptrace support for additional regs in ARCv2 cores

 - fix build failure in linux-next dut to a header include ordering
   change

* tag 'arc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  Revert "ARCv2: Allow enabling PAE40 w/o HIGHMEM"
  ARC: mm: fix build failure in linux-next for UP builds
  ARCv2: ptrace: provide regset for accumulator/r30 regs
  elf: Add ARCv2 specific core note section
  ARCv2: mm: micro-optimize region flush generated code
  ARCv2: mm: Merge 2 updates to DC_CTRL for region flush
  ARCv2: mm: Implement cache region flush operations
  ARC: mm: Move full_page computation into cache version agnostic wrapper
  arc: axs10x: Fix ARC PGU default clock frequency
  arc: axs10x: Add DT bindings for I2S audio playback
parents c6778ff8 cf4100d1

arch/arc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ config ARC_HAS_PAE40 
	bool "Support for the 40-bit Physical Address Extension"

	default n

	depends on ISA_ARCV2

	select HIGHMEM

	help

	  Enable access to physical memory beyond 4G, only supported on

	  ARC cores with 40 bit Physical Addressing support

arch/arc/boot/dts/axs10x_mb.dtsi

+19 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
			pguclk: pguclk {

				#clock-cells = <0>;

				compatible = "fixed-clock";

				clock-frequency = <74440000>;

				clock-frequency = <74250000>;

			};

		};
@@ -149,12 +149,13 @@ 
			interrupts = <14>;

		};



		i2c@0x1e000 {

			compatible = "snps,designware-i2c";

		i2s: i2s@1e000 {

			compatible = "snps,designware-i2s";

			reg = <0x1e000 0x100>;

			clock-frequency = <400000>;

			clocks = <&i2cclk>;

			clocks = <&i2sclk 0>;

			clock-names = "i2sclk";

			interrupts = <15>;

			#sound-dai-cells = <0>;

		};



		i2c@0x1f000 {
@@ -174,6 +175,7 @@ 
				adi,input-colorspace = "rgb";

				adi,input-clock = "1x";

				adi,clock-delay = <0x03>;

				#sound-dai-cells = <0>;



				ports {

					#address-cells = <1>;
@@ -295,5 +297,17 @@ 
				};

			};

		};



		sound_playback {

			compatible = "simple-audio-card";

			simple-audio-card,name = "AXS10x HDMI Audio";

			simple-audio-card,format = "i2s";

			simple-audio-card,cpu {

				sound-dai = <&i2s>;

			};

			simple-audio-card,codec {

				sound-dai = <&adv7511>;

			};

		};

	};

};

arch/arc/include/asm/cache.h

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ extern unsigned long perip_base, perip_end; 
#define ARC_REG_IC_BCR		0x77	/* Build Config reg */

#define ARC_REG_IC_IVIC		0x10

#define ARC_REG_IC_CTRL		0x11

#define ARC_REG_IC_IVIR		0x16

#define ARC_REG_IC_ENDR		0x17

#define ARC_REG_IC_IVIL		0x19

#define ARC_REG_IC_PTAG		0x1E

#define ARC_REG_IC_PTAG_HI	0x1F
@@ -76,6 +78,8 @@ extern unsigned long perip_base, perip_end; 
#define ARC_REG_DC_IVDL		0x4A

#define ARC_REG_DC_FLSH		0x4B

#define ARC_REG_DC_FLDL		0x4C

#define ARC_REG_DC_STARTR	0x4D

#define ARC_REG_DC_ENDR		0x4E

#define ARC_REG_DC_PTAG		0x5C

#define ARC_REG_DC_PTAG_HI	0x5F
@@ -83,6 +87,8 @@ extern unsigned long perip_base, perip_end; 
#define DC_CTRL_DIS		0x001

#define DC_CTRL_INV_MODE_FLUSH	0x040

#define DC_CTRL_FLUSH_STATUS	0x100

#define DC_CTRL_RGN_OP_INV	0x200

#define DC_CTRL_RGN_OP_MSK	0x200



/*System-level cache (L2 cache) related Auxiliary registers */

#define ARC_REG_SLC_CFG		0x901

arch/arc/include/asm/mmu.h

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
#ifndef _ASM_ARC_MMU_H

#define _ASM_ARC_MMU_H



#ifndef __ASSEMBLY__

#include <linux/threads.h>	/* NR_CPUS */

#endif



#if defined(CONFIG_ARC_MMU_V1)

#define CONFIG_ARC_MMU_VER 1

#elif defined(CONFIG_ARC_MMU_V2)

arch/arc/include/asm/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ 
#ifndef _ASM_ARC_PGTABLE_H

#define _ASM_ARC_PGTABLE_H



#include <asm/page.h>

#include <asm/mmu.h>

#include <linux/const.h>

#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>

#include <linux/const.h>

#include <asm/page.h>

#include <asm/mmu.h>	/* to propagate CONFIG_ARC_MMU_VER <n> */



/**************************************************************************

 * Page Table Flags