Unverified Commit 7b732090 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

AT91 DT #1 for 5.17:

- 2 low priority fixes about pin function for sama7g5 and better
  tailored mmc interface on sama5d2 xplained
- Addition of the Microchip EVB-KSZ9477: a Gigabit Ethernet
  managed Switch Evaluation Board
- QSPI: addition of sama5d2 clock name and nodes for new sama7g7 and its
  associated Evaluation Kit

* tag 'at91-dt-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama7g5ek: Add QSPI0 node
  ARM: dts: at91: sama7g5: Add QSPI nodes
  ARM: dts: at91: sama5d2: Name the qspi clock
  ARM: dts: at91: add Microchip EVB-KSZ9477 board
  ARM: dts: at91: sama5d2_xplained: remove PA11__SDMMC0_VDDSEL from pinctrl
  ARM: dts: at91: update alternate function of signal PD20

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1c8e994f 078c2a0e

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ 
	at91-sama5d2_icp.dtb \

	at91-sama5d2_ptc_ek.dtb \

	at91-sama5d2_xplained.dtb \

	at91-sama5d3_ksz9477_evb.dtb \

	at91-sama5d3_xplained.dtb \

	at91-dvk_som60.dtb \

	at91-gatwick.dtb \

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

+2 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ sdmmc0: sdio-host@a0000000 { 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_sdmmc0_default>;

			non-removable;

			mmc-ddr-1_8v;

			mmc-ddr-3_3v;

			status = "okay";

		};
@@ -619,10 +619,9 @@ cmd_data { 
						bias-disable;

					};



					ck_cd_rstn_vddsel {

					ck_cd_rstn {

						pinmux = <PIN_PA0__SDMMC0_CK>,

							 <PIN_PA10__SDMMC0_RSTN>,

							 <PIN_PA11__SDMMC0_VDDSEL>,

							 <PIN_PA13__SDMMC0_CD>;

						bias-disable;

					};

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

0 → 100644
+209 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright (c) 2021 Oleksij Rempel <kernel@pengutronix.de>, Pengutronix

 */

/dts-v1/;

#include "sama5d36.dtsi"



/ {

	model = "EVB-KSZ9477";

	compatible = "microchip,sama5d3-ksz9477-evb", "atmel,sama5d36",

		     "atmel,sama5d3", "atmel,sama5";



	chosen {

		stdout-path = &dbgu;

	};



	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_vcc_mmc0: regulator-mmc0 {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_mcc0_vcc>;

		regulator-name = "mmc0-vcc";

		regulator-max-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		gpio = <&pioE 2 GPIO_ACTIVE_LOW>;

	};

};



&dbgu {

	status = "okay";

};



&ebi {

	pinctrl-0 = <&pinctrl_ebi_nand_addr>;

	pinctrl-names = "default";

	status = "okay";

};



&i2c0 {

	pinctrl-0 = <&pinctrl_i2c0_pu>;

	status = "okay";

};



&macb0 {

	phy-mode = "rgmii";

	status = "okay";



	fixed-link {

		speed = <1000>;

		full-duplex;

	};

};



&main_xtal {

	clock-frequency = <12000000>;

};



&mmc0 {

	pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3

		     &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;

	status = "okay";



	slot@0 {

		reg = <0>;

		bus-width = <8>;

		cd-gpios = <&pioE 0 GPIO_ACTIVE_LOW>;

		disable-wp;

		vmmc-supply = <&reg_vcc_mmc0>;

		vqmmc-supply = <&reg_3v3>;

	};

};



&nand_controller {

	status = "okay";



	nand@3 {

		reg = <0x3 0x0 0x2>;

		atmel,rb = <0>;

		nand-bus-width = <8>;

		nand-ecc-mode = "hw";

		nand-ecc-strength = <4>;

		nand-ecc-step-size = <512>;

		nand-on-flash-bbt;

		label = "atmel_nand";

	};

};



&slow_xtal {

	clock-frequency = <32768>;

};



&spi0 {

	cs-gpios = <&pioD 13 GPIO_ACTIVE_LOW>, <0>, <0>,

		   <&pioD 16 GPIO_ACTIVE_LOW>;

	status = "okay";

};



&spi1 {

	pinctrl-0 = <&pinctrl_spi_ksz>;

	cs-gpios = <&pioC 25 GPIO_ACTIVE_LOW>;

	status = "okay";



	switch@0 {

		compatible = "microchip,ksz9477";

		reg = <0>;

		spi-max-frequency = <1000000>;

		spi-cpha;

		spi-cpol;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				label = "lan1";

			};



			port@1 {

				reg = <1>;

				label = "lan2";

			};



			port@2 {

				reg = <2>;

				label = "lan3";

			};



			port@3 {

				reg = <3>;

				label = "lan4";

			};



			port@4 {

				reg = <4>;

				label = "lan5";

			};



			port@5 {

				reg = <5>;

				label = "cpu";

				ethernet = <&macb0>;

				phy-mode = "rgmii-txid";



				fixed-link {

					speed = <1000>;

					full-duplex;

				};

			};

		};

	};

};



