Commit eb492df9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-r8a7740-multiplatform-for-v3.18' of... 

Merge tag 'renesas-r8a7740-multiplatform-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

 into next/soc

Pull "Renesas ARM Based SoC r8a7740 Multiplatform Updates for v3.18" from Simon Horman:

* Enable multiplatform support for r8a7740 SoC and remove
  its DT-reference C board DTS files.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'renesas-r8a7740-multiplatform-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: armadillo800eva reference: Remove DTS
  ARM: shmobile: armadillo800eva reference: Remove C board code
  ARM: shmobile: r8a7740: Add restart callback
  ARM: shmobile: armadillo800eva: Build DTS for multiplatform
  ARM: shmobile: armadillo800eva: Sync DTS
  ARM: shmobile: r8a7740: Multiplatform support
parents 0b7f509d 968d1af1

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ 
	r8a7740-armadillo800eva.dtb \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7740-armadillo800eva-reference.dtb \

	r8a7779-marzen.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \
@@ -372,6 +371,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ 
	sh7372-mackerel.dtb

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

	r7s72100-genmai.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7791-henninger.dtb \

	r8a7791-koelsch.dtb \

	r8a7790-lager.dtb \

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts

deleted100644 → 0
+0 −300
Original line number Diff line number Diff line 
/*

 * Reference Device Tree Source for the armadillo 800 eva board

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any

 * kind, whether express or implied.

 */



/dts-v1/;

#include "r8a7740.dtsi"

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

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

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

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



/ {

	model = "armadillo 800 eva reference";

	compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";



	aliases {

		serial1 = &scifa1;

	};



	chosen {

		bootargs = "console=tty0 console=ttySC1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";

	};



	memory {

		device_type = "memory";

		reg = <0x40000000 0x20000000>;

	};



	reg_3p3v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

	};



	vcc_sdhi0: regulator@1 {

		compatible = "regulator-fixed";



		regulator-name = "SDHI0 Vcc";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		gpio = <&pfc 75 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vccq_sdhi0: regulator@2 {

		compatible = "regulator-gpio";



		regulator-name = "SDHI0 VccQ";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_sdhi0>;



		enable-gpio = <&pfc 74 GPIO_ACTIVE_HIGH>;

		gpios = <&pfc 17 GPIO_ACTIVE_HIGH>;

		states = <3300000 0

			  1800000 1>;



		enable-active-high;

	};



	reg_5p0v: regulator@3 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-5.0V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

	};



	gpio-keys {

		compatible = "gpio-keys";



		power-key {

			gpios = <&pfc 99 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "SW3";

			gpio-key,wakeup;

		};



		back-key {

			gpios = <&pfc 100 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_BACK>;

			label = "SW4";

		};



		menu-key {

			gpios = <&pfc 97 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_MENU>;

			label = "SW5";

		};



		home-key {

			gpios = <&pfc 98 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_HOME>;

			label = "SW6";

		};

	};



	leds {

		compatible = "gpio-leds";

		led3 {

			gpios = <&pfc 102 GPIO_ACTIVE_HIGH>;

			label = "LED3";

		};

		led4 {

			gpios = <&pfc 111 GPIO_ACTIVE_HIGH>;

			label = "LED4";

		};

		led5 {

			gpios = <&pfc 110 GPIO_ACTIVE_HIGH>;

			label = "LED5";

		};

		led6 {

			gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;

			label = "LED6";

		};

	};



	i2c2: i2c@2 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "i2c-gpio";

		gpios = <&pfc 208 GPIO_ACTIVE_HIGH /* sda */

			 &pfc 91 GPIO_ACTIVE_HIGH /* scl */

			>;

		i2c-gpio,delay-us = <5>;

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&tpu 2 33333 PWM_POLARITY_INVERTED>;

		brightness-levels = <0 1 2 4 8 16 32 64 128 255>;

		default-brightness-level = <9>;

		pinctrl-0 = <&backlight_pins>;

		pinctrl-names = "default";

		power-supply = <&reg_5p0v>;

		enable-gpios = <&pfc 61 GPIO_ACTIVE_HIGH>;

	};



	sound {

		compatible = "simple-audio-card";



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



		simple-audio-card,cpu {

			sound-dai = <&sh_fsi2 0>;

			bitclock-inversion;

		};



		simple-audio-card,codec {

			sound-dai = <&wm8978>;

			bitclock-master;

			frame-master;

			system-clock-frequency = <12288000>;

		};

	};

};



