Commit 37d59d10 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (pmbus/isl68137) Fix up chip IDs



I2C chip IDs need to reflect chip names, not chip functionality.

Fixes: f621d61f ("hwmon: (pmbus) add support for 2nd Gen Renesas digital multiphase")
Cc: Grant Peltier <grantpeltier93@gmail.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 8f3d9f35
Loading
Loading
Loading
Loading
+38 −38
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Supported chips:

  * Renesas ISL68220

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl68220'

    Addresses scanned: -

@@ -26,7 +26,7 @@ Supported chips:

  * Renesas ISL68221

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl68221'

    Addresses scanned: -

@@ -36,7 +36,7 @@ Supported chips:

  * Renesas ISL68222

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl68222'

    Addresses scanned: -

@@ -46,7 +46,7 @@ Supported chips:

  * Renesas ISL68223

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl68223'

    Addresses scanned: -

@@ -56,7 +56,7 @@ Supported chips:

  * Renesas ISL68224

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl68224'

    Addresses scanned: -

@@ -66,7 +66,7 @@ Supported chips:

  * Renesas ISL68225

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl68225'

    Addresses scanned: -

@@ -76,7 +76,7 @@ Supported chips:

  * Renesas ISL68226

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl68226'

    Addresses scanned: -

@@ -86,7 +86,7 @@ Supported chips:

  * Renesas ISL68227

    Prefix: 'raa_dmpvr2_1rail'
    Prefix: 'isl68227'

    Addresses scanned: -

@@ -96,7 +96,7 @@ Supported chips:

  * Renesas ISL68229

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl68229'

    Addresses scanned: -

@@ -106,7 +106,7 @@ Supported chips:

  * Renesas ISL68233

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl68233'

    Addresses scanned: -

@@ -116,7 +116,7 @@ Supported chips:

  * Renesas ISL68239

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl68239'

    Addresses scanned: -

@@ -126,7 +126,7 @@ Supported chips:

  * Renesas ISL69222

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69222'

    Addresses scanned: -

@@ -136,7 +136,7 @@ Supported chips:

  * Renesas ISL69223

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl69223'

    Addresses scanned: -

@@ -146,7 +146,7 @@ Supported chips:

  * Renesas ISL69224

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69224'

    Addresses scanned: -

@@ -156,7 +156,7 @@ Supported chips:

  * Renesas ISL69225

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69225'

    Addresses scanned: -

@@ -166,7 +166,7 @@ Supported chips:

  * Renesas ISL69227

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl69227'

    Addresses scanned: -

@@ -176,7 +176,7 @@ Supported chips:

  * Renesas ISL69228

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl69228'

    Addresses scanned: -

@@ -186,7 +186,7 @@ Supported chips:

  * Renesas ISL69234

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69234'

    Addresses scanned: -

@@ -196,7 +196,7 @@ Supported chips:

  * Renesas ISL69236

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69236'

    Addresses scanned: -

@@ -206,7 +206,7 @@ Supported chips:

  * Renesas ISL69239

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl69239'

    Addresses scanned: -

@@ -216,7 +216,7 @@ Supported chips:

  * Renesas ISL69242

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69242'

    Addresses scanned: -

@@ -226,7 +226,7 @@ Supported chips:

  * Renesas ISL69243

    Prefix: 'raa_dmpvr2_1rail'
    Prefix: 'isl69243'

    Addresses scanned: -

@@ -236,7 +236,7 @@ Supported chips:

  * Renesas ISL69247

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69247'

    Addresses scanned: -

@@ -246,7 +246,7 @@ Supported chips:

  * Renesas ISL69248

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69248'

    Addresses scanned: -

@@ -256,7 +256,7 @@ Supported chips:

  * Renesas ISL69254

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69254'

    Addresses scanned: -

@@ -266,7 +266,7 @@ Supported chips:

  * Renesas ISL69255

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69255'

    Addresses scanned: -

@@ -276,7 +276,7 @@ Supported chips:

  * Renesas ISL69256

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69256'

    Addresses scanned: -

@@ -286,7 +286,7 @@ Supported chips:

  * Renesas ISL69259

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69259'

    Addresses scanned: -

@@ -296,7 +296,7 @@ Supported chips:

  * Renesas ISL69260

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69260'

    Addresses scanned: -

@@ -306,7 +306,7 @@ Supported chips:

  * Renesas ISL69268

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69268'

    Addresses scanned: -

@@ -316,7 +316,7 @@ Supported chips:

  * Renesas ISL69269

    Prefix: 'raa_dmpvr2_3rail'
    Prefix: 'isl69269'

    Addresses scanned: -

@@ -326,7 +326,7 @@ Supported chips:

  * Renesas ISL69298

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'isl69298'

    Addresses scanned: -

@@ -336,7 +336,7 @@ Supported chips:

  * Renesas RAA228000

    Prefix: 'raa_dmpvr2_hv'
    Prefix: 'raa228000'

    Addresses scanned: -

@@ -346,7 +346,7 @@ Supported chips:

  * Renesas RAA228004

    Prefix: 'raa_dmpvr2_hv'
    Prefix: 'raa228004'

    Addresses scanned: -

