Unverified Commit 2ef306e1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-5.19-2' of... 

Merge tag 'at91-dt-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/late

AT91 DT #2 for 5.19:

- at91: more DT compliance updates for RTC and RTT nodes
- at91: sama7g5: add microphone support

* tag 'at91-dt-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama7g5ek: add node for PDMC0
  ARM: dts: at91: sama7g5: add nodes for PDMC
  ARM: dts: at91: Use the generic "rtc" node name for the rtt IPs
  ARM: dts: at91: Add the required 'atmel, rtt-rtc-time-reg' property

Link: https://lore.kernel.org/r/20220517153252.92393-1-nicolas.ferre@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fd82d925 821cb05f

arch/arm/boot/dts/at91-sama7g5ek.dts

+20 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <dt-bindings/mfd/atmel-flexcom.h>

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

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

#include <dt-bindings/sound/microchip,pdmc.h>



/ {

	model = "Microchip SAMA7G5-EK";
@@ -456,7 +457,7 @@ 
		     &pinctrl_gmac1_mdio_default

		     &pinctrl_gmac1_phy_irq>;

	phy-mode = "rmii";

	status = "okay";

	status = "okay"; /* Conflict with pdmc0. */



	ethernet-phy@0 {

		reg = <0x0>;
@@ -470,6 +471,17 @@ 
	pinctrl-0 = <&pinctrl_i2s0_default>;

};



&pdmc0 {

	#sound-dai-cells = <0>;

	microchip,mic-pos = <MCHP_PDMC_DS0 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 1 */

			    <MCHP_PDMC_DS1 MCHP_PDMC_CLK_NEGATIVE>, /* MIC 2 */

			    <MCHP_PDMC_DS0 MCHP_PDMC_CLK_POSITIVE>, /* MIC 3 */

			    <MCHP_PDMC_DS1 MCHP_PDMC_CLK_POSITIVE>; /* MIC 4 */

	status = "disabled"; /* Conflict with gmac1. */

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pdmc0_default>;

};



&pioA {



	pinctrl_can0_default: can0_default {
@@ -639,6 +651,13 @@ 
		bias-disable;

	};



	pinctrl_pdmc0_default: pdmc0_default {

		pinmux = <PIN_PD23__PDMC0_DS0>,

			 <PIN_PD24__PDMC0_DS1>,

			 <PIN_PD22__PDMC0_CLK>;

		bias_disable;

	};



	pinctrl_qspi: qspi {

		pinmux = <PIN_PB12__QSPI0_IO0>,

			 <PIN_PB11__QSPI0_IO1>,

arch/arm/boot/dts/at91sam9261ek.dts

+4 −0
Original line number Diff line number Diff line
@@ -178,6 +178,10 @@ 
				status = "okay";

			};



			rtc@fffffd20 {

				atmel,rtt-rtc-time-reg = <&gpbr 0x0>;

			};



			watchdog@fffffd40 {

				status = "okay";

			};

arch/arm/boot/dts/at91sam9263ek.dts

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ 
				};

			};



			rtc@fffffd20 {

				atmel,rtt-rtc-time-reg = <&gpbr 0x0>;

			};



			watchdog@fffffd40 {

				status = "okay";

			};

arch/arm/boot/dts/at91sam9rlek.dts

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,10 @@ 
				status = "okay";

			};



			rtc@fffffd20 {

				atmel,rtt-rtc-time-reg = <&gpbr 0x0>;

			};



			rtc@fffffe00 {

				status = "okay";

			};

arch/arm/boot/dts/sam9x60.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ 
				status = "disabled";

			};



			rtt: rtt@fffffe20 {

			rtt: rtc@fffffe20 {

				compatible = "microchip,sam9x60-rtt", "atmel,at91sam9260-rtt";

				reg = <0xfffffe20 0x20>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;