forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
cd59b49
commit 3bef40a
Showing
33 changed files
with
1,232 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <[email protected]> | |
|
||
#include "xhci.h" | ||
#include "xhci-trace.h" | ||
@@ -266,6 +268,458 @@ static void xhci_pme_acpi_rtd3_enable(st | ||
@@ -268,6 +270,458 @@ static void xhci_pme_acpi_rtd3_enable(st | ||
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } | ||
#endif /* CONFIG_ACPI */ | ||
|
||
|
@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <[email protected]> | |
/* called during probe() after chip reset completes */ | ||
static int xhci_pci_setup(struct usb_hcd *hcd) | ||
{ | ||
@@ -301,6 +755,22 @@ static int xhci_pci_probe(struct pci_dev | ||
@@ -306,6 +760,22 @@ static int xhci_pci_probe(struct pci_dev | ||
struct hc_driver *driver; | ||
struct usb_hcd *hcd; | ||
|
||
|
@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <[email protected]> | |
driver = (struct hc_driver *)id->driver_data; | ||
|
||
/* For some HW implementation, a XHCI reset is just not enough... */ | ||
@@ -365,6 +835,16 @@ static void xhci_pci_remove(struct pci_d | ||
@@ -367,6 +837,16 @@ static void xhci_pci_remove(struct pci_d | ||
{ | ||
struct xhci_hcd *xhci; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <[email protected]> | |
|
||
#include "xhci.h" | ||
#include "xhci-trace.h" | ||
@@ -262,6 +264,458 @@ static void xhci_pme_acpi_rtd3_enable(st | ||
@@ -264,6 +266,458 @@ static void xhci_pme_acpi_rtd3_enable(st | ||
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } | ||
#endif /* CONFIG_ACPI */ | ||
|
||
|
@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <[email protected]> | |
/* called during probe() after chip reset completes */ | ||
static int xhci_pci_setup(struct usb_hcd *hcd) | ||
{ | ||
@@ -300,6 +754,22 @@ static int xhci_pci_probe(struct pci_dev | ||
@@ -305,6 +759,22 @@ static int xhci_pci_probe(struct pci_dev | ||
struct hc_driver *driver; | ||
struct usb_hcd *hcd; | ||
|
||
|
@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <[email protected]> | |
driver = (struct hc_driver *)id->driver_data; | ||
|
||
/* Prevent runtime suspending between USB-2 and USB-3 initialization */ | ||
@@ -361,6 +831,16 @@ static void xhci_pci_remove(struct pci_d | ||
@@ -363,6 +833,16 @@ static void xhci_pci_remove(struct pci_d | ||
{ | ||
struct xhci_hcd *xhci; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,8 +62,8 @@ Signed-off-by: Stefan Wahren <[email protected]> | |
+ const struct brcmstb_thermal_of_data *socdata; | ||
}; | ||
|
||
static void avs_tmon_get_coeffs(struct thermal_zone_device *tz, int *slope, | ||
@@ -164,17 +171,18 @@ static inline u32 avs_tmon_temp_to_code( | ||
/* Convert a HW code to a temperature reading (millidegree celsius) */ | ||
@@ -151,17 +158,18 @@ static inline u32 avs_tmon_temp_to_code( | ||
static int brcmstb_get_temp(void *data, int *temp) | ||
{ | ||
struct brcmstb_thermal_priv *priv = data; | ||
|
@@ -84,7 +84,7 @@ Signed-off-by: Stefan Wahren <[email protected]> | |
|
||
t = avs_tmon_code_to_temp(priv->thermal, val); | ||
if (t < 0) | ||
@@ -299,13 +307,34 @@ static int brcmstb_set_trips(void *data, | ||
@@ -286,13 +294,34 @@ static int brcmstb_set_trips(void *data, | ||
return 0; | ||
} | ||
|
||
|
@@ -121,7 +121,7 @@ Signed-off-by: Stefan Wahren <[email protected]> | |
{}, | ||
}; | ||
MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table); | ||
@@ -326,10 +355,27 @@ static int brcmstb_thermal_probe(struct | ||
@@ -313,10 +342,27 @@ static int brcmstb_thermal_probe(struct | ||
if (IS_ERR(priv->tmon_base)) | ||
return PTR_ERR(priv->tmon_base); | ||
|
||
|
@@ -150,7 +150,7 @@ Signed-off-by: Stefan Wahren <[email protected]> | |
if (IS_ERR(thermal)) { | ||
ret = PTR_ERR(thermal); | ||
dev_err(&pdev->dev, "could not register sensor: %d\n", ret); | ||
@@ -369,6 +415,9 @@ static int brcmstb_thermal_exit(struct p | ||
@@ -356,6 +402,9 @@ static int brcmstb_thermal_exit(struct p | ||
if (thermal) | ||
thermal_zone_of_sensor_unregister(&pdev->dev, priv->thermal); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -222,6 +222,10 @@ static void xhci_pci_quirks(struct devic | ||
@@ -224,6 +224,10 @@ static void xhci_pci_quirks(struct devic | ||
pdev->device == 0x3432) | ||
xhci->quirks |= XHCI_BROKEN_STREAMS; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -223,8 +223,10 @@ static void xhci_pci_quirks(struct devic | ||
@@ -225,8 +225,10 @@ static void xhci_pci_quirks(struct devic | ||
xhci->quirks |= XHCI_BROKEN_STREAMS; | ||
|
||
if (pdev->vendor == PCI_VENDOR_ID_VIA && | ||
|
@@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1865,6 +1865,7 @@ struct xhci_hcd { | ||
@@ -1872,6 +1872,7 @@ struct xhci_hcd { | ||
#define XHCI_ZERO_64B_REGS BIT_ULL(32) | ||
#define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) | ||
#define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci-mem.c | ||
+++ b/drivers/usb/host/xhci-mem.c | ||
@@ -2495,9 +2495,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, | ||
@@ -2516,9 +2516,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, | ||
* Event ring setup: Allocate a normal ring, but also setup | ||
* the event ring segment table (ERST). Section 4.9.3. | ||
*/ | ||
|
@@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (!xhci->event_ring) | ||
goto fail; | ||
if (xhci_check_trb_in_td_math(xhci) < 0) | ||
@@ -2510,7 +2512,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, | ||
@@ -2531,7 +2533,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, | ||
/* set ERST count with the number of entries in the segment table */ | ||
val = readl(&xhci->ir_set->erst_size); | ||
val &= ERST_SIZE_MASK; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
target/linux/generic/backport-4.19/410-mtd-fix-calculating-partition-end-address.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]> | ||
Date: Mon, 9 Mar 2020 08:30:19 +0100 | ||
Subject: [PATCH] mtd: fix calculating partition end address | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
This fixes check for partitions that don't start at beginning of their | ||
parents. Missing partition's offset in formula could result in forcing | ||
read-only incorrectly. | ||
|
||
Fixes: 6750f61a13a0 ("mtd: improve calculating partition boundaries when checking for alignment") | ||
Signed-off-by: Rafał Miłecki <[email protected]> | ||
--- | ||
drivers/mtd/mtdpart.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
--- a/drivers/mtd/mtdpart.c | ||
+++ b/drivers/mtd/mtdpart.c | ||
@@ -538,7 +538,7 @@ static struct mtd_part *allocate_partiti | ||
part->name); | ||
} | ||
|
||
- tmp = part_absolute_offset(parent) + slave->mtd.size; | ||
+ tmp = part_absolute_offset(parent) + slave->offset + slave->mtd.size; | ||
remainder = do_div(tmp, wr_alignment); | ||
if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) { | ||
slave->mtd.flags &= ~MTD_WRITEABLE; |
27 changes: 27 additions & 0 deletions
27
target/linux/generic/backport-4.19/464-v5.6-mtd-spi-nor-Add-4B_OPCODES-flag-to-w25q256.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From 10050a02f7d508fa88f70fcfceefbacd13488ca7 Mon Sep 17 00:00:00 2001 | ||
From: Robert Marko <[email protected]> | ||
Date: Mon, 23 Dec 2019 17:05:49 +0200 | ||
Subject: [PATCH] mtd: spi-nor: Add 4B_OPCODES flag to w25q256 | ||
|
||
The w25q256 supports 4-byte opcodes so lets add the flag. | ||
Tested on OpenWrt under 4.19.82 kernel on 8devices Habanero. | ||
|
||
Signed-off-by: Robert Marko <[email protected]> | ||
Signed-off-by: Tudor Ambarus <[email protected]> | ||
--- | ||
drivers/mtd/spi-nor/spi-nor.c | 4 +++- | ||
1 file changed, 3 insertions(+), 1 deletion(-) | ||
|
||
--- a/drivers/mtd/spi-nor/spi-nor.c | ||
+++ b/drivers/mtd/spi-nor/spi-nor.c | ||
@@ -1244,7 +1244,9 @@ static const struct flash_info spi_nor_i | ||
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, | ||
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, | ||
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, | ||
- { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, | ||
+ { "w25q256", INFO(0xef4019, 0, 64 * 1024, 512, | ||
+ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | | ||
+ SPI_NOR_4B_OPCODES) }, | ||
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024, | ||
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) }, | ||
|
136 changes: 136 additions & 0 deletions
136
...et/linux/generic/backport-4.19/499-v4.22-iio-add-IIO_MASSCONCENTRATION-channel-type.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
From 17abc9ec68b73ddeb262a507a62421016b9c54d5 Mon Sep 17 00:00:00 2001 | ||
From: Tomasz Duszynski <[email protected]> | ||
Date: Fri, 14 Dec 2018 19:28:01 +0100 | ||
Subject: [PATCH] iio: add IIO_MASSCONCENTRATION channel type | ||
|
||
Measuring particulate matter in ug / m3 (micro-grams per cubic meter) | ||
is de facto standard. Existing air quality sensors usually follow | ||
this convention and are capable of returning measurements using | ||
this unit. | ||
|
||
IIO currently does not offer suitable channel type for this | ||
type of measurements hence this patch adds this. | ||
|
||
In addition, extra modifiers are introduced used for distinguishing | ||
between fine pm1, pm2p5 and coarse pm4, pm10 particle measurements, i.e | ||
IIO_MOD_PM1, IIO_MOD_PM25 and IIO_MOD_PM4, IIO_MOD_PM10. | ||
|
||
pmX consists of particles with aerodynamic diameter less or equal to | ||
X micrometers. | ||
|
||
Signed-off-by: Tomasz Duszynski <[email protected]> | ||
Acked-by: Matt Ranostay <[email protected]> | ||
Signed-off-by: Jonathan Cameron <[email protected]> | ||
--- | ||
Documentation/ABI/testing/sysfs-bus-iio | 17 ++++++++++++++++- | ||
drivers/iio/industrialio-core.c | 5 +++++ | ||
include/uapi/linux/iio/types.h | 5 +++++ | ||
tools/iio/iio_event_monitor.c | 10 ++++++++++ | ||
4 files changed, 36 insertions(+), 1 deletion(-) | ||
|
||
--- a/Documentation/ABI/testing/sysfs-bus-iio | ||
+++ b/Documentation/ABI/testing/sysfs-bus-iio | ||
@@ -1684,4 +1684,19 @@ KernelVersion: 4.18 | ||
Contact: [email protected] | ||
Description: | ||
Raw (unscaled) phase difference reading from channel Y | ||
- that can be processed to radians. | ||
\ No newline at end of file | ||
+ that can be processed to radians. | ||
+ | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm1_input | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm1_input | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm2p5_input | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm2p5_input | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm4_input | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm4_input | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm10_input | ||
+What: /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm10_input | ||
+KernelVersion: 4.22 | ||
+Contact: [email protected] | ||
+Description: | ||
+ Mass concentration reading of particulate matter in ug / m3. | ||
+ pmX consists of particles with aerodynamic diameter less or | ||
+ equal to X micrometers. | ||
--- a/drivers/iio/industrialio-core.c | ||
+++ b/drivers/iio/industrialio-core.c | ||
@@ -87,6 +87,7 @@ static const char * const iio_chan_type_ | ||
[IIO_GRAVITY] = "gravity", | ||
[IIO_POSITIONRELATIVE] = "positionrelative", | ||
[IIO_PHASE] = "phase", | ||
+ [IIO_MASSCONCENTRATION] = "massconcentration", | ||
}; | ||
|
||
static const char * const iio_modifier_names[] = { | ||
@@ -127,6 +128,10 @@ static const char * const iio_modifier_n | ||
[IIO_MOD_Q] = "q", | ||
[IIO_MOD_CO2] = "co2", | ||
[IIO_MOD_VOC] = "voc", | ||
+ [IIO_MOD_PM1] = "pm1", | ||
+ [IIO_MOD_PM2P5] = "pm2p5", | ||
+ [IIO_MOD_PM4] = "pm4", | ||
+ [IIO_MOD_PM10] = "pm10", | ||
}; | ||
|
||
/* relies on pairs of these shared then separate */ | ||
--- a/include/uapi/linux/iio/types.h | ||
+++ b/include/uapi/linux/iio/types.h | ||
@@ -46,6 +46,7 @@ enum iio_chan_type { | ||
IIO_GRAVITY, | ||
IIO_POSITIONRELATIVE, | ||
IIO_PHASE, | ||
+ IIO_MASSCONCENTRATION, | ||
}; | ||
|
||
enum iio_modifier { | ||
@@ -87,6 +88,10 @@ enum iio_modifier { | ||
IIO_MOD_VOC, | ||
IIO_MOD_LIGHT_UV, | ||
IIO_MOD_LIGHT_DUV, | ||
+ IIO_MOD_PM1, | ||
+ IIO_MOD_PM2P5, | ||
+ IIO_MOD_PM4, | ||
+ IIO_MOD_PM10, | ||
}; | ||
|
||
enum iio_event_type { | ||
--- a/tools/iio/iio_event_monitor.c | ||
+++ b/tools/iio/iio_event_monitor.c | ||
@@ -60,6 +60,7 @@ static const char * const iio_chan_type_ | ||
[IIO_GRAVITY] = "gravity", | ||
[IIO_POSITIONRELATIVE] = "positionrelative", | ||
[IIO_PHASE] = "phase", | ||
+ [IIO_MASSCONCENTRATION] = "massconcentration", | ||
}; | ||
|
||
static const char * const iio_ev_type_text[] = { | ||
@@ -115,6 +116,10 @@ static const char * const iio_modifier_n | ||
[IIO_MOD_Q] = "q", | ||
[IIO_MOD_CO2] = "co2", | ||
[IIO_MOD_VOC] = "voc", | ||
+ [IIO_MOD_PM1] = "pm1", | ||
+ [IIO_MOD_PM2P5] = "pm2p5", | ||
+ [IIO_MOD_PM4] = "pm4", | ||
+ [IIO_MOD_PM10] = "pm10", | ||
}; | ||
|
||
static bool event_is_known(struct iio_event_data *event) | ||
@@ -156,6 +161,7 @@ static bool event_is_known(struct iio_ev | ||
case IIO_GRAVITY: | ||
case IIO_POSITIONRELATIVE: | ||
case IIO_PHASE: | ||
+ case IIO_MASSCONCENTRATION: | ||
break; | ||
default: | ||
return false; | ||
@@ -200,6 +206,10 @@ static bool event_is_known(struct iio_ev | ||
case IIO_MOD_Q: | ||
case IIO_MOD_CO2: | ||
case IIO_MOD_VOC: | ||
+ case IIO_MOD_PM1: | ||
+ case IIO_MOD_PM2P5: | ||
+ case IIO_MOD_PM4: | ||
+ case IIO_MOD_PM10: | ||
break; | ||
default: | ||
return false; |
Oops, something went wrong.