imx6/current: rewrite-kernel-patches, no changes

This commit is contained in:
Ricardo Pardini
2025-01-04 01:33:24 +00:00
committed by Igor
parent 5c670e08a8
commit e2ed1e4465

View File

@@ -1,18 +1,21 @@
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 7327fce87808..b06128da94e5 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -336,6 +336,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_TEST=m
CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ONBOARD_HUB=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pete <chiefwigms@hotmail.com>
Date: Mon, 22 Apr 2024 16:00:47 +0200
Subject: [ARCHEOLOGY] Add UDOO USB patch for newer kernels (#6505)
> X-Git-Archeology: - Revision 4b53634475c798f4a0ae4d9530cc8f4896c43723: https://github.com/armbian/build/commit/4b53634475c798f4a0ae4d9530cc8f4896c43723
> X-Git-Archeology: Date: Mon, 22 Apr 2024 16:00:47 +0200
> X-Git-Archeology: From: Pete <chiefwigms@hotmail.com>
> X-Git-Archeology: Subject: Add UDOO USB patch for newer kernels (#6505)
> X-Git-Archeology:
---
arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi | 25 +++++-----
arch/arm/configs/imx_v6_v7_defconfig | 1 +
drivers/usb/misc/onboard_usb_hub.c | 14 ++++++
3 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi
index 647ba5e623dd..14272b42f9a1 100644
index 111111111111..222222222222 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi
@@ -59,16 +59,6 @@ panel_in: endpoint {
@@ -54,9 +57,20 @@ index 647ba5e623dd..14272b42f9a1 100644
};
&usbotg {
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 111111111111..222222222222 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -336,6 +336,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_TEST=m
CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ONBOARD_HUB=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y
diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c
index 6d122772a97064..3b209104f648fd 100644
index 111111111111..222222222222 100644
--- a/drivers/usb/misc/onboard_usb_hub.c
+++ b/drivers/usb/misc/onboard_usb_hub.c
@@ -5,6 +5,7 @@
@@ -66,8 +80,8 @@ index 6d122772a97064..3b209104f648fd 100644
+#include <linux/clk.h>
#include <linux/device.h>
#include <linux/export.h>
#include <linux/err.h>
@@ -61,12 +62,19 @@ struct onboard_hub {
#include <linux/gpio/consumer.h>
@@ -60,12 +61,19 @@ struct onboard_hub {
bool going_away;
struct list_head udev_list;
struct mutex lock;
@@ -86,8 +100,8 @@ index 6d122772a97064..3b209104f648fd 100644
+
err = regulator_bulk_enable(hub->pdata->num_supplies, hub->supplies);
if (err) {
dev_err(hub->dev, "failed to enable supplies: %pe\n", ERR_PTR(err));
@@ -93,6 +101,8 @@ static int onboard_hub_power_off(struct onboard_hub *hub)
dev_err(hub->dev, "failed to enable supplies: %d\n", err);
@@ -92,6 +100,8 @@ static int onboard_hub_power_off(struct onboard_hub *hub)
return err;
}
@@ -96,7 +110,7 @@ index 6d122772a97064..3b209104f648fd 100644
hub->is_powered_on = false;
return 0;
@@ -267,6 +277,10 @@ static int onboard_hub_probe(struct platform_device *pdev)
@@ -271,6 +281,10 @@ static int onboard_hub_probe(struct platform_device *pdev)
return err;
}
@@ -107,4 +121,6 @@ index 6d122772a97064..3b209104f648fd 100644
hub->reset_gpio = devm_gpiod_get_optional(dev, "reset",
GPIOD_OUT_HIGH);
if (IS_ERR(hub->reset_gpio))
--
Armbian