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

Commit 0da2bc64 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: kona: enable LAN78XX based USB Ethernet adapter driver"

parents 06a922e5 f52c0695

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ CONFIG_PPP=y 
CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_USB_LAN78XX=y

CONFIG_USB_USBNET=y

CONFIG_WIL6210=m

CONFIG_CLD_LL_CORE=y

arch/arm64/configs/vendor/kona_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -284,11 +284,11 @@ CONFIG_BONDING=y 
CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_RMNET=y

CONFIG_PHYLIB=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_USB_LAN78XX=y

CONFIG_WIL6210=m

CONFIG_CLD_LL_CORE=y

CONFIG_CNSS2=y

drivers/net/usb/lan78xx.c

+2 −4
Original line number Diff line number Diff line
@@ -936,11 +936,9 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset, 
	ret = lan78xx_read_raw_otp(dev, 0, 1, &sig);



	if (ret == 0) {

		if (sig == OTP_INDICATOR_1)

			offset = offset;

		else if (sig == OTP_INDICATOR_2)

		if (sig == OTP_INDICATOR_2)

			offset += 0x100;

		else

		else if (sig != OTP_INDICATOR_1)

			ret = -EINVAL;

		if (!ret)

			ret = lan78xx_read_raw_otp(dev, offset, length, data);