Unverified Commit 4d1010ff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt 

AT91 DT for 6.5

It contains:
- gpio-line-names addition for at91-tse850-3 board
- support for SMA connectors on lan966x-pcb8309 board
- use drive-open-drain as boolean property as this is how code handles
  it
- generic names for clock controller devices
- use of the new clock controller bindings for at91sam9n12 slow clock
  controller
- one blank line removal on sama5d2.dtsi

* tag 'at91-dt-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2: remove extra line
  ARM: dts: at91: Return to boolean properties
  ARM: dts: lan966x: Add support for SMA connectors
  ARM: dts: at91: use clock-controller name for sckc nodes
  ARM: dts: at91: at91sam9n12: witch sckc to new clock bindings
  ARM: dts: at91: use clock-controller name for PMC nodes
  ARM: dts: at91: tse850: add properties for gpio-line-names

Link: https://lore.kernel.org/r/20230530105945.11638-1-claudiu.beznea@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 35ee6a4d 4ceb0c70

arch/arm/boot/dts/at91-kizbox3-hs.dts

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ pinctrl_pio_zbe_rst: gpio_zbe_rst { 
		pinctrl_pio_io_reset: gpio_io_reset {

			pinmux = <PIN_PB30__GPIO>;

			bias-disable;

			drive-open-drain = <1>;

			drive-open-drain;

			output-low;

		};

		pinctrl_pio_input: gpio_input {

arch/arm/boot/dts/at91-kizbox3_common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ pinctrl_flx4_default: flx4_i2c6_default { 
		pinmux = <PIN_PD12__FLEXCOM4_IO0>, //DATA

		<PIN_PD13__FLEXCOM4_IO1>; //CLK

		bias-disable;

		drive-open-drain = <1>;

		drive-open-drain;

	};



	pinctrl_pwm0 {

arch/arm/boot/dts/at91-tse850-3.dts

+60 −0
Original line number Diff line number Diff line
@@ -300,3 +300,63 @@ &dbgu { 


	dmas = <0>, <0>;	/*  Do not use DMA for dbgu */

};



&pioA {

	gpio-line-names =

	/*  0 */	"SUP-A", "SUP-B", "SUP-C", "SIG<LEV",

	/*  4 */	"", "/RFRST", "", "",

	/*  8 */	"/ADD", "", "/LOOP1", "/LOOP2",

	/* 12 */	"", "", "", "",

	/* 16 */	"LED1GREEN", "LED1RED", "LED2GREEN", "LED2RED",

	/* 20 */	"LED3GREEN", "LED3RED", "LED4GREEN", "LED4RED",

	/* 24 */	"", "", "", "",

	/* 28 */	"", "", "SDA", "SCL";

};



&pioB {

	gpio-line-names =

	/*  0 */	"", "", "", "",

	/*  4 */	"", "", "", "",

	/*  8 */	"", "", "", "",

	/* 12 */	"", "", "", "",

	/* 16 */	"", "", "", "",

	/* 20 */	"", "", "", "",

	/* 24 */	"", "", "SIG<LIN", "SIG>LIN",

	/* 28 */	"RXD", "TXD", "BRX", "BTX";

};



&pioC {

	gpio-line-names =

	/*  0 */	"ETX0", "ETX1", "ERX0", "ERX1",

	/*  4 */	"ETXEN", "ECRSDV", "ERXER", "EREFCK",

	/*  8 */	"EMDC", "EMDIO", "", "",

	/* 12 */	"", "", "", "/ILIM",

	/* 16 */	"BCK", "LRCK", "DIN", "",

	/* 20 */	"", "", "", "",

	/* 24 */	"", "", "", "",

	/* 28 */	"", "", "", "VBUS";

};



&pioD {

	gpio-line-names =

	/*  0 */	"I1", "I2", "O1", "EXTVEN",

	/*  4 */	"", "456KHZ", "VCTRL", "SYNCSEL",

	/*  8 */	"STEREO", "", "", "",

	/* 12 */	"", "", "", "",

	/* 16 */	"", ">LIN", "LIN>", "",

	/* 20 */	"VREFEN", "", "", "",

	/* 24 */	"", "", "VINOK", "",

	/* 28 */	"POEOK", "USBON", "POELOAD", "";

};



&pioE {

	gpio-line-names =

	/*  0 */	"", "", "", "",

	/*  4 */	"", "", "", "",

	/*  8 */	"", "", "", "",

	/* 12 */	"", "", "", "",

	/* 16 */	"", "", "", "",

	/* 20 */	"", "ALE", "CLE", "",

	/* 24 */	"", "", "", "",

	/* 28 */	"", "", "", "/ETHINT";

};

arch/arm/boot/dts/at91rm9200.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ ramc0: ramc@ffffff00 { 
				reg = <0xffffff00 0x100>;

			};



			pmc: pmc@fffffc00 {

			pmc: clock-controller@fffffc00 {

				compatible = "atmel,at91rm9200-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

arch/arm/boot/dts/at91sam9260.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ matrix: matrix@ffffee00 { 
				reg = <0xffffee00 0x200>;

			};



			pmc: pmc@fffffc00 {

			pmc: clock-controller@fffffc00 {

				compatible = "atmel,at91sam9260-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;