&ether {

	pinctrl-0 = <&ether_pins>;

	pinctrl-names = "default";



	phy-handle = <&phy0>;

	status = "ok";



	phy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&extal1_clk {

	clock-frequency = <25000000>;

};

&extal2_clk {

	clock-frequency = <48000000>;

};

&fsibck_clk {

	clock-frequency = <12288000>;

};

&cpg_clocks {

	renesas,mode = <0x05>; /* MD_CK0 | MD_CK2 */

};



&cmt1 {

	status = "ok";

};



&i2c0 {

	status = "okay";

	touchscreen@55 {

		compatible = "sitronix,st1232";

		reg = <0x55>;

		interrupt-parent = <&irqpin1>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-0 = <&st1232_pins>;

		pinctrl-names = "default";

		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;

	};



	wm8978: wm8978@1a {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8978";

		reg = <0x1a>;

	};

};



&i2c2 {

	status = "okay";

	rtc@30 {

		compatible = "sii,s35390a";

		reg = <0x30>;

	};

};



&pfc {

	ether_pins: ether {

		renesas,groups = "gether_mii", "gether_int";

		renesas,function = "gether";

	};



	scifa1_pins: serial1 {

		renesas,groups = "scifa1_data";

		renesas,function = "scifa1";

	};



	st1232_pins: touchscreen {

		renesas,groups = "intc_irq10";

		renesas,function = "intc";

	};



	backlight_pins: backlight {

		renesas,groups = "tpu0_to2_1";

		renesas,function = "tpu0";

	};



	mmc0_pins: mmc0 {

		renesas,groups = "mmc0_data8_1", "mmc0_ctrl_1";

		renesas,function = "mmc0";

	};



	sdhi0_pins: sd0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_wp";

		renesas,function = "sdhi0";

	};



	fsia_pins: sounda {

		renesas,groups = "fsia_sclk_in", "fsia_mclk_out",

				 "fsia_data_in_1", "fsia_data_out_0";

		renesas,function = "fsia";

	};

};



&tpu {

	status = "okay";

};



&mmcif0 {

	pinctrl-0 = <&mmc0_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&reg_3p3v>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&scifa1 {

	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&vcc_sdhi0>;

	vqmmc-supply = <&vccq_sdhi0>;

	bus-width = <4>;

	cd-gpios = <&pfc 167 GPIO_ACTIVE_LOW>;

	status = "okay";

};



&sh_fsi2 {

	pinctrl-0 = <&fsia_pins>;

	pinctrl-names = "default";



	status = "okay";

};

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+275 −1
Original line number Diff line number Diff line
@@ -10,10 +10,18 @@ 


/dts-v1/;

#include "r8a7740.dtsi"

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

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

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

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



/ {

	model = "armadillo 800 eva";

	compatible = "renesas,armadillo800eva";

	compatible = "renesas,armadillo800eva", "renesas,r8a7740";



	aliases {

		serial1 = &scifa1;

	};



	chosen {

		bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
@@ -23,4 +31,270 @@ 
		device_type = "memory";

		reg = <0x40000000 0x20000000>;

	};



	reg_3p3v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

	};



	vcc_sdhi0: regulator@1 {

		compatible = "regulator-fixed";



		regulator-name = "SDHI0 Vcc";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		gpio = <&pfc 75 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vccq_sdhi0: regulator@2 {

		compatible = "regulator-gpio";



		regulator-name = "SDHI0 VccQ";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_sdhi0>;



		enable-gpio = <&pfc 74 GPIO_ACTIVE_HIGH>;

		gpios = <&pfc 17 GPIO_ACTIVE_HIGH>;

		states = <3300000 0

			  1800000 1>;



		enable-active-high;

	};



	reg_5p0v: regulator@3 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-5.0V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

		regulator-boot-on;

	};



	gpio-keys {

		compatible = "gpio-keys";



		power-key {

			gpios = <&pfc 99 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "SW3";

			gpio-key,wakeup;

		};



		back-key {

			gpios = <&pfc 100 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_BACK>;

			label = "SW4";

		};



		menu-key {

			gpios = <&pfc 97 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_MENU>;

			label = "SW5";

		};



		home-key {

			gpios = <&pfc 98 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_HOME>;

			label = "SW6";

		};

	};



	leds {

		compatible = "gpio-leds";

		led3 {

			gpios = <&pfc 102 GPIO_ACTIVE_HIGH>;

			label = "LED3";

		};

		led4 {

			gpios = <&pfc 111 GPIO_ACTIVE_HIGH>;

			label = "LED4";

		};

		led5 {

			gpios = <&pfc 110 GPIO_ACTIVE_HIGH>;

			label = "LED5";

		};

		led6 {

			gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;

			label = "LED6";

		};

	};



	i2c2: i2c@2 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "i2c-gpio";

		gpios = <&pfc 208 GPIO_ACTIVE_HIGH /* sda */

			 &pfc 91 GPIO_ACTIVE_HIGH /* scl */

			>;

		i2c-gpio,delay-us = <5>;

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&tpu 2 33333 PWM_POLARITY_INVERTED>;

		brightness-levels = <0 1 2 4 8 16 32 64 128 255>;

		default-brightness-level = <9>;

		pinctrl-0 = <&backlight_pins>;

		pinctrl-names = "default";

		power-supply = <&reg_5p0v>;

		enable-gpios = <&pfc 61 GPIO_ACTIVE_HIGH>;

	};



	sound {

		compatible = "simple-audio-card";



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



		simple-audio-card,cpu {

			sound-dai = <&sh_fsi2 0>;

			bitclock-inversion;

		};



		simple-audio-card,codec {

			sound-dai = <&wm8978>;

			bitclock-master;

			frame-master;

			system-clock-frequency = <12288000>;

		};

	};

};



