-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v4.19.261' of https://git.kernel.org/pub/scm/linux/kernel/…
…git/stable/linux into 13.0-alioth This is the 4.19.261 stable release
- Loading branch information
Showing
18 changed files
with
146 additions
and
70 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
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
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
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 |
---|---|---|
|
@@ -78,8 +78,8 @@ static struct sunxi_sram_desc sun4i_a10_sram_d = { | |
|
||
static struct sunxi_sram_desc sun50i_a64_sram_c = { | ||
.data = SUNXI_SRAM_DATA("C", 0x4, 24, 1, | ||
SUNXI_SRAM_MAP(0, 1, "cpu"), | ||
SUNXI_SRAM_MAP(1, 0, "de2")), | ||
SUNXI_SRAM_MAP(1, 0, "cpu"), | ||
SUNXI_SRAM_MAP(0, 1, "de2")), | ||
}; | ||
|
||
static const struct of_device_id sunxi_sram_dt_ids[] = { | ||
|
@@ -264,6 +264,7 @@ int sunxi_sram_claim(struct device *dev) | |
writel(val | ((device << sram_data->offset) & mask), | ||
base + sram_data->reg); | ||
|
||
sram_desc->claimed = true; | ||
spin_unlock(&sram_lock); | ||
|
||
return 0; | ||
|
@@ -324,12 +325,12 @@ static struct regmap_config sunxi_sram_emac_clock_regmap = { | |
.writeable_reg = sunxi_sram_regmap_accessible_reg, | ||
}; | ||
|
||
static int sunxi_sram_probe(struct platform_device *pdev) | ||
static int __init sunxi_sram_probe(struct platform_device *pdev) | ||
{ | ||
struct resource *res; | ||
struct dentry *d; | ||
struct regmap *emac_clock; | ||
const struct sunxi_sramc_variant *variant; | ||
struct device *dev = &pdev->dev; | ||
|
||
sram_dev = &pdev->dev; | ||
|
||
|
@@ -342,13 +343,6 @@ static int sunxi_sram_probe(struct platform_device *pdev) | |
if (IS_ERR(base)) | ||
return PTR_ERR(base); | ||
|
||
of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); | ||
|
||
d = debugfs_create_file("sram", S_IRUGO, NULL, NULL, | ||
&sunxi_sram_fops); | ||
if (!d) | ||
return -ENOMEM; | ||
|
||
if (variant->has_emac_clock) { | ||
emac_clock = devm_regmap_init_mmio(&pdev->dev, base, | ||
&sunxi_sram_emac_clock_regmap); | ||
|
@@ -357,6 +351,10 @@ static int sunxi_sram_probe(struct platform_device *pdev) | |
return PTR_ERR(emac_clock); | ||
} | ||
|
||
of_platform_populate(dev->of_node, NULL, NULL, dev); | ||
|
||
debugfs_create_file("sram", 0444, NULL, NULL, &sunxi_sram_fops); | ||
|
||
return 0; | ||
} | ||
|
||
|
@@ -398,9 +396,8 @@ static struct platform_driver sunxi_sram_driver = { | |
.name = "sunxi-sram", | ||
.of_match_table = sunxi_sram_dt_match, | ||
}, | ||
.probe = sunxi_sram_probe, | ||
}; | ||
module_platform_driver(sunxi_sram_driver); | ||
builtin_platform_driver_probe(sunxi_sram_driver, sunxi_sram_probe); | ||
|
||
MODULE_AUTHOR("Maxime Ripard <[email protected]>"); | ||
MODULE_DESCRIPTION("Allwinner sunXi SRAM Controller Driver"); | ||
|
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 |
---|---|---|
|
@@ -52,6 +52,13 @@ UNUSUAL_DEV(0x059f, 0x1061, 0x0000, 0x9999, | |
USB_SC_DEVICE, USB_PR_DEVICE, NULL, | ||
US_FL_NO_REPORT_OPCODES | US_FL_NO_SAME), | ||
|
||
/* Reported-by: Hongling Zeng <[email protected]> */ | ||
UNUSUAL_DEV(0x090c, 0x2000, 0x0000, 0x9999, | ||
"Hiksemi", | ||
"External HDD", | ||
USB_SC_DEVICE, USB_PR_DEVICE, NULL, | ||
US_FL_IGNORE_UAS), | ||
|
||
/* | ||
* Apricorn USB3 dongle sometimes returns "USBSUSBSUSBS" in response to SCSI | ||
* commands in UAS mode. Observed with the 1.28 firmware; are there others? | ||
|
@@ -76,6 +83,13 @@ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x9999, | |
USB_SC_DEVICE, USB_PR_DEVICE, NULL, | ||
US_FL_NO_REPORT_LUNS), | ||
|
||
/* Reported-by: Hongling Zeng <[email protected]> */ | ||
UNUSUAL_DEV(0x0bda, 0x9210, 0x0000, 0x9999, | ||
"Hiksemi", | ||
"External HDD", | ||
USB_SC_DEVICE, USB_PR_DEVICE, NULL, | ||
US_FL_IGNORE_UAS), | ||
|
||
/* Reported-by: Benjamin Tissoires <[email protected]> */ | ||
UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, | ||
"Initio Corporation", | ||
|
@@ -118,6 +132,13 @@ UNUSUAL_DEV(0x154b, 0xf00d, 0x0000, 0x9999, | |
USB_SC_DEVICE, USB_PR_DEVICE, NULL, | ||
US_FL_NO_ATA_1X), | ||
|
||
/* Reported-by: Hongling Zeng <[email protected]> */ | ||
UNUSUAL_DEV(0x17ef, 0x3899, 0x0000, 0x9999, | ||
"Thinkplus", | ||
"External HDD", | ||
USB_SC_DEVICE, USB_PR_DEVICE, NULL, | ||
US_FL_IGNORE_UAS), | ||
|
||
/* Reported-by: Hans de Goede <[email protected]> */ | ||
UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, | ||
"VIA", | ||
|
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
Oops, something went wrong.