Unverified Commit 70fed748 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

AT91 DT for v6.1

It contains:
- one new LAN966X based board, namely lan966x-pcb8290
- gpio leds support for lan966x-pcb8291 and lan966x-pcb8309
- a cleanup for sam9x60ek to avoid DT compilation warning due to regulators

* tag 'at91-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: lan966x: add led configuration
  ARM: dts: at91: sam9x60ek: remove simple-bus for regulators
  ARM: dts: lan966x: add support for pcb8290

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1db56016 0b7baa1a

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ dtb-$(CONFIG_SOC_IMXRT) += \ 
dtb-$(CONFIG_SOC_LAN966) += \

	lan966x-kontron-kswitch-d10-mmt-6g-2gs.dtb \

	lan966x-kontron-kswitch-d10-mmt-8g.dtb \

	lan966x-pcb8290.dtb \

	lan966x-pcb8291.dtb \

	lan966x-pcb8309.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

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

+36 −42
Original line number Diff line number Diff line
@@ -34,48 +34,6 @@ main_xtal { 
		};

	};



	regulators: regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		vdd_1v8: fixed-regulator-vdd_1v8@0 {

			compatible = "regulator-fixed";

			regulator-name = "VDD_1V8";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-always-on;

			status = "okay";

		};



		vdd_1v15: fixed-regulator-vdd_1v15@1 {

			compatible = "regulator-fixed";

			regulator-name = "VDD_1V15";

			regulator-min-microvolt = <1150000>;

			regulator-max-microvolt = <1150000>;

			regulator-always-on;

			status = "okay";

		};



		vdd1_3v3: fixed-regulator-vdd1_3v3@2 {

			compatible = "regulator-fixed";

			regulator-name = "VDD1_3V3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

			status = "okay";

		};



		vdd2_3v3: regulator-fixed-vdd2_3v3@3 {

			compatible = "regulator-fixed";

			regulator-name = "VDD2_3V3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

			status = "okay";

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";
@@ -111,6 +69,42 @@ blue { 
			linux,default-trigger = "heartbeat";

		};

	};



	vdd_1v8: fixed-regulator-vdd_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "VDD_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		status = "okay";

	};



	vdd_1v15: fixed-regulator-vdd_1v15 {

		compatible = "regulator-fixed";

		regulator-name = "VDD_1V15";

		regulator-min-microvolt = <1150000>;

		regulator-max-microvolt = <1150000>;

		regulator-always-on;

		status = "okay";

	};



	vdd1_3v3: fixed-regulator-vdd1_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDD1_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		status = "okay";

	};



	vdd2_3v3: regulator-fixed-vdd2_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDD2_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		status = "okay";

	};

};



&adc {

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

0 → 100644
+175 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * lan966x-pcb8290.dts - Device Tree file for LAN966X-PCB8290 board

 *

 * Copyright (C) 2022 Microchip Technology Inc. and its subsidiaries

 *

 * Author: Horatiu Vultur <horatiu.vultur@microchip.com>

 */

/dts-v1/;

#include "lan966x.dtsi"

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



/ {

	model = "Microchip EVB LAN9668";

	compatible = "microchip,lan9668-pcb8290", "microchip,lan9668", "microchip,lan966";



	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpio 56 GPIO_ACTIVE_LOW>;

		priority = <200>;

	};

};



&gpio {

	miim_a_pins: mdio-pins {

		/* MDC, MDIO */

		pins =  "GPIO_28", "GPIO_29";

		function = "miim_a";

	};



	pps_out_pins: pps-out-pins {

		/* 1pps output */

		pins = "GPIO_38";

		function = "ptpsync_3";

	};



	ptp_ext_pins: ptp-ext-pins {

		/* 1pps input */

		pins = "GPIO_35";

		function = "ptpsync_0";

	};



	udc_pins: ucd-pins {

		/* VBUS_DET B */

		pins = "GPIO_8";

		function = "usb_slave_b";

	};

};



