hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]

Add support for Ericsson BMR450, BMR451, BMR462, BMR463, and BMR464, which are
based on ZL2005 and ZL2008, to zl6100 driver. Remove BMR450 and BMR451 device
IDs from generic PMBus driver.

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>

3 files changed, 9 insertions, 5 deletions

diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
index d357ab280263..cfec923f42b7 100644
--- a/drivers/hwmon/pmbus/Kconfig
+++ b/drivers/hwmon/pmbus/Kconfig
@@ -19,8 +19,8 @@ config SENSORS_PMBUS
         default y
         help
           If you say yes here you get hardware monitoring support for generic
-          PMBus devices, including but not limited to ADP4000, BMR450, BMR451,
-          BMR453, BMR454, NCP4200, and NCP4208.
+          PMBus devices, including but not limited to ADP4000, BMR453, BMR454,
+          NCP4200, and NCP4208.
 
           This driver can also be built as a module. If so, the module will
           be called pmbus.
@@ -114,7 +114,8 @@ config SENSORS_ZL6100
         help
           If you say yes here you get hardware monitoring support for Intersil
           ZL2004, ZL2005, ZL2006, ZL2008, ZL2105, ZL2106, ZL6100, and ZL6105
-          Digital DC/DC Controllers.
+          Digital DC/DC Controllers, as well as for Ericsson BMR450, BMR451,
+          BMR462, BMR463, and BMR464.
 
           This driver can also be built as a module. If so, the module will
           be called zl6100.
diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index 995e873197e3..18a385e753d7 100644
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -200,8 +200,6 @@ static int pmbus_remove(struct i2c_client *client)
  */
 static const struct i2c_device_id pmbus_id[] = {
         {"adp4000", 1},
-        {"bmr450", 1},
-        {"bmr451", 1},
         {"bmr453", 1},
         {"bmr454", 1},
         {"ncp4200", 1},
diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c
index d78bdcf467f3..7a72b6e4ff1d 100644
--- a/drivers/hwmon/pmbus/zl6100.c
+++ b/drivers/hwmon/pmbus/zl6100.c
@@ -135,6 +135,11 @@ static int zl6100_write_byte(struct i2c_client *client, int page, u8 value)
 }
 
 static const struct i2c_device_id zl6100_id[] = {
+        {"bmr450", zl2005},
+        {"bmr451", zl2005},
+        {"bmr462", zl2008},
+        {"bmr463", zl2008},
+        {"bmr464", zl2008},
         {"zl2004", zl2004},
         {"zl2005", zl2005},
         {"zl2006", zl2006},