diff mbox

UBUNTU: [Config] armhf: MFD_TPS65217=y && REGULATOR_TPS65217=y

Message ID 1474901074-30372-2-git-send-email-paolo.pisati@canonical.com
State New
Headers show

Commit Message

Paolo Pisati Sept. 26, 2016, 2:44 p.m. UTC 
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.master/abi/4.8.0-17.19/armhf/generic.modules | 2 --
 debian.master/config/amd64/config.common.amd64      | 1 +
 debian.master/config/annotations                    | 6 ++++--
 debian.master/config/arm64/config.common.arm64      | 1 +
 debian.master/config/armhf/config.common.armhf      | 3 ++-
 debian.master/config/config.common.ubuntu           | 1 -
 debian.master/config/i386/config.common.i386        | 1 +
 debian.master/config/powerpc/config.common.powerpc  | 1 +
 debian.master/config/ppc64el/config.common.ppc64el  | 1 +
 9 files changed, 11 insertions(+), 6 deletions(-)

Comments

Tim Gardner Sept. 26, 2016, 4:22 p.m. UTC | #1
Stefan Bader Sept. 27, 2016, 8:35 a.m. UTC | #2
diff mbox

Patch

diff --git a/debian.master/abi/4.8.0-17.19/armhf/generic.modules b/debian.master/abi/4.8.0-17.19/armhf/generic.modules
index 0ceb534..d4f0fd7 100644
--- a/debian.master/abi/4.8.0-17.19/armhf/generic.modules
+++ b/debian.master/abi/4.8.0-17.19/armhf/generic.modules
@@ -4356,10 +4356,8 @@  tps65086
 tps65086-regulator
 tps65090-charger
 tps65090-regulator
-tps65217
 tps65217_bl
 tps65217_charger
-tps65217-regulator
 tps65218
 tps65218-pwrbutton
 tps65218-regulator
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 1106c0d..16f8892 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -481,6 +481,7 @@  CONFIG_REED_SOLOMON=m
 CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_RELOCATABLE=y
 CONFIG_RESET_CONTROLLER=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b5c849a..fff3a4c 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -3237,7 +3237,7 @@  CONFIG_TPS6105X                                 policy<{'amd64': 'm', 'arm64': '
 CONFIG_TPS65010                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_TPS6507X                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_MFD_TPS65090                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
-CONFIG_MFD_TPS65217                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
+CONFIG_MFD_TPS65217                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_MFD_TPS65218                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 CONFIG_MFD_TPS6586X                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
 CONFIG_MFD_TPS65910                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}>
@@ -3271,6 +3271,7 @@  CONFIG_MFD_WM8994                               policy<{'amd64': 'm', 'arm64': '
 CONFIG_MFD_VEXPRESS_SYSREG                      policy<{'arm64': 'y', 'armhf': 'y'}>
 #
 CONFIG_MFD_SM501                                note<boot essential on OMAP4>
+CONFIG_MFD_TPS65217                             mark<ENFORCE> note<boot essential on AM335x>
 
 # Menu: Device Drivers >> Multifunction device drivers >> Multimedia Capabilities Port drivers
 
@@ -6930,7 +6931,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': '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_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'}>
@@ -6946,6 +6947,7 @@  CONFIG_REGULATOR_WM8994                         policy<{'amd64': 'm', 'arm64': '
 #
 CONFIG_REGULATOR_FIXED_VOLTAGE                  note<boot essential on arm>
 CONFIG_REGULATOR_TWL4030                        mark<ENFORCED> note<boot requisite for omap4>
+CONFIG_REGULATOR_TPS65217                       mark<ENFORCED> note<boot essential on AM335x>
 
 # Menu: Device Drivers >> Watchdog Timer Support
 CONFIG_WATCHDOG                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index a7e1752..0353360 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -523,6 +523,7 @@  CONFIG_REED_SOLOMON=m
 CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_RELOCATABLE=y
 # CONFIG_RENESAS_USB_DMAC is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 5b12e94..b616cb6 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -341,7 +341,7 @@  CONFIG_MFD_SM501=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TMIO=y
-CONFIG_MFD_TPS65217=m
+CONFIG_MFD_TPS65217=y
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS65912_I2C=y
 CONFIG_MFD_VX855=m
@@ -504,6 +504,7 @@  CONFIG_REED_SOLOMON=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_TPS65217=y
 CONFIG_RENESAS_USB_DMAC=m
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RFKILL=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index fd5c61c..931e150 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6456,7 +6456,6 @@  CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65086=m
 CONFIG_REGULATOR_TPS65090=m
-CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 48186a7..0a12f17 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -473,6 +473,7 @@  CONFIG_REED_SOLOMON=m
 CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_RELOCATABLE=y
 CONFIG_RESET_CONTROLLER=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index cf3a328..4654613 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -456,6 +456,7 @@  CONFIG_REED_SOLOMON=m
 CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RFKILL=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index f701c7c..ac5bad9 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -518,6 +518,7 @@  CONFIG_REED_SOLOMON=m
 CONFIG_REGMAP_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TWL4030=m
 CONFIG_RELOCATABLE=y
 CONFIG_RESET_CONTROLLER=y