elbert: bump to kernel 6.6

Summary: Upgrade elbert openbmc kernel from 6.0 to 6.6. Test Plan: 1) "bitbake elbert-image" passed. 2) booted up linux 6.6 on elbert bmc successfully. 3) more testing in progress.. Reviewed By: alandau Differential Revision: D60638619 fbshipit-source-id: a44c3ce134aad4268069cc540c93f4e59076ce78
facebook · Aug 27, 2024 · 4186b13 · 4186b13
1 parent d71fd34
commit 4186b13
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 42 deletions.
diff --git a/meta-facebook/meta-elbert/conf/machine/elbert.conf b/meta-facebook/meta-elbert/conf/machine/elbert.conf
@@ -12,8 +12,8 @@ UBOOT_MACHINE:elbert = "facebook-elbert_defconfig"
 #
 # Kernel version.
 #
-KERNEL_DEVICETREE = "aspeed-bmc-facebook-elbert.dtb"
-PREFERRED_VERSION_linux-aspeed = "6.0.%"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-elbert.dtb"
+PREFERRED_VERSION_linux-aspeed = "6.6.%"
 
 #
 # U-boot version.

diff --git a/meta-facebook/meta-elbert/recipes-kernel/cpld-mod/files/fancpld.c b/meta-facebook/meta-elbert/recipes-kernel/cpld-mod/files/fancpld.c
@@ -713,18 +713,12 @@ static int fancpld_detect(struct i2c_client *client,
   return 0;
 }
 
-static int fancpld_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int fancpld_probe(struct i2c_client *client)
 {
   int n_attrs = sizeof(fancpld_attr_table) / sizeof(fancpld_attr_table[0]);
-  return i2c_dev_sysfs_data_init(client, &fancpld_data,
-                                 fancpld_attr_table, n_attrs);
-}
 
-static int fancpld_remove(struct i2c_client *client)
-{
-  i2c_dev_sysfs_data_clean(client, &fancpld_data);
-  return 0;
+  return devm_i2c_dev_sysfs_init(client, &fancpld_data,
+                                 fancpld_attr_table, n_attrs);
 }
 
 static struct i2c_driver fancpld_driver = {
@@ -733,7 +727,6 @@ static struct i2c_driver fancpld_driver = {
     .name = "fancpld",
   },
   .probe    = fancpld_probe,
-  .remove   = fancpld_remove,
   .id_table = fancpld_id,
   .detect   = fancpld_detect,
   .address_list = normal_i2c,

diff --git a/meta-facebook/meta-elbert/recipes-kernel/cpld-mod/files/scmcpld.c b/meta-facebook/meta-elbert/recipes-kernel/cpld-mod/files/scmcpld.c
@@ -450,18 +450,12 @@ static int scmcpld_detect(struct i2c_client *client,
   return 0;
 }
 
-static int scmcpld_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int scmcpld_probe(struct i2c_client *client)
 {
   int n_attrs = sizeof(scmcpld_attr_table) / sizeof(scmcpld_attr_table[0]);
-  return i2c_dev_sysfs_data_init(client, &scmcpld_data,
-                                 scmcpld_attr_table, n_attrs);
-}
 
-static int scmcpld_remove(struct i2c_client *client)
-{
-  i2c_dev_sysfs_data_clean(client, &scmcpld_data);
-  return 0;
+  return devm_i2c_dev_sysfs_init(client, &scmcpld_data,
+                                 scmcpld_attr_table, n_attrs);
 }
 
 static struct i2c_driver scmcpld_driver = {
@@ -470,7 +464,6 @@ static struct i2c_driver scmcpld_driver = {
     .name = "scmcpld",
   },
   .probe    = scmcpld_probe,
-  .remove   = scmcpld_remove,
   .id_table = scmcpld_id,
   .detect   = scmcpld_detect,
   .address_list = normal_i2c,

diff --git a/meta-facebook/meta-elbert/recipes-kernel/cpld-mod/files/smbcpld.c b/meta-facebook/meta-elbert/recipes-kernel/cpld-mod/files/smbcpld.c
@@ -908,18 +908,12 @@ static int smbcpld_detect(struct i2c_client *client,
   return 0;
 }
 
-static int smbcpld_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
+static int smbcpld_probe(struct i2c_client *client)
 {
   int n_attrs = sizeof(smbcpld_attr_table) / sizeof(smbcpld_attr_table[0]);
-  return i2c_dev_sysfs_data_init(client, &smbcpld_data,
-                                 smbcpld_attr_table, n_attrs);
-}
 
-static int smbcpld_remove(struct i2c_client *client)
-{
-  i2c_dev_sysfs_data_clean(client, &smbcpld_data);
-  return 0;
+  return devm_i2c_dev_sysfs_init(client, &smbcpld_data,
+                                 smbcpld_attr_table, n_attrs);
 }
 
 static struct i2c_driver smbcpld_driver = {
@@ -928,7 +922,6 @@ static struct i2c_driver smbcpld_driver = {
     .name = "smbcpld",
   },
   .probe    = smbcpld_probe,
-  .remove   = smbcpld_remove,
   .id_table = smbcpld_id,
   .detect   = smbcpld_detect,
   .address_list = normal_i2c,

diff --git a/meta-facebook/meta-elbert/recipes-kernel/i2c-mod/files/psu_driver.c b/meta-facebook/meta-elbert/recipes-kernel/i2c-mod/files/psu_driver.c
@@ -418,28 +418,20 @@ static int psu_detect(struct i2c_client *client,
   return 0;
 }
 
-static int psu_probe(struct i2c_client *client,
-                     const struct i2c_device_id *id)
+static int psu_probe(struct i2c_client *client)
 {
   int n_attrs = sizeof(psu_attr_table) / sizeof(psu_attr_table[0]);
 
-  return i2c_dev_sysfs_data_init(client, &psu_data,
+  return devm_i2c_dev_sysfs_init(client, &psu_data,
                                  psu_attr_table, n_attrs);
 }
 
-static int psu_remove(struct i2c_client *client)
-{
-  i2c_dev_sysfs_data_clean(client, &psu_data);
-  return 0;
-}
-
 static struct i2c_driver psu_driver = {
   .class    = I2C_CLASS_HWMON,
   .driver = {
     .name = "psu_driver",
   },
   .probe    = psu_probe,
-  .remove   = psu_remove,
   .id_table = psu_id,
   .detect   = psu_detect,
   .address_list = normal_i2c,