Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: dts: ti: k3-am642-evm: add overlay for ICSSG1 2nd port

The am642-evm doesn't allow to enable 2 x CPSW3g ports and 2 x ICSSG1 ports
all together, so base k3-am642-evm.dts enables by default 2 x CPSW3g ports
and 1 x ICSSG1 ports, but it is also possible to support 1 x CPSW3g ports
and 2 x ICSSG1 ports configuration.

This patch adds overlay to support 1 x CPSW3g ports and 2 x ICSSG1 ports
configuration:
- Add label name 'mdio_mux_1' for 'mdio-mux-1' node so that the node
'mdio-mux-1' can be disabled in the overlay using the label name.
- disable 2nd CPSW3g port
- update CPSW3g pinmuxes to not use RGMII2
- disable mdio-mux-1 and define mdio-mux-2 to route ICSSG1 MDIO to the
shared DP83869 PHY
- add and enable ICSSG1 RGMII2 pinmuxes
- enable ICSSG1 MII1 port

Reviewed-by: Ravi Gunasekaran <r-gunasekaran@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
Link: https://lore.kernel.org/r/20240215103036.2825096-4-danishanwar@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

authored by

MD Danish Anwar and committed by
Vignesh Raghavendra
ae0aba12 efb32a10

+85 -1
+5
arch/arm64/boot/dts/ti/Makefile
··· 39 39 40 40 # Boards with AM64x SoC 41 41 dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb 42 + dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac.dtbo 42 43 dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb 43 44 dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb 44 45 dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb ··· 116 115 k3-am62a7-sk-csi2-tevi-ov5640-dtbs := k3-am62a7-sk.dtb \ 117 116 k3-am62x-sk-csi2-tevi-ov5640.dtbo 118 117 k3-am62a7-sk-hdmi-audio-dtbs := k3-am62a7-sk.dtb k3-am62x-sk-hdmi-audio.dtbo 118 + k3-am642-evm-icssg1-dualemac-dtbs := \ 119 + k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac.dtbo 119 120 k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \ 120 121 k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo 121 122 k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \ ··· 142 139 k3-am62a7-sk-csi2-imx219.dtb \ 143 140 k3-am62a7-sk-csi2-ov5640.dtb \ 144 141 k3-am62a7-sk-hdmi-audio.dtb \ 142 + k3-am642-evm-icssg1-dualemac.dtb \ 145 143 k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb \ 146 144 k3-am642-tqma64xxl-mbax4xxl-wlan.dtb \ 147 145 k3-am68-sk-base-board-csi2-dual-imx219-dtbs \ ··· 156 152 DTC_FLAGS_k3-am625-sk += -@ 157 153 DTC_FLAGS_k3-am62-lp-sk += -@ 158 154 DTC_FLAGS_k3-am62a7-sk += -@ 155 + DTC_FLAGS_k3-am642-evm += -@ 159 156 DTC_FLAGS_k3-am642-tqma64xxl-mbax4xxl += -@ 160 157 DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@ 161 158 DTC_FLAGS_k3-am68-sk-base-board += -@
+79
arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac.dtso
··· 1 + // SPDX-License-Identifier: GPL-2.0-only OR MIT 2 + /** 3 + * DT overlay for enabling 2nd ICSSG1 port on AM642 EVM 4 + * 5 + * Copyright (C) 2020-2024 Texas Instruments Incorporated - https://www.ti.com/ 6 + */ 7 + 8 + /dts-v1/; 9 + /plugin/; 10 + 11 + #include <dt-bindings/gpio/gpio.h> 12 + #include "k3-pinctrl.h" 13 + 14 + &{/} { 15 + aliases { 16 + ethernet1 = "/icssg1-eth/ethernet-ports/port@1"; 17 + }; 18 + 19 + mdio-mux-2 { 20 + compatible = "mdio-mux-multiplexer"; 21 + mux-controls = <&mdio_mux>; 22 + mdio-parent-bus = <&icssg1_mdio>; 23 + #address-cells = <1>; 24 + #size-cells = <0>; 25 + 26 + mdio@0 { 27 + reg = <0x0>; 28 + #address-cells = <1>; 29 + #size-cells = <0>; 30 + 31 + icssg1_phy2: ethernet-phy@3 { 32 + reg = <3>; 33 + tx-internal-delay-ps = <250>; 34 + rx-internal-delay-ps = <2000>; 35 + }; 36 + }; 37 + }; 38 + }; 39 + 40 + &main_pmx0 { 41 + icssg1_rgmii2_pins_default: icssg1-rgmii2-default-pins { 42 + pinctrl-single,pins = < 43 + AM64X_IOPAD(0x0108, PIN_INPUT, 2) /* (W11) PRG1_PRU1_GPO0.RGMII2_RD0 */ 44 + AM64X_IOPAD(0x010c, PIN_INPUT, 2) /* (V11) PRG1_PRU1_GPO1.RGMII2_RD1 */ 45 + AM64X_IOPAD(0x0110, PIN_INPUT, 2) /* (AA12) PRG1_PRU1_GPO2.RGMII2_RD2 */ 46 + AM64X_IOPAD(0x0114, PIN_INPUT, 2) /* (Y12) PRG1_PRU1_GPO3.RGMII2_RD3 */ 47 + AM64X_IOPAD(0x0120, PIN_INPUT, 2) /* (U11) PRG1_PRU1_GPO6.RGMII2_RXC */ 48 + AM64X_IOPAD(0x0118, PIN_INPUT, 2) /* (W12) PRG1_PRU1_GPO4.RGMII2_RX_CTL */ 49 + AM64X_IOPAD(0x0134, PIN_OUTPUT, 2) /* (AA10) PRG1_PRU1_GPO11.RGMII2_TD0 */ 50 + AM64X_IOPAD(0x0138, PIN_OUTPUT, 2) /* (V10) PRG1_PRU1_GPO12.RGMII2_TD1 */ 51 + AM64X_IOPAD(0x013c, PIN_OUTPUT, 2) /* (U10) PRG1_PRU1_GPO13.RGMII2_TD2 */ 52 + AM64X_IOPAD(0x0140, PIN_OUTPUT, 2) /* (AA11) PRG1_PRU1_GPO14.RGMII2_TD3 */ 53 + AM64X_IOPAD(0x0148, PIN_OUTPUT, 2) /* (Y10) PRG1_PRU1_GPO16.RGMII2_TXC */ 54 + AM64X_IOPAD(0x0144, PIN_OUTPUT, 2) /* (Y11) PRG1_PRU1_GPO15.RGMII2_TX_CTL */ 55 + >; 56 + }; 57 + }; 58 + 59 + &cpsw3g { 60 + pinctrl-0 = <&rgmii1_pins_default>; 61 + }; 62 + 63 + &cpsw_port2 { 64 + status = "disabled"; 65 + }; 66 + 67 + &mdio_mux_1 { 68 + status = "disabled"; 69 + }; 70 + 71 + &icssg1_eth { 72 + pinctrl-0 = <&icssg1_rgmii1_pins_default>, <&icssg1_rgmii2_pins_default>; 73 + }; 74 + 75 + &icssg1_emac1 { 76 + status = "okay"; 77 + phy-handle = <&icssg1_phy2>; 78 + phy-mode = "rgmii-id"; 79 + };
+1 -1
arch/arm64/boot/dts/ti/k3-am642-evm.dts
··· 199 199 mux-gpios = <&exp1 12 GPIO_ACTIVE_HIGH>; 200 200 }; 201 201 202 - mdio-mux-1 { 202 + mdio_mux_1: mdio-mux-1 { 203 203 compatible = "mdio-mux-multiplexer"; 204 204 mux-controls = <&mdio_mux>; 205 205 mdio-parent-bus = <&cpsw3g_mdio>;