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

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

AT91 & LAN966 DT #1 for 5.18:

- lan966x basic DT and associated evaluation board pcb8291 (2-ports)
- documentation for an upcoming Kontron switch board featuring a LAN9668
- one fix for an old bug we have with PMECC on sama5d2 in some corner
  cases
- sama7g5 and its EK: crypto, CAN and DVFS operating points

* tag 'at91-dt-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama7g5: add opps
  ARM: dts: at91: sama7g5ek: set regulator voltages for standby state
  ARM: dts: at91: fix low limit for CPU regulator
  ARM: dts: at91: sama7g5: Enable can0 and can1 support in sama7g5-ek
  ARM: dts: at91: sama7g5: Add can controllers of sama7g5
  ARM: dts: at91: sama7g5: Add crypto nodes
  ARM: dts: at91: Use the generic "crypto" node name for the crypto IPs
  ARM: dts: at91: remove status = "okay" from soc specific dtsi
  ARM: dts: at91: sama5d2: Fix PMERRLOC resource size
  dt-bindings: arm: at91: add Kontron's new KSwitches
  ARM: dts: add DT for lan966 SoC and 2-port board pcb8291

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eda2a683 3c8a9c2e

Documentation/devicetree/bindings/arm/atmel-at91.yaml

+9 −0
Original line number Diff line number Diff line
@@ -174,6 +174,15 @@ properties: 
          - const: microchip,lan9668

          - const: microchip,lan966



      - description: Kontron KSwitch D10 MMT series

        items:

          - enum:

              - kontron,kswitch-d10-mmt-8g

              - kontron,kswitch-d10-mmt-6g-2gs

          - const: kontron,s1921

          - const: microchip,lan9668

          - const: microchip,lan966



      - items:

          - enum:

              - atmel,sams70j19

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -737,6 +737,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
dtb-$(CONFIG_SOC_IMX7ULP) += \

	imx7ulp-com.dtb \

	imx7ulp-evk.dtb

dtb-$(CONFIG_SOC_LAN966) += \

	lan966x-pcb8291.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-moxa-uc-8410a.dtb \

	ls1021a-qds.dtb \

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

+31 −1
Original line number Diff line number Diff line
@@ -131,6 +131,18 @@ &adc { 
	status = "okay";

};



&can0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_can0_default>;

	status = "okay";

};



&can1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_can1_default>;

	status = "okay";

};



&cpu0 {

	cpu-supply = <&vddcpu>;

};
@@ -239,6 +251,7 @@ vdd_3v3: VDD_IO { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-microvolt = <3300000>;

						regulator-mode = <4>;

					};
@@ -279,6 +292,7 @@ vddcore: VDD_CORE { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1150000>;

						regulator-mode = <4>;

					};
