aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch
diff options
context:
space:
mode:
authorTomasz Maciej Nowak <tmn505@gmail.com>2020-11-23 14:59:45 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-25 13:57:50 +0100
commit92b3efec54b36797614650c830a57c4f8786b5c9 (patch)
tree4ed06c90bde035a38ecd6d9a79004717ec3ee5ce /target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch
parentbffb30603cca586ee2a5713748ed1f6e76d6754b (diff)
downloadupstream-92b3efec54b36797614650c830a57c4f8786b5c9.tar.gz
upstream-92b3efec54b36797614650c830a57c4f8786b5c9.tar.bz2
upstream-92b3efec54b36797614650c830a57c4f8786b5c9.zip
mvebu: sort patches
Sort patches according to target/linux/generic/PATCHES. Additionally: - replace hashes in backported patches with the ones from main Linux tree - add descriptions to some patches Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com> [remove 004-add_sata_disk_activity_trigger.patch separately] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch b/target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch
new file mode 100644
index 0000000000..818fce85a8
--- /dev/null
+++ b/target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch
@@ -0,0 +1,53 @@
+From 11b2af36cc874027ce701c5784cb957c99c7de3d Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@armlinux.org.uk>
+Date: Wed, 6 May 2020 10:40:37 +0100
+Subject: [PATCH] arm64: dts: add uDPU i2c bus recovery
+
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
+---
+ .../boot/dts/marvell/armada-3720-uDPU.dts | 22 +++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
++++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+@@ -117,18 +117,36 @@
+ };
+ };
+
++&pinctrl_nb {
++ i2c1_recovery_pins: i2c1-recovery-pins {
++ groups = "i2c1";
++ function = "gpio";
++ };
++
++ i2c2_recovery_pins: i2c2-recovery-pins {
++ groups = "i2c2";
++ function = "gpio";
++ };
++};
++
+ &i2c0 {
+ status = "okay";
+- pinctrl-names = "default";
++ pinctrl-names = "default", "recovery";
+ pinctrl-0 = <&i2c1_pins>;
++ pinctrl-1 = <&i2c1_recovery_pins>;
+ /delete-property/mrvl,i2c-fast-mode;
++ scl-gpios = <&gpionb 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
++ sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ };
+
+ &i2c1 {
+ status = "okay";
+- pinctrl-names = "default";
++ pinctrl-names = "default", "recovery";
+ pinctrl-0 = <&i2c2_pins>;
++ pinctrl-1 = <&i2c2_recovery_pins>;
+ /delete-property/mrvl,i2c-fast-mode;
++ scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
++ sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+
+ lm75@48 {
+ status = "okay";