[SRU][Bionic][PATCH 1/1] UBUNTU: [Config] Enable timestamping in network PHY devices

[Khalid Elmously]

Set CONFIG_NETWORK_PHY_TIMESTAMPING=y, and enable the DP83640_PHY
driver it exposes as a module.

BugLink: https://bugs.launchpad.net/bugs/1785816
Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
 debian.master/config/annotations          | 7 ++++++-
 debian.master/config/config.common.ubuntu | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 8913de3b466f..1910206b1125 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5889,8 +5889,12 @@ CONFIG_PPS_CLIENT_KTIMER                        flag<TESTING>
 CONFIG_PPS                                      flag<REVIEW>
 
 # Menu: Device Drivers >> PTP clock support
+CONFIG_DP83640_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_PTP_1588_CLOCK_PCH                       policy<{'i386': 'm'}>
 
+CONFIG_DP83640_PHY                              mark<ENFORCED> note<LP:1785816>
+
+
 # Menu: Device Drivers >> PTP clock support >> PTP clock support
 CONFIG_PTP_1588_CLOCK                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'y', 's390x': 'm'}>
 CONFIG_PTP_1588_CLOCK_DTE                       policy<{'arm64': 'm'}>
@@ -10028,7 +10032,7 @@ CONFIG_AFIUCV                                   policy<{'s390x': 'm'}>
 CONFIG_SMC                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_SMC_DIAG                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NETWORK_SECMARK                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_NETWORK_PHY_TIMESTAMPING                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_NETWORK_PHY_TIMESTAMPING                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BRIDGE                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BRIDGE_IGMP_SNOOPING                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BRIDGE_VLAN_FILTERING                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -10058,6 +10062,7 @@ CONFIG_CGROUP_NET_CLASSID                       policy<{'amd64': 'y', 'arm64': '
 CONFIG_BPF_JIT                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_BPF_STREAM_PARSER                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 
+CONFIG_NETWORK_PHY_TIMESTAMPING                 mark<ENFORCED> note<LP:1785816>
 # Menu: Networking support >> Networking options >> 6LoWPAN Support
 CONFIG_6LOWPAN                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_6LOWPAN_DEBUGFS                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 2dc1b94582fc..7137f47c81f1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2215,6 +2215,7 @@ CONFIG_DONGLE=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DOVE_CLK=y
 CONFIG_DOVE_THERMAL=m
+CONFIG_DP83640_PHY=m
 CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
@@ -5802,7 +5803,7 @@ CONFIG_NETLINK_DIAG=m
 CONFIG_NETPOLL=y
 CONFIG_NETROM=m
 CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETXEN_NIC=m
 CONFIG_NET_9P=m
-- 
2.17.1