&ether {

	pinctrl-0 = <&ether_pins>;

	pinctrl-names = "default";



	phy-handle = <&phy0>;

	status = "ok";



	phy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&extal1_clk {

	clock-frequency = <25000000>;

};

&extal2_clk {

	clock-frequency = <48000000>;

};

&fsibck_clk {

	clock-frequency = <12288000>;

};

&cpg_clocks {

	renesas,mode = <0x05>; /* MD_CK0 | MD_CK2 */

};



&cmt1 {

	status = "ok";

};



&i2c0 {

	status = "okay";

	touchscreen@55 {

		compatible = "sitronix,st1232";

		reg = <0x55>;

		interrupt-parent = <&irqpin1>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		pinctrl-0 = <&st1232_pins>;

		pinctrl-names = "default";

		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;

	};



	wm8978: wm8978@1a {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8978";

		reg = <0x1a>;

	};

};



&i2c2 {

	status = "okay";

	rtc@30 {

		compatible = "sii,s35390a";

		reg = <0x30>;

	};

};



&pfc {

	ether_pins: ether {

		renesas,groups = "gether_mii", "gether_int";

		renesas,function = "gether";

	};



	scifa1_pins: serial1 {

		renesas,groups = "scifa1_data";

		renesas,function = "scifa1";

	};



	st1232_pins: touchscreen {

		renesas,groups = "intc_irq10";

		renesas,function = "intc";

	};



	backlight_pins: backlight {

		renesas,groups = "tpu0_to2_1";

		renesas,function = "tpu0";

	};



	mmc0_pins: mmc0 {

		renesas,groups = "mmc0_data8_1", "mmc0_ctrl_1";

		renesas,function = "mmc0";

	};



	sdhi0_pins: sd0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_wp";

		renesas,function = "sdhi0";

	};



	fsia_pins: sounda {

		renesas,groups = "fsia_sclk_in", "fsia_mclk_out",

				 "fsia_data_in_1", "fsia_data_out_0";

		renesas,function = "fsia";

	};

};



&tpu {

	status = "okay";

};



&mmcif0 {

	pinctrl-0 = <&mmc0_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&reg_3p3v>;

	bus-width = <8>;

	non-removable;

	status = "okay";

};



&scifa1 {

	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-names = "default";



	vmmc-supply = <&vcc_sdhi0>;

	vqmmc-supply = <&vccq_sdhi0>;

	bus-width = <4>;

	cd-gpios = <&pfc 167 GPIO_ACTIVE_LOW>;

	status = "okay";

};



&sh_fsi2 {

	pinctrl-0 = <&fsia_pins>;

	pinctrl-names = "default";



	status = "okay";

};

arch/arm/mach-shmobile/Kconfig

+5 −15
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ config ARCH_R7S72100 
	bool "RZ/A1H (R7S72100)"

	select SYS_SUPPORTS_SH_MTU2



config ARCH_R8A7740

	bool "R-Mobile A1 (R8A77400)"

	select ARCH_RMOBILE

	select RENESAS_INTC_IRQPIN



config ARCH_R8A7779

	bool "R-Car H1 (R8A77790)"

	select RENESAS_INTC_IRQPIN
@@ -183,21 +188,6 @@ config MACH_ARMADILLO800EVA 
	select SND_SOC_WM8978 if SND_SIMPLE_CARD

	select USE_OF



config MACH_ARMADILLO800EVA_REFERENCE

	bool "Armadillo-800 EVA board - Reference Device Tree Implementation"

	depends on ARCH_R8A7740

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SH_ETH

	select SND_SOC_WM8978 if SND_SIMPLE_CARD

	select USE_OF

	---help---

	   Use reference implementation of Armadillo800 EVA board support

	   which makes greater use of device tree at the expense

	   of not supporting a number of devices.



	   This is intended to aid developers



config MACH_BOCKW

	bool "BOCK-W platform"

	depends on ARCH_R8A7778

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o 
obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o

obj-$(CONFIG_MACH_LAGER)	+= board-lager.o

obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o

obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)	+= board-armadillo800eva-reference.o

obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch.o

obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o

obj-$(CONFIG_MACH_KZM9G_REFERENCE)	+= board-kzm9g-reference.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE