Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Koutný <mkoutny@suse.com>2019-01-11 23:09:49 +0100
committerMichal Koutný <mkoutny@suse.com>2019-01-14 19:22:07 +0100
commitc0a4b5490f62e46b46b20291b80e78592a3af7af (patch)
tree7cd7ae05991b2585c53aeffed0fd268d208c7e6a
parentcb923498977d02b25959c2e45ce3e7756dfc7958 (diff)
housekeeping: Refresh patches, move code, non-functional changes
-rw-r--r--patches.arch/arm64-bcm2837-0080-ARM-bcm2835-Give-HDMI-a-HPD-GPIO-on-the-pi3.patch14
-rw-r--r--patches.drivers/0001-dt-assign-uart0-to-BT-and-uart1-to-pin-headers.patch2
-rw-r--r--patches.drivers/0005-dt-add-pinctrl-group-to-uart1-rpi3.patch3
-rw-r--r--patches.drivers/0012-dt-add-sdhci-and-sdhost-rpi3-enables-wifi.patch4
-rw-r--r--patches.drivers/0014-block-introduce-bdev_file_inode.patch2
-rw-r--r--patches.suse/0004-efi-Add-misc-char-driver-interface-to-update-EFI-fir.patch2
6 files changed, 14 insertions, 13 deletions
diff --git a/patches.arch/arm64-bcm2837-0080-ARM-bcm2835-Give-HDMI-a-HPD-GPIO-on-the-pi3.patch b/patches.arch/arm64-bcm2837-0080-ARM-bcm2835-Give-HDMI-a-HPD-GPIO-on-the-pi3.patch
index d56d68d15c..6bfe95ff1e 100644
--- a/patches.arch/arm64-bcm2837-0080-ARM-bcm2835-Give-HDMI-a-HPD-GPIO-on-the-pi3.patch
+++ b/patches.arch/arm64-bcm2837-0080-ARM-bcm2835-Give-HDMI-a-HPD-GPIO-on-the-pi3.patch
@@ -2,9 +2,8 @@ From 4df8f031643d949d72ef091396728ea5eab5cf07 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 1 Jun 2016 12:22:13 +0200
Subject: [PATCH] ARM: bcm2835: Give HDMI a HPD GPIO on the pi3
-Git-commit: 4df8f031643d949d72ef091396728ea5eab5cf07
-Patch-mainline: Queued in subsystem maintainer repository
-Git-repo: git://git.kraxel.org/linux
+Patch-mainline: No, handled differently
+X-notes: Handled upstream in commit b1b8f45b3130dbd8704e5ea0d82b49b1d929498e
References: FATE#319481
This is the wrong GPIO, but it means vc4 probes and turns on hdmi.
@@ -20,14 +19,17 @@ diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/
index 6f47dd2bb1db..e2c3801dd6ae 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-@@ -28,3 +28,7 @@
- &uart1 {
- status = "okay";
+@@ -28,6 +28,10 @@
+ };
+ };
};
+
+&hdmi {
+ hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
+};
+
+ &uart1 {
+ status = "okay";
--
1.8.5.6
diff --git a/patches.drivers/0001-dt-assign-uart0-to-BT-and-uart1-to-pin-headers.patch b/patches.drivers/0001-dt-assign-uart0-to-BT-and-uart1-to-pin-headers.patch
index bccd9097a9..6b130c263d 100644
--- a/patches.drivers/0001-dt-assign-uart0-to-BT-and-uart1-to-pin-headers.patch
+++ b/patches.drivers/0001-dt-assign-uart0-to-BT-and-uart1-to-pin-headers.patch
@@ -20,7 +20,7 @@ index c09707b..3b22035 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
@@ -25,9 +25,16 @@
- };
+ hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
};
+/* uart0 communicates with the BT module */
diff --git a/patches.drivers/0005-dt-add-pinctrl-group-to-uart1-rpi3.patch b/patches.drivers/0005-dt-add-pinctrl-group-to-uart1-rpi3.patch
index f7f8d1e934..dd435eeae7 100644
--- a/patches.drivers/0005-dt-add-pinctrl-group-to-uart1-rpi3.patch
+++ b/patches.drivers/0005-dt-add-pinctrl-group-to-uart1-rpi3.patch
@@ -17,7 +17,7 @@ diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/
index e2c3801dd6ae..f3ff90796f17 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-@@ -26,6 +26,8 @@
+@@ -26,5 +26,7 @@
};
&uart1 {
@@ -25,7 +25,6 @@ index e2c3801dd6ae..f3ff90796f17 100644
+ pinctrl-0 = <&uart1_gpio32>;
status = "okay";
};
-
--
2.6.6
diff --git a/patches.drivers/0012-dt-add-sdhci-and-sdhost-rpi3-enables-wifi.patch b/patches.drivers/0012-dt-add-sdhci-and-sdhost-rpi3-enables-wifi.patch
index 611ee8f8f2..f13785d4c9 100644
--- a/patches.drivers/0012-dt-add-sdhci-and-sdhost-rpi3-enables-wifi.patch
+++ b/patches.drivers/0012-dt-add-sdhci-and-sdhost-rpi3-enables-wifi.patch
@@ -16,8 +16,8 @@ Acked-by: Michal Marek <mmarek@suse.com>
--- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
@@ -34,3 +34,20 @@
- &hdmi {
- hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
+ pinctrl-0 = <&uart1_gpio32>;
+ status = "okay";
};
+
+/* SDHCI is used to control the SDIO for wireless */
diff --git a/patches.drivers/0014-block-introduce-bdev_file_inode.patch b/patches.drivers/0014-block-introduce-bdev_file_inode.patch
index 49316c5df6..00523a51cf 100644
--- a/patches.drivers/0014-block-introduce-bdev_file_inode.patch
+++ b/patches.drivers/0014-block-introduce-bdev_file_inode.patch
@@ -20,7 +20,7 @@ Acked-by: Johannes Thumshirn <jthumshirn@suse.com>
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
-@@ -163,11 +163,16 @@ static void submit_failfast_bio(int rw,
+@@ -155,11 +155,16 @@ static void submit_failfast_bio(int rw,
submit_bio(rw, bio);
}
diff --git a/patches.suse/0004-efi-Add-misc-char-driver-interface-to-update-EFI-fir.patch b/patches.suse/0004-efi-Add-misc-char-driver-interface-to-update-EFI-fir.patch
index d83a2e4b2a..e32fb17e9e 100644
--- a/patches.suse/0004-efi-Add-misc-char-driver-interface-to-update-EFI-fir.patch
+++ b/patches.suse/0004-efi-Add-misc-char-driver-interface-to-update-EFI-fir.patch
@@ -66,9 +66,9 @@ Acked-by: Lee, Chun-Yi <jlee@suse.com>
@@ -20,3 +20,5 @@ obj-$(CONFIG_EFI_RUNTIME_WRAPPERS) += ru
obj-$(CONFIG_EFI_STUB) += libstub/
obj-$(CONFIG_EFI_FAKE_MEMMAP) += fake_mem.o
- obj-$(CONFIG_EFI_PARAMS_FROM_FDT) += efi-fdt.o
+
+obj-$(CONFIG_EFI_CAPSULE_LOADER) += capsule-loader.o
+ obj-$(CONFIG_EFI_PARAMS_FROM_FDT) += efi-fdt.o
--- /dev/null
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -0,0 +1,343 @@