diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:08:55 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-05-28 19:12:43 +0200 |
| commit | 77e97abf129c5028385dd72587eabab68db0d954 (patch) | |
| tree | fc52a8c2ba346da77281f00538a1eb6de49deb5d /target/linux/bcm27xx/patches-5.4/950-0618-i2c-brcmstb-The-interrupt-line-is-optional-so-use-pl.patch | |
| parent | 5d3a0c6b26144eb5d62515b99613b5ad8dbdc717 (diff) | |
| download | upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.gz upstream-77e97abf129c5028385dd72587eabab68db0d954.tar.bz2 upstream-77e97abf129c5028385dd72587eabab68db0d954.zip | |
bcm27xx: update to latest patches from RPi foundation
Also removes random module and switches to new bcm2711 thermal driver.
Boot tested on RPi 4B v1.1 4G.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0618-i2c-brcmstb-The-interrupt-line-is-optional-so-use-pl.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0618-i2c-brcmstb-The-interrupt-line-is-optional-so-use-pl.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0618-i2c-brcmstb-The-interrupt-line-is-optional-so-use-pl.patch b/target/linux/bcm27xx/patches-5.4/950-0618-i2c-brcmstb-The-interrupt-line-is-optional-so-use-pl.patch new file mode 100644 index 0000000000..89285ad25c --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0618-i2c-brcmstb-The-interrupt-line-is-optional-so-use-pl.patch @@ -0,0 +1,49 @@ +From 8aa48c2a3fa470d348104e8f8aa558a661b724e5 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.com> +Date: Tue, 31 Mar 2020 16:23:11 +0100 +Subject: [PATCH] i2c: brcmstb: The interrupt line is optional, so use + platform_get_irq_optional + +If there is no interrupt defined then an error is logged due +to the use of platform_get_irq. The driver handles not having +the interrupt by falling back to polling, therefore make +the appropriate call when claiming it. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> +--- + drivers/i2c/busses/i2c-brcmstb.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +--- a/drivers/i2c/busses/i2c-brcmstb.c ++++ b/drivers/i2c/busses/i2c-brcmstb.c +@@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct plat + int_name = NULL; + + /* Get the interrupt number */ +- dev->irq = platform_get_irq(pdev, 0); ++ dev->irq = platform_get_irq_optional(pdev, 0); + + /* disable the bsc interrupt line */ + brcmstb_i2c_enable_disable_irq(dev, INT_DISABLE); + + /* register the ISR handler */ +- rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr, +- IRQF_SHARED, +- int_name ? int_name : pdev->name, +- dev); ++ if (dev->irq >= 0) { ++ rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr, ++ IRQF_SHARED, ++ int_name ? int_name : pdev->name, ++ dev); + +- if (rc) { +- dev_dbg(dev->device, "falling back to polling mode"); +- dev->irq = -1; ++ if (rc) { ++ dev_dbg(dev->device, "falling back to polling mode"); ++ dev->irq = -1; ++ } + } + + if (of_property_read_u32(dev->device->of_node, |