Detect both SYS_VENDOR and BOARD_VENDOR.

2025-12-26 09:47:13 +00:00 · 2016-12-10 15:33:36 +00:00
parent 06c2d4bf58
commit 65529d39fe
9 changed files with 81 additions and 18 deletions
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5512_54x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5512_54x-device-drivers.patch
@@ -807,7 +807,7 @@ diff --git a/drivers/hwmon/accton_i2c_cpld.c b/drivers/hwmon/accton_i2c_cpld.c
 index acf88c9..e50c599 100644
 --- a/drivers/hwmon/accton_i2c_cpld.c
 +++ b/drivers/hwmon/accton_i2c_cpld.c
-@@ -255,6 +255,22 @@ int platform_accton_as5812_54t(void)
+@@ -255,6 +255,29 @@ int platform_accton_as5812_54t(void)
 }
 EXPORT_SYMBOL(platform_accton_as5812_54t);
 
@@ -818,7 +818,14 @@ index acf88c9..e50c599 100644
 +			DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "AS5512"),
 +		},
-+	}
+	},
+	{
+		.ident = "Accton AS5512",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AS5512"),
+		},
+	},
 +};
 +
 +int platform_accton_as5512_54x(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5712_54x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5712_54x-device-drivers.patch
@@ -828,7 +828,7 @@ new file mode 100644
 index 0000000..6381db5
 --- /dev/null
 +++ b/drivers/i2c/muxes/i2c-mux-accton_as5712_54x_cpld.c
-@@ -0,0 +1,459 @@
+@@ -0,0 +1,466 @@
 +/*
 + * I2C multiplexer
 + *
@@ -872,7 +872,14 @@ index 0000000..6381db5
 +            DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +            DMI_MATCH(DMI_PRODUCT_NAME, "AS5712"),
 +        },
-+    }
+    },
+    {
+        .ident = "Accton AS5712",
+        .matches = {
+            DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+            DMI_MATCH(DMI_PRODUCT_NAME, "AS5712"),
+        },
+    },
 +};
 +
 +int platform_accton_as5712_54x(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5812_54t-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5812_54t-device-drivers.patch
@@ -838,7 +838,7 @@ index 3aeb08d..acf88c9 100644
 	accton_i2c_cpld_remove_client(client);
 	
 	return 0;
-@@ -217,6 +239,22 @@ int platform_accton_as7712_32x(void)
+@@ -217,6 +239,29 @@ int platform_accton_as7712_32x(void)
 }
 EXPORT_SYMBOL(platform_accton_as7712_32x);
 
@@ -849,7 +849,14 @@ index 3aeb08d..acf88c9 100644
 +			DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "AS5812-54T"),
 +		},
-+	}
+	},
+	{
+		.ident = "Accton AS5812 54t",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AS5812-54T"),
+		},
+	},
 +};
 +
 +int platform_accton_as5812_54t(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5812_54x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as5812_54x-device-drivers.patch
@@ -826,7 +826,7 @@ new file mode 100644
 index 0000000..e01e557
 --- /dev/null
 +++ b/drivers/i2c/muxes/i2c-mux-accton_as5812_54x_cpld.c
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,394 @@
 +/*
 + * An I2C multiplexer dirver for accton as5812 CPLD
 + *
@@ -871,7 +871,14 @@ index 0000000..e01e557
 +            DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +            DMI_MATCH(DMI_PRODUCT_NAME, "AS5812-54X"),
 +        },
-+    }
+    },
+    {
+        .ident = "Accton AS5812-54X",
+        .matches = {
+            DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+            DMI_MATCH(DMI_PRODUCT_NAME, "AS5812-54X"),
+        },
+    },
 +};
 +
 +int platform_accton_as5812_54x(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as6712_32x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as6712_32x-device-drivers.patch
@@ -837,7 +837,7 @@ new file mode 100644
 index 0000000..2ec0a59
 --- /dev/null
 +++ b/drivers/i2c/muxes/i2c-mux-accton_as6712_32x_cpld.c
-@@ -0,0 +1,420 @@
+@@ -0,0 +1,427 @@
 +/*
 + * I2C multiplexer
 + *
@@ -881,7 +881,14 @@ index 0000000..2ec0a59
 +            DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +            DMI_MATCH(DMI_PRODUCT_NAME, "AS6712"),
 +        },
-+    }
+    },
+    {
+        .ident = "Accton AS6712",
+        .matches = {
+            DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+            DMI_MATCH(DMI_PRODUCT_NAME, "AS6712"),
+        },
+    },
 +};
 +
 +int platform_accton_as6712_32x(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as6812_32x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as6812_32x-device-drivers.patch
@@ -829,7 +829,7 @@ new file mode 100644
 index 0000000..d668ca4
 --- /dev/null
 +++ b/drivers/i2c/muxes/i2c-mux-accton_as6812_32x_cpld.c
-@@ -0,0 +1,382 @@
+@@ -0,0 +1,389 @@
 +/*
 + * I2C multiplexer for accton as6812 CPLD
 + *
@@ -874,7 +874,14 @@ index 0000000..d668ca4
 +			DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "AS6812"),
 +		},
-+	}
+	},
+	{
+		.ident = "Accton AS6812",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AS6812"),
+		},
+	},
 +};
 +
 +int platform_accton_as6812_32x(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as7512_32x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as7512_32x-device-drivers.patch
@@ -888,7 +888,7 @@ new file mode 100644
 index 0000000..96e3490
 --- /dev/null
 +++ b/drivers/hwmon/accton_i2c_cpld.c
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,216 @@
 +/*
 + * A hwmon driver for the accton_i2c_cpld
 + *
@@ -1083,7 +1083,14 @@ index 0000000..96e3490
 +			DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "AS7512"),
 +		},
-+	}
+	},
+	{
+		.ident = "Accton AS7512",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AS7512"),
+		},
+	},
 +};
 +
 +int platform_accton_as7512_32x(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as7712_32x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as7712_32x-device-drivers.patch
@@ -803,7 +803,7 @@ diff --git a/drivers/hwmon/accton_i2c_cpld.c b/drivers/hwmon/accton_i2c_cpld.c
 index 96e3490..3aeb08d 100644
 --- a/drivers/hwmon/accton_i2c_cpld.c
 +++ b/drivers/hwmon/accton_i2c_cpld.c
-@@ -201,6 +201,22 @@ int platform_accton_as7512_32x(void)
+@@ -201,6 +201,29 @@ int platform_accton_as7512_32x(void)
 }
 EXPORT_SYMBOL(platform_accton_as7512_32x);
 
@@ -814,7 +814,14 @@ index 96e3490..3aeb08d 100644
 +			DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "AS7712"),
 +		},
-+	}
+	},
+	{
+		.ident = "Accton AS7712",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "AS7712"),
+		},
+	},
 +};
 +
 +int platform_accton_as7712_32x(void)
--- a/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as7716_32x-device-drivers.patch
+++ b/packages/base/any/kernels/3.2.65-1+deb7u2/patches/platform-accton-as7716_32x-device-drivers.patch
@@ -803,7 +803,7 @@ diff --git a/drivers/hwmon/accton_i2c_cpld.c b/drivers/hwmon/accton_i2c_cpld.c
 index e50c599..89e3a0e 100644
 --- a/drivers/hwmon/accton_i2c_cpld.c
 +++ b/drivers/hwmon/accton_i2c_cpld.c
-@@ -271,6 +271,22 @@ int platform_accton_as5512_54x(void)
+@@ -271,6 +271,29 @@ int platform_accton_as5512_54x(void)
 }
 EXPORT_SYMBOL(platform_accton_as5512_54x);
 
@@ -814,7 +814,14 @@ index e50c599..89e3a0e 100644
 +                        DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
 +                        DMI_MATCH(DMI_PRODUCT_NAME, "AS7716"),
 +                },
-+        }
+        },
+        {
+                .ident = "Accton AS7716",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Accton"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AS7716"),
+                },
+        },
 +};
 +
 +int platform_accton_as7716_32x(void)