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

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

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

Pull ARC fixes from Vineet Gupta:
 "Accumulated fixes for ARC which I've been been sitting on for a while:

   - reading clk from driver vs device tree [Vlad]

   - fix support for UIO in VDK platform [Alexey]

   - SLC busy bit reading workaround

   - build warning with kprobes header reorg"

* tag 'arc-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: fix build warnings with !CONFIG_KPROBES
  ARCv2: SLC: Make sure busy bit is set properly on SLC flushing
  ARC: vdk: Fix support of UIO
  ARCv2: make unimplemented vectors as no-ops rather than halt core
  ARC: get rate from clk driver instead of reading device tree
  ARC: [dts] add cpu nodes to ARCHS SMP device tree
  ARC: [dts] add input clocks for cpu nodes
parents 09c8b3d1 4c6fabda

arch/arc/boot/dts/skeleton.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
			device_type = "cpu";

			compatible = "snps,arc770d";

			reg = <0>;

			clocks = <&core_clk>;

		};

	};

arch/arc/boot/dts/skeleton_hs.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
			device_type = "cpu";

			compatible = "snps,archs38";

			reg = <0>;

			clocks = <&core_clk>;

		};

	};

arch/arc/boot/dts/skeleton_hs_idu.dtsi

+20 −1
Original line number Diff line number Diff line
@@ -19,8 +19,27 @@ 


		cpu@0 {

			device_type = "cpu";

			compatible = "snps,archs38xN";

			compatible = "snps,archs38";

			reg = <0>;

			clocks = <&core_clk>;

		};

		cpu@1 {

			device_type = "cpu";

			compatible = "snps,archs38";

			reg = <1>;

			clocks = <&core_clk>;

		};

		cpu@2 {

			device_type = "cpu";

			compatible = "snps,archs38";

			reg = <2>;

			clocks = <&core_clk>;

		};

		cpu@3 {

			device_type = "cpu";

			compatible = "snps,archs38";

			reg = <3>;

			clocks = <&core_clk>;

		};

	};

arch/arc/boot/dts/vdk_axs10x_mb.dtsi

+13 −7
Original line number Diff line number Diff line
@@ -112,13 +112,19 @@ 
			interrupts = <7>;

			bus-width = <4>;

		};

	};



		/* Embedded Vision subsystem UIO mappings; only relevant for EV VDK */

	/*

	 * Embedded Vision subsystem UIO mappings; only relevant for EV VDK

	 *

	 * This node is intentionally put outside of MB above becase

	 * it maps areas outside of MB's 0xEz-0xFz.

	 */

	uio_ev: uio@0xD0000000 {

		compatible = "generic-uio";

		reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>;

		reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";

		interrupt-parent = <&mb_intc>;

		interrupts = <23>;

	};

};
 
};

arch/arc/include/asm/kprobes.h

+1 −3
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ int kprobe_fault_handler(struct pt_regs *regs, unsigned long cause); 
void kretprobe_trampoline(void);

void trap_is_kprobe(unsigned long address, struct pt_regs *regs);

#else

static void trap_is_kprobe(unsigned long address, struct pt_regs *regs)

{

}

#define trap_is_kprobe(address, regs)

#endif /* CONFIG_KPROBES */



#endif /* _ARC_KPROBES_H */