Re: [DistroKit] [PATCH v1 2/5] v7a_noneon: use upstreamed devicetree the KSZ9477 EVB

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

On 06.07.23 13:44, Oleksij Rempel wrote:
> KSZ9477 EVB is already mainline and there are some naming differences.
> So, drop downstream dts and use the mainline version.
> 
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>

Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>

> ---
>  .../dts/at91-microchip-ksz9477-evb.dts        | 193 ------------------
>  configs/platform-v7a_noneon/platformconfig    |   2 +-
>  .../loader/entries/sama5d3-ksz9477-evb.conf   |   2 +-
>  3 files changed, 2 insertions(+), 195 deletions(-)
>  delete mode 100644 configs/platform-v7a_noneon/dts/at91-microchip-ksz9477-evb.dts
> 
> diff --git a/configs/platform-v7a_noneon/dts/at91-microchip-ksz9477-evb.dts b/configs/platform-v7a_noneon/dts/at91-microchip-ksz9477-evb.dts
> deleted file mode 100644
> index df77df5..0000000
> --- a/configs/platform-v7a_noneon/dts/at91-microchip-ksz9477-evb.dts
> +++ /dev/null
> @@ -1,193 +0,0 @@
> -/*
> - * at91-sama5d3_xplained_ung8071.dts - Device Tree file for the EVB-KSZ9477 board
> - *
> - *  Copyright (C) 2014 Atmel,
> - *		  2014 Nicolas Ferre <nicolas.ferre@atmel.com>
> - *		  2018 Ahmad Fatoum <a.fatoum@pengutronix.de>
> - *
> - * Licensed under GPLv2 or later.
> - */
> -/dts-v1/;
> -#include "sama5d36.dtsi"
> -
> -/ {
> -	model = "EVB-KSZ9477";
> -	compatible = "atmel,sama5d3-ksz9477-evb", "atmel,sama5d3", "atmel,sama5";
> -
> -	chosen {
> -		stdout-path = &dbgu;
> -	};
> -
> -	clocks {
> -		slow_xtal {
> -			clock-frequency = <32768>;
> -		};
> -
> -		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>; */
> -		broken-cd;
> -	};
> -};
> -
> -&spi0 {
> -	cs-gpios = <&pioD 13 GPIO_ACTIVE_LOW>, <0>, <0>,
> -	           <&pioD 16 GPIO_ACTIVE_LOW>;
> -	status = "okay";
> -};
> -
> -&i2c0 {
> -	pinctrl-0 = <&pinctrl_i2c0_pu>;
> -	status = "okay";
> -};
> -
> -&macb0 {
> -	phy-mode = "rgmii";
> -	status = "okay";
> -
> -	fixed-link {
> -		speed = <1000>;
> -		full-duplex;
> -	};
> -};
> -
> -&spi1 {
> -	pinctrl-0 = <&pinctrl_spi_ksz>;
> -	cs-gpios = <&pioC 25 GPIO_ACTIVE_LOW>;
> -	status = "okay";
> -
> -	switch@0 {
> -		compatible = "microchip,ksz9477", "microchip,ksz9893";
> -		reg = <0>;
> -
> -		/* Bus clock is 132 MHz. */
> -		spi-max-frequency = <1000000>;
> -		spi-cpha;
> -		spi-cpol;
> -		/* reset-gpios = <&pioC 31 GPIO_ACTIVE_LOW>; */
> -		/* IRQ gpios = <&pioB 28 GPIO_ACTIVE_LOW>; */
> -		status = "okay";
> -
> -		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;
> -				};
> -			};
> -		};
> -	};
> -};
> -
> -&dbgu {
> -	status = "okay";
> -};
> -
> -&ebi {
> -	pinctrl-0 = <&pinctrl_ebi_nand_addr>;
> -	pinctrl-names = "default";
> -	status = "okay";
> -};
> -
> -&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";
> -	};
> -};
> -
> -&usb0 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_usba_vbus>;
> -	atmel,vbus-gpio = <&pioE 9 GPIO_ACTIVE_HIGH>;	/* PE9, conflicts with A9 */
> -	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_PULL_UP_DEGLITCH>;
> -		};
> -
> -		pinctrl_usba_vbus: usba_vbus {
> -			atmel,pins =
> -				<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;	/* PE9, conflicts with A9 */
> -		};
> -
> -		pinctrl_spi_ksz: spi-ksz {
> -			atmel,pins =
> -				<
> -				AT91_PIOC 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP	/* PC22 periph A SPI1_MISO pin */
> -				AT91_PIOC 23 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC23 periph A SPI1_MOSI pin */
> -				AT91_PIOC 24 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PC24 periph A SPI1_SPCK pin */
> -
> -				/* 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
> -				>;
> -		};
> -	};
> -};
> diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig
> index 160c422..3ff91ce 100644
> --- a/configs/platform-v7a_noneon/platformconfig
> +++ b/configs/platform-v7a_noneon/platformconfig
> @@ -135,7 +135,7 @@ PTXCONF_KERNEL_IMAGE_Z=y
>  PTXCONF_KERNEL_IMAGE="zImage"
>  PTXCONF_KERNEL_DTB=y
>  PTXCONF_KERNEL_DTS_PATH="${PTXDIST_PLATFORMCONFIGDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
> -PTXCONF_KERNEL_DTS="at91-microchip-ksz9477-evb.dts vexpress-v2p-ca9.dts"
> +PTXCONF_KERNEL_DTS="at91-sama5d3_ksz9477_evb.dts vexpress-v2p-ca9.dts"
>  # PTXCONF_KERNEL_DTBO is not set
>  # PTXCONF_KERNEL_CODE_SIGNING is not set
>  # PTXCONF_KERNEL_ZSTD is not set
> diff --git a/configs/platform-v7a_noneon/projectroot/loader/entries/sama5d3-ksz9477-evb.conf b/configs/platform-v7a_noneon/projectroot/loader/entries/sama5d3-ksz9477-evb.conf
> index bdd9a4b..6ce491d 100644
> --- a/configs/platform-v7a_noneon/projectroot/loader/entries/sama5d3-ksz9477-evb.conf
> +++ b/configs/platform-v7a_noneon/projectroot/loader/entries/sama5d3-ksz9477-evb.conf
> @@ -3,4 +3,4 @@ version		5.8
>  options		rootwait rw
>  linux-appendroot true
>  linux		/boot/zImage
> -devicetree	/boot/at91-microchip-ksz9477-evb.dtb
> +devicetree	/boot/at91-sama5d3_ksz9477_evb.dtb

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |