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

Commit 5fd70b1b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt2-for-v4.8' of... 

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

Second Round of Renesas ARM Based SoC DT Updates for v4.8

* Use APMU on R-Car Gen2 and provide SMP for r8a7793 SoC
* Update console parameters to uniformly use chosen/stdout-path,
  serial0, not provide kernel unnecessary command line parameters
* Add DU pins to silk board
* Add support for blanche/r8a7792
* Name pfc subnodes after device name

* tag 'renesas-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (41 commits)
  ARM: dts: r8a7792: add SMP support
  ARM: dts: r8a7793: Add APMU node and second CPU core
  ARM: dts: r8a7791: Add APMU node
  ARM: dts: r8a7790: Add APMU nodes
  devicetree: bindings: Renesas APMU and SMP Enable method
  ARM: dts: kzm9g: Update console parameters
  ARM: dts: kzm9d: Update console parameters
  ARM: dts: marzen: Add serial port config to chosen/stdout-path
  ARM: dts: genmai: Update console parameters
  ARM: dts: armadillo800eva: Update console parameters
  ARM: dts: r8a7792: add JPU support
  ARM: dts: r8a7792: add JPU clocks
  ARM: dts: silk: add DU pins
  ARM: dts: blanche: add Ethernet support
  ARM: dts: blanche: initial device tree
  ARM: dts: blanche: document Blanche board
  ARM: dts: r8a7792: add IRQC support
  ARM: dts: r8a7792: add [H]SCIF support
  ARM: dts: r8a7792: add SYS-DMAC support
  ARM: dts: r8a7792: initial SoC device tree
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 46e6b3aa 8fd763c7

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,gcc-msm8660"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "renesas,apmu"

			    "rockchip,rk3036-smp"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"

Documentation/devicetree/bindings/arm/shmobile.txt

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ Boards: 
    compatible = "renesas,ape6evm", "renesas,r8a73a4"

  - Atmark Techno Armadillo-800 EVA

    compatible = "renesas,armadillo800eva"

  - Blanche (RTP0RC7792SEB00010S)

    compatible = "renesas,blanche", "renesas,r8a7792"

  - BOCK-W

    compatible = "renesas,bockw", "renesas,r8a7778"

  - Genmai (RTK772100BC00000BR)

Documentation/devicetree/bindings/power/renesas,apmu.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
DT bindings for the Renesas Advanced Power Management Unit



Renesas R-Car line of SoCs utilize one or more APMU hardware units

for CPU core power domain control including SMP boot and CPU Hotplug.



Required properties:



- compatible: Should be "renesas,<soctype>-apmu", "renesas,apmu" as fallback.

	      Examples with soctypes are:

		- "renesas,r8a7790-apmu" (R-Car H2)

		- "renesas,r8a7791-apmu" (R-Car M2-W)

		- "renesas,r8a7792-apmu" (R-Car V2H)

		- "renesas,r8a7793-apmu" (R-Car M2-N)

		- "renesas,r8a7794-apmu" (R-Car E2)



- reg: Base address and length of the I/O registers used by the APMU.



- cpus: This node contains a list of CPU cores, which should match the order

  of CPU cores used by the WUPCR and PSTR registers in the Advanced Power

  Management Unit section of the device's datasheet.





Example:



This shows the r8a7791 APMU that can control CPU0 and CPU1.



	apmu@e6152000 {

		compatible = "renesas,r8a7791-apmu", "renesas,apmu";

		reg = <0 0xe6152000 0 0x188>;

		cpus = <&cpu0 &cpu1>;

	};

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ 
	r8a7790-lager.dtb \

	r8a7791-koelsch.dtb \

	r8a7791-porter.dtb \

	r8a7792-blanche.dtb \

	r8a7793-gose.dtb \

	r8a7794-alt.dtb \

	r8a7794-silk.dtb \

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

+6 −2
Original line number Diff line number Diff line
@@ -23,9 +23,13 @@ 
		reg = <0x40000000 0x8000000>;

	};



	aliases {

		serial1 = &uart1;

	};



	chosen {

		bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";

		stdout-path = &uart1;

		bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp";

		stdout-path = "serial1:115200n8";

	};



	gpio_keys {