Unverified Commit 10c4c527 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-5.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt 

AT91 DT for v5.20 #3

It contains updates for LAN966X devices as follows:
- clock gating support
- gpio restart and network switch for lan966x-pcb8291 board

* tag 'at91-dt-5.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: lan966x: Enable network driver on pcb8291
  ARM: dts: lan966x: Disable can0 on pcb8291
  ARM: dts: lan966x: Add gpio-restart
  ARM: dts: lan966x: add clock gating register

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2c947cd6 d3e71a2e

arch/arm/boot/dts/lan966x-pcb8291.dts

+42 −1
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */

 */

/dts-v1/;

/dts-v1/;

#include "lan966x.dtsi"

#include "lan966x.dtsi"

#include "dt-bindings/phy/phy-lan966x-serdes.h"





/ {

/ {

	model = "Microchip EVB - LAN9662";

	model = "Microchip EVB - LAN9662";
@@ -16,6 +17,12 @@ chosen { 
	aliases {

	aliases {

		serial0 = &usart3;

		serial0 = &usart3;

	};

	};



	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpio 56 GPIO_ACTIVE_LOW>;

		priority = <200>;

	};

};

};





&gpio {

&gpio {
@@ -35,7 +42,7 @@ can0_b_pins: can0-b-pins { 
&can0 {

&can0 {

	pinctrl-0 = <&can0_b_pins>;

	pinctrl-0 = <&can0_b_pins>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	status = "okay";

	status = "disabled"; /* Conflict with switch */

};

};





&flx3 {

&flx3 {
@@ -49,6 +56,40 @@ usart3: serial@200 { 
	};

	};

};

};





&mdio1 {

	status = "okay";

};



&phy0 {

	status = "okay";

};



&phy1 {

	status = "okay";

};



&port0 {

	phy-handle = <&phy0>;

	phy-mode = "gmii";

	phys = <&serdes 0 CU(0)>;

	status = "okay";

};



&port1 {

	phy-handle = <&phy1>;

	phy-mode = "gmii";

	phys = <&serdes 1 CU(1)>;

	status = "okay";

};



&serdes {

	status = "okay";

};



&switch {

	status = "okay";

};



&watchdog {

&watchdog {

	status = "okay";

	status = "okay";

};
 
};

arch/arm/boot/dts/lan966x.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ clks: clock-controller@e00c00a8 { 
		#clock-cells = <1>;

		#clock-cells = <1>;

		clocks = <&cpu_clk>, <&ddr_clk>, <&sys_clk>;

		clocks = <&cpu_clk>, <&ddr_clk>, <&sys_clk>;

		clock-names = "cpu", "ddr", "sys";

		clock-names = "cpu", "ddr", "sys";

		reg = <0xe00c00a8 0x38>;

		reg = <0xe00c00a8 0x38>, <0xe00c02cc 0x4>;

	};

	};





	timer {

	timer {