Enable Physlink/SFP functionality, minor cleanups, Tegra DRM FTB fix

28 files changed, 140 insertions, 24 deletions

diff --git a/baseconfig/CONFIG_CEC_PIN b/baseconfig/CONFIG_CEC_PIN
new file mode 100644
index 000000000..395ddfbf2
--- /dev/null
+++ b/baseconfig/CONFIG_CEC_PIN
@@ -0,0 +1 @@
+CONFIG_CEC_PIN=y
diff --git a/baseconfig/CONFIG_MDIO_I2C b/baseconfig/CONFIG_MDIO_I2C
new file mode 100644
index 000000000..df7d9e025
--- /dev/null
+++ b/baseconfig/CONFIG_MDIO_I2C
@@ -0,0 +1 @@
+CONFIG_MDIO_I2C=m
diff --git a/baseconfig/CONFIG_PHYLINK b/baseconfig/CONFIG_PHYLINK
new file mode 100644
index 000000000..cc1e23e0b
--- /dev/null
+++ b/baseconfig/CONFIG_PHYLINK
@@ -0,0 +1 @@
+CONFIG_PHYLINK=m
diff --git a/baseconfig/CONFIG_SERIO_GPIO_PS2 b/baseconfig/CONFIG_SERIO_GPIO_PS2
index 33383d85a..22c1adbfb 100644
--- a/baseconfig/CONFIG_SERIO_GPIO_PS2
+++ b/baseconfig/CONFIG_SERIO_GPIO_PS2
@@ -1 +1 @@
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
diff --git a/baseconfig/CONFIG_SFP b/baseconfig/CONFIG_SFP
new file mode 100644
index 000000000..db57db12e
--- /dev/null
+++ b/baseconfig/CONFIG_SFP
@@ -0,0 +1 @@
+CONFIG_SFP=m
diff --git a/baseconfig/arm/CONFIG_DRM_SUN4I_BACKEND b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_BACKEND
index c1d1d2121..c1d1d2121 100644
--- a/baseconfig/arm/CONFIG_DRM_SUN4I_BACKEND
+++ b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_BACKEND
diff --git a/drm-tegra-trace-fix-patch.patch b/drm-tegra-trace-fix-patch.patch
new file mode 100644
index 000000000..77bc9c6dc
--- /dev/null
+++ b/drm-tegra-trace-fix-patch.patch
@@ -0,0 +1,30 @@
+From 65d5d30ccebd555de9ad8fd2b5dfc50291922337 Mon Sep 17 00:00:00 2001
+From: Thierry Reding <treding@nvidia.com>
+Date: Wed, 23 Aug 2017 19:13:26 +0200
+Subject: drm/tegra: trace: Fix path to include
+
+The TRACE_INCLUDE_PATH macro needs to specify the path relative to the
+define_trace.h header rather than relative to the file defining it.
+
+Reported-by: Dmitry Osipenko <digetx@gmail.com>
+Tested-by: Dmitry Osipenko <digetx@gmail.com>
+Signed-off-by: Thierry Reding <treding@nvidia.com>
+---
+ drivers/gpu/drm/tegra/trace.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/tegra/trace.h b/drivers/gpu/drm/tegra/trace.h
+index e9b7cdad..5a1ab40 100644
+--- a/drivers/gpu/drm/tegra/trace.h
++++ b/drivers/gpu/drm/tegra/trace.h
+@@ -63,6 +63,6 @@ DEFINE_EVENT(register_access, sor_readl,
+ 
+ /* This part must be outside protection */
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/tegra
+ #define TRACE_INCLUDE_FILE trace
+ #include <trace/define_trace.h>
+-- 
+cgit v1.1
+
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 7436ce885..7a3c6974f 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -772,6 +772,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -1330,7 +1331,6 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SIL_SII8620=m
 # CONFIG_DRM_SIS is not set
 # CONFIG_DRM_STM is not set
-CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN8I_MIXER=m
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
@@ -2897,6 +2897,7 @@ CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_SUN4I is not set
 CONFIG_MDIO_THUNDER=m
@@ -4040,6 +4041,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
@@ -5007,7 +5009,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -5021,6 +5023,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 91f442dd8..f6af49b2d 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -772,6 +772,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -1320,7 +1321,6 @@ CONFIG_DRM_ROCKCHIP=m
 CONFIG_DRM_SIL_SII8620=m
 # CONFIG_DRM_SIS is not set
 # CONFIG_DRM_STM is not set
-CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN8I_MIXER=m
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_TEGRA_DEBUG is not set
@@ -2877,6 +2877,7 @@ CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_SUN4I is not set
 CONFIG_MDIO_THUNDER=m
@@ -4019,6 +4020,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
@@ -4985,7 +4987,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4999,6 +5001,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 845d0e117..a8716fe97 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -814,6 +814,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -3098,6 +3099,7 @@ CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 CONFIG_MDIO_SUN4I=m
 # CONFIG_MDIO_THUNDER is not set
@@ -4335,6 +4337,7 @@ CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MIPHY28LP=m
@@ -5388,7 +5391,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_NVEC_PS2=y
@@ -5403,6 +5406,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 5370c2c02..743a7d3ef 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -789,6 +789,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2954,6 +2955,7 @@ CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 CONFIG_MDIO_SUN4I=m
 # CONFIG_MDIO_THUNDER is not set
@@ -4115,6 +4117,7 @@ CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
@@ -5067,7 +5070,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -5081,6 +5084,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 20b5f3c13..c4df7305c 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -788,6 +788,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2934,6 +2935,7 @@ CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 CONFIG_MDIO_SUN4I=m
 # CONFIG_MDIO_THUNDER is not set
@@ -4094,6 +4096,7 @@ CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
@@ -5045,7 +5048,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -5059,6 +5062,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 0f84603ba..61f27754f 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -813,6 +813,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -3078,6 +3079,7 @@ CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 CONFIG_MDIO_SUN4I=m
 # CONFIG_MDIO_THUNDER is not set
@@ -4314,6 +4316,7 @@ CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MIPHY28LP=m
@@ -5366,7 +5369,7 @@ CONFIG_SERIO_AMBAKMI=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_NVEC_PS2=y
@@ -5381,6 +5384,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 61c981a38..0edbd0200 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -672,6 +672,7 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2803,6 +2804,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3903,6 +3905,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4728,7 +4731,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4742,6 +4745,7 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFI=y
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 478b71876..df2e8e582 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -673,6 +673,7 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2823,6 +2824,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3923,6 +3925,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4749,7 +4752,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4763,6 +4766,7 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFI=y
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index a4ba15679..cbe3f8ee3 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -673,6 +673,7 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2823,6 +2824,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3923,6 +3925,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4749,7 +4752,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4763,6 +4766,7 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFI=y
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-i686.config b/kernel-i686.config
index d64e69a92..8d6f24137 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -672,6 +672,7 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2803,6 +2804,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3903,6 +3905,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4728,7 +4731,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4742,6 +4745,7 @@ CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
 CONFIG_SFI=y
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index bde4ad3f9..9eda31d30 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -659,6 +659,7 @@ CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2667,6 +2668,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3715,6 +3717,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4558,7 +4561,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4572,6 +4575,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 58ef69ed8..349dd6b2d 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -658,6 +658,7 @@ CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2646,6 +2647,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3693,6 +3695,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4535,7 +4538,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4549,6 +4552,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a951d28e2..1e22e0a90 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -615,6 +615,7 @@ CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2612,6 +2613,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3657,6 +3659,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4495,7 +4498,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4509,6 +4512,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index c6c7d5398..6fc0d49e9 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -614,6 +614,7 @@ CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2591,6 +2592,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3635,6 +3637,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4472,7 +4475,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4486,6 +4489,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 255e400ca..c4a1e1f65 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -615,6 +615,7 @@ CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2611,6 +2612,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3656,6 +3658,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4494,7 +4497,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4508,6 +4511,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 151b35339..c55bbf5cc 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -614,6 +614,7 @@ CONFIG_CB710_CORE=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2590,6 +2591,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3634,6 +3636,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4471,7 +4474,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4485,6 +4488,7 @@ CONFIG_SERIO=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_SH_ETH=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 62ef09ef6..b9c4a9bcf 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -615,6 +615,7 @@ CONFIG_CCW=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2554,6 +2555,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_DEVICE=m
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3590,6 +3592,7 @@ CONFIG_PFAULT=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=m
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4394,7 +4397,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 # CONFIG_SERIO is not set
 CONFIG_SERIO_LIBPS2=m
@@ -4407,6 +4410,7 @@ CONFIG_SERIO_SERPORT=m
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHARED_KERNEL=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c94ce63b6..0f1c7b0f9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -614,6 +614,7 @@ CONFIG_CCW=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2533,6 +2534,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_DEVICE=m
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3568,6 +3570,7 @@ CONFIG_PFAULT=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=m
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4371,7 +4374,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 # CONFIG_SERIO is not set
 CONFIG_SERIO_LIBPS2=m
@@ -4384,6 +4387,7 @@ CONFIG_SERIO_SERPORT=m
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
 # CONFIG_SFC is not set
+CONFIG_SFP=m
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHARED_KERNEL=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index cc47f89b4..b79e61f4b 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -686,6 +686,7 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2870,6 +2871,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3967,6 +3969,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4790,7 +4793,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4808,6 +4811,7 @@ CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MTD=y
 CONFIG_SFC_SRIOV=y
 CONFIG_SFI=y
+CONFIG_SFP=m
 # CONFIG_SGI_GRU_DEBUG is not set
 CONFIG_SGI_GRU=m
 CONFIG_SGI_IOC4=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index a9d78afc2..c609aa1ac 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -685,6 +685,7 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_CEC_PIN=y
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS=m
@@ -2850,6 +2851,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -3947,6 +3949,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 # CONFIG_PHY_CPCAP_USB is not set
 CONFIG_PHYLIB=y
+CONFIG_PHYLINK=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -4769,7 +4772,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_SERIO_GPIO_PS2 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4787,6 +4790,7 @@ CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MTD=y
 CONFIG_SFC_SRIOV=y
 CONFIG_SFI=y
+CONFIG_SFP=m
 # CONFIG_SGI_GRU_DEBUG is not set
 CONFIG_SGI_GRU=m
 CONFIG_SGI_IOC4=m
diff --git a/kernel.spec b/kernel.spec
index f7a466ae3..28276535e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2189,11 +2189,15 @@ fi
 #
 #
 %changelog
+* Tue Sep 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 4.14.0-0.rc0.git4.1
+- Enable Physlink/SFP functionality
+- Tegra DRM FTB fix
+
 * Mon Sep 11 2017 Peter Robinson <pbrobinson@fedoraproject.org>
 - Raspberry Pi serial console fixes, minor other Pi improvements
 - Various ARM cleanups, build mmc/pwrseq non modular
 
-* Mon Sep 11 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc0.git4.1
+* Mon Sep 11 2017 Justin M. Forbes <jforbes@fedoraproject.org>
 - Linux v4.13-11197-gf007cad159e9
 
 * Sat Sep  9 2017 Peter Robinson <pbrobinson@fedoraproject.org>