Unverified Commit d5aa0245 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-dt-for-v5.15-tag2' of... 

Merge tag 'renesas-arm-dt-for-v5.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/dt

Renesas ARM DT updates for v5.15 (take two)

  - Pin control, ADC, and CANFD support for the RZ/G2L SoC,
  - Add interrupt-names properties to the Renesas RZ/A and RZ/G2L I2C
    Bus Interface.

* tag 'renesas-arm-dt-for-v5.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  dt-bindings: i2c: renesas,riic: Make interrupt-names required
  arm64: dts: renesas: r9a07g044: Add I2C interrupt-names
  ARM: dts: rza: Add I2C interrupt-names
  dt-bindings: i2c: renesas,riic: Add interrupt-names
  arm64: dts: renesas: r9a07g044: Add CANFD node
  arm64: dts: renesas: r9a07g044: Add ADC node
  arm64: dts: renesas: r9a07g044: Add pinctrl node
  dt-bindings: clock: r9a07g044-cpg: Add entry for P0_DIV2 core clock

Link: https://lore.kernel.org/r/cover.1628849623.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 81b6a285 13bf92e6

Documentation/devicetree/bindings/i2c/renesas,riic.yaml

+22 −8
Original line number Diff line number Diff line
@@ -27,14 +27,25 @@ properties: 


  interrupts:

    items:

      - description: Transmit End Interrupt (TEI)

      - description: Receive Data Full Interrupt (RI)

      - description: Transmit Data Empty Interrupt (TI)

      - description: Stop Condition Detection Interrupt (SPI)

      - description: Start Condition Detection Interrupt (STI)

      - description: NACK Reception Interrupt (NAKI)

      - description: Arbitration-Lost Interrupt (ALI)

      - description: Timeout Interrupt (TMOI)

      - description: Transmit End Interrupt

      - description: Receive Data Full Interrupt

      - description: Transmit Data Empty Interrupt

      - description: Stop Condition Detection Interrupt

      - description: Start Condition Detection Interrupt

      - description: NACK Reception Interrupt

      - description: Arbitration-Lost Interrupt

      - description: Timeout Interrupt



  interrupt-names:

    items:

      - const: tei

      - const: ri

      - const: ti

      - const: spi

      - const: sti

      - const: naki

      - const: ali

      - const: tmoi



  clock-frequency:

    description:
@@ -51,6 +62,7 @@ required: 
  - compatible

  - reg

  - interrupts

  - interrupt-names

  - clocks

  - clock-frequency

  - power-domains
@@ -85,6 +97,8 @@ examples: 
                         <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;

            interrupt-names = "tei", "ri", "ti", "spi", "sti", "naki", "ali",

                              "tmoi";

            clocks = <&mstp9_clks R7S72100_CLK_I2C0>;

            clock-frequency = <100000>;

            power-domains = <&cpg_clocks>;

arch/arm/boot/dts/r7s72100.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -608,6 +608,8 @@ 
				     <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&mstp9_clks R7S72100_CLK_I2C0>;

			clock-frequency = <100000>;

			power-domains = <&cpg_clocks>;
@@ -627,6 +629,8 @@ 
				     <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&mstp9_clks R7S72100_CLK_I2C1>;

			clock-frequency = <100000>;

			power-domains = <&cpg_clocks>;
@@ -646,6 +650,8 @@ 
				     <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&mstp9_clks R7S72100_CLK_I2C2>;

			clock-frequency = <100000>;

			power-domains = <&cpg_clocks>;
@@ -665,6 +671,8 @@ 
				     <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&mstp9_clks R7S72100_CLK_I2C3>;

			clock-frequency = <100000>;

			power-domains = <&cpg_clocks>;

arch/arm/boot/dts/r7s9210.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ 
				     <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD 87>;

			power-domains = <&cpg>;

			clock-frequency = <100000>;
@@ -255,6 +257,8 @@ 
				     <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD 86>;

			power-domains = <&cpg>;

			clock-frequency = <100000>;
@@ -274,6 +278,8 @@ 
				     <GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD 85>;

			power-domains = <&cpg>;

			clock-frequency = <100000>;
@@ -293,6 +299,8 @@ 
				     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD 84>;

			power-domains = <&cpg>;

			clock-frequency = <100000>;

arch/arm64/boot/dts/renesas/r9a07g044.dtsi