@@ -356,7 +356,7 @@ Supported chips:

  * Renesas RAA228006

    Prefix: 'raa_dmpvr2_hv'
    Prefix: 'raa228006'

    Addresses scanned: -

@@ -366,7 +366,7 @@ Supported chips:

  * Renesas RAA228228

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'raa228228'

    Addresses scanned: -

@@ -376,7 +376,7 @@ Supported chips:

  * Renesas RAA229001

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'raa229001'

    Addresses scanned: -

@@ -386,7 +386,7 @@ Supported chips:

  * Renesas RAA229004

    Prefix: 'raa_dmpvr2_2rail'
    Prefix: 'raa229004'

    Addresses scanned: -

+85 −7
Original line number Diff line number Diff line
@@ -21,8 +21,50 @@
#define ISL68137_VOUT_AVS	0x30
#define RAA_DMPVR2_READ_VMON	0xc8

enum versions {
enum chips {
	isl68137,
	isl68220,
	isl68221,
	isl68222,
	isl68223,
	isl68224,
	isl68225,
	isl68226,
	isl68227,
	isl68229,
	isl68233,
	isl68239,
	isl69222,
	isl69223,
	isl69224,
	isl69225,
	isl69227,
	isl69228,
	isl69234,
	isl69236,
	isl69239,
	isl69242,
	isl69243,
	isl69247,
	isl69248,
	isl69254,
	isl69255,
	isl69256,
	isl69259,
	isl69260,
	isl69268,
	isl69269,
	isl69298,
	raa228000,
	raa228004,
	raa228006,
	raa228228,
	raa229001,
	raa229004,
};

enum variants {
	raa_dmpvr1_2rail,
	raa_dmpvr2_1rail,
	raa_dmpvr2_2rail,
	raa_dmpvr2_3rail,
@@ -186,7 +228,7 @@ static int isl68137_probe(struct i2c_client *client,
	memcpy(info, &raa_dmpvr_info, sizeof(*info));

	switch (id->driver_data) {
	case isl68137:
	case raa_dmpvr1_2rail:
		info->pages = 2;
		info->R[PSC_VOLTAGE_IN] = 3;
		info->func[0] &= ~PMBUS_HAVE_VMON;
@@ -224,11 +266,47 @@ static int isl68137_probe(struct i2c_client *client,
}

static const struct i2c_device_id raa_dmpvr_id[] = {
	{"isl68137", isl68137},
	{"raa_dmpvr2_1rail", raa_dmpvr2_1rail},
	{"raa_dmpvr2_2rail", raa_dmpvr2_2rail},
	{"raa_dmpvr2_3rail", raa_dmpvr2_3rail},
	{"raa_dmpvr2_hv", raa_dmpvr2_hv},
	{"isl68137", raa_dmpvr1_2rail},
	{"isl68220", raa_dmpvr2_2rail},
	{"isl68221", raa_dmpvr2_3rail},
	{"isl68222", raa_dmpvr2_2rail},
	{"isl68223", raa_dmpvr2_2rail},
	{"isl68224", raa_dmpvr2_3rail},
	{"isl68225", raa_dmpvr2_2rail},
	{"isl68226", raa_dmpvr2_3rail},
	{"isl68227", raa_dmpvr2_1rail},
	{"isl68229", raa_dmpvr2_3rail},
	{"isl68233", raa_dmpvr2_2rail},
	{"isl68239", raa_dmpvr2_3rail},

	{"isl69222", raa_dmpvr2_2rail},
	{"isl69223", raa_dmpvr2_3rail},
	{"isl69224", raa_dmpvr2_2rail},
	{"isl69225", raa_dmpvr2_2rail},
	{"isl69227", raa_dmpvr2_3rail},
	{"isl69228", raa_dmpvr2_3rail},
	{"isl69234", raa_dmpvr2_2rail},
	{"isl69236", raa_dmpvr2_2rail},
	{"isl69239", raa_dmpvr2_3rail},
	{"isl69242", raa_dmpvr2_2rail},
	{"isl69243", raa_dmpvr2_1rail},
	{"isl69247", raa_dmpvr2_2rail},
	{"isl69248", raa_dmpvr2_2rail},
	{"isl69254", raa_dmpvr2_2rail},
	{"isl69255", raa_dmpvr2_2rail},
	{"isl69256", raa_dmpvr2_2rail},
	{"isl69259", raa_dmpvr2_2rail},
	{"isl69260", raa_dmpvr2_2rail},
	{"isl69268", raa_dmpvr2_2rail},
	{"isl69269", raa_dmpvr2_3rail},
	{"isl69298", raa_dmpvr2_2rail},

	{"raa228000", raa_dmpvr2_hv},
	{"raa228004", raa_dmpvr2_hv},
	{"raa228006", raa_dmpvr2_hv},
	{"raa228228", raa_dmpvr2_2rail},
	{"raa229001", raa_dmpvr2_2rail},
	{"raa229004", raa_dmpvr2_2rail},
	{}
};