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

Commit 295d44ae authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-arm-dt-for-v4.19' of... 

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

Renesas ARM Based SoC DT Updates for v4.19

* RZ/G1C (r8a77470) SoC: Use r8a77470-cpg-mssr binding definitions
* Add GR-Peach audio camera shield support with MT9V111 image sensor
* Add initial support for RZ/N1D (r9a06g032) SoC and its RZN1D-DB board
* Use SPDX identifiers in DT for all SoCs and boards
* Add missing OPP properties for all CPUs on various SoCs
* Add missing PMIC nodes to R-Car Gen2 M2-W (r8a7791) based porter board

* tag 'renesas-arm-dt-for-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: dts: r8a77470: Use r8a77470-cpg-mssr binding definitions
  ARM: dts: gr-peach: Add GR-Peach audiocamerashield support
  ARM: dts: Renesas R9A06G032 SMP enable method
  ARM: dts: Renesas RZN1D-DB Board base file
  ARM: dts: Renesas R9A06G032 base device tree file
  ARM: dts: convert to SPDX identifier for Renesas boards
  ARM: dts: r8a77(43|9[013]): Add missing OPP properties for CPUs
  ARM: dts: porter: Add missing PMIC nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bcdd2208 c03e2f12

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1969,6 +1969,7 @@ S: Supported 
F:	arch/arm/boot/dts/emev2*

F:	arch/arm/boot/dts/r7s*

F:	arch/arm/boot/dts/r8a*

F:	arch/arm/boot/dts/r9a*

F:	arch/arm/boot/dts/sh*

F:	arch/arm/configs/shmobile_defconfig

F:	arch/arm/include/debug/renesas-scif.S

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -838,6 +838,7 @@ dtb-$(CONFIG_ARCH_RENESAS) += \ 
	r8a7793-gose.dtb \

	r8a7794-alt.dtb \

	r8a7794-silk.dtb \

	r9a06g032-rzn1d400-db.dtb \

	sh73a0-kzm9g.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += \

	rv1108-evb.dtb \

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

+1 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the KZM9D board

 *

 * Copyright (C) 2013 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/;

arch/arm/boot/dts/emev2.dtsi

+1 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the EMEV2 SoC

 *

 * 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.

 */



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

arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi

0 → 100644
+79 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device Tree Source for the GR-Peach audiocamera shield expansion board

 *

 * Copyright (C) 2017 Jacopo Mondi <jacopo+renesas@jmondi.org>

 */



#include "r7s72100.dtsi"

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

#include <dt-bindings/pinctrl/r7s72100-pinctrl.h>



/ {

	/* On-board camera clock. */

	camera_clk: camera_clk {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <27000000>;

	};

};



&pinctrl {

	i2c1_pins: i2c1 {

		/* P1_2 as SCL; P1_3 as SDA */

		pinmux = <RZA1_PINMUX(1, 2, 1)>, <RZA1_PINMUX(1, 3, 1)>;

	};



	vio_pins: vio {

		/* CEU pins: VIO_D[0-10], VIO_VD, VIO_HD, VIO_CLK */

		pinmux = <RZA1_PINMUX(1, 0, 5)>, /* VIO_VD */

			 <RZA1_PINMUX(1, 1, 5)>, /* VIO_HD */

			 <RZA1_PINMUX(2, 0, 7)>, /* VIO_D0 */

			 <RZA1_PINMUX(2, 1, 7)>, /* VIO_D1 */

			 <RZA1_PINMUX(2, 2, 7)>, /* VIO_D2 */

			 <RZA1_PINMUX(2, 3, 7)>, /* VIO_D3 */

			 <RZA1_PINMUX(2, 4, 7)>, /* VIO_D4 */

			 <RZA1_PINMUX(2, 5, 7)>, /* VIO_D5 */

			 <RZA1_PINMUX(2, 6, 7)>, /* VIO_D6 */

			 <RZA1_PINMUX(2, 7, 7)>, /* VIO_D7 */

			 <RZA1_PINMUX(10, 0, 6)>; /* VIO_CLK */

	};

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;



	status = "okay";

	clock-frequency = <100000>;



	camera@48 {

		compatible = "aptina,mt9v111";

		reg = <0x48>;



		clocks = <&camera_clk>;



		port {

			mt9v111_out: endpoint {

				remote-endpoint = <&ceu_in>;

			};

		};

	};

};



&ceu {

	pinctrl-names = "default";

	pinctrl-0 = <&vio_pins>;



	status = "okay";



	port {

		ceu_in: endpoint {

			hsync-active = <1>;

			vsync-active = <1>;

			bus-width = <8>;

			pclk-sample = <1>;

			remote-endpoint = <&mt9v111_out>;

		};

	};

};