Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f3e0564 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sa2150p: Enable STMMAC driver"

parents 12b68143 8da9587b

arch/arm64/configs/vendor/sa2150p-perf_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_STMMAC_ETH=y

# CONFIG_DWMAC_GENERIC is not set

# CONFIG_DWMAC_IPQ806X is not set

CONFIG_AT803X_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_PPP=y
@@ -290,7 +293,6 @@ CONFIG_SPI_QUP=y 
CONFIG_SPMI=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_QCS405=y

CONFIG_FRAGMENTED_GPIO_ADDRESS_SPACE=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

arch/arm64/configs/vendor/sa2150p_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -255,6 +255,9 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_STMMAC_ETH=y

# CONFIG_DWMAC_GENERIC is not set

# CONFIG_DWMAC_IPQ806X is not set

CONFIG_AT803X_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_PPP=y
@@ -300,7 +303,6 @@ CONFIG_SPMI=y 
CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_PPS_CLIENT_GPIO=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_QCS405=y

CONFIG_FRAGMENTED_GPIO_ADDRESS_SPACE=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "stmmac_ptp.h"

#include "dwmac-qcom-ipa-offload.h"



static unsigned long tlmm_central_base_addr;

static void __iomem *tlmm_central_base_addr;

bool phy_intr_en;



static struct ethqos_emac_por emac_por[] = {
@@ -1446,9 +1446,9 @@ static int ethqos_update_rgmii_tx_drv_strength(struct qcom_ethqos *ethqos) 
	ETHQOSDBG("tlmm_central_base = 0x%x, size = 0x%x\n",

		  tlmm_central_base, tlmm_central_size);



	tlmm_central_base_addr = (unsigned long)ioremap(

	tlmm_central_base_addr = ioremap(

	   tlmm_central_base, tlmm_central_size);

	if ((void __iomem *)!tlmm_central_base_addr) {

	if (!tlmm_central_base_addr) {

		ETHQOSERR("cannot map dwc_tlmm_central reg memory, aborting\n");

		ret = -EIO;

		goto err_out;
@@ -1488,7 +1488,7 @@ static int ethqos_update_rgmii_tx_drv_strength(struct qcom_ethqos *ethqos) 


err_out:

	if (tlmm_central_base_addr)

		iounmap((void __iomem *)tlmm_central_base_addr);

		iounmap(tlmm_central_base_addr);



	return ret;

}