+104 −0
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	/* External CAN clock - to be overridden by boards that provide it */

	can_clk: can {

		compatible = "fixed-clock";

		#clock-cells = <0>;

		clock-frequency = <0>;

	};



	/* clock can be either from exclk or crystal oscillator (XIN/XOUT) */

	extal_clk: extal {

		compatible = "fixed-clock";
@@ -89,6 +96,40 @@ 
			status = "disabled";

		};



		canfd: can@10050000 {

			compatible = "renesas,r9a07g044-canfd", "renesas,rzg2l-canfd";

			reg = <0 0x10050000 0 0x8000>;

			interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "g_err", "g_recc",

					  "ch0_err", "ch0_rec", "ch0_trx",

					  "ch1_err", "ch1_rec", "ch1_trx";

			clocks = <&cpg CPG_MOD R9A07G044_CANFD_PCLK>,

				 <&cpg CPG_CORE R9A07G044_CLK_P0_DIV2>,

				 <&can_clk>;

			clock-names = "fck", "canfd", "can_clk";

			assigned-clocks = <&cpg CPG_CORE R9A07G044_CLK_P0_DIV2>;

			assigned-clock-rates = <50000000>;

			resets = <&cpg R9A07G044_CANFD_RSTP_N>,

				 <&cpg R9A07G044_CANFD_RSTC_N>;

			reset-names = "rstp_n", "rstc_n";

			power-domains = <&cpg>;

			status = "disabled";



			channel0 {

				status = "disabled";

			};

			channel1 {

				status = "disabled";

			};

		};



		i2c0: i2c@10058000 {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -102,6 +143,8 @@ 
				     <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD R9A07G044_I2C0_PCLK>;

			clock-frequency = <100000>;

			resets = <&cpg R9A07G044_I2C0_MRST>;
@@ -122,6 +165,8 @@ 
				     <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD R9A07G044_I2C1_PCLK>;

			clock-frequency = <100000>;

			resets = <&cpg R9A07G044_I2C1_MRST>;
@@ -142,6 +187,8 @@ 
				     <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD R9A07G044_I2C2_PCLK>;

			clock-frequency = <100000>;

			resets = <&cpg R9A07G044_I2C2_MRST>;
@@ -162,6 +209,8 @@ 
				     <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "tei", "ri", "ti", "spi", "sti",

					  "naki", "ali", "tmoi";

			clocks = <&cpg CPG_MOD R9A07G044_I2C3_PCLK>;

			clock-frequency = <100000>;

			resets = <&cpg R9A07G044_I2C3_MRST>;
@@ -169,6 +218,48 @@ 
			status = "disabled";

		};



		adc: adc@10059000 {

			compatible = "renesas,r9a07g044-adc", "renesas,rzg2l-adc";

			reg = <0 0x10059000 0 0x400>;

			interrupts = <GIC_SPI 347 IRQ_TYPE_EDGE_RISING>;

			clocks = <&cpg CPG_MOD R9A07G044_ADC_ADCLK>,

				 <&cpg CPG_MOD R9A07G044_ADC_PCLK>;

			clock-names = "adclk", "pclk";

			resets = <&cpg R9A07G044_ADC_PRESETN>,

				 <&cpg R9A07G044_ADC_ADRST_N>;

			reset-names = "presetn", "adrst-n";

			power-domains = <&cpg>;

			status = "disabled";



			#address-cells = <1>;

			#size-cells = <0>;



			channel@0 {

				reg = <0>;

			};

			channel@1 {

				reg = <1>;

			};

			channel@2 {

				reg = <2>;

			};

			channel@3 {

				reg = <3>;

			};

			channel@4 {

				reg = <4>;

			};

			channel@5 {

				reg = <5>;

			};

			channel@6 {

				reg = <6>;

			};

			channel@7 {

				reg = <7>;

			};

		};



		cpg: clock-controller@11010000 {

			compatible = "renesas,r9a07g044-cpg";

			reg = <0 0x11010000 0 0x10000>;
@@ -191,6 +282,19 @@ 
			status = "disabled";

		};



		pinctrl: pin-controller@11030000 {

			compatible = "renesas,r9a07g044-pinctrl";

			reg = <0 0x11030000 0 0x10000>;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&pinctrl 0 0 392>;

			clocks = <&cpg CPG_MOD R9A07G044_GPIO_HCLK>;

			power-domains = <&cpg>;

			resets = <&cpg R9A07G044_GPIO_RSTN>,

				 <&cpg R9A07G044_GPIO_PORT_RESETN>,

				 <&cpg R9A07G044_GPIO_SPARE_RESETN>;

		};



		gic: interrupt-controller@11900000 {

			compatible = "arm,gic-v3";

			#interrupt-cells = <3>;

include/dt-bindings/clock/r9a07g044-cpg.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define R9A07G044_CLK_P2		19

#define R9A07G044_CLK_AT		20

#define R9A07G044_OSCCLK		21

#define R9A07G044_CLK_P0_DIV2		22



/* R9A07G044 Module Clocks */

#define R9A07G044_CA55_SCLK		0