Commit c65176fd authored by Roger Quadros's avatar Roger Quadros Committed by Nishanth Menon
Browse files

arm64: dts: ti: k3-j721e: Rename mux header and update macro names 



We intend to use one header file for SERDES MUX for all
TI SoCs so rename the header file.

The exsting macros are too generic. Prefix them with SoC name.

While at that, add the missing configurations for completeness.

Fixes: b766e3b0 ("arm64: dts: ti: k3-j721e-main: Add system controller node and SERDES lane mux")
Reported-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Acked-by: default avatarPeter Rosin <peda@axentia.se>
Link: https://lore.kernel.org/r/20200918165930.2031-1-rogerq@ti.com
parent f75aef39

arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts

+6 −5
Original line number Diff line number Diff line
@@ -404,11 +404,12 @@ 
};



&serdes_ln_ctrl {

	idle-states = <SERDES0_LANE0_PCIE0_LANE0>, <SERDES0_LANE1_PCIE0_LANE1>,

		      <SERDES1_LANE0_PCIE1_LANE0>, <SERDES1_LANE1_PCIE1_LANE1>,

		      <SERDES2_LANE0_PCIE2_LANE0>, <SERDES2_LANE1_PCIE2_LANE1>,

		      <SERDES3_LANE0_USB3_0_SWAP>, <SERDES3_LANE1_USB3_0>,

		      <SERDES4_LANE0_EDP_LANE0>, <SERDES4_LANE1_EDP_LANE1>, <SERDES4_LANE2_EDP_LANE2>, <SERDES4_LANE3_EDP_LANE3>;

	idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_PCIE0_LANE1>,

		      <J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,

		      <J721E_SERDES2_LANE0_PCIE2_LANE0>, <J721E_SERDES2_LANE1_PCIE2_LANE1>,

		      <J721E_SERDES3_LANE0_USB3_0_SWAP>, <J721E_SERDES3_LANE1_USB3_0>,

		      <J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,

		      <J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;

};



