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

Commit 1c928d10 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'renesas-dt-for-v3.14' of... 

Merge tag 'renesas-dt-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

From Simon Horman:
Renesas ARM based SoC DT updates for v3.14

* Global
  - Use interrupt macros
  - Use #include in device tree sources
  - Tidyup DT node naming

* emev2 (Emma Mobile EV2) SoC
  - Setup internal peripheral interrupts as level high
  - Use interrupt macros in DT files
  - Add clock tree description in DT

* r8a7791 (R-Car M2) SoC
  - Correct GPIO resources

* r8a7791 (R-Car M2) based Koelsch board
  - Configure PFC and GPO
  - Use r8a7791 suffix for IRQC compat string
  - Add DT reference

* r8a7790 (R-Car H2) based Lager board
  - Include all 4 GiB of memory
  - Use r8a7790 suffix for IRQC and MMCIF compat strings
  - Enable MMCIF
  - Add default PFC settings

* r8a7778 (R-Car M1) SoC
  - Suffix for INTC compat string
  - Add HSPI, MMCIF, SDHI and I2C suppport on DTSI
  - Correct pin control device addresses

* r8a7778 (R-Car M1) based Bock-W board
  - Use falling edge IRQ for LAN9221 in DT reference
  - Enable I2C, HSPI0, MMCIF and SDHI
  - Correct MMC pin conflict
  - Remove manual PFC settings from DT reference
  - Add default PFC settings

* r8a7779 (R-Car H1) SoC
  - Add HSPI and SDHI support
  - Suffix for INTC compat string

* r8a7779 (R-Car H1) based Marzen board
  - Enable HSPI0 and SDHI in DTS
  - Remove SDHI0 WP pin setting
  - Use falling edge IRQ for LAN9221 in DT reference
  - Add SDHI support

* r8a7740 (R-Mobile A1) SoC
  - Suffix for INTC compat string
  - Add FSI support via DTSI
  - Use interrupt macros

* r8a7740 based Armadillo board
  - Add FSI support for DTS
  - Use low level IRQ for ST1231 in DT reference

* r8a73a4 (SH-Mobile APE6) SoC
  - Use interrupt macros in DT files

* r8a73a4 (R-Mobile APE6) based ape6evm board
  - Include all 2 GiB of memory

* r8a73a0 (SH-Mobile AG5) SoC
  - Correct SDHI compat string

* r8a73a0 (SH-Mobile AG5) based kzm9d board
  - Add GPIO keys and Add PCF8575 GPIO extender to DT
  - Enable DSW2 with gpio-keys
  - Use falling edge IRQ for LAN9221 in DT reference

* tag 'renesas-dt-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (102 commits)
  ARM: shmobile: marzen: enable HSPI0 in DTS
  ARM: shmobile: r8a7779: add HSPI support to DTSI
  ARM: shmobile: Use r8a7779 suffix for INTC compat string
  ARM: shmobile: Use r8a7778 suffix for INTC compat string
  ARM: shmobile: Use r8a7740 suffix for INTC compat string
  ARM: shmobile: Use sh73a0 suffix for INTC compat string
  ARM: shmobile: armadillo: add FSI support for DTS
  ARM: shmobile: r8a7740: add FSI support via DTSI
  ARM: shmobile: emev2: Setup internal peripheral interrupts as level high
  ARM: shmobile: emev2: Use interrupt macros in DT files
  ARM: shmobile: Use interrupt macros in r8a73a4 and r8a7778 DT files
  ARM: shmobile: Fix r8a7791 GPIO resources in DTS
  ARM: shmobile: Include all 4 GiB of memory on Lager DT Ref
  ARM: shmobile: Include all 4 GiB of memory on Lager
  ARM: shmobile: Include all 2 GiB of memory on APE6EVM
  ARM: shmobile: Include all 2 GiB of memory on APE6EVM DT Ref
  ARM: shmobile: kzm9g-reference: Add GPIO keys to DT
  ARM: shmobile: kzm9g-reference: Add PCF8575 GPIO extender to DT
  ARM: shmobile: Koelsch DT reference GPIO LED support
  ARM: shmobile: Enable DSW2 with gpio-keys on KZM9D
  ...

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 84dac16a 1fd21956

