From mboxrd@z Thu Jan 1 00:00:00 1970 From: Priyanka Jain Date: Fri, 7 May 2021 09:04:45 +0000 Subject: [PATCH v2 3/4] board: fsl: lx2160ardb: add dts fixup function for RevC In-Reply-To: <20210426130113.6514-4-ioana.ciornei@nxp.com> References: <20210426130113.6514-1-ioana.ciornei@nxp.com> <20210426130113.6514-4-ioana.ciornei@nxp.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de >-----Original Message----- >From: Ioana Ciornei >Sent: Monday, April 26, 2021 6:31 PM >To: Priyanka Jain >Cc: u-boot at lists.denx.de; Florin Laurentiu Chiculita >; Wasim Khan (OSS) >; Ioana Ciornei >Subject: [PATCH v2 3/4] board: fsl: lx2160ardb: add dts fixup function for RevC > >From: Florin Chiculita > >Since the new RevC LX2160A-RDB board has its 10G Aquantia PHYs at different >MDIO bus addresses, we must update both the kernel DTS and u-boot's DTS (in >case of DM_ETH) in case the board is indeed RevC. >Use the newly introduced get_board_rev() function to trigger a fixup of the kernel >DTS to properly match the actual PHY addresses. >All this is encapsulated in the fdt_fixup_board_phy_revc() function which will be >used in the next patch. > >Signed-off-by: Florin Chiculita >Signed-off-by: Ioana Ciornei >--- > board/freescale/lx2160a/eth_lx2160ardb.c | 106 +++++++++++++++++++++++ > board/freescale/lx2160a/lx2160a.h | 1 + > 2 files changed, 107 insertions(+) > >diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c >b/board/freescale/lx2160a/eth_lx2160ardb.c >index 8fd2a501de16..c693ad9a0a4a 100644 >--- a/board/freescale/lx2160a/eth_lx2160ardb.c >+++ b/board/freescale/lx2160a/eth_lx2160ardb.c >@@ -231,6 +231,112 @@ void reset_phy(void) } #endif /* >CONFIG_RESET_PHY_R */ > >+static int fdt_get_dpmac_node(void *fdt, int dpmac_id) { >+ char dpmac_str[] = "dpmacs at 00"; >+ int offset, dpmacs_offset; >+ >+ /* get the dpmac offset */ >+ dpmacs_offset = fdt_path_offset(fdt, "/soc/fsl-mc/dpmacs"); >+ if (dpmacs_offset < 0) >+ dpmacs_offset = fdt_path_offset(fdt, "/fsl-mc/dpmacs"); >+ >+ if (dpmacs_offset < 0) { >+ printf("dpmacs node not found in device tree\n"); >+ return dpmacs_offset; >+ } >+ >+ sprintf(dpmac_str, "dpmac@%x", dpmac_id); >+ offset = fdt_subnode_offset(fdt, dpmacs_offset, dpmac_str); >+ if (offset < 0) { >+ sprintf(dpmac_str, "ethernet@%x", dpmac_id); >+ offset = fdt_subnode_offset(fdt, dpmacs_offset, dpmac_str); >+ if (offset < 0) { >+ printf("dpmac@%x/ethernet@%x node not found in >device tree\n", >+ dpmac_id, dpmac_id); >+ return offset; >+ } >+ } >+ >+ return offset; >+} >+ >+static int fdt_update_phy_addr(void *fdt, int dpmac_id, int phy_addr) { >+ char dpmac_str[] = "dpmacs at 00"; >+ const u32 *phyhandle; >+ int offset; >+ int err; >+ >+ /* get the dpmac offset */ >+ offset = fdt_get_dpmac_node(fdt, dpmac_id); >+ if (offset < 0) >+ return offset; >+ >+ /* get dpmac phy-handle */ >+ sprintf(dpmac_str, "dpmac@%x", dpmac_id); >+ phyhandle = (u32 *)fdt_getprop(fdt, offset, "phy-handle", NULL); >+ if (!phyhandle) { >+ printf("%s node not found in device tree\n", dpmac_str); >+ return offset; >+ } >+ >+ offset = fdt_node_offset_by_phandle(fdt, fdt32_to_cpu(*phyhandle)); >+ if (offset < 0) { >+ printf("Could not get the ph node offset for dpmac %d\n", >+ dpmac_id); >+ return offset; >+ } >+ >+ phy_addr = cpu_to_fdt32(phy_addr); >+ err = fdt_setprop(fdt, offset, "reg", &phy_addr, sizeof(phy_addr)); >+ if (err < 0) { >+ printf("Could not set phy node's reg for dpmac %d: %s.\n", >+ dpmac_id, fdt_strerror(err)); >+ return err; >+ } >+ >+ return 0; >+} >+ >+static int fdt_delete_phy_handle(void *fdt, int dpmac_id) { >+ const u32 *phyhandle; >+ int offset; >+ >+ /* get the dpmac offset */ >+ offset = fdt_get_dpmac_node(fdt, dpmac_id); >+ if (offset < 0) >+ return offset; >+ >+ /* verify if the node has a phy-handle */ >+ phyhandle = (u32 *)fdt_getprop(fdt, offset, "phy-handle", NULL); >+ if (!phyhandle) >+ return 0; >+ >+ return fdt_delprop(fdt, offset, "phy-handle"); } >+ >+int fdt_fixup_board_phy_revc(void *fdt) { >+ int ret; >+ >+ if (get_board_rev() != 'C') >+ return 0; Do we want to check for < 'C' version or != here? Is fdt_fixup_board_phy_revc() rquired only for Rev C version or >= Rev C? Regards Priyanka