From 449372148f6d9b5b8bded88ed8eee5c581a4bf81 Mon Sep 17 00:00:00 2001 From: Prabhakar Kushwaha Date: Mon, 9 Nov 2015 16:42:07 +0530 Subject: armv8: LS2080A: Rename LS2085A to reflect LS2080A MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LS2080A is a prime personality of Freescale’s LS2085A. It is a non-AIOP personality without support of DP-DDR, L2 switch, 1588, PCIe endpoint etc. So renaming existing LS2085A code base to reflect LS2080A (Prime personality) Signed-off-by: Pratiyush Mohan Srivastava Signed-off-by: Prabhakar Kushwaha [York Sun: Dropped #ifdef in cpu.c for cpu_type_list] Reviewed-by: York Sun --- drivers/ddr/fsl/fsl_ddr_gen4.c | 4 +- drivers/net/fsl-mc/mc.c | 5 ++- drivers/net/ldpaa_eth/Makefile | 2 +- drivers/net/ldpaa_eth/ls2080a.c | 81 +++++++++++++++++++++++++++++++++++++++++ drivers/net/ldpaa_eth/ls2085a.c | 81 ----------------------------------------- drivers/pci/pcie_layerscape.c | 2 +- 6 files changed, 89 insertions(+), 86 deletions(-) create mode 100644 drivers/net/ldpaa_eth/ls2080a.c delete mode 100644 drivers/net/ldpaa_eth/ls2085a.c (limited to 'drivers') diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c index 49e4688..eefe709 100644 --- a/drivers/ddr/fsl/fsl_ddr_gen4.c +++ b/drivers/ddr/fsl/fsl_ddr_gen4.c @@ -107,14 +107,14 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, goto step2; #ifdef CONFIG_SYS_FSL_ERRATUM_A008336 -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A /* A008336 only applies to general DDR controllers */ if ((ctrl_num == 0) || (ctrl_num == 1)) #endif ddr_out32(eddrtqcr1, 0x63b30002); #endif #ifdef CONFIG_SYS_FSL_ERRATUM_A008514 -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A /* A008514 only applies to DP-DDR controler */ if (ctrl_num == 2) #endif diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 5168b99..e1a02d1 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1147,7 +1147,10 @@ static int do_fsl_mc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) switch (argv[1][0]) { case 's': { char sub_cmd; - u64 mc_fw_addr, mc_dpc_addr, aiop_fw_addr; + u64 mc_fw_addr, mc_dpc_addr; +#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET + u64 aiop_fw_addr; +#endif sub_cmd = argv[2][0]; switch (sub_cmd) { diff --git a/drivers/net/ldpaa_eth/Makefile b/drivers/net/ldpaa_eth/Makefile index c37633f..5587aa6 100644 --- a/drivers/net/ldpaa_eth/Makefile +++ b/drivers/net/ldpaa_eth/Makefile @@ -6,4 +6,4 @@ obj-y += ldpaa_wriop.o obj-y += ldpaa_eth.o -obj-$(CONFIG_LS2085A) += ls2085a.o +obj-$(CONFIG_LS2080A) += ls2080a.o diff --git a/drivers/net/ldpaa_eth/ls2080a.c b/drivers/net/ldpaa_eth/ls2080a.c new file mode 100644 index 0000000..93ed4f1 --- /dev/null +++ b/drivers/net/ldpaa_eth/ls2080a.c @@ -0,0 +1,81 @@ +/* + * Copyright 2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include +#include +#include +#include +#include + +u32 dpmac_to_devdisr[] = { + [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1, + [WRIOP1_DPMAC2] = FSL_CHASSIS3_DEVDISR2_DPMAC2, + [WRIOP1_DPMAC3] = FSL_CHASSIS3_DEVDISR2_DPMAC3, + [WRIOP1_DPMAC4] = FSL_CHASSIS3_DEVDISR2_DPMAC4, + [WRIOP1_DPMAC5] = FSL_CHASSIS3_DEVDISR2_DPMAC5, + [WRIOP1_DPMAC6] = FSL_CHASSIS3_DEVDISR2_DPMAC6, + [WRIOP1_DPMAC7] = FSL_CHASSIS3_DEVDISR2_DPMAC7, + [WRIOP1_DPMAC8] = FSL_CHASSIS3_DEVDISR2_DPMAC8, + [WRIOP1_DPMAC9] = FSL_CHASSIS3_DEVDISR2_DPMAC9, + [WRIOP1_DPMAC10] = FSL_CHASSIS3_DEVDISR2_DPMAC10, + [WRIOP1_DPMAC11] = FSL_CHASSIS3_DEVDISR2_DPMAC11, + [WRIOP1_DPMAC12] = FSL_CHASSIS3_DEVDISR2_DPMAC12, + [WRIOP1_DPMAC13] = FSL_CHASSIS3_DEVDISR2_DPMAC13, + [WRIOP1_DPMAC14] = FSL_CHASSIS3_DEVDISR2_DPMAC14, + [WRIOP1_DPMAC15] = FSL_CHASSIS3_DEVDISR2_DPMAC15, + [WRIOP1_DPMAC16] = FSL_CHASSIS3_DEVDISR2_DPMAC16, + [WRIOP1_DPMAC17] = FSL_CHASSIS3_DEVDISR2_DPMAC17, + [WRIOP1_DPMAC18] = FSL_CHASSIS3_DEVDISR2_DPMAC18, + [WRIOP1_DPMAC19] = FSL_CHASSIS3_DEVDISR2_DPMAC19, + [WRIOP1_DPMAC20] = FSL_CHASSIS3_DEVDISR2_DPMAC20, + [WRIOP1_DPMAC21] = FSL_CHASSIS3_DEVDISR2_DPMAC21, + [WRIOP1_DPMAC22] = FSL_CHASSIS3_DEVDISR2_DPMAC22, + [WRIOP1_DPMAC23] = FSL_CHASSIS3_DEVDISR2_DPMAC23, + [WRIOP1_DPMAC24] = FSL_CHASSIS3_DEVDISR2_DPMAC24, +}; + +static int is_device_disabled(int dpmac_id) +{ + struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; + u32 devdisr2 = in_le32(&gur->devdisr2); + + return dpmac_to_devdisr[dpmac_id] & devdisr2; +} + +void wriop_dpmac_disable(int dpmac_id) +{ + struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; + + setbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]); +} + +void wriop_dpmac_enable(int dpmac_id) +{ + struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; + + clrbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]); +} + +phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl) +{ + enum srds_prtcl; + + if (is_device_disabled(dpmac_id + 1)) + return PHY_INTERFACE_MODE_NONE; + + if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII16) + return PHY_INTERFACE_MODE_SGMII; + + if (lane_prtcl >= XFI1 && lane_prtcl <= XFI8) + return PHY_INTERFACE_MODE_XGMII; + + if (lane_prtcl >= XAUI1 && lane_prtcl <= XAUI2) + return PHY_INTERFACE_MODE_XGMII; + + if (lane_prtcl >= QSGMII_A && lane_prtcl <= QSGMII_D) + return PHY_INTERFACE_MODE_QSGMII; + + return PHY_INTERFACE_MODE_NONE; +} diff --git a/drivers/net/ldpaa_eth/ls2085a.c b/drivers/net/ldpaa_eth/ls2085a.c deleted file mode 100644 index 93ed4f1..0000000 --- a/drivers/net/ldpaa_eth/ls2085a.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2015 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - */ -#include -#include -#include -#include -#include - -u32 dpmac_to_devdisr[] = { - [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1, - [WRIOP1_DPMAC2] = FSL_CHASSIS3_DEVDISR2_DPMAC2, - [WRIOP1_DPMAC3] = FSL_CHASSIS3_DEVDISR2_DPMAC3, - [WRIOP1_DPMAC4] = FSL_CHASSIS3_DEVDISR2_DPMAC4, - [WRIOP1_DPMAC5] = FSL_CHASSIS3_DEVDISR2_DPMAC5, - [WRIOP1_DPMAC6] = FSL_CHASSIS3_DEVDISR2_DPMAC6, - [WRIOP1_DPMAC7] = FSL_CHASSIS3_DEVDISR2_DPMAC7, - [WRIOP1_DPMAC8] = FSL_CHASSIS3_DEVDISR2_DPMAC8, - [WRIOP1_DPMAC9] = FSL_CHASSIS3_DEVDISR2_DPMAC9, - [WRIOP1_DPMAC10] = FSL_CHASSIS3_DEVDISR2_DPMAC10, - [WRIOP1_DPMAC11] = FSL_CHASSIS3_DEVDISR2_DPMAC11, - [WRIOP1_DPMAC12] = FSL_CHASSIS3_DEVDISR2_DPMAC12, - [WRIOP1_DPMAC13] = FSL_CHASSIS3_DEVDISR2_DPMAC13, - [WRIOP1_DPMAC14] = FSL_CHASSIS3_DEVDISR2_DPMAC14, - [WRIOP1_DPMAC15] = FSL_CHASSIS3_DEVDISR2_DPMAC15, - [WRIOP1_DPMAC16] = FSL_CHASSIS3_DEVDISR2_DPMAC16, - [WRIOP1_DPMAC17] = FSL_CHASSIS3_DEVDISR2_DPMAC17, - [WRIOP1_DPMAC18] = FSL_CHASSIS3_DEVDISR2_DPMAC18, - [WRIOP1_DPMAC19] = FSL_CHASSIS3_DEVDISR2_DPMAC19, - [WRIOP1_DPMAC20] = FSL_CHASSIS3_DEVDISR2_DPMAC20, - [WRIOP1_DPMAC21] = FSL_CHASSIS3_DEVDISR2_DPMAC21, - [WRIOP1_DPMAC22] = FSL_CHASSIS3_DEVDISR2_DPMAC22, - [WRIOP1_DPMAC23] = FSL_CHASSIS3_DEVDISR2_DPMAC23, - [WRIOP1_DPMAC24] = FSL_CHASSIS3_DEVDISR2_DPMAC24, -}; - -static int is_device_disabled(int dpmac_id) -{ - struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; - u32 devdisr2 = in_le32(&gur->devdisr2); - - return dpmac_to_devdisr[dpmac_id] & devdisr2; -} - -void wriop_dpmac_disable(int dpmac_id) -{ - struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; - - setbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]); -} - -void wriop_dpmac_enable(int dpmac_id) -{ - struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; - - clrbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]); -} - -phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl) -{ - enum srds_prtcl; - - if (is_device_disabled(dpmac_id + 1)) - return PHY_INTERFACE_MODE_NONE; - - if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII16) - return PHY_INTERFACE_MODE_SGMII; - - if (lane_prtcl >= XFI1 && lane_prtcl <= XFI8) - return PHY_INTERFACE_MODE_XGMII; - - if (lane_prtcl >= XAUI1 && lane_prtcl <= XAUI2) - return PHY_INTERFACE_MODE_XGMII; - - if (lane_prtcl >= QSGMII_A && lane_prtcl <= QSGMII_D) - return PHY_INTERFACE_MODE_QSGMII; - - return PHY_INTERFACE_MODE_NONE; -} diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 4cee038..8af6531 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -665,7 +665,7 @@ void ft_pci_setup(void *blob, bd_t *bd) } #endif -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A void pcie_set_available_streamids(void *blob, const char *pcie_path, u32 *stream_ids, int count) -- cgit v1.1