arch/arm/Kconfig

+8 −6
Original line number Diff line number Diff line
@@ -644,8 +644,9 @@ config ARCH_MSM 
	  stack and controls some vital subsystems

	  (clock and power control, etc).



config ARCH_SHMOBILE

	bool "Renesas SH-Mobile / R-Mobile"

config ARCH_SHMOBILE_LEGACY

	bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"

	select ARCH_SHMOBILE

	select ARM_PATCH_PHYS_VIRT

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS
@@ -660,7 +661,8 @@ config ARCH_SHMOBILE 
	select PM_GENERIC_DOMAINS if PM

	select SPARSE_IRQ

	help

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms.

	  Support for Renesas's SH-Mobile and R-Mobile ARM platforms using

	  a non-multiplatform kernel.



config ARCH_RPC

	bool "RiscPC"
@@ -1611,7 +1613,7 @@ config HZ_FIXED 
	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY

	default 0



choice
@@ -1796,8 +1798,8 @@ config ARCH_WANT_GENERAL_HUGETLB 
source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE

	int "Maximum zone order" if ARCH_SHMOBILE_LEGACY

	range 11 64 if ARCH_SHMOBILE_LEGACY

	default "12" if SOC_AM33XX

	default "9" if SA1111

	default "11"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PC100) += s5pc100 
machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210

machine-$(CONFIG_ARCH_SA1100)		+= sa1100

machine-$(CONFIG_ARCH_SHMOBILE) 	+= shmobile

machine-$(CONFIG_ARCH_SHMOBILE_MULTI) 	+= shmobile

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga

machine-$(CONFIG_ARCH_STI)		+= sti

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ else 
endif

endif



ifeq ($(CONFIG_ARCH_SHMOBILE),y)

ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y)

OBJS		+= head-shmobile.o

endif

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ 
dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \

	s3c6410-smdk6410.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \
@@ -230,6 +230,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 
	r8a7779-marzen.dtb \

	r8a7779-marzen-reference.dtb \

	r8a7791-koelsch.dtb \

	r8a7791-koelsch-reference.dtb \

	r8a7790-lager.dtb \

	r8a7790-lager-reference.dtb \

	sh73a0-kzm9g.dtb \

arch/arm/boot/dts/emev2-kzm9d.dts

+40 −2
Original line number Diff line number Diff line
@@ -9,7 +9,10 @@ 
 */

/dts-v1/;



/include/ "emev2.dtsi"

#include "emev2.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "EMEV2 KZM9D Board";
@@ -47,11 +50,46 @@ 
		reg = <0x20000000 0x10000>;

		phy-mode = "mii";

		interrupt-parent = <&gpio0>;

		interrupts = <1 1>;	/* active high */

		interrupts = <1 IRQ_TYPE_EDGE_RISING>;

		reg-io-width = <4>;

		smsc,irq-active-high;

		smsc,irq-push-pull;

		vddvario-supply = <&reg_1p8v>;

		vdd33a-supply = <&reg_3p3v>;

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@1 {

			debounce_interval = <50>;

			wakeup = <1>;

			label = "DSW2-1";

			linux,code = <KEY_1>;

			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;

		};

		button@2 {

			debounce_interval = <50>;

			wakeup = <1>;

			label = "DSW2-2";

			linux,code = <KEY_2>;

			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;

		};

		button@3 {

			debounce_interval = <50>;

			wakeup = <1>;

			label = "DSW2-3";

			linux,code = <KEY_3>;

			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;

		};

		button@4 {

			debounce_interval = <50>;

			wakeup = <1>;

			label = "DSW2-4";

			linux,code = <KEY_4>;

			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;

		};

	};

};