linux (Allwinner): rebase patches for 6.6-rc1

This commit is contained in:
Rudi Heitbaum 2023-09-11 11:44:45 +00:00
parent 0fa9026b93
commit b7187253a8
3 changed files with 3 additions and 3 deletions

View File

@ -53,7 +53,7 @@ index 6a8dfc022d3c..35d7a7ffd208 100644
@@ -437,6 +442,7 @@ MODULE_DEVICE_TABLE(of, sun4i_drv_of_table);
static struct platform_driver sun4i_drv_platform_driver = {
.probe = sun4i_drv_probe,
.remove = sun4i_drv_remove,
.remove_new = sun4i_drv_remove,
+ .shutdown = sun4i_drv_shutdown,
.driver = {
.name = "sun4i-drm",

View File

@ -182,7 +182,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+ .name = "ac200",
+ .of_match_table = of_match_ptr(ac200_of_match),
+ },
+ .probe_new = ac200_i2c_probe,
+ .probe = ac200_i2c_probe,
+ .remove = ac200_i2c_remove,
+ .id_table = ac200_ids,
+};

View File

@ -89,9 +89,9 @@ index c7cf61fe41cf..3bfe9bf6b3ac 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -30,6 +30,7 @@
#include <linux/phy_led_triggers.h>
#include <linux/pse-pd/pse.h>
#include <linux/property.h>
#include <linux/rtnetlink.h>
+#include <linux/regulator/consumer.h>
#include <linux/sfp.h>
#include <linux/skbuff.h>