bcm27xx: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>master
Álvaro Fernández Rojas
4 years ago
parent
8f5d714a7f
commit
c56ae22db0
@ -0,0 +1,23 @@
|
||||
From 85c5cd3d5d6b14b3afb60bba363a6358f321ddf1 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.com>
|
||||
Date: Wed, 5 Feb 2020 09:44:54 +0000
|
||||
Subject: [PATCH] overlays: Update upstream overlay
|
||||
|
||||
Changed due to the dwc2 overlay fifo size change.
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||
---
|
||||
arch/arm/boot/dts/overlays/upstream-overlay.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
|
||||
+++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
|
||||
@@ -123,7 +123,7 @@
|
||||
compatible = "brcm,bcm2835-usb";
|
||||
dr_mode = "otg";
|
||||
g-np-tx-fifo-size = <32>;
|
||||
- g-rx-fifo-size = <256>;
|
||||
+ g-rx-fifo-size = <558>;
|
||||
g-tx-fifo-size = <512 512 512 512 512 256 256>;
|
||||
status = "okay";
|
||||
};
|
||||
@ -0,0 +1,106 @@
|
||||
From 24ec4e6211e88c02b925182281cb435f96dbd692 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Kaplan <m.kaplan@evva.com>
|
||||
Date: Wed, 5 Feb 2020 10:27:23 +0100
|
||||
Subject: [PATCH] overlays: add hdmi-backlight-hwhack-gpio-overlay
|
||||
|
||||
This is a Devicetree overlay for GPIO based backlight on/off capability.
|
||||
|
||||
Use this if you have one of those HDMI displays whose backlight cannot be controlled via DPMS over HDMI and plan to do a little soldering to use an RPi gpio pin for on/off switching.
|
||||
|
||||
See: https://www.waveshare.com/wiki/7inch_HDMI_LCD_(C)#Backlight_Control
|
||||
|
||||
This was tested with a clone of the Waveshare "7 inch HDMI Touch LCD C" where I soldered two mosfets to override the backlight dip-switch.
|
||||
When the overlay is loaded, a sysfs backlight node appears which can be used to modify the brightness value (0 or 1), and is even used by DPMS to switch the display backlight off after the configured timeout.
|
||||
(On current Raspbian Buster Desktop, it's also possible to wakeup the display via a tap on the touch display :-) )
|
||||
|
||||
Signed-off-by: Michael Kaplan <m.kaplan@evva.com>
|
||||
---
|
||||
arch/arm/boot/dts/overlays/Makefile | 1 +
|
||||
arch/arm/boot/dts/overlays/README | 14 ++++++
|
||||
.../hdmi-backlight-hwhack-gpio-overlay.dts | 47 +++++++++++++++++++
|
||||
3 files changed, 62 insertions(+)
|
||||
create mode 100644 arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
|
||||
|
||||
--- a/arch/arm/boot/dts/overlays/Makefile
|
||||
+++ b/arch/arm/boot/dts/overlays/Makefile
|
||||
@@ -51,6 +51,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
|
||||
gpio-poweroff.dtbo \
|
||||
gpio-shutdown.dtbo \
|
||||
hd44780-lcd.dtbo \
|
||||
+ hdmi-backlight-hwhack-gpio.dtbo \
|
||||
hifiberry-amp.dtbo \
|
||||
hifiberry-dac.dtbo \
|
||||
hifiberry-dacplus.dtbo \
|
||||
--- a/arch/arm/boot/dts/overlays/README
|
||||
+++ b/arch/arm/boot/dts/overlays/README
|
||||
@@ -883,6 +883,20 @@ Params: pin_d4 GPIO pin
|
||||
display_width Width of the display in characters
|
||||
|
||||
|
||||
+Name: hdmi-backlight-hwhack-gpio
|
||||
+Info: Devicetree overlay for GPIO based backlight on/off capability.
|
||||
+ Use this if you have one of those HDMI displays whose backlight cannot
|
||||
+ be controlled via DPMS over HDMI and plan to do a little soldering to
|
||||
+ use an RPi gpio pin for on/off switching. See:
|
||||
+ https://www.waveshare.com/wiki/7inch_HDMI_LCD_(C)#Backlight_Control
|
||||
+Load: dtoverlay=hdmi-backlight-hwhack-gpio,<param>=<val>
|
||||
+Params: gpio_pin GPIO pin used (default 17)
|
||||
+ active_low Set this to 1 if the display backlight is
|
||||
+ switched on when the wire goes low.
|
||||
+ Leave the default (value 0) if the backlight
|
||||
+ expects a high to switch it on.
|
||||
+
|
||||
+
|
||||
Name: hifiberry-amp
|
||||
Info: Configures the HifiBerry Amp and Amp+ audio cards
|
||||
Load: dtoverlay=hifiberry-amp
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
|
||||
@@ -0,0 +1,47 @@
|
||||
+/*
|
||||
+ * Devicetree overlay for GPIO based backlight on/off capability.
|
||||
+ *
|
||||
+ * Use this if you have one of those HDMI displays whose backlight cannot be
|
||||
+ * controlled via DPMS over HDMI and plan to do a little soldering to use an
|
||||
+ * RPi gpio pin for on/off switching.
|
||||
+ *
|
||||
+ * See: https://www.waveshare.com/wiki/7inch_HDMI_LCD_(C)#Backlight_Control
|
||||
+ *
|
||||
+ */
|
||||
+/dts-v1/;
|
||||
+/plugin/;
|
||||
+
|
||||
+/ {
|
||||
+ compatible = "brcm,bcm2835";
|
||||
+
|
||||
+ fragment@1 {
|
||||
+ target = <&gpio>;
|
||||
+ __overlay__ {
|
||||
+ hdmi_backlight_hwhack_gpio_pins: hdmi_backlight_hwhack_gpio_pins {
|
||||
+ brcm,pins = <17>;
|
||||
+ brcm,function = <1>; /* out */
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ fragment@2 {
|
||||
+ target-path = "/";
|
||||
+ __overlay__ {
|
||||
+ hdmi_backlight_hwhack_gpio: hdmi_backlight_hwhack_gpio {
|
||||
+ compatible = "gpio-backlight";
|
||||
+
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&hdmi_backlight_hwhack_gpio_pins>;
|
||||
+
|
||||
+ gpios = <&gpio 17 0>;
|
||||
+ default-on;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ __overrides__ {
|
||||
+ gpio_pin = <&hdmi_backlight_hwhack_gpio>,"gpios:4",
|
||||
+ <&hdmi_backlight_hwhack_gpio_pins>,"brcm,pins:0";
|
||||
+ active_low = <&hdmi_backlight_hwhack_gpio>,"gpios:8";
|
||||
+ };
|
||||
+};
|
||||
@ -0,0 +1,34 @@
|
||||
From 4c4cc35a921e7706b696c25ce432b23ad32cd6e5 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.com>
|
||||
Date: Fri, 7 Feb 2020 09:51:31 +0000
|
||||
Subject: [PATCH] overlays: Add timeout_ms parameter to gpio-poweroff
|
||||
|
||||
The timeout_ms parameter specifies in milliseconds how long the kernel
|
||||
waits for power-down before issuing a WARN. The default value is 3000 ms.
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||
---
|
||||
arch/arm/boot/dts/overlays/README | 2 ++
|
||||
arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts | 1 +
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
--- a/arch/arm/boot/dts/overlays/README
|
||||
+++ b/arch/arm/boot/dts/overlays/README
|
||||
@@ -821,6 +821,8 @@ Params: gpiopin GPIO for
|
||||
input Set if the gpio pin should be configured as
|
||||
an input.
|
||||
export Set to export the configured pin to sysfs
|
||||
+ timeout_ms Specify (in ms) how long the kernel waits for
|
||||
+ power-down before issuing a WARN (default 3000).
|
||||
|
||||
|
||||
Name: gpio-shutdown
|
||||
--- a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
|
||||
+++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
|
||||
@@ -32,5 +32,6 @@
|
||||
active_low = <&power_ctrl>,"gpios:8";
|
||||
input = <&power_ctrl>,"input?";
|
||||
export = <&power_ctrl>,"export?";
|
||||
+ timeout_ms = <&power_ctrl>,"timeout-ms:0";
|
||||
};
|
||||
};
|
||||
@ -0,0 +1,37 @@
|
||||
From c580e406566b6dac7810b495632bdbac11eb88a4 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.com>
|
||||
Date: Thu, 6 Feb 2020 12:23:15 +0000
|
||||
Subject: [PATCH] of: overlay: Correct symbol path fixups
|
||||
|
||||
When symbols from overlays are added to the live tree their paths must
|
||||
be rebased. The translated symbol is normally the result of joining
|
||||
the fragment-relative path (with a leading "/") to the target path
|
||||
(either copied directly from the "target-path" property or resolved
|
||||
from the phandle). This translation fails when the target is the root
|
||||
node (a common case for Raspberry Pi overlays) because the resulting
|
||||
path starts with a double slash. For example, if target-path is "/" and
|
||||
the fragment adds a node called "newnode", the label associated with
|
||||
that node will be assigned the path "//newnode", which can't be found
|
||||
in the tree.
|
||||
|
||||
Fix the failure case by explicitly replacing a target path of "/" with
|
||||
an empty string.
|
||||
|
||||
Fixes: d1651b03c2df ("of: overlay: add overlay symbols to live device tree")
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||
---
|
||||
drivers/of/overlay.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/drivers/of/overlay.c
|
||||
+++ b/drivers/of/overlay.c
|
||||
@@ -245,6 +245,8 @@ static struct property *dup_and_fixup_sy
|
||||
if (!target_path)
|
||||
return NULL;
|
||||
target_path_len = strlen(target_path);
|
||||
+ if (!strcmp(target_path, "/"))
|
||||
+ target_path_len = 0;
|
||||
|
||||
new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);
|
||||
if (!new_prop)
|
||||
@ -0,0 +1,28 @@
|
||||
From 291a74051f1d5337bbfcbb0aaa17c8774ad84624 Mon Sep 17 00:00:00 2001
|
||||
From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
|
||||
Date: Fri, 19 Jul 2019 10:05:34 +0000
|
||||
Subject: [PATCH] ASoC: sgtl5000: add ADC mute control
|
||||
|
||||
This control mute/unmute the ADC input of SGTL5000
|
||||
using its CHIP_ANA_CTRL register.
|
||||
|
||||
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
|
||||
Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
|
||||
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
|
||||
Reviewed-by: Fabio Estevam <festevam@gmail.com>
|
||||
Link: https://lore.kernel.org/r/20190719100524.23300-5-oleksandr.suvorov@toradex.com
|
||||
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
---
|
||||
sound/soc/codecs/sgtl5000.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/sound/soc/codecs/sgtl5000.c
|
||||
+++ b/sound/soc/codecs/sgtl5000.c
|
||||
@@ -712,6 +712,7 @@ static const struct snd_kcontrol_new sgt
|
||||
SGTL5000_CHIP_ANA_ADC_CTRL,
|
||||
8, 1, 0, capture_6db_attenuate),
|
||||
SOC_SINGLE("Capture ZC Switch", SGTL5000_CHIP_ANA_CTRL, 1, 1, 0),
|
||||
+ SOC_SINGLE("Capture Switch", SGTL5000_CHIP_ANA_CTRL, 0, 1, 1),
|
||||
|
||||
SOC_DOUBLE_TLV("Headphone Playback Volume",
|
||||
SGTL5000_CHIP_ANA_HP_CTRL,
|
||||
@ -0,0 +1,33 @@
|
||||
From ae29bcf2ddf2b82098d003768a51d28b90ffc5b4 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.com>
|
||||
Date: Tue, 25 Feb 2020 16:53:31 +0000
|
||||
Subject: [PATCH] ARM: dts: Remove virtgpio from bcm2711-rpi-4-b.dts
|
||||
|
||||
Pi 4B doesn't need the virtgpio driver (it was added to reduce the
|
||||
overhead of driving the ACT LED on the Pi 3B's GPIO expander), so
|
||||
remove the instantiation by the Pi 4 DTS file to avoid confusion.
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 10 ----------
|
||||
1 file changed, 10 deletions(-)
|
||||
|
||||
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
|
||||
@@ -34,16 +34,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
-&soc {
|
||||
- virtgpio: virtgpio {
|
||||
- compatible = "brcm,bcm2835-virtgpio";
|
||||
- gpio-controller;
|
||||
- #gpio-cells = <2>;
|
||||
- firmware = <&firmware>;
|
||||
- status = "okay";
|
||||
- };
|
||||
-};
|
||||
-
|
||||
&mmcnr {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&sdio_pins>;
|
||||
Loading…
Reference in New Issue