&usb0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usba_vbus>;

	atmel,vbus-gpio = <&pioE 9 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&pinctrl {

	board {

		pinctrl_i2c0_pu: i2c0-pu {

			atmel,pins =

				<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,

				<AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

		};



		pinctrl_mmc0_cd: mmc0-cd {

			atmel,pins = <AT91_PIOE 0 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};



		pinctrl_mcc0_vcc: mmc0-vcc {

			atmel,pins = <AT91_PIOE 2 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};



		pinctrl_spi_ksz: spi-ksz {

			atmel,pins =

				<

				/* SPI1_MISO */

				AT91_PIOC 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP

				/* SPI1_MOSI */

				AT91_PIOC 23 AT91_PERIPH_A AT91_PINCTRL_NONE

				/* SPI1_SPCK */

				AT91_PIOC 24 AT91_PERIPH_A AT91_PINCTRL_NONE



				/* SPI CS */

				AT91_PIOC 25 AT91_PERIPH_GPIO AT91_PINCTRL_NONE

				/* switch IRQ */

				AT91_PIOB 28 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH

				/* switch PME_N, SoC IN */

				AT91_PIOC 30 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP

				/* switch RST */

				AT91_PIOC 31 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH

				>;

		};



		pinctrl_usba_vbus: usba-vbus {

			atmel,pins =

				<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;

		};

	};

};

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

+73 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "sama7g5.dtsi"

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

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

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



/ {

	model = "Microchip SAMA7G5-EK";
@@ -134,6 +135,59 @@ &cpu0 { 
	cpu-supply = <&vddcpu>;

};



&qspi0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_qspi>;

	status = "okay";



	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "jedec,spi-nor";

		reg = <0>;

		spi-max-frequency = <133000000>;

		spi-tx-bus-width = <8>;

		spi-rx-bus-width = <8>;

		m25p,fast-read;



		at91bootstrap@0 {

			label = "ospi: at91bootstrap";

			reg = <0x0 0x40000>;

		};



		bootloader@40000 {

			label = "ospi: bootloader";

			reg = <0x40000 0xc0000>;

		};



		bootloaderenvred@100000 {

			label = "ospi: bootloader env redundant";

			reg = <0x100000 0x40000>;

		};



		bootloaderenv@140000 {

			label = "ospi: bootloader env";

			reg = <0x140000 0x40000>;

		};



		dtb@180000 {

			label = "ospi: device tree";

			reg = <0x180000 0x80000>;

		};



		kernel@200000 {

			label = "ospi: kernel";

			reg = <0x200000 0x600000>;

		};



		rootfs@800000 {

			label = "ospi: rootfs";

			reg = <0x800000 0x7800000>;

		};



	};

};



&dma0 {

	status = "okay";

};
@@ -555,6 +609,25 @@ pinctrl_mikrobus1_spi: mikrobus1_spi { 
		bias-disable;

	};



	pinctrl_qspi: qspi {

		pinmux = <PIN_PB12__QSPI0_IO0>,

			 <PIN_PB11__QSPI0_IO1>,

			 <PIN_PB10__QSPI0_IO2>,

			 <PIN_PB9__QSPI0_IO3>,

			 <PIN_PB16__QSPI0_IO4>,

			 <PIN_PB17__QSPI0_IO5>,

			 <PIN_PB18__QSPI0_IO6>,

			 <PIN_PB19__QSPI0_IO7>,

			 <PIN_PB13__QSPI0_CS>,

			 <PIN_PB14__QSPI0_SCK>,

			 <PIN_PB15__QSPI0_SCKN>,

			 <PIN_PB20__QSPI0_DQS>,

			 <PIN_PB21__QSPI0_INT>;

		bias-disable;

		slew-rate = <0>;

		atmel,drive-strength = <ATMEL_PIO_DRVSTR_HI>;

	};



	pinctrl_sdmmc0_default: sdmmc0_default {

		cmd_data {

			pinmux = <PIN_PA1__SDMMC0_CMD>,

arch/arm/boot/dts/sama5d2.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ qspi0: spi@f0020000 { 
				reg-names = "qspi_base", "qspi_mmap";

				interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 52>;

				clock-names = "pclk";

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";
@@ -299,6 +300,7 @@ qspi1: spi@f0024000 { 
				reg-names = "qspi_base", "qspi_mmap";

				interrupts = <53 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 53>;

				clock-names = "pclk";

				#address-cells = <1>;

				#size-cells = <0>;

				status = "disabled";