&serdes_wiz3 {

arch/arm64/boot/dts/ti/k3-j721e-main.dtsi

+7 −6
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 */

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

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

#include <dt-bindings/mux/mux-j721e-wiz.h>

#include <dt-bindings/mux/ti-serdes.h>



&cbass_main {

	msmc_ram: sram@70000000 {
@@ -38,11 +38,12 @@ 
					<0x40b0 0x3>, <0x40b4 0x3>, /* SERDES3 lane0/1 select */

					<0x40c0 0x3>, <0x40c4 0x3>, <0x40c8 0x3>, <0x40cc 0x3>;

					/* SERDES4 lane0/1/2/3 select */

			idle-states = <SERDES0_LANE0_PCIE0_LANE0>, <SERDES0_LANE1_PCIE0_LANE1>,

				      <SERDES1_LANE0_PCIE1_LANE0>, <SERDES1_LANE1_PCIE1_LANE1>,

				      <SERDES2_LANE0_PCIE2_LANE0>, <SERDES2_LANE1_PCIE2_LANE1>,

				      <MUX_IDLE_AS_IS>, <SERDES3_LANE1_USB3_0>,

				      <SERDES4_LANE0_EDP_LANE0>, <SERDES4_LANE1_EDP_LANE1>, <SERDES4_LANE2_EDP_LANE2>, <SERDES4_LANE3_EDP_LANE3>;

			idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_PCIE0_LANE1>,

				      <J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,

				      <J721E_SERDES2_LANE0_PCIE2_LANE0>, <J721E_SERDES2_LANE1_PCIE2_LANE1>,

				      <MUX_IDLE_AS_IS>, <J721E_SERDES3_LANE1_USB3_0>,

				      <J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,

				      <J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;

		};



		usb_serdes_mux: mux-controller@4000 {

include/dt-bindings/mux/mux-j721e-wiz.h

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * This header provides constants for J721E WIZ.

 */



#ifndef _DT_BINDINGS_J721E_WIZ

#define _DT_BINDINGS_J721E_WIZ



#define SERDES0_LANE0_QSGMII_LANE1	0x0

#define SERDES0_LANE0_PCIE0_LANE0	0x1

#define SERDES0_LANE0_USB3_0_SWAP	0x2



#define SERDES0_LANE1_QSGMII_LANE2	0x0

#define SERDES0_LANE1_PCIE0_LANE1	0x1

#define SERDES0_LANE1_USB3_0		0x2



#define SERDES1_LANE0_QSGMII_LANE3	0x0

#define SERDES1_LANE0_PCIE1_LANE0	0x1

#define SERDES1_LANE0_USB3_1_SWAP	0x2

#define SERDES1_LANE0_SGMII_LANE0	0x3



#define SERDES1_LANE1_QSGMII_LANE4	0x0

#define SERDES1_LANE1_PCIE1_LANE1	0x1

#define SERDES1_LANE1_USB3_1		0x2

#define SERDES1_LANE1_SGMII_LANE1	0x3



#define SERDES2_LANE0_PCIE2_LANE0	0x1

#define SERDES2_LANE0_SGMII_LANE0	0x3

#define SERDES2_LANE0_USB3_1_SWAP	0x2



#define SERDES2_LANE1_PCIE2_LANE1	0x1

#define SERDES2_LANE1_USB3_1		0x2

#define SERDES2_LANE1_SGMII_LANE1	0x3



#define SERDES3_LANE0_PCIE3_LANE0	0x1

#define SERDES3_LANE0_USB3_0_SWAP	0x2



#define SERDES3_LANE1_PCIE3_LANE1	0x1

#define SERDES3_LANE1_USB3_0		0x2



#define SERDES4_LANE0_EDP_LANE0		0x0

#define SERDES4_LANE0_QSGMII_LANE5	0x2



#define SERDES4_LANE1_EDP_LANE1		0x0

#define SERDES4_LANE1_QSGMII_LANE6	0x2



#define SERDES4_LANE2_EDP_LANE2		0x0

#define SERDES4_LANE2_QSGMII_LANE7	0x2



#define SERDES4_LANE3_EDP_LANE3		0x0

#define SERDES4_LANE3_QSGMII_LANE8	0x2



#endif /* _DT_BINDINGS_J721E_WIZ */

include/dt-bindings/mux/ti-serdes.h

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * This header provides constants for SERDES MUX for TI SoCs

 */



#ifndef _DT_BINDINGS_MUX_TI_SERDES

#define _DT_BINDINGS_MUX_TI_SERDES



/* J721E */



#define J721E_SERDES0_LANE0_QSGMII_LANE1	0x0

#define J721E_SERDES0_LANE0_PCIE0_LANE0		0x1

#define J721E_SERDES0_LANE0_USB3_0_SWAP		0x2

#define J721E_SERDES0_LANE0_IP4_UNUSED		0x3



#define J721E_SERDES0_LANE1_QSGMII_LANE2	0x0

#define J721E_SERDES0_LANE1_PCIE0_LANE1		0x1

#define J721E_SERDES0_LANE1_USB3_0		0x2

#define J721E_SERDES0_LANE1_IP4_UNUSED		0x3



#define J721E_SERDES1_LANE0_QSGMII_LANE3	0x0

#define J721E_SERDES1_LANE0_PCIE1_LANE0		0x1

#define J721E_SERDES1_LANE0_USB3_1_SWAP		0x2

#define J721E_SERDES1_LANE0_SGMII_LANE0		0x3



#define J721E_SERDES1_LANE1_QSGMII_LANE4	0x0

#define J721E_SERDES1_LANE1_PCIE1_LANE1		0x1

#define J721E_SERDES1_LANE1_USB3_1		0x2

#define J721E_SERDES1_LANE1_SGMII_LANE1		0x3



#define J721E_SERDES2_LANE0_IP1_UNUSED		0x0

#define J721E_SERDES2_LANE0_PCIE2_LANE0		0x1

#define J721E_SERDES2_LANE0_USB3_1_SWAP		0x2

#define J721E_SERDES2_LANE0_SGMII_LANE0		0x3



#define J721E_SERDES2_LANE1_IP1_UNUSED		0x0

#define J721E_SERDES2_LANE1_PCIE2_LANE1		0x1

#define J721E_SERDES2_LANE1_USB3_1		0x2

#define J721E_SERDES2_LANE1_SGMII_LANE1		0x3



#define J721E_SERDES3_LANE0_IP1_UNUSED		0x0

#define J721E_SERDES3_LANE0_PCIE3_LANE0		0x1

#define J721E_SERDES3_LANE0_USB3_0_SWAP		0x2

#define J721E_SERDES3_LANE0_IP4_UNUSED		0x3



#define J721E_SERDES3_LANE1_IP1_UNUSED		0x0

#define J721E_SERDES3_LANE1_PCIE3_LANE1		0x1

#define J721E_SERDES3_LANE1_USB3_0		0x2

#define J721E_SERDES3_LANE1_IP4_UNUSED		0x3



#define J721E_SERDES4_LANE0_EDP_LANE0		0x0

#define J721E_SERDES4_LANE0_IP2_UNUSED		0x1

#define J721E_SERDES4_LANE0_QSGMII_LANE5	0x2

#define J721E_SERDES4_LANE0_IP4_UNUSED		0x3



#define J721E_SERDES4_LANE1_EDP_LANE1		0x0

#define J721E_SERDES4_LANE1_IP2_UNUSED		0x1

#define J721E_SERDES4_LANE1_QSGMII_LANE6	0x2

#define J721E_SERDES4_LANE1_IP4_UNUSED		0x3



#define J721E_SERDES4_LANE2_EDP_LANE2		0x0

#define J721E_SERDES4_LANE2_IP2_UNUSED		0x1

#define J721E_SERDES4_LANE2_QSGMII_LANE7	0x2

#define J721E_SERDES4_LANE2_IP4_UNUSED		0x3



#define J721E_SERDES4_LANE3_EDP_LANE3		0x0

#define J721E_SERDES4_LANE3_IP2_UNUSED		0x1

#define J721E_SERDES4_LANE3_QSGMII_LANE8	0x2

#define J721E_SERDES4_LANE3_IP4_UNUSED		0x3



#endif /* _DT_BINDINGS_MUX_TI_SERDES */

CRA Git | Maintained and supported by SUSTech CRA and CCSE