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

Commit 67e7ebc2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc 

A few device tree updates and an include file fix for versatile.

* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux

:
  ARM: vexpress: Remove twice included header files
  ARM: vexpress: Device Tree updates
  + update to 3.4

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 516fb7a2 c533f32e

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -539,3 +539,13 @@ When: 3.6 
Why:	setitimer is not returning -EFAULT if user pointer is NULL. This

	violates the spec.

Who:	Sasikantha Babu <sasikanth.v19@gmail.com>



----------------------------



What:	V4L2_CID_HCENTER, V4L2_CID_VCENTER V4L2 controls

When:	3.7

Why:	The V4L2_CID_VCENTER, V4L2_CID_HCENTER controls have been deprecated

	for about 4 years and they are not used by any mainline driver.

	There are newer controls (V4L2_CID_PAN*, V4L2_CID_TILT*) that provide

	similar	functionality.

Who:	Sylwester Nawrocki <sylvester.nawrocki@gmail.com>

Makefile

+7 −4
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION =

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*
@@ -442,7 +442,7 @@ asm-generic: 


no-dot-config-targets := clean mrproper distclean \

			 cscope gtags TAGS tags help %docs check% coccicheck \

			 include/linux/version.h headers_% archheaders \

			 include/linux/version.h headers_% archheaders archscripts \

			 kernelversion %src-pkg



config-targets := 0
@@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ 
                   include/config/auto.conf

	$(cmd_crmodverdir)



archprepare: archheaders prepare1 scripts_basic

archprepare: archheaders archscripts prepare1 scripts_basic



prepare0: archprepare FORCE

	$(Q)$(MAKE) $(build)=.
@@ -1049,8 +1049,11 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) 
PHONY += archheaders

archheaders:



PHONY += archscripts

archscripts:



PHONY += __headers

__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE

__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE

	$(Q)$(MAKE) $(build)=scripts build_unifdef



PHONY += headers_install_all

arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts

+12 −1
Original line number Diff line number Diff line
@@ -73,7 +73,10 @@ 
		#address-cells = <0>;

		interrupt-controller;

		reg = <0x2c001000 0x1000>,

		      <0x2c002000 0x100>;

		      <0x2c002000 0x1000>,

		      <0x2c004000 0x2000>,

		      <0x2c006000 0x2000>;

		interrupts = <1 9 0xf04>;

	};



	memory-controller@7ffd0000 {
@@ -93,6 +96,14 @@ 
			     <0 91 4>;

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <1 13 0xf08>,

			     <1 14 0xf08>,

			     <1 11 0xf08>,

			     <1 10 0xf08>;

	};



	pmu {

		compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu";

		interrupts = <0 68 4>,

arch/arm/boot/dts/vexpress-v2p-ca5s.dts

+9 −4
Original line number Diff line number Diff line
@@ -77,13 +77,18 @@ 


	timer@2c000600 {

		compatible = "arm,cortex-a5-twd-timer";

		reg = <0x2c000600 0x38>;

		interrupts = <1 2 0x304>,

			     <1 3 0x304>;

		reg = <0x2c000600 0x20>;

		interrupts = <1 13 0x304>;

	};



	watchdog@2c000620 {

		compatible = "arm,cortex-a5-twd-wdt";

		reg = <0x2c000620 0x20>;

		interrupts = <1 14 0x304>;

	};



	gic: interrupt-controller@2c001000 {

		compatible = "arm,corex-a5-gic", "arm,cortex-a9-gic";

		compatible = "arm,cortex-a5-gic", "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		#address-cells = <0>;

		interrupt-controller;

arch/arm/boot/dts/vexpress-v2p-ca9.dts

+7 −2
Original line number Diff line number Diff line
@@ -105,8 +105,13 @@ 
	timer@1e000600 {

		compatible = "arm,cortex-a9-twd-timer";

		reg = <0x1e000600 0x20>;

		interrupts = <1 2 0xf04>,

			     <1 3 0xf04>;

		interrupts = <1 13 0xf04>;

	};



	watchdog@1e000620 {

		compatible = "arm,cortex-a9-twd-wdt";

		reg = <0x1e000620 0x20>;

		interrupts = <1 14 0xf04>;

	};



	gic: interrupt-controller@1e001000 {