UBUNTU: [Config] CONFIG_MFD_TPS65217=n for ppc64el

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 93765d86b4d86e4714fbc3f0bdfc4e7e36f0c003..b9a3f7bf370e58028acffffcb544f951f1a5c4c0 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6934,7 +6934,7 @@ CONFIG_REGULATOR_TPS62360                       policy<{'amd64': 'm', 'arm64': '
 CONFIG_REGULATOR_TPS65023                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6507X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS65090                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
-CONFIG_REGULATOR_TPS65217                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
+CONFIG_REGULATOR_TPS65217                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm', 'powerpc': 'm', 'ppc64el': '-'}>
 CONFIG_REGULATOR_TPS65218                       policy<{'arm64': 'm', 'armhf': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6524X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_REGULATOR_TPS6586X                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 99fb091be8bd135cf82f1689a2f3aa0de5bbd48e..29e3ea182cb0a516a8ac50b9fc30a287a6fc4ab0 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -339,7 +339,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 # CONFIG_MFD_TMIO is not set
-CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65217 is not set
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_VX855=m
@@ -522,7 +522,6 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_RELOCATABLE=y
 # CONFIG_RESET_BERLIN is not set