@@ -290,7 +304,7 @@ regulator-state-mem { 


				vddcpu: VDD_OTHER {

					regulator-name = "VDD_OTHER";

					regulator-min-microvolt = <1125000>;

					regulator-min-microvolt = <1050000>;

					regulator-max-microvolt = <1850000>;

					regulator-initial-mode = <2>;

					regulator-allowed-modes = <2>, <4>;
@@ -299,6 +313,7 @@ vddcpu: VDD_OTHER { 


					regulator-state-standby {

						regulator-on-in-suspend;

						regulator-suspend-voltage = <1050000>;

						regulator-mode = <4>;

					};
@@ -315,6 +330,7 @@ vldo1: LDO1 { 
					regulator-always-on;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-on-in-suspend;

					};
@@ -329,6 +345,7 @@ vldo2: LDO2 { 
					regulator-max-microvolt = <3700000>;



					regulator-state-standby {

						regulator-suspend-voltage = <1800000>;

						regulator-on-in-suspend;

					};
@@ -454,6 +471,19 @@ &i2s0 { 
};



&pioA {



	pinctrl_can0_default: can0_default {

		pinmux = <PIN_PD12__CANTX0>,

			 <PIN_PD13__CANRX0 >;

		bias-disable;

	};



	pinctrl_can1_default: can1_default {

		pinmux = <PIN_PD14__CANTX1>,

			 <PIN_PD15__CANRX1 >;

		bias-disable;

	};



	pinctrl_flx0_default: flx0_default {

		pinmux = <PIN_PE3__FLEXCOM0_IO0>,

			 <PIN_PE4__FLEXCOM0_IO1>,

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

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

/*

 * lan966x_pcb8291.dts - Device Tree file for PCB8291

 */

/dts-v1/;

#include "lan966x.dtsi"



/ {

	model = "Microchip EVB - LAN9662";

	compatible = "microchip,lan9662-pcb8291", "microchip,lan9662", "microchip,lan966";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	aliases {

		serial0 = &usart3;

	};

};



&gpio {

	fc_shrd7_pins: fc_shrd7-pins {

		pins = "GPIO_49";

		function = "fc_shrd7";

	};



	fc_shrd8_pins: fc_shrd8-pins {

		pins = "GPIO_54";

		function = "fc_shrd8";

	};



	fc3_b_pins: fcb3-spi-pins {

		/* SCK, RXD, TXD */

		pins = "GPIO_51", "GPIO_52", "GPIO_53";

		function = "fc3_b";

	};



	can0_b_pins:  can0_b_pins {

		/* RX, TX */

		pins = "GPIO_35", "GPIO_36";

		function = "can0_b";

	};

};



&can0 {

	pinctrl-0 = <&can0_b_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&flx3 {

	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;

	status = "okay";



	usart3: serial@200 {

		pinctrl-0 = <&fc3_b_pins>, <&fc_shrd7_pins>, <&fc_shrd8_pins>;

		pinctrl-names = "default";

		status = "okay";

	};

};



&watchdog {

	status = "okay";

};

arch/arm/boot/dts/lan966x.dtsi

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

/*

 * lan966x.dtsi - Device Tree Include file for Microchip LAN966 family SoC

 *

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

 *

 * Author: Kavyasree Kotagiri <kavyasree.kotagiri@microchip.com>

 *

 */



#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/mfd/atmel-flexcom.h>

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

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

#include <dt-bindings/clock/microchip,lan966x.h>



/ {

	model = "Microchip LAN966 family SoC";

	compatible = "microchip,lan966";

	interrupt-parent = <&gic>;

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu@0 {

			device_type = "cpu";

			compatible = "arm,cortex-a7";

			clock-frequency = <600000000>;

			reg = <0x0>;

		};

	};



	clocks {

		sys_clk: sys_clk {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <162500000>;

		};



		cpu_clk: cpu_clk {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <600000000>;

		};



		ddr_clk: ddr_clk {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <300000000>;

		};



		nic_clk: nic_clk {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <200000000>;

		};

	};



	clks: clock-controller@e00c00a8 {

		compatible = "microchip,lan966x-gck";

		#clock-cells = <1>;

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

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

		reg = <0xe00c00a8 0x38>;

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupt-parent = <&gic>;

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;

		clock-frequency = <37500000>;

	};



	soc {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		flx0: flexcom@e0040000 {

			compatible = "atmel,sama5d2-flexcom";

			reg = <0xe0040000 0x100>;

			clocks = <&clks GCK_ID_FLEXCOM0>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xe0040000 0x800>;

			status = "disabled";

		};



		flx1: flexcom@e0044000 {

			compatible = "atmel,sama5d2-flexcom";

			reg = <0xe0044000 0x100>;

			clocks = <&clks GCK_ID_FLEXCOM1>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xe0044000 0x800>;

			status = "disabled";

		};



		trng: rng@e0048000 {

			compatible = "atmel,at91sam9g45-trng";

			reg = <0xe0048000 0x100>;

			clocks = <&nic_clk>;

		};



		aes: crypto@e004c000 {

			compatible = "atmel,at91sam9g46-aes";

			reg = <0xe004c000 0x100>;

			interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&dma0 AT91_XDMAC_DT_PERID(13)>,

			       <&dma0 AT91_XDMAC_DT_PERID(12)>;

			dma-names = "rx", "tx";

			clocks = <&nic_clk>;

			clock-names = "aes_clk";

		};



		flx2: flexcom@e0060000 {

			compatible = "atmel,sama5d2-flexcom";

			reg = <0xe0060000 0x100>;

			clocks = <&clks GCK_ID_FLEXCOM2>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xe0060000 0x800>;

			status = "disabled";

		};



		flx3: flexcom@e0064000 {

			compatible = "atmel,sama5d2-flexcom";

			reg = <0xe0064000 0x100>;

			clocks = <&clks GCK_ID_FLEXCOM3>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xe0064000 0x800>;

			status = "disabled";



			usart3: serial@200 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0x200 0x200>;

				interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&nic_clk>;

				clock-names = "usart";

				atmel,fifo-size = <32>;

				status = "disabled";

			};

		};



		dma0: dma-controller@e0068000 {

			compatible = "microchip,sama7g5-dma";

			reg = <0xe0068000 0x1000>;

			interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

			#dma-cells = <1>;

			clocks = <&nic_clk>;

			clock-names = "dma_clk";

		};



		sha: crypto@e006c000 {

			compatible = "atmel,at91sam9g46-sha";

			reg = <0xe006c000 0xec>;

			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&dma0 AT91_XDMAC_DT_PERID(14)>;

			dma-names = "tx";

			clocks = <&nic_clk>;

			clock-names = "sha_clk";

		};



		flx4: flexcom@e0070000 {

			compatible = "atmel,sama5d2-flexcom";

			reg = <0xe0070000 0x100>;

			clocks = <&clks GCK_ID_FLEXCOM4>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xe0070000 0x800>;

			status = "disabled";

		};



		timer0: timer@e008c000 {

			compatible = "snps,dw-apb-timer";

			reg = <0xe008c000 0x400>;

			clocks = <&nic_clk>;

			clock-names = "timer";

			interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

		};



		watchdog: watchdog@e0090000 {

			compatible = "snps,dw-wdt";

			reg = <0xe0090000 0x1000>;

			interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&nic_clk>;

			status = "disabled";

		};



		can0: can@e081c000 {

			compatible = "bosch,m_can";

			reg = <0xe081c000 0xfc>, <0x00100000 0x4000>;

			reg-names = "m_can", "message_ram";

			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "int0", "int1";

			clocks = <&clks GCK_ID_MCAN0>, <&clks GCK_ID_MCAN0>;

			clock-names = "hclk", "cclk";

			assigned-clocks = <&clks GCK_ID_MCAN0>;

			assigned-clock-rates = <40000000>;

			bosch,mram-cfg = <0x0 0 0 64 0 0 32 32>;

			status = "disabled";

		};



		gpio: pinctrl@e2004064 {

			compatible = "microchip,lan966x-pinctrl";

			reg = <0xe2004064 0xb4>,

			    <0xe2010024 0x138>;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&gpio 0 0 78>;

			interrupt-controller;

			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

			#interrupt-cells = <2>;

		};



		gic: interrupt-controller@e8c11000 {

			compatible = "arm,gic-400", "arm,cortex-a7-gic";

			#interrupt-cells = <3>;

			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-controller;

			reg = <0xe8c11000 0x1000>,

			      <0xe8c12000 0x2000>,

			      <0xe8c14000 0x2000>,

			      <0xe8c16000 0x2000>;

		};

	};

};