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

Commit c6ffdc07 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt3-for-v3.17' of... 

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

Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.17" from Simon
Horman:

* Initialise SCI using DT when booting the kzm9g, armadillo800eva,
  ape6evm and bockw boards without legacy-C code.

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

: (24 commits)
  ARM: shmobile: kzm9g-reference: Initialise SCIF device using DT
  ARM: shmobile: sh73a0: Add SCIF nodes
  ARM: shmobile: armadillo800eva-reference: Initialise SCIF device using DT
  ARM: shmobile: r8a7740: Add SCIF nodes
  ARM: shmobile: ape6evm-reference: Initialise SCIF device using DT
  ARM: shmobile: r8a73a4: Add SCIF nodes
  ARM: shmobile: bockw-reference: Initialise SCIF device using DT
  ARM: shmobile: r8a7778: Add SCIF nodes
  ARM: shmobile: sh73a0: add SCI clock support for DT
  ARM: shmobile: r8a7740: correct SCI clock support for DT
  ARM: shmobile: r8a73a4: add SCI clock support for DT
  ARM: shmobile: r8a7778: add SCI clock support for DT
  ARM: shmobile: r8a7790: lager: use iic cores instead of i2c
  ARM: shmobile: Lager: Correct I2C bus for VDD MPU regulator
  ARM: shmobile: kzm9g-reference: Remove early_printk from command line
  ARM: shmobile: armadillo800eva-reference: Remove early_printk from command line
  ARM: shmobile: r8a7779: Consistently use tabs for indentation
  ARM: shmobile: henninger: Consistently use tabs for indentation
  ARM: shmobile: henninger: enable internal PCI
  ARM: shmobile: koelsch: enable internal PCI
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dc8fbed5 700ce7c2

arch/arm/boot/dts/r7s72100-genmai.dts

+10 −0
Original line number Diff line number Diff line
@@ -57,3 +57,13 @@ 
&scif2 {

	status = "okay";

};



&spi4 {

	status = "okay";



	codec: codec@0 {

		compatible = "wlf,wm8978";

		reg = <0>;

		spi-max-frequency = <5000000>;

	};

};

arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts

+11 −3
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
	model = "APE6EVM";

	compatible = "renesas,ape6evm-reference", "renesas,r8a73a4";



	aliases {

		serial0 = &scifa0;

	};



	chosen {

		bootargs = "console=ttySC0,115200 ignore_loglevel rw";

	};
@@ -90,9 +94,6 @@ 
};



&pfc {

	pinctrl-0 = <&scifa0_pins>;

	pinctrl-names = "default";



	scifa0_pins: serial0 {

		renesas,groups = "scifa0_data";

		renesas,function = "scifa0";
@@ -123,6 +124,13 @@ 
	status = "okay";

};



&scifa0 {

	pinctrl-0 = <&scifa0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&sdhi0 {

	vmmc-supply = <&vcc_sdhi0>;

	bus-width = <4>;

arch/arm/boot/dts/r8a73a4.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -252,6 +252,48 @@ 
		status = "disabled";

	};



	scifa0: serial@e6c40000 {

		compatible = "renesas,scifa-r8a73a4", "renesas,scifa";

		reg = <0 0xe6c40000 0 0x100>;

		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa1: serial@e6c50000 {

		compatible = "renesas,scifa-r8a73a4", "renesas,scifa";

		reg = <0 0xe6c50000 0 0x100>;

		interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifb2: serial@e6c20000 {

		compatible = "renesas,scifb-r8a73a4", "renesas,scifb";

		reg = <0 0xe6c20000 0 0x100>;

		interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifb3: serial@e6c30000 {

		compatible = "renesas,scifb-r8a73a4", "renesas,scifb";

		reg = <0 0xe6c30000 0 0x100>;

		interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifb4: serial@e6ce0000 {

		compatible = "renesas,scifb-r8a73a4", "renesas,scifb";

		reg = <0 0xe6ce0000 0 0x100>;

		interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifb5: serial@e6cf0000 {

		compatible = "renesas,scifb-r8a73a4", "renesas,scifb";

		reg = <0 0xe6cf0000 0 0x100>;

		interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	mmcif0: mmc@ee200000 {

		compatible = "renesas,sh-mmcif";

		reg = <0 0xee200000 0 0x80>;

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

+12 −4
Original line number Diff line number Diff line
@@ -19,8 +19,12 @@ 
	model = "armadillo 800 eva reference";

	compatible = "renesas,armadillo800eva-reference", "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";

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

	};



	memory {
@@ -202,9 +206,6 @@ 
};



&pfc {

	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";



	ether_pins: ether {

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

		renesas,function = "gether";
@@ -256,6 +257,13 @@ 
	status = "okay";

};



&scifa1 {

	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-names = "default";

arch/arm/boot/dts/r8a7740.dtsi

+63 −0
Original line number Diff line number Diff line
@@ -156,6 +156,69 @@ 
		status = "disabled";

	};



	scifa0: serial@e6c40000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6c40000 0x100>;

		interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa1: serial@e6c50000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6c50000 0x100>;

		interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa2: serial@e6c60000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6c60000 0x100>;

		interrupts = <0 102 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa3: serial@e6c70000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6c70000 0x100>;

		interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa4: serial@e6c80000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6c80000 0x100>;

		interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa5: serial@e6cb0000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6cb0000 0x100>;

		interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa6: serial@e6cc0000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6cc0000 0x100>;

		interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifa7: serial@e6cd0000 {

		compatible = "renesas,scifa-r8a7740", "renesas,scifa";

		reg = <0xe6cd0000 0x100>;

		interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	scifb8: serial@e6c30000 {

		compatible = "renesas,scifb-r8a7740", "renesas,scifb";

		reg = <0xe6c30000 0x100>;

		interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	pfc: pfc@e6050000 {

		compatible = "renesas,pfc-r8a7740";

		reg = <0xe6050000 0x8000>,