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

Merge tag 'renesas-arm-dt-for-v5.3' of... 

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

Renesas ARM Based SoC DT Updates for v5.3

* Renesas SoC based boards
  - Use ip=on for bootargs

* Renesas R-Car Gen 2 SOC based boards
  - Configure PMIC IRQ pinmux

* R-Car V2H (r8a7792) SoC
  - Describe CMT devices in DT

* RZ/G1C (r8a77470) based iWave SBC (iwg23s-sbc) and
  RZ/G1N (r8a7744) based boards:
  - Correct SDHI2 VccQ regulator to fix SDR50 mode

* RZ/A2M (r7s9210) based rza2mevb EVB
  RZ/A1H (r7s72100) based rskrza1 board
  - Describe input switch in DT

* RZ/A2M (r7s9210) based rza2mevb EVB
  - Sort nodes to ease future maintenance
  - Add USB host, Ethernet and SDHI support

* RZ/A2M (r7s9210) and RZ/A1H (r7s72100) SoCs
  - Describe IRQC device in DT

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

: (22 commits)
  ARM: dts: r8a7792: Add CMT0 and CMT1 to r8a7792
  ARM: dts: iwg23s-sbc: Fix SDHI2 VccQ regulator
  ARM: dts: iwg20d-q7-common: Fix SDHI1 VccQ regularor
  ARM: dts: rza2mevb: Add input switch
  ARM: dts: r7s9210: Add IRQC device node
  ARM: dts: rza2mevb: sort nodes of rza2mevb board
  ARM: dts: renesas: Use ip=on for bootargs
  ARM: dts: rza2mevb: Add USB Host support
  ARM: dts: r7s9210: Add USB Device support
  ARM: dts: r7s9210: Add USB Host support
  ARM: dts: rskrza1: Add input switches
  ARM: dts: r7s72100: Add IRQC device node
  ARM: dts: r8a779x: Configure PMIC IRQ pinmux
  ARM: dts: rza2mevb: Add 48MHz USB clock
  ARM: dts: r7s9210: Add USB clock
  ARM: dts: rza2mevb: add ethernet aliases
  ARM: dts: rza2mevb: Add SDHI support
  ARM: dts: rza2mevb: Add Ethernet support
  ARM: dts: r7s9210: Add SDHI support
  ARM: dts: r7s9210: Add RIIC support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents af647fc7 9dd6f7c4

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
	};



	chosen {

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

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";

		stdout-path = "serial1:115200n8";

	};

arch/arm/boot/dts/iwg20d-q7-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;



		gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;

		gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;

		gpios-states = <1>;

		states = <3300000 1

			  1800000 0>;

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
	};



	chosen {

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

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";

		stdout-path = "serial0:115200n8";

	};

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

+38 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
/dts-v1/;

#include "r7s72100.dtsi"

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

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

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



/ {
@@ -28,6 +29,37 @@ 
		reg = <0x08000000 0x02000000>;

	};



	keyboard {

		compatible = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&keyboard_pins>;



		key-1 {

			interrupt-parent = <&irqc>;

			interrupts = <3 IRQ_TYPE_EDGE_BOTH>;

			linux,code = <KEY_1>;

			label = "SW1";

			wakeup-source;

		};



		key-2 {

			interrupt-parent = <&irqc>;

			interrupts = <2 IRQ_TYPE_EDGE_BOTH>;

			linux,code = <KEY_2>;

			label = "SW2";

			wakeup-source;

		};



		key-3 {

			interrupt-parent = <&irqc>;

			interrupts = <5 IRQ_TYPE_EDGE_BOTH>;

			linux,code = <KEY_3>;

			label = "SW3";

			wakeup-source;

		};

	};



	lbsc {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -101,6 +133,12 @@ 
			 <RZA1_PINMUX(1, 7, 1)>;	/* RIIC3SDA */

	};



	keyboard_pins: keyboard {

		pinmux = <RZA1_PINMUX(1, 9, 3)>,	/* IRQ3 */

			 <RZA1_PINMUX(1, 8, 3)>,	/* IRQ2 */

			 <RZA1_PINMUX(1, 11, 3)>;	/* IRQ5 */

	};



	/* Serial Console */

	scif2_pins: serial2 {

		pinmux = <RZA1_PINMUX(3, 0, 6)>,	/* TxD2 */

arch/arm/boot/dts/r7s72100.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -670,6 +670,25 @@ 
			status = "disabled";

		};



		irqc: interrupt-controller@fcfef800 {

			compatible = "renesas,r7s72100-irqc",

				     "renesas,rza1-irqc";

			#interrupt-cells = <2>;

			#address-cells = <0>;

			interrupt-controller;

			reg = <0xfcfef800 0x6>;

			interrupt-map =

				<0 0 &gic GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

				<1 0 &gic GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

				<2 0 &gic GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

				<3 0 &gic GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,

				<4 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,

				<5 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,

				<6 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,

				<7 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map-mask = <7 0>;

		};



		mtu2: timer@fcff0000 {

			compatible = "renesas,mtu2-r7s72100", "renesas,mtu2";

			reg = <0xfcff0000 0x400>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE