Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc1.git1.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc1.git1.1.vanilla.knurd.1.fc26

7 files changed, 626 insertions, 3 deletions

diff --git a/0001-qxl-fix-qxl_release_-map-unmap.patch b/0001-qxl-fix-qxl_release_-map-unmap.patch
new file mode 100644
index 000000000..952dbfa16
--- /dev/null
+++ b/0001-qxl-fix-qxl_release_-map-unmap.patch
@@ -0,0 +1,61 @@
+From aabf8665c5e88deefe8b27898bad089b67f8b08a Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Tue, 17 Apr 2018 09:11:12 +0200
+Subject: [PATCH 1/2] qxl: fix qxl_release_{map,unmap}
+
+s/PAGE_SIZE/PAGE_MASK/
+
+Luckily release_offset is never larger than PAGE_SIZE, so the bug has no
+bad side effects and managed to stay unnoticed for years that way ...
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ drivers/gpu/drm/qxl/qxl_ioctl.c   | 4 ++--
+ drivers/gpu/drm/qxl/qxl_release.c | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
+index e8c0b10372..ae37cfc56b 100644
+--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
++++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
+@@ -182,9 +182,9 @@ static int qxl_process_single_command(struct qxl_device *qdev,
+ 		goto out_free_reloc;
+ 
+ 	/* TODO copy slow path code from i915 */
+-	fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
++	fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_MASK));
+ 	unwritten = __copy_from_user_inatomic_nocache
+-		(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE),
++		(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_MASK),
+ 		 u64_to_user_ptr(cmd->command), cmd->command_size);
+ 
+ 	{
+diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
+index b223c8d0a4..91a10459da 100644
+--- a/drivers/gpu/drm/qxl/qxl_release.c
++++ b/drivers/gpu/drm/qxl/qxl_release.c
+@@ -411,10 +411,10 @@ union qxl_release_info *qxl_release_map(struct qxl_device *qdev,
+ 	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
+ 	struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
+ 
+-	ptr = qxl_bo_kmap_atomic_page(qdev, bo, release->release_offset & PAGE_SIZE);
++	ptr = qxl_bo_kmap_atomic_page(qdev, bo, release->release_offset & PAGE_MASK);
+ 	if (!ptr)
+ 		return NULL;
+-	info = ptr + (release->release_offset & ~PAGE_SIZE);
++	info = ptr + (release->release_offset & ~PAGE_MASK);
+ 	return info;
+ }
+ 
+@@ -426,7 +426,7 @@ void qxl_release_unmap(struct qxl_device *qdev,
+ 	struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
+ 	void *ptr;
+ 
+-	ptr = ((void *)info) - (release->release_offset & ~PAGE_SIZE);
++	ptr = ((void *)info) - (release->release_offset & ~PAGE_MASK);
+ 	qxl_bo_kunmap_atomic_page(qdev, bo, ptr);
+ }
+ 
+-- 
+2.9.3
+
diff --git a/0002-qxl-keep-separate-release_bo-pointer.patch b/0002-qxl-keep-separate-release_bo-pointer.patch
new file mode 100644
index 000000000..66b4bdb2d
--- /dev/null
+++ b/0002-qxl-keep-separate-release_bo-pointer.patch
@@ -0,0 +1,120 @@
+From 0e305b67752775d6f47b2730bfba5bc77ac81f16 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Tue, 17 Apr 2018 22:36:48 +0200
+Subject: [PATCH 2/2] qxl: keep separate release_bo pointer
+
+qxl expects that list_first_entry(release->bos) returns the first
+element qxl added to the list.  ttm_eu_reserve_buffers() may reorder
+the list though.
+
+Add a release_bo field to struct qxl_release and use that instead.
+
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ drivers/gpu/drm/qxl/qxl_drv.h     |  1 +
+ drivers/gpu/drm/qxl/qxl_cmd.c     |  6 ++----
+ drivers/gpu/drm/qxl/qxl_release.c | 12 ++++++------
+ 3 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
+index 00a1a66b05..864b456080 100644
+--- a/drivers/gpu/drm/qxl/qxl_drv.h
++++ b/drivers/gpu/drm/qxl/qxl_drv.h
+@@ -167,6 +167,7 @@ struct qxl_release {
+ 
+ 	int id;
+ 	int type;
++	struct qxl_bo *release_bo;
+ 	uint32_t release_offset;
+ 	uint32_t surface_release_id;
+ 	struct ww_acquire_ctx ticket;
+diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
+index c0fb52c6d4..01665b98c5 100644
+--- a/drivers/gpu/drm/qxl/qxl_cmd.c
++++ b/drivers/gpu/drm/qxl/qxl_cmd.c
+@@ -179,10 +179,9 @@ qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release *relea
+ 			      uint32_t type, bool interruptible)
+ {
+ 	struct qxl_command cmd;
+-	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
+ 
+ 	cmd.type = type;
+-	cmd.data = qxl_bo_physical_address(qdev, to_qxl_bo(entry->tv.bo), release->release_offset);
++	cmd.data = qxl_bo_physical_address(qdev, release->release_bo, release->release_offset);
+ 
+ 	return qxl_ring_push(qdev->command_ring, &cmd, interruptible);
+ }
+@@ -192,10 +191,9 @@ qxl_push_cursor_ring_release(struct qxl_device *qdev, struct qxl_release *releas
+ 			     uint32_t type, bool interruptible)
+ {
+ 	struct qxl_command cmd;
+-	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
+ 
+ 	cmd.type = type;
+-	cmd.data = qxl_bo_physical_address(qdev, to_qxl_bo(entry->tv.bo), release->release_offset);
++	cmd.data = qxl_bo_physical_address(qdev, release->release_bo, release->release_offset);
+ 
+ 	return qxl_ring_push(qdev->cursor_ring, &cmd, interruptible);
+ }
+diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
+index 91a10459da..7c11855b74 100644
+--- a/drivers/gpu/drm/qxl/qxl_release.c
++++ b/drivers/gpu/drm/qxl/qxl_release.c
+@@ -173,6 +173,7 @@ qxl_release_free_list(struct qxl_release *release)
+ 		list_del(&entry->tv.head);
+ 		kfree(entry);
+ 	}
++	release->release_bo = NULL;
+ }
+ 
+ void
+@@ -296,7 +297,6 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev,
+ {
+ 	if (surface_cmd_type == QXL_SURFACE_CMD_DESTROY && create_rel) {
+ 		int idr_ret;
+-		struct qxl_bo_list *entry = list_first_entry(&create_rel->bos, struct qxl_bo_list, tv.head);
+ 		struct qxl_bo *bo;
+ 		union qxl_release_info *info;
+ 
+@@ -304,8 +304,9 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev,
+ 		idr_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release);
+ 		if (idr_ret < 0)
+ 			return idr_ret;
+-		bo = to_qxl_bo(entry->tv.bo);
++		bo = create_rel->release_bo;
+ 
++		(*release)->release_bo = bo;
+ 		(*release)->release_offset = create_rel->release_offset + 64;
+ 
+ 		qxl_release_list_add(*release, bo);
+@@ -365,6 +366,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
+ 
+ 	bo = qxl_bo_ref(qdev->current_release_bo[cur_idx]);
+ 
++	(*release)->release_bo = bo;
+ 	(*release)->release_offset = qdev->current_release_bo_offset[cur_idx] * release_size_per_bo[cur_idx];
+ 	qdev->current_release_bo_offset[cur_idx]++;
+ 
+@@ -408,8 +410,7 @@ union qxl_release_info *qxl_release_map(struct qxl_device *qdev,
+ {
+ 	void *ptr;
+ 	union qxl_release_info *info;
+-	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
+-	struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
++	struct qxl_bo *bo = release->release_bo;
+ 
+ 	ptr = qxl_bo_kmap_atomic_page(qdev, bo, release->release_offset & PAGE_MASK);
+ 	if (!ptr)
+@@ -422,8 +423,7 @@ void qxl_release_unmap(struct qxl_device *qdev,
+ 		       struct qxl_release *release,
+ 		       union qxl_release_info *info)
+ {
+-	struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
+-	struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
++	struct qxl_bo *bo = release->release_bo;
+ 	void *ptr;
+ 
+ 	ptr = ((void *)info) - (release->release_offset & ~PAGE_MASK);
+-- 
+2.9.3
+
diff --git a/arm-dts-Add-am335x-pocketbeagle.patch b/arm-dts-Add-am335x-pocketbeagle.patch
new file mode 100644
index 000000000..76fab6b55
--- /dev/null
+++ b/arm-dts-Add-am335x-pocketbeagle.patch
@@ -0,0 +1,432 @@
+From patchwork Tue Apr 17 17:14:04 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v3] ARM: dts: Add am335x-pocketbeagle
+From: Robert Nelson <robertcnelson@gmail.com>
+X-Patchwork-Id: 10346089
+Message-Id: <20180417171404.13624-1-robertcnelson@gmail.com>
+To: tony@atomide.com,
+	devicetree@vger.kernel.org
+Cc: Drew Fustini <drew@beagleboard.org>,
+ Peter Robinson <pbrobinson@redhat.com>, 
+ Jason Kridner <jkridner@beagleboard.org>, linux-omap@vger.kernel.org, 
+ Robert Nelson <robertcnelson@gmail.com>,
+ linux-arm-kernel@lists.infradead.org
+Date: Tue, 17 Apr 2018 12:14:04 -0500
+
+PocketBeagle is an ultra-tiny-yet-complete open-source USB-key-fob computer.
+
+This board family can be indentified by the A335PBGL in the at24 eeprom:
+A2: [aa 55 33 ee 41 33 33 35  50 42 47 4c 30 30 41 32 |.U3.A335PBGL00A2|]
+
+http://beagleboard.org/pocket
+https://github.com/beagleboard/pocketbeagle
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+CC: Tony Lindgren <tony@atomide.com>
+CC: Jason Kridner <jkridner@beagleboard.org>
+CC: Drew Fustini <drew@beagleboard.org>
+CC: Peter Robinson <pbrobinson@redhat.com>
+---
+Changes in v3:
+- Fix: Board eeprom in subject message. (accidently copied PocketBone)
+Changes in v2:
+- Use SPDX tags.
+- Use eeprom@50, remove repeated node and fix  and remove '_' to fix node_name_chars_strict Warning
+- Fix: PocketBeagle Name in Subject (not PocketBeagle Blue)
+- Fix: leds remove '_' to fix node_name_chars_strict warning
+- Fix: node_name_chars_strict pinmux_*_pins label's.
+---
+ arch/arm/boot/dts/Makefile                   |   1 +
+ arch/arm/boot/dts/am335x-osd335x-common.dtsi | 124 ++++++++++
+ arch/arm/boot/dts/am335x-pocketbeagle.dts    | 237 +++++++++++++++++++
+ 3 files changed, 362 insertions(+)
+ create mode 100644 arch/arm/boot/dts/am335x-osd335x-common.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-pocketbeagle.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 7e2424957809..5a09ff15743b 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -688,6 +688,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
+ 	am335x-pdu001.dtb \
+ 	am335x-pepper.dtb \
+ 	am335x-phycore-rdk.dtb \
++	am335x-pocketbeagle.dtb \
+ 	am335x-shc.dtb \
+ 	am335x-sbc-t335.dtb \
+ 	am335x-sl50.dtb \
+diff --git a/arch/arm/boot/dts/am335x-osd335x-common.dtsi b/arch/arm/boot/dts/am335x-osd335x-common.dtsi
+new file mode 100644
+index 000000000000..d2150d207b7a
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-osd335x-common.dtsi
+@@ -0,0 +1,124 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * Author: Robert Nelson <robertcnelson@gmail.com>
++ */
++
++/ {
++	cpus {
++		cpu@0 {
++			cpu0-supply = <&dcdc2_reg>;
++		};
++	};
++
++	memory@80000000 {
++		device_type = "memory";
++		reg = <0x80000000 0x20000000>; /* 512 MB */
++	};
++};
++
++&cpu0_opp_table {
++	/*
++	* Octavo Systems:
++	* The EFUSE_SMA register is not programmed for any of the AM335x wafers
++	* we get and we are not programming them during our production test.
++	* Therefore, from a DEVICE_ID revision point of view, the silicon looks
++	* like it is Revision 2.1.  However, from an EFUSE_SMA point of view for
++	* the HW OPP table, the silicon looks like it is Revision 1.0 (ie the
++	* EFUSE_SMA register reads as all zeros).
++	*/
++	oppnitro-1000000000 {
++		opp-supported-hw = <0x06 0x0100>;
++	};
++};
++
++&am33xx_pinmux {
++	i2c0_pins: pinmux-i2c0-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0)	/* (C17) I2C0_SDA.I2C0_SDA */
++			AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0)	/* (C16) I2C0_SCL.I2C0_SCL */
++		>;
++	};
++};
++
++&i2c0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c0_pins>;
++
++	status = "okay";
++	clock-frequency = <400000>;
++
++	tps: tps@24 {
++		reg = <0x24>;
++	};
++};
++
++/include/ "tps65217.dtsi"
++
++&tps {
++	interrupts = <7>; /* NMI */
++	interrupt-parent = <&intc>;
++
++	ti,pmic-shutdown-controller;
++
++	pwrbutton {
++		interrupts = <2>;
++		status = "okay";
++	};
++
++	regulators {
++		dcdc1_reg: regulator@0 {
++			regulator-name = "vdds_dpr";
++			regulator-always-on;
++		};
++
++		dcdc2_reg: regulator@1 {
++			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
++			regulator-name = "vdd_mpu";
++			regulator-min-microvolt = <925000>;
++			regulator-max-microvolt = <1351500>;
++			regulator-boot-on;
++			regulator-always-on;
++		};
++
++		dcdc3_reg: regulator@2 {
++			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
++			regulator-name = "vdd_core";
++			regulator-min-microvolt = <925000>;
++			regulator-max-microvolt = <1150000>;
++			regulator-boot-on;
++			regulator-always-on;
++		};
++
++		ldo1_reg: regulator@3 {
++			regulator-name = "vio,vrtc,vdds";
++			regulator-always-on;
++		};
++
++		ldo2_reg: regulator@4 {
++			regulator-name = "vdd_3v3aux";
++			regulator-always-on;
++		};
++
++		ldo3_reg: regulator@5 {
++			regulator-name = "vdd_1v8";
++			regulator-min-microvolt = <1800000>;
++			regulator-max-microvolt = <1800000>;
++			regulator-always-on;
++		};
++
++		ldo4_reg: regulator@6 {
++			regulator-name = "vdd_3v3a";
++			regulator-always-on;
++		};
++	};
++};
++
++&aes {
++	status = "okay";
++};
++
++&sham {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/am335x-pocketbeagle.dts b/arch/arm/boot/dts/am335x-pocketbeagle.dts
+new file mode 100644
+index 000000000000..62fe5cab9fae
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-pocketbeagle.dts
+@@ -0,0 +1,237 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * Author: Robert Nelson <robertcnelson@gmail.com>
++ */
++/dts-v1/;
++
++#include "am33xx.dtsi"
++#include "am335x-osd335x-common.dtsi"
++
++/ {
++	model = "TI AM335x PocketBeagle";
++	compatible = "ti,am335x-pocketbeagle", "ti,am335x-bone", "ti,am33xx";
++
++	chosen {
++		stdout-path = &uart0;
++	};
++
++	leds {
++		pinctrl-names = "default";
++		pinctrl-0 = <&usr_leds_pins>;
++
++		compatible = "gpio-leds";
++
++		usr0 {
++			label = "beaglebone:green:usr0";
++			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "heartbeat";
++			default-state = "off";
++		};
++
++		usr1 {
++			label = "beaglebone:green:usr1";
++			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "mmc0";
++			default-state = "off";
++		};
++
++		usr2 {
++			label = "beaglebone:green:usr2";
++			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "cpu0";
++			default-state = "off";
++		};
++
++		usr3 {
++			label = "beaglebone:green:usr3";
++			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
++			default-state = "off";
++		};
++	};
++
++	vmmcsd_fixed: fixedregulator0 {
++		compatible = "regulator-fixed";
++		regulator-name = "vmmcsd_fixed";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++	};
++};
++
++&am33xx_pinmux {
++	i2c2_pins: pinmux-i2c2-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x97c, PIN_INPUT_PULLUP | MUX_MODE3)	/* (D17) uart1_rtsn.I2C2_SCL */
++			AM33XX_IOPAD(0x978, PIN_INPUT_PULLUP | MUX_MODE3)	/* (D18) uart1_ctsn.I2C2_SDA */
++		>;
++	};
++
++	ehrpwm0_pins: pinmux-ehrpwm0-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* (A13) mcasp0_aclkx.ehrpwm0A */
++		>;
++	};
++
++	ehrpwm1_pins: pinmux-ehrpwm1-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x848, PIN_OUTPUT_PULLDOWN | MUX_MODE6)	/* (U14) gpmc_a2.ehrpwm1A */
++		>;
++	};
++
++	mmc0_pins: pinmux-mmc0-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7)		/* (C15) spi0_cs1.gpio0[6] */
++			AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0)	/* (G16) mmc0_dat0.mmc0_dat0 */
++			AM33XX_IOPAD(0x8f8, PIN_INPUT_PULLUP | MUX_MODE0)	/* (G15) mmc0_dat1.mmc0_dat1 */
++			AM33XX_IOPAD(0x8f4, PIN_INPUT_PULLUP | MUX_MODE0)	/* (F18) mmc0_dat2.mmc0_dat2 */
++			AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0)	/* (F17) mmc0_dat3.mmc0_dat3 */
++			AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0)	/* (G18) mmc0_cmd.mmc0_cmd */
++			AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0)	/* (G17) mmc0_clk.mmc0_clk */
++			AM33XX_IOPAD(0x9a0, PIN_INPUT | MUX_MODE4)		/* (B12) mcasp0_aclkr.mmc0_sdwp */
++		>;
++	};
++
++	spi0_pins: pinmux-spi0-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE0)	/* (A17) spi0_sclk.spi0_sclk */
++			AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE0)	/* (B17) spi0_d0.spi0_d0 */
++			AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE0)	/* (B16) spi0_d1.spi0_d1 */
++			AM33XX_IOPAD(0x95c, PIN_INPUT_PULLUP | MUX_MODE0)	/* (A16) spi0_cs0.spi0_cs0 */
++		>;
++	};
++
++	spi1_pins: pinmux-spi1-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x964, PIN_INPUT_PULLUP | MUX_MODE4)	/* (C18) eCAP0_in_PWM0_out.spi1_sclk */
++			AM33XX_IOPAD(0x968, PIN_INPUT_PULLUP | MUX_MODE4)	/* (E18) uart0_ctsn.spi1_d0 */
++			AM33XX_IOPAD(0x96c, PIN_INPUT_PULLUP | MUX_MODE4)	/* (E17) uart0_rtsn.spi1_d1 */
++			AM33XX_IOPAD(0x9b0, PIN_INPUT_PULLUP | MUX_MODE4)	/* (A15) xdma_event_intr0.spi1_cs1 */
++		>;
++	};
++
++	usr_leds_pins: pinmux-usr-leds-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x854, PIN_OUTPUT | MUX_MODE7)		/* (V15) gpmc_a5.gpio1[21] - USR_LED_0 */
++			AM33XX_IOPAD(0x858, PIN_OUTPUT | MUX_MODE7)		/* (U15) gpmc_a6.gpio1[22] - USR_LED_1 */
++			AM33XX_IOPAD(0x85c, PIN_OUTPUT | MUX_MODE7)		/* (T15) gpmc_a7.gpio1[23] - USR_LED_2 */
++			AM33XX_IOPAD(0x860, PIN_OUTPUT | MUX_MODE7)		/* (V16) gpmc_a8.gpio1[24] - USR_LED_3 */
++		>;
++	};
++
++	uart0_pins: pinmux-uart0-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* (E15) uart0_rxd.uart0_rxd */
++			AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* (E16) uart0_txd.uart0_txd */
++		>;
++	};
++
++	uart4_pins: pinmux-uart4-pins {
++		pinctrl-single,pins = <
++			AM33XX_IOPAD(0x870, PIN_INPUT_PULLUP | MUX_MODE6)	/* (T17) gpmc_wait0.uart4_rxd */
++			AM33XX_IOPAD(0x874, PIN_OUTPUT_PULLDOWN | MUX_MODE6)	/* (U17) gpmc_wpn.uart4_txd */
++		>;
++	};
++};
++
++&epwmss0 {
++	status = "okay";
++};
++
++&ehrpwm0 {
++	status = "okay";
++	pinctrl-names = "default";
++	pinctrl-0 = <&ehrpwm0_pins>;
++};
++
++&epwmss1 {
++	status = "okay";
++};
++
++&ehrpwm1 {
++	status = "okay";
++	pinctrl-names = "default";
++	pinctrl-0 = <&ehrpwm1_pins>;
++};
++
++&i2c0 {
++	eeprom: eeprom@50 {
++		compatible = "atmel,24c256";
++		reg = <0x50>;
++	};
++};
++
++&i2c2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c2_pins>;
++
++	status = "okay";
++	clock-frequency = <400000>;
++};
++
++&mmc1 {
++	status = "okay";
++	vmmc-supply = <&vmmcsd_fixed>;
++	bus-width = <4>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&mmc0_pins>;
++	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
++};
++
++&rtc {
++	system-power-controller;
++};
++
++&tscadc {
++	status = "okay";
++	adc {
++		ti,adc-channels = <0 1 2 3 4 5 6 7>;
++		ti,chan-step-avg = <16 16 16 16 16 16 16 16>;
++		ti,chan-step-opendelay = <0x98 0x98 0x98 0x98 0x98 0x98 0x98 0x98>;
++		ti,chan-step-sampledelay = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>;
++	};
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_pins>;
++
++	status = "okay";
++};
++
++&uart4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart4_pins>;
++
++	status = "okay";
++};
++
++&usb {
++	status = "okay";
++};
++
++&usb_ctrl_mod {
++	status = "okay";
++};
++
++&usb0_phy {
++	status = "okay";
++};
++
++&usb0 {
++	status = "okay";
++	dr_mode = "otg";
++};
++
++&usb1_phy {
++	status = "okay";
++};
++
++&usb1 {
++	status = "okay";
++	dr_mode = "host";
++};
++
++&cppi41dma  {
++	status = "okay";
++};
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM b/configs/fedora/generic/s390x/CONFIG_DRM
deleted file mode 100644
index c9d4b0f66..000000000
--- a/configs/fedora/generic/s390x/CONFIG_DRM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 7366eb465..a4ab1a0e4 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1087,10 +1087,10 @@ CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_LVDS_ENCODER is not set
+CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6e63791c1..7b03cb78e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1076,10 +1076,10 @@ CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-# CONFIG_DRM is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_LVDS_ENCODER is not set
+CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
diff --git a/kernel.spec b/kernel.spec
index b78737c5d..73fe85e63 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -605,6 +605,9 @@ Patch309: crypto-testmgr-Allow-different-compression-results.patch
 
 Patch310: arm-tegra-fix-nouveau-crash.patch
 
+# https://patchwork.kernel.org/patch/10346089/
+Patch311: arm-dts-Add-am335x-pocketbeagle.patch
+
 # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/
 Patch320: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
 
@@ -631,6 +634,10 @@ Patch503: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
 # Drop this when configs are updated
 Patch504: 0001-Back-out-Kconfig.patch
 
+# rhbz 1565354
+Patch505: 0001-qxl-fix-qxl_release_-map-unmap.patch
+Patch506: 0002-qxl-keep-separate-release_bo-pointer.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1882,8 +1889,12 @@ fi
 #
 #
 %changelog
+* Wed Apr 18 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix rhbz 1565354
+
 * Tue Apr 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
 - Enable drivers for Xilinx ZYMQ-MP Ultra96
+- Initial support for PocketBeagle
 
 * Tue Apr 17 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git1.1
 - Linux v4.17-rc1-21-ga27fc14219f2