mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
6ac6f2402d
1. Use final (accepted) patches 2. Add two more required for v6.4 nvmem stuff Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 553bd29700145e1849698985e9800f14e967da49 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Stein <alexander.stein@ew.tq-group.com>
|
|
Date: Tue, 7 Feb 2023 12:05:29 +0100
|
|
Subject: [PATCH] of: device: Ignore modalias of reused nodes
|
|
|
|
If of_node is reused, do not use that node's modalias. This will hide
|
|
the name of the actual device. This is rather prominent in USB glue
|
|
drivers creating a platform device for the host controller.
|
|
|
|
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
|
|
Reviewed-by: Rob Herring <robh@kernel.org>
|
|
Link: https://lore.kernel.org/r/20230207110531.1060252-2-alexander.stein@ew.tq-group.com
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/of/device.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/of/device.c
|
|
+++ b/drivers/of/device.c
|
|
@@ -223,7 +223,7 @@ static ssize_t of_device_get_modalias(st
|
|
ssize_t csize;
|
|
ssize_t tsize;
|
|
|
|
- if ((!dev) || (!dev->of_node))
|
|
+ if ((!dev) || (!dev->of_node) || dev->of_node_reused)
|
|
return -ENODEV;
|
|
|
|
/* Name & Type */
|
|
@@ -338,7 +338,7 @@ int of_device_uevent_modalias(struct dev
|
|
{
|
|
int sl;
|
|
|
|
- if ((!dev) || (!dev->of_node))
|
|
+ if ((!dev) || (!dev->of_node) || dev->of_node_reused)
|
|
return -ENODEV;
|
|
|
|
/* Devicetree modalias is tricky, we add it in 2 steps */
|