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

Commit 17aa8b8e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARCH: arm: defconfig: Enable ethernet over SPI"

parents 5f1e663f f20b8b52

arch/arm/configs/msm8937-perf_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_KS8851=y

CONFIG_RNDIS_IPA=y

CONFIG_MSM_RMNET_BAM=y

CONFIG_PPP=y
@@ -317,8 +318,6 @@ CONFIG_INPUT_UINPUT=y 
CONFIG_INPUT_GPIO=y

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVMEM is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_MSM_HS=y

CONFIG_SERIAL_MSM_SMD=y

CONFIG_DIAG_CHAR=y
@@ -333,8 +332,9 @@ CONFIG_SLIMBUS=y 
CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPI_SPIDEV=y

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y
@@ -342,6 +342,7 @@ CONFIG_PINCTRL_MSM8940=y 
CONFIG_PINCTRL_MSM8953=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_SX150X=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_SMB135X_CHARGER=y

arch/arm/configs/msm8937_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_KS8851=y

CONFIG_RNDIS_IPA=y

CONFIG_MSM_RMNET_BAM=y

CONFIG_PPP=y
@@ -335,8 +336,9 @@ CONFIG_SLIMBUS=y 
CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPI_SPIDEV=y

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y
@@ -345,6 +347,7 @@ CONFIG_PINCTRL_MSM8953=y 
CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_SX150X=y

CONFIG_POWER_SUPPLY=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_SMB135X_CHARGER=y

arch/arm64/configs/msm8937-perf_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_KS8851=y

CONFIG_RNDIS_IPA=y

CONFIG_MSM_RMNET_BAM=y

CONFIG_PPP=y
@@ -313,8 +314,6 @@ CONFIG_INPUT_UINPUT=y 
CONFIG_INPUT_GPIO=y

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVMEM is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_MSM_HS=y

CONFIG_SERIAL_MSM_SMD=y

CONFIG_DIAG_CHAR=y
@@ -329,8 +328,9 @@ CONFIG_SLIMBUS=y 
CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPI_SPIDEV=y

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSMCOBALT=y
@@ -339,6 +339,7 @@ CONFIG_PINCTRL_MSM8940=y 
CONFIG_PINCTRL_MSM8953=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_SX150X=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_SMB135X_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

arch/arm64/configs/msm8937_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ CONFIG_DM_VERITY_FEC=y 
CONFIG_NETDEVICES=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_KS8851=y

CONFIG_RNDIS_IPA=y

CONFIG_MSM_RMNET_BAM=y

CONFIG_PPP=y
@@ -329,8 +330,9 @@ CONFIG_SLIMBUS=y 
CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_SPI_SPIDEV=y

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSMCOBALT=y
@@ -339,6 +341,7 @@ CONFIG_PINCTRL_MSM8940=y 
CONFIG_PINCTRL_MSM8953=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_SX150X=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_SMB135X_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y