[azure][PATCH 05/20] UBUNTU: [Config] azure: CONFIG_PINCTRL_CHERRYVIEW=n

[Marcelo Henrique Cerri]

BugLink: http://bugs.launchpad.net/bugs/1710261

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 debian.azure/config/annotations          | 2 --
 debian.azure/config/config.common.ubuntu | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index a1abe88fd19a..c8fc78314295 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -5450,7 +5450,6 @@ CONFIG_PINCTRL_IMX6UL                           policy<{'armhf-generic': 'y'}>
 CONFIG_PINCTRL_IMX7D                            policy<{'armhf-generic': 'y'}>
 CONFIG_PINCTRL_VF610                            policy<{'armhf-generic': 'y'}>
 CONFIG_PINCTRL_BAYTRAIL                         policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
-CONFIG_PINCTRL_CHERRYVIEW                       policy<{'amd64': 'y', 'arm64': 'm', 'i386': 'm'}>
 CONFIG_PINCTRL_MERRIFIELD                       policy<{'i386': 'n'}>
 CONFIG_PINCTRL_BROXTON                          policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}>
 CONFIG_PINCTRL_SUNRISEPOINT                     policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}>
@@ -5479,7 +5478,6 @@ CONFIG_PINCTRL_MT6397                           policy<{'arm64': 'y', 'armhf': '
 #
 CONFIG_PINCTRL_MT8135                           flag<REVIEW>
 CONFIG_PINCTRL_MT8127                           flag<REVIEW>
-CONFIG_PINCTRL_CHERRYVIEW                       mark<ENFORCED> note<LP #1630238>
 
 # Menu: Device Drivers >> Pin controllers >> Nomadik pin controller driver
 
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 4ec2b383d7c8..37c777929852 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -3307,7 +3307,7 @@ CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_AMD is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 # CONFIG_PINCTRL_BROXTON is not set
-CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_CHERRYVIEW=n
 # CONFIG_PINCTRL_GEMINILAKE is not set
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 CONFIG_PINMUX=y
-- 
2.7.4