&mdio0 {

	pinctrl-0 = <&miim_a_pins>;

	pinctrl-names = "default";

	status = "okay";



	ext_phy0: ethernet-phy@7 {

		reg = <7>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};



	ext_phy1: ethernet-phy@8 {

		reg = <8>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};



	ext_phy2: ethernet-phy@9 {

		reg = <9>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};



	ext_phy3: ethernet-phy@10 {

		reg = <10>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};



	ext_phy4: ethernet-phy@15 {

		reg = <15>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};



	ext_phy5: ethernet-phy@16 {

		reg = <16>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};



	ext_phy6: ethernet-phy@17 {

		reg = <17>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};



	ext_phy7: ethernet-phy@18 {

		reg = <18>;

		coma-mode-gpios = <&gpio 60 GPIO_OPEN_DRAIN>;

	};

};



&port0 {

	reg = <2>;

	phy-handle = <&ext_phy2>;

	phy-mode = "qsgmii";

	phys = <&serdes 0 SERDES6G(1)>;

	status = "okay";

};



&port1 {

	reg = <3>;

	phy-handle = <&ext_phy3>;

	phy-mode = "qsgmii";

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

	status = "okay";

};



&port2 {

	reg = <0>;

	phy-handle = <&ext_phy0>;

	phy-mode = "qsgmii";

	phys = <&serdes 2 SERDES6G(1)>;

	status = "okay";

};



&port3 {

	reg = <1>;

	phy-handle = <&ext_phy1>;

	phy-mode = "qsgmii";

	phys = <&serdes 3 SERDES6G(1)>;

	status = "okay";

};



&port4 {

	reg = <6>;

	phy-handle = <&ext_phy6>;

	phy-mode = "qsgmii";

	phys = <&serdes 4 SERDES6G(2)>;

	status = "okay";

};



&port5 {

	reg = <7>;

	phy-handle = <&ext_phy7>;

	phy-mode = "qsgmii";

	phys = <&serdes 5 SERDES6G(2)>;

	status = "okay";

};



&port6 {

	reg = <4>;

	phy-handle = <&ext_phy4>;

	phy-mode = "qsgmii";

	phys = <&serdes 6 SERDES6G(2)>;

	status = "okay";

};



&port7 {

	reg = <5>;

	phy-handle = <&ext_phy5>;

	phy-mode = "qsgmii";

	phys = <&serdes 7 SERDES6G(2)>;

	status = "okay";

};



&serdes {

	status = "okay";

};



&switch {

	pinctrl-0 = <&pps_out_pins>, <&ptp_ext_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&udc {

	pinctrl-0 = <&udc_pins>;

	pinctrl-names = "default";

	atmel,vbus-gpio = <&gpio 8 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

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

+28 −0
Original line number Diff line number Diff line
@@ -23,6 +23,34 @@ gpio-restart { 
		gpios = <&gpio 56 GPIO_ACTIVE_LOW>;

		priority = <200>;

	};



	leds {

		compatible = "gpio-leds";



		led-s0-blue {

			label = "s0:blue";

			gpios = <&sgpio_out 2 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-s0-green {

			label = "s0:green";

			gpios = <&sgpio_out 2 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-s1-blue {

			label = "s1:blue";

			gpios = <&sgpio_out 3 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-s1-green {

			label = "s1:green";

			gpios = <&sgpio_out 3 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};

};



&gpio {

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

+28 −0
Original line number Diff line number Diff line
@@ -42,6 +42,34 @@ i2c103: i2c-sfp@2 { 
		};

	};



	leds {

		compatible = "gpio-leds";



		led-s0-green {

			label = "s0:green";

			gpios = <&sgpio_out 2 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-s0-red {

			label = "s0:red";

			gpios = <&sgpio_out 2 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-s1-green {

			label = "s1:green";

			gpios = <&sgpio_out 3 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-s1-red {

			label = "s1:red";

			gpios = <&sgpio_out 3 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};



	mux: mux-controller {

		compatible = "gpio-mux";

		#mux-control-cells = <0>;