diff --git a/device/device-nokia-n9/APKBUILD b/device/device-nokia-n9/APKBUILD
index 5c2007cfb..d282beccb 100644
--- a/device/device-nokia-n9/APKBUILD
+++ b/device/device-nokia-n9/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-nokia-n9
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="Nokia N9"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -36,6 +36,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="3298afa3312a032836e271d4c6808d304436470545472beb4a4ac1a4b8f93ec25d5b895f5bebf351ffb6e910a155f97a4d96b1d74f1d8ab278c246cb3815bf79  deviceinfo
+sha512sums="4d68746c16e0375a9853a94bddf63541d64e290e4e624ae3790fed70bb9c86a02e492bfd3a32179ae5163d371963d763718ac9d3a57140b8e135d322ae9b09ee  deviceinfo
 61d9e6bf94f3b9cab0ccb2e18c18e5886a08aae5e70fe5e7b7d7cc2a8d655dc11cdec603731c4328dd288f13ba3aa9328f2fc46e7a473be3da31767786978b05  initfs-hook.sh
 df0fe900693e5f176076c59f5379e56aaa96c3df16a4120448f15b71f530170730b43e5fe32733c40c118a00ca3581043231a062a8a1eb0a930bfbfbb6c52a47  weston.ini"
diff --git a/device/device-nokia-n9/deviceinfo b/device/device-nokia-n9/deviceinfo
index c42f3e163..0259ee471 100644
--- a/device/device-nokia-n9/deviceinfo
+++ b/device/device-nokia-n9/deviceinfo
@@ -8,7 +8,6 @@ deviceinfo_date=""
 deviceinfo_keyboard="false"
 deviceinfo_keymaps=""
 deviceinfo_nonfree="????"
-deviceinfo_dtb="omap3-n9"
 deviceinfo_modules_initfs=""
 deviceinfo_external_disk="false"
 deviceinfo_external_disk_install="false"
diff --git a/device/linux-nokia-n9/0001-SEB.patch b/device/linux-nokia-n9/0001-SEB.patch
deleted file mode 100644
index 0a3902054..000000000
--- a/device/linux-nokia-n9/0001-SEB.patch
+++ /dev/null
@@ -1,1158 +0,0 @@
-From f70f270793e34ae99ab777f6cb27cb1e72054d78 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
-Date: Sat, 28 Oct 2017 14:28:52 +0200
-Subject: [PATCH 01/12] SEB
-
----
- arch/arm/boot/dts/omap3-n950.dts                |  88 ++++++++
- arch/arm/boot/dts/omap4-droid4-xt894.dts        |   6 +-
- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 289 +++++++++++++++++-------
- drivers/gpu/drm/omapdrm/dss/dispc.c             |  16 ++
- drivers/gpu/drm/omapdrm/dss/omapdss.h           |   5 +-
- drivers/gpu/drm/omapdrm/omap_connector.c        |  14 ++
- drivers/gpu/drm/omapdrm/omap_crtc.c             | 158 ++++++++++++-
- drivers/gpu/drm/omapdrm/omap_drv.h              |   4 +
- drivers/gpu/drm/omapdrm/omap_fb.c               |  20 ++
- drivers/gpu/drm/omapdrm/omap_fbdev.c            |   3 -
- drivers/gpu/drm/omapdrm/omap_irq.c              |  24 ++
- 11 files changed, 529 insertions(+), 98 deletions(-)
-
-diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
-index c354a1ed1e70..2354e09343f3 100644
---- a/arch/arm/boot/dts/omap3-n950.dts
-+++ b/arch/arm/boot/dts/omap3-n950.dts
-@@ -51,6 +51,26 @@
-	};
- };
-
-+&omap3_pmx_core {
-+	dsi_pins: pinmux_dsi_pins {
-+		pinctrl-single,pins = <
-+			OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE1) /* dsi_dx0 - data0+ */
-+			OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE1) /* dsi_dy0 - data0- */
-+			OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE1) /* dsi_dx1 - clk+   */
-+			OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE1) /* dsi_dy1 - clk-   */
-+			OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE1) /* dsi_dx2 - data1+ */
-+			OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE1) /* dsi_dy2 - data1- */
-+		>;
-+	};
-+
-+	display_pins: pinmux_display_pins {
-+		pinctrl-single,pins = <
-+			OMAP3_CORE1_IOPAD(0x20ca, PIN_INPUT | MUX_MODE4) /* gpio 62 - display te */
-+			OMAP3_CORE1_IOPAD(0x20fe, PIN_OUTPUT | MUX_MODE4) /* gpio 87 - display reset */
-+		>;
-+	};
-+};
-+
- &i2c2 {
-	smia_1: camera@10 {
-		compatible = "nokia,smia";
-@@ -186,3 +206,71 @@
-	st,max-limit-y = <32>;
-	st,max-limit-z = <32>;
- };
-+
-+&dss {
-+	status = "ok";
-+
-+	vdda_video-supply = <&vdac>;
-+};
-+
-+&dsi {
-+	status = "ok";
-+
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&dsi_pins>;
-+
-+	vdd-supply = <&vpll2>;
-+
-+	port {
-+		dsi_out_ep: endpoint {
-+			remote-endpoint = <&lcd0_in>;
-+			lanes = <2 3 0 1 4 5>;
-+		};
-+	};
-+
-+	lcd0: display {
-+		compatible = "nokia,himalaya", "panel-dsi-cm";
-+		label = "lcd0";
-+
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&display_pins>;
-+
-+		vpnl-supply = <&vmmc2>;
-+		vddi-supply = <&vio>;
-+
-+		reset-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;	/* 87 */
-+		te-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;	/* 62 */
-+
-+		width-mm = <49>; /* 48.960 mm */
-+		height-mm = <88>; /* 88.128 mm */
-+
-+		/* TODO:
-+		 * - panel is upside-down
-+		 * - top + bottom 5px are not visible
-+		 */
-+		panel-timing {
-+			clock-frequency = <0>;          /* Calculated by dsi */
-+
-+			hback-porch = <2>;
-+			hactive = <480>;
-+			hfront-porch = <0>;
-+			hsync-len = <2>;
-+
-+			vback-porch = <1>;
-+			vactive = <864>;
-+			vfront-porch = <0>;
-+			vsync-len = <1>;
-+
-+			hsync-active = <0>;
-+			vsync-active = <0>;
-+			de-active = <1>;
-+			pixelclk-active = <1>;
-+		};
-+
-+		port {
-+			lcd0_in: endpoint {
-+				remote-endpoint = <&dsi_out_ep>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
-index 24a463f8641f..b21084da490b 100644
---- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
-+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
-@@ -177,6 +177,10 @@
-		vddi-supply = <&lcd_regulator>;
-		reset-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;	/* gpio101 */
-
-+		width-mm = <50>;
-+		height-mm = <89>;
-+		backlight = <&lcd_backlight>;
-+
-		panel-timing {
-			clock-frequency = <0>;		/* Calculated by dsi */
-
-@@ -346,7 +350,7 @@
-
-		enable-gpios = <&gpio6 12 GPIO_ACTIVE_HIGH>;
-
--		backlight {
-+		lcd_backlight: backlight {
-			compatible = "ti,lm3532-backlight";
-
-			lcd {
-diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
-index 92c556ac22c7..996991de674b 100644
---- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
-+++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
-@@ -22,9 +22,10 @@
- #include <linux/slab.h>
- #include <linux/workqueue.h>
- #include <linux/of_device.h>
--#include <linux/of_gpio.h>
-+#include <linux/regulator/consumer.h>
-
- #include <video/mipi_display.h>
-+#include <video/of_display_timing.h>
-
- #include "../dss/omapdss.h"
-
-@@ -49,6 +50,7 @@ struct panel_drv_data {
-	struct mutex lock;
-
-	struct backlight_device *bldev;
-+	struct backlight_device *extbldev;
-
-	unsigned long	hw_guard_end;	/* next value of jiffies when we can
-					 * issue the next sleep in/out command
-@@ -56,11 +58,17 @@ struct panel_drv_data {
-	unsigned long	hw_guard_wait;	/* max guard time in jiffies */
-
-	/* panel HW configuration from DT or platform data */
--	int reset_gpio;
--	int ext_te_gpio;
-+	struct gpio_desc *reset_gpio;
-+	struct gpio_desc *ext_te_gpio;
-+
-+	struct regulator *vpnl;
-+	struct regulator *vddi;
-
-	bool use_dsi_backlight;
-
-+	int width_mm;
-+	int height_mm;
-+
-	struct omap_dsi_pin_config pin_config;
-
-	/* runtime variables */
-@@ -92,6 +100,30 @@ static int dsicm_panel_reset(struct panel_drv_data *ddata);
-
- static void dsicm_ulps_work(struct work_struct *work);
-
-+static void dsicm_bl_power(struct panel_drv_data *ddata, bool enable)
-+{
-+	struct backlight_device *backlight;
-+
-+	if (ddata->bldev)
-+		backlight = ddata->bldev;
-+	else if (ddata->extbldev)
-+		backlight = ddata->extbldev;
-+	else
-+		return;
-+
-+	if (enable) {
-+		backlight->props.fb_blank = FB_BLANK_UNBLANK;
-+		backlight->props.state = ~(BL_CORE_FBBLANK | BL_CORE_SUSPENDED);
-+		backlight->props.power = FB_BLANK_UNBLANK;
-+	} else {
-+		backlight->props.fb_blank = FB_BLANK_NORMAL;
-+		backlight->props.power = FB_BLANK_POWERDOWN;
-+		backlight->props.state |= BL_CORE_FBBLANK | BL_CORE_SUSPENDED;
-+	}
-+
-+	backlight_update_status(backlight);
-+}
-+
- static void hw_guard_start(struct panel_drv_data *ddata, int guard_msec)
- {
-	ddata->hw_guard_wait = msecs_to_jiffies(guard_msec);
-@@ -255,8 +287,8 @@ static int dsicm_enter_ulps(struct panel_drv_data *ddata)
-	if (r)
-		goto err;
-
--	if (gpio_is_valid(ddata->ext_te_gpio))
--		disable_irq(gpio_to_irq(ddata->ext_te_gpio));
-+	if (ddata->ext_te_gpio)
-+		disable_irq(gpiod_to_irq(ddata->ext_te_gpio));
-
-	in->ops.dsi->disable(in, false, true);
-
-@@ -297,8 +329,8 @@ static int dsicm_exit_ulps(struct panel_drv_data *ddata)
-		goto err2;
-	}
-
--	if (gpio_is_valid(ddata->ext_te_gpio))
--		enable_irq(gpio_to_irq(ddata->ext_te_gpio));
-+	if (ddata->ext_te_gpio)
-+		enable_irq(gpiod_to_irq(ddata->ext_te_gpio));
-
-	dsicm_queue_ulps_work(ddata);
-
-@@ -311,8 +343,8 @@ static int dsicm_exit_ulps(struct panel_drv_data *ddata)
-
-	r = dsicm_panel_reset(ddata);
-	if (!r) {
--		if (gpio_is_valid(ddata->ext_te_gpio))
--			enable_irq(gpio_to_irq(ddata->ext_te_gpio));
-+		if (ddata->ext_te_gpio)
-+			enable_irq(gpiod_to_irq(ddata->ext_te_gpio));
-		ddata->ulps_enabled = false;
-	}
- err1:
-@@ -335,7 +367,7 @@ static int dsicm_bl_update_status(struct backlight_device *dev)
- {
-	struct panel_drv_data *ddata = dev_get_drvdata(&dev->dev);
-	struct omap_dss_device *in = ddata->in;
--	int r;
-+	int r = 0;
-	int level;
-
-	if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-@@ -356,8 +388,6 @@ static int dsicm_bl_update_status(struct backlight_device *dev)
-			r = dsicm_dcs_write_1(ddata, DCS_BRIGHTNESS, level);
-
-		in->ops.dsi->bus_unlock(in);
--	} else {
--		r = 0;
-	}
-
-	mutex_unlock(&ddata->lock);
-@@ -560,16 +590,13 @@ static const struct attribute_group dsicm_attr_group = {
-
- static void dsicm_hw_reset(struct panel_drv_data *ddata)
- {
--	if (!gpio_is_valid(ddata->reset_gpio))
--		return;
--
--	gpio_set_value(ddata->reset_gpio, 1);
-+	gpiod_set_value(ddata->reset_gpio, 1);
-	udelay(10);
-	/* reset the panel */
--	gpio_set_value(ddata->reset_gpio, 0);
-+	gpiod_set_value(ddata->reset_gpio, 0);
-	/* assert reset */
-	udelay(10);
--	gpio_set_value(ddata->reset_gpio, 1);
-+	gpiod_set_value(ddata->reset_gpio, 1);
-	/* wait after releasing reset */
-	usleep_range(5000, 10000);
- }
-@@ -589,25 +616,43 @@ static int dsicm_power_on(struct panel_drv_data *ddata)
-		.lp_clk_max = 10000000,
-	};
-
-+	if (ddata->vpnl) {
-+		r = regulator_enable(ddata->vpnl);
-+		if (r) {
-+			dev_err(&ddata->pdev->dev,
-+				"failed to enable VPNL: %d\n", r);
-+			return r;
-+		}
-+	}
-+
-+	if (ddata->vddi) {
-+		r = regulator_enable(ddata->vddi);
-+		if (r) {
-+			dev_err(&ddata->pdev->dev,
-+				"failed to enable VDDI: %d\n", r);
-+			goto err_vpnl;
-+		}
-+	}
-+
-	if (ddata->pin_config.num_pins > 0) {
-		r = in->ops.dsi->configure_pins(in, &ddata->pin_config);
-		if (r) {
-			dev_err(&ddata->pdev->dev,
-				"failed to configure DSI pins\n");
--			goto err0;
-+			goto err_vddi;
-		}
-	}
-
-	r = in->ops.dsi->set_config(in, &dsi_config);
-	if (r) {
-		dev_err(&ddata->pdev->dev, "failed to configure DSI\n");
--		goto err0;
-+		goto err_vddi;
-	}
-
-	r = in->ops.dsi->enable(in);
-	if (r) {
-		dev_err(&ddata->pdev->dev, "failed to enable DSI\n");
--		goto err0;
-+		goto err_vddi;
-	}
-
-	dsicm_hw_reset(ddata);
-@@ -665,7 +710,13 @@ static int dsicm_power_on(struct panel_drv_data *ddata)
-	dsicm_hw_reset(ddata);
-
-	in->ops.dsi->disable(in, true, false);
--err0:
-+err_vddi:
-+	if (ddata->vddi)
-+		regulator_disable(ddata->vddi);
-+err_vpnl:
-+	if (ddata->vpnl)
-+		regulator_disable(ddata->vpnl);
-+
-	return r;
- }
-
-@@ -688,6 +739,11 @@ static void dsicm_power_off(struct panel_drv_data *ddata)
-
-	in->ops.dsi->disable(in, true, false);
-
-+	if (ddata->vddi)
-+		regulator_disable(ddata->vddi);
-+	if (ddata->vpnl)
-+		regulator_disable(ddata->vpnl);
-+
-	ddata->enabled = 0;
- }
-
-@@ -782,6 +838,8 @@ static int dsicm_enable(struct omap_dss_device *dssdev)
-
-	mutex_unlock(&ddata->lock);
-
-+	dsicm_bl_power(ddata, true);
-+
-	return 0;
- err:
-	dev_dbg(&ddata->pdev->dev, "enable failed\n");
-@@ -797,6 +855,8 @@ static void dsicm_disable(struct omap_dss_device *dssdev)
-
-	dev_dbg(&ddata->pdev->dev, "disable\n");
-
-+	dsicm_bl_power(ddata, false);
-+
-	mutex_lock(&ddata->lock);
-
-	dsicm_cancel_ulps_work(ddata);
-@@ -890,7 +950,7 @@ static int dsicm_update(struct omap_dss_device *dssdev,
-	if (r)
-		goto err;
-
--	if (ddata->te_enabled && gpio_is_valid(ddata->ext_te_gpio)) {
-+	if (ddata->te_enabled && ddata->ext_te_gpio) {
-		schedule_delayed_work(&ddata->te_timeout_work,
-				msecs_to_jiffies(250));
-		atomic_set(&ddata->do_update, 1);
-@@ -937,7 +997,7 @@ static int _dsicm_enable_te(struct panel_drv_data *ddata, bool enable)
-	else
-		r = dsicm_dcs_write_0(ddata, MIPI_DCS_SET_TEAR_OFF);
-
--	if (!gpio_is_valid(ddata->ext_te_gpio))
-+	if (!ddata->ext_te_gpio)
-		in->ops.dsi->enable_te(in, enable);
-
-	/* possible panel bug */
-@@ -1099,6 +1159,45 @@ static void dsicm_ulps_work(struct work_struct *work)
-	mutex_unlock(&ddata->lock);
- }
-
-+static void dsicm_get_timings(struct omap_dss_device *dssdev,
-+			      struct videomode *vm)
-+{
-+	struct panel_drv_data *ddata = to_panel_data(dssdev);
-+
-+	*vm = ddata->vm;
-+}
-+
-+static int dsicm_check_timings(struct omap_dss_device *dssdev,
-+			       struct videomode *vm)
-+{
-+	struct panel_drv_data *ddata = to_panel_data(dssdev);
-+	int ret = 0;
-+
-+	if (vm->hactive != ddata->vm.hactive)
-+		ret = -EINVAL;
-+
-+	if (vm->vactive != ddata->vm.vactive)
-+		ret = -EINVAL;
-+
-+	if (ret) {
-+		dev_warn(dssdev->dev, "wrong resolution: %d x %d",
-+			 vm->hactive, vm->vactive);
-+		dev_warn(dssdev->dev, "panel resolution: %d x %d",
-+			 ddata->vm.hactive, ddata->vm.vactive);
-+	}
-+
-+	return ret;
-+}
-+
-+static void dsicm_get_size(struct omap_dss_device *dssdev,
-+			  unsigned int *width, unsigned int *height)
-+{
-+	struct panel_drv_data *ddata = to_panel_data(dssdev);
-+
-+	*width = ddata->width_mm;
-+	*height = ddata->height_mm;
-+}
-+
- static struct omap_dss_driver dsicm_ops = {
-	.connect	= dsicm_connect,
-	.disconnect	= dsicm_disconnect,
-@@ -1109,6 +1208,10 @@ static struct omap_dss_driver dsicm_ops = {
-	.update		= dsicm_update,
-	.sync		= dsicm_sync,
-
-+	.get_timings	= dsicm_get_timings,
-+	.check_timings	= dsicm_check_timings,
-+	.get_size	= dsicm_get_size,
-+
-	.enable_te	= dsicm_enable_te,
-	.get_te		= dsicm_get_te,
-
-@@ -1118,41 +1221,87 @@ static struct omap_dss_driver dsicm_ops = {
- static int dsicm_probe_of(struct platform_device *pdev)
- {
-	struct device_node *node = pdev->dev.of_node;
-+	struct device_node *backlight;
-	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-	struct omap_dss_device *in;
--	int gpio;
-+	struct display_timing timing;
-+	int err;
-+
-+	ddata->reset_gpio = devm_gpiod_get(&pdev->dev, "reset", GPIOD_OUT_LOW);
-+	if (IS_ERR(ddata->reset_gpio)) {
-+		err = PTR_ERR(ddata->reset_gpio);
-+		dev_err(&pdev->dev, "reset gpio request failed: %d", err);
-+		return err;
-+	}
-
--	gpio = of_get_named_gpio(node, "reset-gpios", 0);
--	if (!gpio_is_valid(gpio)) {
--		dev_err(&pdev->dev, "failed to parse reset gpio\n");
--		return gpio;
-+	ddata->ext_te_gpio = devm_gpiod_get_optional(&pdev->dev, "te",
-+						     GPIOD_IN);
-+	if (IS_ERR(ddata->ext_te_gpio)) {
-+		err = PTR_ERR(ddata->ext_te_gpio);
-+		dev_err(&pdev->dev, "TE gpio request failed: %d", err);
-+		return err;
-	}
--	ddata->reset_gpio = gpio;
-
--	gpio = of_get_named_gpio(node, "te-gpios", 0);
--	if (gpio_is_valid(gpio) || gpio == -ENOENT) {
--		ddata->ext_te_gpio = gpio;
-+	err = of_get_display_timing(node, "panel-timing", &timing);
-+	if (!err) {
-+		videomode_from_timing(&timing, &ddata->vm);
-+		if (!ddata->vm.pixelclock)
-+			ddata->vm.pixelclock =
-+				ddata->vm.hactive * ddata->vm.vactive * 60;
-	} else {
--		dev_err(&pdev->dev, "failed to parse TE gpio\n");
--		return gpio;
-+		dev_warn(&pdev->dev,
-+			 "failed to get video timing, using defaults\n");
-	}
-
-+	ddata->width_mm = 0;
-+	of_property_read_u32(node, "width-mm", &ddata->width_mm);
-+
-+	ddata->height_mm = 0;
-+	of_property_read_u32(node, "height-mm", &ddata->height_mm);
-+
-	in = omapdss_of_find_source_for_first_ep(node);
-	if (IS_ERR(in)) {
-		dev_err(&pdev->dev, "failed to find video source\n");
-		return PTR_ERR(in);
-	}
-
-+	ddata->vpnl = devm_regulator_get_optional(&pdev->dev, "vpnl");
-+	if (IS_ERR(ddata->vpnl)) {
-+		err = PTR_ERR(ddata->vpnl);
-+		if (err == -EPROBE_DEFER)
-+			return err;
-+		ddata->vpnl = NULL;
-+	}
-+
-+	ddata->vddi = devm_regulator_get_optional(&pdev->dev, "vddi");
-+	if (IS_ERR(ddata->vddi)) {
-+		err = PTR_ERR(ddata->vddi);
-+		if (err == -EPROBE_DEFER)
-+			return err;
-+		ddata->vddi = NULL;
-+	}
-+
-	ddata->in = in;
-
--	/* TODO: ulps, backlight */
-+	backlight = of_parse_phandle(node, "backlight", 0);
-+	if (backlight) {
-+		ddata->extbldev = of_find_backlight_by_node(backlight);
-+		of_node_put(backlight);
-+
-+		if (!ddata->extbldev)
-+			return -EPROBE_DEFER;
-+	} else {
-+		/* assume native backlight support */
-+		ddata->use_dsi_backlight = true;
-+	}
-+
-+	/* TODO: ulps */
-
-	return 0;
- }
-
- static int dsicm_probe(struct platform_device *pdev)
- {
--	struct backlight_properties props;
-	struct panel_drv_data *ddata;
-	struct backlight_device *bldev = NULL;
-	struct device *dev = &pdev->dev;
-@@ -1171,14 +1320,14 @@ static int dsicm_probe(struct platform_device *pdev)
-	if (!pdev->dev.of_node)
-		return -ENODEV;
-
--	r = dsicm_probe_of(pdev);
--	if (r)
--		return r;
--
-	ddata->vm.hactive = 864;
-	ddata->vm.vactive = 480;
-	ddata->vm.pixelclock = 864 * 480 * 60;
-
-+	r = dsicm_probe_of(pdev);
-+	if (r)
-+		return r;
-+
-	dssdev = &ddata->dssdev;
-	dssdev->dev = dev;
-	dssdev->driver = &dsicm_ops;
-@@ -1200,31 +1349,15 @@ static int dsicm_probe(struct platform_device *pdev)
-
-	atomic_set(&ddata->do_update, 0);
-
--	if (gpio_is_valid(ddata->reset_gpio)) {
--		r = devm_gpio_request_one(dev, ddata->reset_gpio,
--				GPIOF_OUT_INIT_LOW, "taal rst");
--		if (r) {
--			dev_err(dev, "failed to request reset gpio\n");
--			return r;
--		}
--	}
--
--	if (gpio_is_valid(ddata->ext_te_gpio)) {
--		r = devm_gpio_request_one(dev, ddata->ext_te_gpio,
--				GPIOF_IN, "taal irq");
--		if (r) {
--			dev_err(dev, "GPIO request failed\n");
--			return r;
--		}
--
--		r = devm_request_irq(dev, gpio_to_irq(ddata->ext_te_gpio),
-+	if (ddata->ext_te_gpio) {
-+		r = devm_request_irq(dev, gpiod_to_irq(ddata->ext_te_gpio),
-				dsicm_te_isr,
-				IRQF_TRIGGER_RISING,
-				"taal vsync", ddata);
-
-		if (r) {
-			dev_err(dev, "IRQ request failed\n");
--			return r;
-+			goto err_reg;
-		}
-
-		INIT_DEFERRABLE_WORK(&ddata->te_timeout_work,
-@@ -1234,48 +1367,43 @@ static int dsicm_probe(struct platform_device *pdev)
-	}
-
-	ddata->workqueue = create_singlethread_workqueue("dsicm_wq");
--	if (ddata->workqueue == NULL) {
--		dev_err(dev, "can't create workqueue\n");
--		return -ENOMEM;
-+	if (!ddata->workqueue) {
-+		r = -ENOMEM;
-+		goto err_reg;
-	}
-	INIT_DELAYED_WORK(&ddata->ulps_work, dsicm_ulps_work);
-
-	dsicm_hw_reset(ddata);
-
-	if (ddata->use_dsi_backlight) {
--		memset(&props, 0, sizeof(props));
-+		struct backlight_properties props = { 0 };
-		props.max_brightness = 255;
--
-		props.type = BACKLIGHT_RAW;
--		bldev = backlight_device_register(dev_name(dev),
--				dev, ddata, &dsicm_bl_ops, &props);
-+
-+		bldev = devm_backlight_device_register(dev, dev_name(dev),
-+			dev, ddata, &dsicm_bl_ops, &props);
-		if (IS_ERR(bldev)) {
-			r = PTR_ERR(bldev);
-			goto err_bl;
-		}
-
-		ddata->bldev = bldev;
--
--		bldev->props.fb_blank = FB_BLANK_UNBLANK;
--		bldev->props.power = FB_BLANK_UNBLANK;
--		bldev->props.brightness = 255;
--
--		dsicm_bl_update_status(bldev);
-	}
-
-	r = sysfs_create_group(&dev->kobj, &dsicm_attr_group);
-	if (r) {
-		dev_err(dev, "failed to create sysfs files\n");
--		goto err_sysfs_create;
-+		goto err_bl;
-	}
-
-	return 0;
-
--err_sysfs_create:
--	backlight_device_unregister(bldev);
- err_bl:
-	destroy_workqueue(ddata->workqueue);
- err_reg:
-+	if (ddata->extbldev)
-+		put_device(&ddata->extbldev->dev);
-+
-	return r;
- }
-
-@@ -1283,7 +1411,6 @@ static int __exit dsicm_remove(struct platform_device *pdev)
- {
-	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-	struct omap_dss_device *dssdev = &ddata->dssdev;
--	struct backlight_device *bldev;
-
-	dev_dbg(&pdev->dev, "remove\n");
-
-@@ -1294,12 +1421,8 @@ static int __exit dsicm_remove(struct platform_device *pdev)
-
-	sysfs_remove_group(&pdev->dev.kobj, &dsicm_attr_group);
-
--	bldev = ddata->bldev;
--	if (bldev != NULL) {
--		bldev->props.power = FB_BLANK_POWERDOWN;
--		dsicm_bl_update_status(bldev);
--		backlight_device_unregister(bldev);
--	}
-+	if (ddata->extbldev)
-+		put_device(&ddata->extbldev->dev);
-
-	omap_dss_put_device(ddata->in);
-
-diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
-index 0f4fdb221498..d5d2d3c62dfa 100644
---- a/drivers/gpu/drm/omapdrm/dss/dispc.c
-+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
-@@ -1491,6 +1491,18 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane_id plane,
-	}
- }
-
-+void dispc_ovl_set_manual_fifo_threshold(enum omap_plane_id plane)
-+{
-+	u32 fifo_low, fifo_high;
-+	bool use_fifo_merge = false;
-+	bool use_manual_update = true;
-+
-+	dispc_ovl_compute_fifo_thresholds(plane, &fifo_low, &fifo_high,
-+					  use_fifo_merge, use_manual_update);
-+
-+	dispc_ovl_set_fifo_threshold(plane, fifo_low, fifo_high);
-+}
-+
- static void dispc_ovl_set_mflag(enum omap_plane_id plane, bool enable)
- {
-	int bit;
-@@ -2654,6 +2666,10 @@ static int dispc_ovl_setup(enum omap_plane_id plane,
-		oi->zorder, oi->pre_mult_alpha, oi->global_alpha,
-		oi->rotation_type, replication, vm, mem_to_mem);
-
-+	/* manual mode needs other fifo thresholds */
-+	if (mgr_fld_read(channel, DISPC_MGR_FLD_STALLMODE))
-+		dispc_ovl_set_manual_fifo_threshold(plane);
-+
-	return r;
- }
-
-diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
-index 990422b35784..ad6eefc511b7 100644
---- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
-+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
-@@ -563,6 +563,8 @@ struct omap_dss_driver {
-			    struct videomode *vm);
-	void (*get_timings)(struct omap_dss_device *dssdev,
-			    struct videomode *vm);
-+	void (*get_size)(struct omap_dss_device *dssdev,
-+			 unsigned int *width, unsigned int *height);
-
-	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
-	u32 (*get_wss)(struct omap_dss_device *dssdev);
-@@ -585,9 +587,6 @@ struct omap_dss_driver {
-
- bool omapdss_is_initialized(void);
-
--int omap_dss_register_driver(struct omap_dss_driver *);
--void omap_dss_unregister_driver(struct omap_dss_driver *);
--
- int omapdss_register_display(struct omap_dss_device *dssdev);
- void omapdss_unregister_display(struct omap_dss_device *dssdev);
-
-diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
-index aa5ba9ae2191..8874f55259ab 100644
---- a/drivers/gpu/drm/omapdrm/omap_connector.c
-+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
-@@ -59,6 +59,14 @@ bool omap_connector_get_hdmi_mode(struct drm_connector *connector)
-	return omap_connector->hdmi_mode;
- }
-
-+bool omap_connector_get_manually_updated(struct drm_connector *connector)
-+{
-+	struct omap_connector *omap_connector = to_omap_connector(connector);
-+
-+	return !!(omap_connector->dssdev->caps &
-+		  OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE);
-+}
-+
- static enum drm_connector_status omap_connector_detect(
-		struct drm_connector *connector, bool force)
- {
-@@ -149,6 +157,12 @@ static int omap_connector_get_modes(struct drm_connector *connector)
-		drm_mode_set_name(mode);
-		drm_mode_probed_add(connector, mode);
-
-+		if (dssdrv->get_size) {
-+			dssdrv->get_size(dssdev,
-+					 &connector->display_info.width_mm,
-+					 &connector->display_info.height_mm);
-+		}
-+
-		n = 1;
-	}
-
-diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
-index cc85c16cbc2a..8255241d71fc 100644
---- a/drivers/gpu/drm/omapdrm/omap_crtc.c
-+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
-@@ -52,6 +52,10 @@ struct omap_crtc {
-	bool pending;
-	wait_queue_head_t pending_wait;
-	struct drm_pending_vblank_event *event;
-+	struct delayed_work update_work;
-+
-+	void (*framedone_handler)(void *);
-+	void *framedone_handler_data;
- };
-
- /* -----------------------------------------------------------------------------
-@@ -140,6 +144,28 @@ static void omap_crtc_dss_disconnect(enum omap_channel channel,
-
- static void omap_crtc_dss_start_update(enum omap_channel channel)
- {
-+	struct omap_crtc *omap_crtc = omap_crtcs[channel];
-+	struct omap_drm_private *priv = omap_crtc->base.dev->dev_private;
-+
-+	priv->dispc_ops->mgr_enable(channel, true);
-+}
-+
-+static bool omap_crtc_is_manually_updated(struct drm_crtc *crtc)
-+{
-+	struct drm_connector *connector;
-+	struct drm_connector_list_iter conn_iter;
-+	bool result = false;
-+
-+	drm_connector_list_iter_begin(crtc->dev, &conn_iter);
-+	drm_for_each_connector_iter(connector, &conn_iter) {
-+		if (connector->state->crtc != crtc)
-+			continue;
-+		result = omap_connector_get_manually_updated(connector);
-+		break;
-+	}
-+	drm_connector_list_iter_end(&conn_iter);
-+
-+	return result;
- }
-
- /* Called only from the encoder enable/disable and suspend/resume handlers. */
-@@ -151,12 +177,17 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
-	enum omap_channel channel = omap_crtc->channel;
-	struct omap_irq_wait *wait;
-	u32 framedone_irq, vsync_irq;
-+	bool is_manual = omap_crtc_is_manually_updated(crtc);
-+	enum omap_display_type type = omap_crtc_output[channel]->output_type;
-	int ret;
-
-	if (WARN_ON(omap_crtc->enabled == enable))
-		return;
-
--	if (omap_crtc_output[channel]->output_type == OMAP_DISPLAY_TYPE_HDMI) {
-+	if (is_manual)
-+		omap_irq_enable_framedone(crtc, enable);
-+
-+	if (is_manual || type == OMAP_DISPLAY_TYPE_HDMI) {
-		priv->dispc_ops->mgr_enable(channel, enable);
-		omap_crtc->enabled = enable;
-		return;
-@@ -207,7 +238,6 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
-	}
- }
-
--
- static int omap_crtc_dss_enable(enum omap_channel channel)
- {
-	struct omap_crtc *omap_crtc = omap_crtcs[channel];
-@@ -248,6 +278,17 @@ static int omap_crtc_dss_register_framedone(
-		enum omap_channel channel,
-		void (*handler)(void *), void *data)
- {
-+	struct omap_crtc *omap_crtc = omap_crtcs[channel];
-+	struct drm_device *dev = omap_crtc->base.dev;
-+
-+	if (omap_crtc->framedone_handler)
-+		return -EBUSY;
-+
-+	dev_dbg(dev->dev, "register framedone %s", omap_crtc->name);
-+
-+	omap_crtc->framedone_handler = handler;
-+	omap_crtc->framedone_handler_data = data;
-+
-	return 0;
- }
-
-@@ -255,6 +296,16 @@ static void omap_crtc_dss_unregister_framedone(
-		enum omap_channel channel,
-		void (*handler)(void *), void *data)
- {
-+	struct omap_crtc *omap_crtc = omap_crtcs[channel];
-+	struct drm_device *dev = omap_crtc->base.dev;
-+
-+	dev_dbg(dev->dev, "unregister framedone %s", omap_crtc->name);
-+
-+	WARN_ON(omap_crtc->framedone_handler != handler);
-+	WARN_ON(omap_crtc->framedone_handler_data != data);
-+
-+	omap_crtc->framedone_handler = NULL;
-+	omap_crtc->framedone_handler_data = NULL;
- }
-
- static const struct dss_mgr_ops mgr_ops = {
-@@ -322,6 +373,77 @@ void omap_crtc_vblank_irq(struct drm_crtc *crtc)
-	DBG("%s: apply done", omap_crtc->name);
- }
-
-+void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus)
-+{
-+	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-+
-+	if (!omap_crtc->framedone_handler) {
-+		dev_warn(omap_crtc->base.dev->dev, "no framedone handler?");
-+		return;
-+	}
-+
-+	omap_crtc->framedone_handler(omap_crtc->framedone_handler_data);
-+
-+	spin_lock(&crtc->dev->event_lock);
-+	/* Send the vblank event if one has been requested. */
-+	if (omap_crtc->event) {
-+		drm_crtc_send_vblank_event(crtc, omap_crtc->event);
-+		omap_crtc->event = NULL;
-+	}
-+	omap_crtc->pending = false;
-+	spin_unlock(&crtc->dev->event_lock);
-+
-+	/* Wake up omap_atomic_complete. */
-+	wake_up(&omap_crtc->pending_wait);
-+}
-+
-+void omap_crtc_flush(struct drm_crtc *crtc)
-+{
-+	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-+
-+	if (!omap_crtc_is_manually_updated(crtc))
-+		return;
-+
-+	if (!delayed_work_pending(&omap_crtc->update_work))
-+		schedule_delayed_work(&omap_crtc->update_work, 0);
-+}
-+
-+static void omap_crtc_manual_display_update(struct work_struct *data)
-+{
-+	struct omap_crtc *omap_crtc =
-+			container_of(data, struct omap_crtc, update_work.work);
-+	struct omap_dss_device *dssdev = omap_crtc_output[omap_crtc->channel];
-+	struct drm_device *dev = omap_crtc->base.dev;
-+	struct omap_dss_driver *dssdrv;
-+	int ret, width, height;
-+
-+	if (!dssdev || !dssdev->dst) {
-+		dev_err_once(dev->dev, "missing dssdev!");
-+		return;
-+	}
-+
-+	dssdev = dssdev->dst;
-+	dssdrv = dssdev->driver;
-+
-+	if (!dssdrv || !dssdrv->update) {
-+		dev_err_once(dev->dev, "incorrect dssdrv!");
-+		return;
-+	}
-+
-+	if (dssdrv->sync)
-+		dssdrv->sync(dssdev);
-+
-+	width = dssdev->panel.vm.hactive;
-+	height = dssdev->panel.vm.vactive;
-+	ret = dssdrv->update(dssdev, 0, 0, width, height);
-+	if (ret < 0) {
-+		spin_lock_irq(&dev->event_lock);
-+		omap_crtc->pending = false;
-+		spin_unlock_irq(&dev->event_lock);
-+		wake_up(&omap_crtc->pending_wait);
-+	}
-+}
-+
- static void omap_crtc_write_crtc_properties(struct drm_crtc *crtc)
- {
-	struct omap_drm_private *priv = crtc->dev->dev_private;
-@@ -374,6 +496,10 @@ static void omap_crtc_atomic_enable(struct drm_crtc *crtc,
-
-	DBG("%s", omap_crtc->name);
-
-+	/* manual updated display will not trigger vsync irq */
-+	if (omap_crtc_is_manually_updated(crtc))
-+		return;
-+
-	spin_lock_irq(&crtc->dev->event_lock);
-	drm_crtc_vblank_on(crtc);
-	ret = drm_crtc_vblank_get(crtc);
-@@ -387,6 +513,7 @@ static void omap_crtc_atomic_disable(struct drm_crtc *crtc,
-				     struct drm_crtc_state *old_state)
- {
-	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
-+	struct drm_device *dev = crtc->dev;
-
-	DBG("%s", omap_crtc->name);
-
-@@ -397,6 +524,11 @@ static void omap_crtc_atomic_disable(struct drm_crtc *crtc,
-	}
-	spin_unlock_irq(&crtc->dev->event_lock);
-
-+	cancel_delayed_work(&omap_crtc->update_work);
-+
-+	if (!omap_crtc_wait_pending(crtc))
-+		dev_warn(dev->dev, "manual display update did not finish!");
-+
-	drm_crtc_vblank_off(crtc);
- }
-
-@@ -511,13 +643,20 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
-
-	DBG("%s: GO", omap_crtc->name);
-
--	ret = drm_crtc_vblank_get(crtc);
--	WARN_ON(ret != 0);
-+	if (!omap_crtc_is_manually_updated(crtc)) {
-+		ret = drm_crtc_vblank_get(crtc);
-+		WARN_ON(ret != 0);
-
--	spin_lock_irq(&crtc->dev->event_lock);
--	priv->dispc_ops->mgr_go(omap_crtc->channel);
--	omap_crtc_arm_event(crtc);
--	spin_unlock_irq(&crtc->dev->event_lock);
-+		spin_lock_irq(&crtc->dev->event_lock);
-+		priv->dispc_ops->mgr_go(omap_crtc->channel);
-+		omap_crtc_arm_event(crtc);
-+		spin_unlock_irq(&crtc->dev->event_lock);
-+	} else {
-+		spin_lock_irq(&crtc->dev->event_lock);
-+		omap_crtc_flush(crtc);
-+		omap_crtc_arm_event(crtc);
-+		spin_unlock_irq(&crtc->dev->event_lock);
-+	}
- }
-
- static int omap_crtc_atomic_set_property(struct drm_crtc *crtc,
-@@ -678,6 +817,9 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
-	omap_crtc->channel = channel;
-	omap_crtc->name = channel_names[channel];
-
-+	INIT_DELAYED_WORK(&omap_crtc->update_work,
-+			  omap_crtc_manual_display_update);
-+
-	ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL,
-					&omap_crtc_funcs, NULL);
-	if (ret < 0) {
-diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
-index 4bd1e9070b31..3cb9f9afba16 100644
---- a/drivers/gpu/drm/omapdrm/omap_drv.h
-+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
-@@ -97,6 +97,7 @@ void omap_gem_describe_objects(struct list_head *list, struct seq_file *m);
- int omap_gem_resume(struct device *dev);
- #endif
-
-+int omap_irq_enable_framedone(struct drm_crtc *crtc, bool enable);
- int omap_irq_enable_vblank(struct drm_crtc *crtc);
- void omap_irq_disable_vblank(struct drm_crtc *crtc);
- void omap_drm_irq_uninstall(struct drm_device *dev);
-@@ -124,6 +125,8 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
- int omap_crtc_wait_pending(struct drm_crtc *crtc);
- void omap_crtc_error_irq(struct drm_crtc *crtc, uint32_t irqstatus);
- void omap_crtc_vblank_irq(struct drm_crtc *crtc);
-+void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus);
-+void omap_crtc_flush(struct drm_crtc *crtc);
-
- struct drm_plane *omap_plane_init(struct drm_device *dev,
-		int idx, enum drm_plane_type type,
-@@ -140,6 +143,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
- struct drm_encoder *omap_connector_attached_encoder(
-		struct drm_connector *connector);
- bool omap_connector_get_hdmi_mode(struct drm_connector *connector);
-+bool omap_connector_get_manually_updated(struct drm_connector *connector);
-
- struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
-		struct drm_file *file, const struct drm_mode_fb_cmd2 *mode_cmd);
-diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
-index b1a762b70cbf..9492be69d59b 100644
---- a/drivers/gpu/drm/omapdrm/omap_fb.c
-+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
-@@ -97,8 +97,28 @@ static void omap_framebuffer_destroy(struct drm_framebuffer *fb)
-	kfree(omap_fb);
- }
-
-+static int omap_framebuffer_dirty(struct drm_framebuffer *fb,
-+				  struct drm_file *file_priv,
-+				  unsigned flags, unsigned color,
-+				  struct drm_clip_rect *clips,
-+				  unsigned num_clips)
-+{
-+	struct drm_connector *connector = NULL;
-+
-+	drm_modeset_lock_all(fb->dev);
-+
-+	while ((connector = omap_framebuffer_get_next_connector(fb, connector)))
-+		if (connector->encoder && connector->encoder->crtc)
-+			omap_crtc_flush(connector->encoder->crtc);
-+
-+	drm_modeset_unlock_all(fb->dev);
-+
-+	return 0;
-+}
-+
- static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {
-	.create_handle = omap_framebuffer_create_handle,
-+	.dirty = omap_framebuffer_dirty,
-	.destroy = omap_framebuffer_destroy,
- };
-
-diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
-index 9273118040b7..e0378182bd7c 100644
---- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
-+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
-@@ -84,9 +84,6 @@ static struct fb_ops omap_fb_ops = {
-	.owner = THIS_MODULE,
-	DRM_FB_HELPER_DEFAULT_OPS,
-
--	/* Note: to properly handle manual update displays, we wrap the
--	 * basic fbdev ops which write to the framebuffer
--	 */
-	.fb_read = drm_fb_helper_sys_read,
-	.fb_write = drm_fb_helper_sys_write,
-	.fb_fillrect = drm_fb_helper_sys_fillrect,
-diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c
-index 013b0bba712f..301c0e7a70b7 100644
---- a/drivers/gpu/drm/omapdrm/omap_irq.c
-+++ b/drivers/gpu/drm/omapdrm/omap_irq.c
-@@ -87,6 +87,27 @@ int omap_irq_wait(struct drm_device *dev, struct omap_irq_wait *wait,
-	return ret == 0 ? -1 : 0;
- }
-
-+int omap_irq_enable_framedone(struct drm_crtc *crtc, bool enable)
-+{
-+	struct drm_device *dev = crtc->dev;
-+	struct omap_drm_private *priv = dev->dev_private;
-+	unsigned long flags;
-+	enum omap_channel channel = omap_crtc_channel(crtc);
-+	int framedone_irq = priv->dispc_ops->mgr_get_framedone_irq(channel);
-+
-+	DBG("dev=%p, crtc=%u, enable=%d", dev, channel, enable);
-+
-+	spin_lock_irqsave(&priv->wait_lock, flags);
-+	if (enable)
-+		priv->irq_mask |= framedone_irq;
-+	else
-+		priv->irq_mask &= ~framedone_irq;
-+	omap_irq_update(dev);
-+	spin_unlock_irqrestore(&priv->wait_lock, flags);
-+
-+	return 0;
-+}
-+
- /**
-  * enable_vblank - enable vblank interrupt events
-  * @dev: DRM device
-@@ -217,6 +238,9 @@ static irqreturn_t omap_irq_handler(int irq, void *arg)
-
-		if (irqstatus & priv->dispc_ops->mgr_get_sync_lost_irq(channel))
-			omap_crtc_error_irq(crtc, irqstatus);
-+
-+		if (irqstatus & priv->dispc_ops->mgr_get_framedone_irq(channel))
-+			omap_crtc_framedone_irq(crtc, irqstatus);
-	}
-
-	omap_irq_ocp_error_handler(dev, irqstatus);
---
-2.14.1
diff --git a/device/linux-nokia-n9/0001-SREv2.patch b/device/linux-nokia-n9/0001-SREv2.patch
new file mode 100644
index 000000000..2cdff0d3f
--- /dev/null
+++ b/device/linux-nokia-n9/0001-SREv2.patch
@@ -0,0 +1,652 @@
+From 2c62ef61b0361f6850140832b35bc4f400b9ccfe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
+Date: Sat, 10 Feb 2018 20:33:59 +0100
+Subject: [PATCH 01/11] SREv2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
+---
+ .../bindings/display/panel/panel-common.txt        |  12 ++
+ arch/arm/boot/dts/omap4-droid4-xt894.dts           |   3 +
+ drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c    |  13 ++
+ drivers/gpu/drm/omapdrm/dss/dispc.c                |  36 ++++-
+ drivers/gpu/drm/omapdrm/dss/omapdss.h              |   2 +
+ drivers/gpu/drm/omapdrm/omap_connector.c           |  18 ++-
+ drivers/gpu/drm/omapdrm/omap_connector.h           |   1 +
+ drivers/gpu/drm/omapdrm/omap_crtc.c                | 158 +++++++++++++++++++--
+ drivers/gpu/drm/omapdrm/omap_crtc.h                |   2 +
+ drivers/gpu/drm/omapdrm/omap_fb.c                  |  20 +++
+ drivers/gpu/drm/omapdrm/omap_irq.c                 |  24 ++++
+ drivers/gpu/drm/omapdrm/omap_irq.h                 |   1 +
+ 12 files changed, 280 insertions(+), 10 deletions(-)
+
+diff --git a/Documentation/devicetree/bindings/display/panel/panel-common.txt b/Documentation/devicetree/bindings/display/panel/panel-common.txt
+index 557fa765adcb..c646b8908458 100644
+--- a/Documentation/devicetree/bindings/display/panel/panel-common.txt
++++ b/Documentation/devicetree/bindings/display/panel/panel-common.txt
+@@ -18,6 +18,18 @@ Descriptive Properties
+   physical area where images are displayed. These properties are expressed in
+   millimeters and rounded to the closest unit.
+ 
++- orientation: The orientation property specifies the panel orientation
++  in relation to the device's casing. The following values are possible:
++
++   * 0 = The top side of the panel matches the top side of the device's
++         casing.
++   * 1 = The top side of the panel matches the bottom side of the device's
++         casing. In other words the panel is mounted upside-down.
++   * 2 = The left side of the panel matches the top side of the device's
++         casing.
++   * 3 = The right side of the panel matches the top side of the device's
++         casing.
++
+ - label: The label property specifies a symbolic name for the panel as a
+   string suitable for use by humans. It typically contains a name inscribed on
+   the system (e.g. as an affixed label) or specified in the system's
+diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
+index b21084da490b..e11a24397163 100644
+--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
++++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
+@@ -6,6 +6,7 @@
+ /dts-v1/;
+ 
+ #include <dt-bindings/input/input.h>
++#include <dt-bindings/display/common.h>
+ #include "omap443x.dtsi"
+ #include "motorola-cpcap-mapphone.dtsi"
+ 
+@@ -181,6 +182,8 @@
+ 		height-mm = <89>;
+ 		backlight = <&lcd_backlight>;
+ 
++		orientation = <PANEL_ORIENTATION_RIGHT_UP>;
++
+ 		panel-timing {
+ 			clock-frequency = <0>;		/* Calculated by dsi */
+ 
+diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+index 15399a1a666b..7a63d6775a27 100644
+--- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
++++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
+@@ -68,6 +68,7 @@ struct panel_drv_data {
+ 
+ 	int width_mm;
+ 	int height_mm;
++	int orientation;
+ 
+ 	struct omap_dsi_pin_config pin_config;
+ 
+@@ -1198,6 +1199,14 @@ static void dsicm_get_size(struct omap_dss_device *dssdev,
+ 	*height = ddata->height_mm;
+ }
+ 
++static void dsicm_get_orientation(struct omap_dss_device *dssdev,
++				  int *orientation)
++{
++	struct panel_drv_data *ddata = to_panel_data(dssdev);
++
++	*orientation = ddata->orientation;
++}
++
+ static struct omap_dss_driver dsicm_ops = {
+ 	.connect	= dsicm_connect,
+ 	.disconnect	= dsicm_disconnect,
+@@ -1211,6 +1220,7 @@ static struct omap_dss_driver dsicm_ops = {
+ 	.get_timings	= dsicm_get_timings,
+ 	.check_timings	= dsicm_check_timings,
+ 	.get_size	= dsicm_get_size,
++	.get_orientation = dsicm_get_orientation,
+ 
+ 	.enable_te	= dsicm_enable_te,
+ 	.get_te		= dsicm_get_te,
+@@ -1259,6 +1269,9 @@ static int dsicm_probe_of(struct platform_device *pdev)
+ 	ddata->height_mm = 0;
+ 	of_property_read_u32(node, "height-mm", &ddata->height_mm);
+ 
++	ddata->orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
++	of_property_read_u32(node, "orientation", &ddata->orientation);
++
+ 	in = omapdss_of_find_source_for_first_ep(node);
+ 	if (IS_ERR(in)) {
+ 		dev_err(&pdev->dev, "failed to find video source\n");
+diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
+index 4e8f68efd169..0904c3201914 100644
+--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
++++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
+@@ -157,6 +157,8 @@ struct dispc_features {
+ 	bool has_gamma_table:1;
+ 
+ 	bool has_gamma_i734_bug:1;
++
++	bool has_fifo_stallmode_bug:1;
+ };
+ 
+ #define DISPC_MAX_NR_FIFOS 5
+@@ -1489,6 +1491,18 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane_id plane,
+ 	}
+ }
+ 
++static void dispc_ovl_set_manual_fifo_threshold(enum omap_plane_id plane)
++{
++	u32 fifo_low, fifo_high;
++	bool use_fifo_merge = false;
++	bool use_manual_update = true;
++
++	dispc_ovl_compute_fifo_thresholds(plane, &fifo_low, &fifo_high,
++					  use_fifo_merge, use_manual_update);
++
++	dispc_ovl_set_fifo_threshold(plane, fifo_low, fifo_high);
++}
++
+ static void dispc_ovl_set_mflag(enum omap_plane_id plane, bool enable)
+ {
+ 	int bit;
+@@ -2651,8 +2665,21 @@ static int dispc_ovl_setup(enum omap_plane_id plane,
+ 		oi->out_width, oi->out_height, oi->fourcc, oi->rotation,
+ 		oi->zorder, oi->pre_mult_alpha, oi->global_alpha,
+ 		oi->rotation_type, replication, vm, mem_to_mem);
++	if (r)
++		return r;
+ 
+-	return r;
++	/*
++	 * OMAP3 chips have non-working FIFO thresholds for manually updated
++	 * displays. The issue is not fully understood, but this workaround
++	 * fixes the issue. OMAP4 is known to work with default thresholds.
++	 */
++	if (mgr_fld_read(channel, DISPC_MGR_FLD_STALLMODE) &&
++	    dispc.feat->has_fifo_stallmode_bug) {
++		DSSDBG("Enable OMAP3 FIFO stallmode bug workaround!\n");
++		dispc_ovl_set_manual_fifo_threshold(plane);
++	}
++
++	return 0;
+ }
+ 
+ int dispc_wb_setup(const struct omap_dss_writeback_info *wi,
+@@ -4067,6 +4094,7 @@ static const struct dispc_features omap24xx_dispc_feats = {
+ 	.no_framedone_tv	=	true,
+ 	.set_max_preload	=	false,
+ 	.last_pixel_inc_missing	=	true,
++	.has_fifo_stallmode_bug	=	true,
+ };
+ 
+ static const struct dispc_features omap34xx_rev1_0_dispc_feats = {
+@@ -4101,6 +4129,7 @@ static const struct dispc_features omap34xx_rev1_0_dispc_feats = {
+ 	.no_framedone_tv	=	true,
+ 	.set_max_preload	=	false,
+ 	.last_pixel_inc_missing	=	true,
++	.has_fifo_stallmode_bug	=	true,
+ };
+ 
+ static const struct dispc_features omap34xx_rev3_0_dispc_feats = {
+@@ -4135,6 +4164,7 @@ static const struct dispc_features omap34xx_rev3_0_dispc_feats = {
+ 	.no_framedone_tv	=	true,
+ 	.set_max_preload	=	false,
+ 	.last_pixel_inc_missing	=	true,
++	.has_fifo_stallmode_bug	=	true,
+ };
+ 
+ static const struct dispc_features omap36xx_dispc_feats = {
+@@ -4169,6 +4199,7 @@ static const struct dispc_features omap36xx_dispc_feats = {
+ 	.no_framedone_tv	=	true,
+ 	.set_max_preload	=	false,
+ 	.last_pixel_inc_missing	=	true,
++	.has_fifo_stallmode_bug	=	true,
+ };
+ 
+ static const struct dispc_features am43xx_dispc_feats = {
+@@ -4203,6 +4234,7 @@ static const struct dispc_features am43xx_dispc_feats = {
+ 	.no_framedone_tv	=	true,
+ 	.set_max_preload	=	false,
+ 	.last_pixel_inc_missing	=	true,
++	.has_fifo_stallmode_bug	=	false,
+ };
+ 
+ static const struct dispc_features omap44xx_dispc_feats = {
+@@ -4242,6 +4274,7 @@ static const struct dispc_features omap44xx_dispc_feats = {
+ 	.reverse_ilace_field_order =	true,
+ 	.has_gamma_table	=	true,
+ 	.has_gamma_i734_bug	=	true,
++	.has_fifo_stallmode_bug	=	false,
+ };
+ 
+ static const struct dispc_features omap54xx_dispc_feats = {
+@@ -4282,6 +4315,7 @@ static const struct dispc_features omap54xx_dispc_feats = {
+ 	.reverse_ilace_field_order =	true,
+ 	.has_gamma_table	=	true,
+ 	.has_gamma_i734_bug	=	true,
++	.has_fifo_stallmode_bug	=	false,
+ };
+ 
+ static irqreturn_t dispc_irq_handler(int irq, void *arg)
+diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
+index f8f83e826a56..72ebd82409d3 100644
+--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
++++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
+@@ -565,6 +565,8 @@ struct omap_dss_driver {
+ 			    struct videomode *vm);
+ 	void (*get_size)(struct omap_dss_device *dssdev,
+ 			 unsigned int *width, unsigned int *height);
++	void (*get_orientation)(struct omap_dss_device *dssdev,
++				int *orientation);
+ 
+ 	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
+ 	u32 (*get_wss)(struct omap_dss_device *dssdev);
+diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
+index a0d7b1d905e8..2f296d29b74b 100644
+--- a/drivers/gpu/drm/omapdrm/omap_connector.c
++++ b/drivers/gpu/drm/omapdrm/omap_connector.c
+@@ -57,6 +57,14 @@ bool omap_connector_get_hdmi_mode(struct drm_connector *connector)
+ 	return omap_connector->hdmi_mode;
+ }
+ 
++bool omap_connector_get_manually_updated(struct drm_connector *connector)
++{
++	struct omap_connector *omap_connector = to_omap_connector(connector);
++
++	return !!(omap_connector->dssdev->caps &
++		  OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE);
++}
++
+ static enum drm_connector_status omap_connector_detect(
+ 		struct drm_connector *connector, bool force)
+ {
+@@ -241,6 +249,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
+ 	struct drm_connector *connector = NULL;
+ 	struct omap_connector *omap_connector;
+ 	bool hpd_supported = false;
++	int ret;
+ 
+ 	DBG("%s", dssdev->name);
+ 
+@@ -259,7 +268,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
+ 	drm_connector_helper_add(connector, &omap_connector_helper_funcs);
+ 
+ 	if (dssdev->driver->register_hpd_cb) {
+-		int ret = dssdev->driver->register_hpd_cb(dssdev,
++		ret = dssdev->driver->register_hpd_cb(dssdev,
+ 							  omap_connector_hpd_cb,
+ 							  omap_connector);
+ 		if (!ret)
+@@ -280,6 +289,13 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
+ 	connector->interlace_allowed = 1;
+ 	connector->doublescan_allowed = 0;
+ 
++	if (dssdev->driver->get_orientation)
++		dssdev->driver->get_orientation(dssdev, &connector->display_info.panel_orientation);
++
++	ret = drm_connector_init_panel_orientation_property(connector, 0, 0);
++	if (ret)
++		DBG("%s: Failed to init orientation property (%d)", dssdev->name, ret);
++
+ 	return connector;
+ 
+ fail:
+diff --git a/drivers/gpu/drm/omapdrm/omap_connector.h b/drivers/gpu/drm/omapdrm/omap_connector.h
+index 98bbc779b302..652136d167f5 100644
+--- a/drivers/gpu/drm/omapdrm/omap_connector.h
++++ b/drivers/gpu/drm/omapdrm/omap_connector.h
+@@ -33,5 +33,6 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
+ struct drm_encoder *omap_connector_attached_encoder(
+ 		struct drm_connector *connector);
+ bool omap_connector_get_hdmi_mode(struct drm_connector *connector);
++bool omap_connector_get_manually_updated(struct drm_connector *connector);
+ 
+ #endif /* __OMAPDRM_CONNECTOR_H__ */
+diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
+index 1b8154e58d18..c2defb514b9f 100644
+--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
++++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
+@@ -51,6 +51,10 @@ struct omap_crtc {
+ 	bool pending;
+ 	wait_queue_head_t pending_wait;
+ 	struct drm_pending_vblank_event *event;
++	struct delayed_work update_work;
++
++	void (*framedone_handler)(void *);
++	void *framedone_handler_data;
+ };
+ 
+ /* -----------------------------------------------------------------------------
+@@ -139,6 +143,28 @@ static void omap_crtc_dss_disconnect(enum omap_channel channel,
+ 
+ static void omap_crtc_dss_start_update(enum omap_channel channel)
+ {
++	struct omap_crtc *omap_crtc = omap_crtcs[channel];
++	struct omap_drm_private *priv = omap_crtc->base.dev->dev_private;
++
++	priv->dispc_ops->mgr_enable(channel, true);
++}
++
++static bool omap_crtc_is_manually_updated(struct drm_crtc *crtc)
++{
++	struct drm_connector *connector;
++	struct drm_connector_list_iter conn_iter;
++	bool result = false;
++
++	drm_connector_list_iter_begin(crtc->dev, &conn_iter);
++	drm_for_each_connector_iter(connector, &conn_iter) {
++		if (connector->state->crtc != crtc)
++			continue;
++		result = omap_connector_get_manually_updated(connector);
++		break;
++	}
++	drm_connector_list_iter_end(&conn_iter);
++
++	return result;
+ }
+ 
+ /* Called only from the encoder enable/disable and suspend/resume handlers. */
+@@ -150,12 +176,17 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
+ 	enum omap_channel channel = omap_crtc->channel;
+ 	struct omap_irq_wait *wait;
+ 	u32 framedone_irq, vsync_irq;
++	bool is_manual = omap_crtc_is_manually_updated(crtc);
++	enum omap_display_type type = omap_crtc_output[channel]->output_type;
+ 	int ret;
+ 
+ 	if (WARN_ON(omap_crtc->enabled == enable))
+ 		return;
+ 
+-	if (omap_crtc_output[channel]->output_type == OMAP_DISPLAY_TYPE_HDMI) {
++	if (is_manual)
++		omap_irq_enable_framedone(crtc, enable);
++
++	if (is_manual || type == OMAP_DISPLAY_TYPE_HDMI) {
+ 		priv->dispc_ops->mgr_enable(channel, enable);
+ 		omap_crtc->enabled = enable;
+ 		return;
+@@ -206,7 +237,6 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
+ 	}
+ }
+ 
+-
+ static int omap_crtc_dss_enable(enum omap_channel channel)
+ {
+ 	struct omap_crtc *omap_crtc = omap_crtcs[channel];
+@@ -247,6 +277,17 @@ static int omap_crtc_dss_register_framedone(
+ 		enum omap_channel channel,
+ 		void (*handler)(void *), void *data)
+ {
++	struct omap_crtc *omap_crtc = omap_crtcs[channel];
++	struct drm_device *dev = omap_crtc->base.dev;
++
++	if (omap_crtc->framedone_handler)
++		return -EBUSY;
++
++	dev_dbg(dev->dev, "register framedone %s", omap_crtc->name);
++
++	omap_crtc->framedone_handler = handler;
++	omap_crtc->framedone_handler_data = data;
++
+ 	return 0;
+ }
+ 
+@@ -254,6 +295,16 @@ static void omap_crtc_dss_unregister_framedone(
+ 		enum omap_channel channel,
+ 		void (*handler)(void *), void *data)
+ {
++	struct omap_crtc *omap_crtc = omap_crtcs[channel];
++	struct drm_device *dev = omap_crtc->base.dev;
++
++	dev_dbg(dev->dev, "unregister framedone %s", omap_crtc->name);
++
++	WARN_ON(omap_crtc->framedone_handler != handler);
++	WARN_ON(omap_crtc->framedone_handler_data != data);
++
++	omap_crtc->framedone_handler = NULL;
++	omap_crtc->framedone_handler_data = NULL;
+ }
+ 
+ static const struct dss_mgr_ops mgr_ops = {
+@@ -321,6 +372,77 @@ void omap_crtc_vblank_irq(struct drm_crtc *crtc)
+ 	DBG("%s: apply done", omap_crtc->name);
+ }
+ 
++void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus)
++{
++	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
++
++	if (!omap_crtc->framedone_handler) {
++		dev_warn(omap_crtc->base.dev->dev, "no framedone handler?");
++		return;
++	}
++
++	omap_crtc->framedone_handler(omap_crtc->framedone_handler_data);
++
++	spin_lock(&crtc->dev->event_lock);
++	/* Send the vblank event if one has been requested. */
++	if (omap_crtc->event) {
++		drm_crtc_send_vblank_event(crtc, omap_crtc->event);
++		omap_crtc->event = NULL;
++	}
++	omap_crtc->pending = false;
++	spin_unlock(&crtc->dev->event_lock);
++
++	/* Wake up omap_atomic_complete. */
++	wake_up(&omap_crtc->pending_wait);
++}
++
++void omap_crtc_flush(struct drm_crtc *crtc)
++{
++	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
++
++	if (!omap_crtc_is_manually_updated(crtc))
++		return;
++
++	if (!delayed_work_pending(&omap_crtc->update_work))
++		schedule_delayed_work(&omap_crtc->update_work, 0);
++}
++
++static void omap_crtc_manual_display_update(struct work_struct *data)
++{
++	struct omap_crtc *omap_crtc =
++			container_of(data, struct omap_crtc, update_work.work);
++	struct omap_dss_device *dssdev = omap_crtc_output[omap_crtc->channel];
++	struct drm_device *dev = omap_crtc->base.dev;
++	struct omap_dss_driver *dssdrv;
++	int ret, width, height;
++
++	if (!dssdev || !dssdev->dst) {
++		dev_err_once(dev->dev, "missing dssdev!");
++		return;
++	}
++
++	dssdev = dssdev->dst;
++	dssdrv = dssdev->driver;
++
++	if (!dssdrv || !dssdrv->update) {
++		dev_err_once(dev->dev, "incorrect dssdrv!");
++		return;
++	}
++
++	if (dssdrv->sync)
++		dssdrv->sync(dssdev);
++
++	width = dssdev->panel.vm.hactive;
++	height = dssdev->panel.vm.vactive;
++	ret = dssdrv->update(dssdev, 0, 0, width, height);
++	if (ret < 0) {
++		spin_lock_irq(&dev->event_lock);
++		omap_crtc->pending = false;
++		spin_unlock_irq(&dev->event_lock);
++		wake_up(&omap_crtc->pending_wait);
++	}
++}
++
+ static void omap_crtc_write_crtc_properties(struct drm_crtc *crtc)
+ {
+ 	struct omap_drm_private *priv = crtc->dev->dev_private;
+@@ -373,6 +495,10 @@ static void omap_crtc_atomic_enable(struct drm_crtc *crtc,
+ 
+ 	DBG("%s", omap_crtc->name);
+ 
++	/* manual updated display will not trigger vsync irq */
++	if (omap_crtc_is_manually_updated(crtc))
++		return;
++
+ 	spin_lock_irq(&crtc->dev->event_lock);
+ 	drm_crtc_vblank_on(crtc);
+ 	ret = drm_crtc_vblank_get(crtc);
+@@ -386,6 +512,7 @@ static void omap_crtc_atomic_disable(struct drm_crtc *crtc,
+ 				     struct drm_crtc_state *old_state)
+ {
+ 	struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
++	struct drm_device *dev = crtc->dev;
+ 
+ 	DBG("%s", omap_crtc->name);
+ 
+@@ -396,6 +523,11 @@ static void omap_crtc_atomic_disable(struct drm_crtc *crtc,
+ 	}
+ 	spin_unlock_irq(&crtc->dev->event_lock);
+ 
++	cancel_delayed_work(&omap_crtc->update_work);
++
++	if (!omap_crtc_wait_pending(crtc))
++		dev_warn(dev->dev, "manual display update did not finish!");
++
+ 	drm_crtc_vblank_off(crtc);
+ }
+ 
+@@ -545,13 +677,20 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc,
+ 
+ 	DBG("%s: GO", omap_crtc->name);
+ 
+-	ret = drm_crtc_vblank_get(crtc);
+-	WARN_ON(ret != 0);
++	if (!omap_crtc_is_manually_updated(crtc)) {
++		ret = drm_crtc_vblank_get(crtc);
++		WARN_ON(ret != 0);
+ 
+-	spin_lock_irq(&crtc->dev->event_lock);
+-	priv->dispc_ops->mgr_go(omap_crtc->channel);
+-	omap_crtc_arm_event(crtc);
+-	spin_unlock_irq(&crtc->dev->event_lock);
++		spin_lock_irq(&crtc->dev->event_lock);
++		priv->dispc_ops->mgr_go(omap_crtc->channel);
++		omap_crtc_arm_event(crtc);
++		spin_unlock_irq(&crtc->dev->event_lock);
++	} else {
++		spin_lock_irq(&crtc->dev->event_lock);
++		omap_crtc_flush(crtc);
++		omap_crtc_arm_event(crtc);
++		spin_unlock_irq(&crtc->dev->event_lock);
++	}
+ }
+ 
+ static int omap_crtc_atomic_set_property(struct drm_crtc *crtc,
+@@ -713,6 +852,9 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
+ 	omap_crtc->channel = channel;
+ 	omap_crtc->name = channel_names[channel];
+ 
++	INIT_DELAYED_WORK(&omap_crtc->update_work,
++			  omap_crtc_manual_display_update);
++
+ 	ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL,
+ 					&omap_crtc_funcs, NULL);
+ 	if (ret < 0) {
+diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.h b/drivers/gpu/drm/omapdrm/omap_crtc.h
+index ad7b007c6174..b61c94b34f04 100644
+--- a/drivers/gpu/drm/omapdrm/omap_crtc.h
++++ b/drivers/gpu/drm/omapdrm/omap_crtc.h
+@@ -39,5 +39,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
+ int omap_crtc_wait_pending(struct drm_crtc *crtc);
+ void omap_crtc_error_irq(struct drm_crtc *crtc, uint32_t irqstatus);
+ void omap_crtc_vblank_irq(struct drm_crtc *crtc);
++void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus);
++void omap_crtc_flush(struct drm_crtc *crtc);
+ 
+ #endif /* __OMAPDRM_CRTC_H__ */
+diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
+index b2539a90e1a4..57b1767bef09 100644
+--- a/drivers/gpu/drm/omapdrm/omap_fb.c
++++ b/drivers/gpu/drm/omapdrm/omap_fb.c
+@@ -95,8 +95,28 @@ static void omap_framebuffer_destroy(struct drm_framebuffer *fb)
+ 	kfree(omap_fb);
+ }
+ 
++static int omap_framebuffer_dirty(struct drm_framebuffer *fb,
++				  struct drm_file *file_priv,
++				  unsigned flags, unsigned color,
++				  struct drm_clip_rect *clips,
++				  unsigned num_clips)
++{
++	struct drm_connector *connector = NULL;
++
++	drm_modeset_lock_all(fb->dev);
++
++	while ((connector = omap_framebuffer_get_next_connector(fb, connector)))
++		if (connector->encoder && connector->encoder->crtc)
++			omap_crtc_flush(connector->encoder->crtc);
++
++	drm_modeset_unlock_all(fb->dev);
++
++	return 0;
++}
++
+ static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {
+ 	.create_handle = omap_framebuffer_create_handle,
++	.dirty = omap_framebuffer_dirty,
+ 	.destroy = omap_framebuffer_destroy,
+ };
+ 
+diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c
+index 53ba424823b2..354df3583229 100644
+--- a/drivers/gpu/drm/omapdrm/omap_irq.c
++++ b/drivers/gpu/drm/omapdrm/omap_irq.c
+@@ -85,6 +85,27 @@ int omap_irq_wait(struct drm_device *dev, struct omap_irq_wait *wait,
+ 	return ret == 0 ? -1 : 0;
+ }
+ 
++int omap_irq_enable_framedone(struct drm_crtc *crtc, bool enable)
++{
++	struct drm_device *dev = crtc->dev;
++	struct omap_drm_private *priv = dev->dev_private;
++	unsigned long flags;
++	enum omap_channel channel = omap_crtc_channel(crtc);
++	int framedone_irq = priv->dispc_ops->mgr_get_framedone_irq(channel);
++
++	DBG("dev=%p, crtc=%u, enable=%d", dev, channel, enable);
++
++	spin_lock_irqsave(&priv->wait_lock, flags);
++	if (enable)
++		priv->irq_mask |= framedone_irq;
++	else
++		priv->irq_mask &= ~framedone_irq;
++	omap_irq_update(dev);
++	spin_unlock_irqrestore(&priv->wait_lock, flags);
++
++	return 0;
++}
++
+ /**
+  * enable_vblank - enable vblank interrupt events
+  * @dev: DRM device
+@@ -215,6 +236,9 @@ static irqreturn_t omap_irq_handler(int irq, void *arg)
+ 
+ 		if (irqstatus & priv->dispc_ops->mgr_get_sync_lost_irq(channel))
+ 			omap_crtc_error_irq(crtc, irqstatus);
++
++		if (irqstatus & priv->dispc_ops->mgr_get_framedone_irq(channel))
++			omap_crtc_framedone_irq(crtc, irqstatus);
+ 	}
+ 
+ 	omap_irq_ocp_error_handler(dev, irqstatus);
+diff --git a/drivers/gpu/drm/omapdrm/omap_irq.h b/drivers/gpu/drm/omapdrm/omap_irq.h
+index 606c09932bc0..69f4ff80a0e4 100644
+--- a/drivers/gpu/drm/omapdrm/omap_irq.h
++++ b/drivers/gpu/drm/omapdrm/omap_irq.h
+@@ -27,6 +27,7 @@ struct drm_device;
+ struct omap_irq_wait;
+ 
+ int omap_irq_enable_vblank(struct drm_crtc *crtc);
++int omap_irq_enable_framedone(struct drm_crtc *crtc, bool enable);
+ void omap_irq_disable_vblank(struct drm_crtc *crtc);
+ void omap_drm_irq_uninstall(struct drm_device *dev);
+ int omap_drm_irq_install(struct drm_device *dev);
+-- 
+2.14.1
+
diff --git a/device/linux-nokia-n9/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch b/device/linux-nokia-n9/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch
index 5f26121bc..7b0f073cc 100644
--- a/device/linux-nokia-n9/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch
+++ b/device/linux-nokia-n9/0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch
@@ -1,7 +1,7 @@
-From f68a4284dbd93282df0ceda099cab49aa8ef0ec0 Mon Sep 17 00:00:00 2001
+From b6faf8e49d3ce7b8b94d56a88e70926fb35de918 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
 Date: Sat, 28 Oct 2017 09:18:10 +0200
-Subject: [PATCH 02/12] drm: add/rename MIPI_DCS_SET_PARTIAL_XXX
+Subject: [PATCH 02/11] drm: add/rename MIPI_DCS_SET_PARTIAL_XXX
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -19,14 +19,15 @@ index 19aa65a35546..1d9fdd685ded 100644
 --- a/include/video/mipi_display.h
 +++ b/include/video/mipi_display.h
 @@ -102,7 +102,8 @@ enum {
-	MIPI_DCS_WRITE_MEMORY_START	= 0x2C,
-	MIPI_DCS_WRITE_LUT		= 0x2D,
-	MIPI_DCS_READ_MEMORY_START	= 0x2E,
+ 	MIPI_DCS_WRITE_MEMORY_START	= 0x2C,
+ 	MIPI_DCS_WRITE_LUT		= 0x2D,
+ 	MIPI_DCS_READ_MEMORY_START	= 0x2E,
 -	MIPI_DCS_SET_PARTIAL_AREA	= 0x30,
 +	MIPI_DCS_SET_PARTIAL_ROWS	= 0x30,
 +	MIPI_DCS_SET_PARTIAL_COLUMNS	= 0x31,
-	MIPI_DCS_SET_SCROLL_AREA	= 0x33,
-	MIPI_DCS_SET_TEAR_OFF		= 0x34,
-	MIPI_DCS_SET_TEAR_ON		= 0x35,
---
+ 	MIPI_DCS_SET_SCROLL_AREA	= 0x33,
+ 	MIPI_DCS_SET_TEAR_OFF		= 0x34,
+ 	MIPI_DCS_SET_TEAR_ON		= 0x35,
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch b/device/linux-nokia-n9/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch
index 514a63359..895041cab 100644
--- a/device/linux-nokia-n9/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch
+++ b/device/linux-nokia-n9/0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch
@@ -1,7 +1,7 @@
-From d1b874e139935761ea4ef21a9e5c7add46241461 Mon Sep 17 00:00:00 2001
+From 013999e09d13087a9eb4922df3099f5e71035031 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
 Date: Sat, 28 Oct 2017 14:39:23 +0200
-Subject: [PATCH 03/12] drm/omap: panel-dsi-cm: use defines from mipi_display.h
+Subject: [PATCH 03/11] drm/omap: panel-dsi-cm: use defines from mipi_display.h
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,51 +12,52 @@ Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
-index 996991de674b..29a8b1287531 100644
+index 7a63d6775a27..418cf5dd2d69 100644
 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
 +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
 @@ -33,8 +33,6 @@
  #define TCH 0
-
+ 
  #define DCS_READ_NUM_ERRORS	0x05
 -#define DCS_BRIGHTNESS		0x51
 -#define DCS_CTRL_DISPLAY	0x53
  #define DCS_GET_ID1		0xda
  #define DCS_GET_ID2		0xdb
  #define DCS_GET_ID3		0xdc
-@@ -385,7 +383,8 @@ static int dsicm_bl_update_status(struct backlight_device *dev)
-
-		r = dsicm_wake_up(ddata);
-		if (!r)
+@@ -386,7 +384,8 @@ static int dsicm_bl_update_status(struct backlight_device *dev)
+ 
+ 		r = dsicm_wake_up(ddata);
+ 		if (!r)
 -			r = dsicm_dcs_write_1(ddata, DCS_BRIGHTNESS, level);
 +			r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_DISPLAY_BRIGHTNESS,
 +									level);
-
-		in->ops.dsi->bus_unlock(in);
-	}
-@@ -667,11 +666,11 @@ static int dsicm_power_on(struct panel_drv_data *ddata)
-	if (r)
-		goto err;
-
+ 
+ 		in->ops.dsi->bus_unlock(in);
+ 	}
+@@ -668,11 +667,11 @@ static int dsicm_power_on(struct panel_drv_data *ddata)
+ 	if (r)
+ 		goto err;
+ 
 -	r = dsicm_dcs_write_1(ddata, DCS_BRIGHTNESS, 0xff);
 +	r = dsicm_dcs_write_1(ddata, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, 0xff);
-	if (r)
-		goto err;
-
+ 	if (r)
+ 		goto err;
+ 
 -	r = dsicm_dcs_write_1(ddata, DCS_CTRL_DISPLAY,
 +	r = dsicm_dcs_write_1(ddata, MIPI_DCS_WRITE_CONTROL_DISPLAY,
-			(1<<2) | (1<<5));	/* BL | BCTRL */
-	if (r)
-		goto err;
-@@ -1100,7 +1099,8 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev,
-		goto err2;
-
-	while (buf_used < size) {
+ 			(1<<2) | (1<<5));	/* BL | BCTRL */
+ 	if (r)
+ 		goto err;
+@@ -1101,7 +1100,8 @@ static int dsicm_memory_read(struct omap_dss_device *dssdev,
+ 		goto err2;
+ 
+ 	while (buf_used < size) {
 -		u8 dcs_cmd = first ? 0x2e : 0x3e;
 +		u8 dcs_cmd = first ? MIPI_DCS_READ_MEMORY_START :
 +								MIPI_DCS_READ_MEMORY_CONTINUE;
-		first = 0;
-
-		r = in->ops.dsi->dcs_read(in, ddata->channel, dcs_cmd,
---
+ 		first = 0;
+ 
+ 		r = in->ops.dsi->dcs_read(in, ddata->channel, dcs_cmd,
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0004-ARM-dts-n9-add-display-support.patch b/device/linux-nokia-n9/0004-ARM-dts-n9-add-display-support.patch
index 423c46910..dd60c73de 100644
--- a/device/linux-nokia-n9/0004-ARM-dts-n9-add-display-support.patch
+++ b/device/linux-nokia-n9/0004-ARM-dts-n9-add-display-support.patch
@@ -1,7 +1,7 @@
-From 9bf187094ccde898c00538e3b23ae4c76dfa11d8 Mon Sep 17 00:00:00 2001
+From 3390d6d1009dc6cdd166638be4af242e4469bcd1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
 Date: Sat, 28 Oct 2017 14:32:54 +0200
-Subject: [PATCH 04/12] ARM: dts: n9: add display support
+Subject: [PATCH 04/11] ARM: dts: n9: add display support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,13 +14,13 @@ Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
  1 file changed, 91 insertions(+)
 
 diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
-index 39e35f8b8206..7bf1c0c1f884 100644
+index e44d93fc644c..613ada9a982a 100644
 --- a/arch/arm/boot/dts/omap3-n9.dts
 +++ b/arch/arm/boot/dts/omap3-n9.dts
-@@ -17,6 +17,26 @@
-	compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
+@@ -18,6 +18,26 @@
+ 	compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
  };
-
+ 
 +&omap3_pmx_core {
 +	dsi_pins: pinmux_dsi_pins {
 +		pinctrl-single,pins = <
@@ -42,11 +42,11 @@ index 39e35f8b8206..7bf1c0c1f884 100644
 +};
 +
  &i2c2 {
-	smia_1: camera@10 {
-		compatible = "nokia,smia";
-@@ -72,3 +92,74 @@
-	st,max-limit-y = <46>;
-	st,max-limit-z = <46>;
+ 	smia_1: camera@10 {
+ 		compatible = "nokia,smia";
+@@ -79,3 +99,74 @@
+ 			 MATRIX_KEY(7, 8, KEY_VOLUMEDOWN)
+ 			 >;
  };
 +
 +&dss {
@@ -119,5 +119,6 @@ index 39e35f8b8206..7bf1c0c1f884 100644
 +		};
 +	};
 +};
---
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch b/device/linux-nokia-n9/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch
index d68f9f1ba..eac78acbb 100644
--- a/device/linux-nokia-n9/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch
+++ b/device/linux-nokia-n9/0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch
@@ -1,7 +1,7 @@
-From faaa1d9e395ea7231534561d5bd2ed6e1d9a760c Mon Sep 17 00:00:00 2001
+From 324c0340c85dee1a2ae3eb6c71bcd9e47c9f03f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
 Date: Thu, 2 Nov 2017 18:46:21 +0100
-Subject: [PATCH 05/12] Revert "drm/omap: work-around for omap3 display enable"
+Subject: [PATCH 05/11] Revert "drm/omap: work-around for omap3 display enable"
 
 This reverts commit fc5cc9678e130196012c17b37e555d53d3d3476b.
 ---
@@ -9,13 +9,13 @@ This reverts commit fc5cc9678e130196012c17b37e555d53d3d3476b.
  1 file changed, 17 insertions(+), 30 deletions(-)
 
 diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
-index cdf5b0601eba..9b3c36b48356 100644
+index dd68b2556f5b..bc5b68ecd0f7 100644
 --- a/drivers/gpu/drm/omapdrm/omap_drv.c
 +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
-@@ -84,36 +84,23 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state)
-	/* Apply the atomic update. */
-	drm_atomic_helper_commit_modeset_disables(dev, old_state);
-
+@@ -74,36 +74,23 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state)
+ 	/* Apply the atomic update. */
+ 	drm_atomic_helper_commit_modeset_disables(dev, old_state);
+ 
 -	if (priv->omaprev != 0x3430) {
 -		/* With the current dss dispc implementation we have to enable
 -		 * the new modeset before we can commit planes. The dispc ovl
@@ -63,8 +63,9 @@ index cdf5b0601eba..9b3c36b48356 100644
 +	drm_atomic_helper_commit_planes(dev, old_state, 0);
 +
 +	drm_atomic_helper_commit_hw_done(old_state);
-
-	/*
-	 * Wait for completion of the page flips to ensure that old buffers
---
+ 
+ 	/*
+ 	 * Wait for completion of the page flips to ensure that old buffers
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch b/device/linux-nokia-n9/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch
index 7d5c5e19b..ac5893c1d 100644
--- a/device/linux-nokia-n9/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch
+++ b/device/linux-nokia-n9/0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch
@@ -1,7 +1,7 @@
-From 4f521a6bc38b208fb740b2585e1a217893f0f437 Mon Sep 17 00:00:00 2001
+From 8087f305187140d20b7903ba7486f243a2d470d2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
 Date: Wed, 1 Nov 2017 18:25:45 +0100
-Subject: [PATCH 06/12] HACK: drm/omap: panel-dsi-cm: force 0xff for brigthness
+Subject: [PATCH 06/11] HACK: drm/omap: panel-dsi-cm: force 0xff for brigthness
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,17 +12,18 @@ Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
-index 29a8b1287531..36a05da2f818 100644
+index 418cf5dd2d69..069fad8d89b2 100644
 --- a/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
 +++ b/drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
-@@ -374,6 +374,8 @@ static int dsicm_bl_update_status(struct backlight_device *dev)
-	else
-		level = 0;
-
+@@ -375,6 +375,8 @@ static int dsicm_bl_update_status(struct backlight_device *dev)
+ 	else
+ 		level = 0;
+ 
 +	level = 0xff;
 +
-	dev_dbg(&ddata->pdev->dev, "update brightness to %d\n", level);
-
-	mutex_lock(&ddata->lock);
---
+ 	dev_dbg(&ddata->pdev->dev, "update brightness to %d\n", level);
+ 
+ 	mutex_lock(&ddata->lock);
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0007-ARM-dts-N9-Add-support-for-volume-keys.patch b/device/linux-nokia-n9/0007-ARM-dts-N9-Add-support-for-volume-keys.patch
deleted file mode 100644
index 5ce7ad1a3..000000000
--- a/device/linux-nokia-n9/0007-ARM-dts-N9-Add-support-for-volume-keys.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 29c40823eee0bd4d3a40938dfdabd0187e34625f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
-Date: Thu, 23 Nov 2017 19:58:07 +0100
-Subject: [PATCH 07/12] ARM: dts: N9: Add support for volume keys
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
----
- arch/arm/boot/dts/omap3-n9.dts | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
-index 7bf1c0c1f884..9e417ba08deb 100644
---- a/arch/arm/boot/dts/omap3-n9.dts
-+++ b/arch/arm/boot/dts/omap3-n9.dts
-@@ -11,6 +11,7 @@
- /dts-v1/;
-
- #include "omap3-n950-n9.dtsi"
-+#include <dt-bindings/input/input.h>
-
- / {
-	model = "Nokia N9";
-@@ -79,6 +80,12 @@
-	compatible = "nokia,n9-modem";
- };
-
-+&twl_keypad {
-+	linux,keymap = < MATRIX_KEY(6, 8, KEY_VOLUMEUP)
-+			 MATRIX_KEY(7, 8, KEY_VOLUMEDOWN)
-+			 >;
-+};
-+
- &lis302 {
-	st,axis-x = <1>;    /* LIS3_DEV_X */
-	st,axis-y = <(-2)>; /* LIS3_INV_DEV_Y */
---
-2.14.1
diff --git a/device/linux-nokia-n9/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch b/device/linux-nokia-n9/0007-ARM-dts-N9-N950-Add-touchscreen-support.patch
similarity index 73%
rename from device/linux-nokia-n9/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch
rename to device/linux-nokia-n9/0007-ARM-dts-N9-N950-Add-touchscreen-support.patch
index ba9ab2176..fc4f0a5e1 100644
--- a/device/linux-nokia-n9/0008-ARM-dts-N9-N950-Add-touchscreen-support.patch
+++ b/device/linux-nokia-n9/0007-ARM-dts-N9-N950-Add-touchscreen-support.patch
@@ -1,7 +1,7 @@
-From 09b9ba32a440a95dc1a544198e84107d33a40cf7 Mon Sep 17 00:00:00 2001
+From 15b1d44e2e17ace2ac229a062993e5b530208402 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
 Date: Mon, 13 Nov 2017 17:20:42 +0100
-Subject: [PATCH 08/12] ARM: dts: N9/N950: Add touchscreen support
+Subject: [PATCH 07/11] ARM: dts: N9/N950: Add touchscreen support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,13 +12,13 @@ Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
  1 file changed, 22 insertions(+)
 
 diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
-index 12fbb3da5fce..f615428b9f4d 100644
+index 0d9b85317529..219519812050 100644
 --- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
 +++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
 @@ -141,6 +141,14 @@
-			OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)		/* uart2_rx */
-		>;
-	};
+ 			OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)		/* uart2_rx */
+ 		>;
+ 	};
 +
 +	ts_pins: pinmux_ts_pins {
 +		pinctrl-single,pins = <
@@ -28,28 +28,28 @@ index 12fbb3da5fce..f615428b9f4d 100644
 +		>;
 +	};
  };
-
+ 
  &omap3_pmx_core2 {
 @@ -199,6 +207,7 @@
-	regulator-name = "vaux1";
-	regulator-min-microvolt = <2800000>;
-	regulator-max-microvolt = <2800000>;
+ 	regulator-name = "vaux1";
+ 	regulator-min-microvolt = <2800000>;
+ 	regulator-max-microvolt = <2800000>;
 +	regulator-always-on; /* needed for Atmel maXTouch */
  };
-
+ 
  /* CSI-2 receiver */
 @@ -261,6 +270,7 @@
-	regulator-name = "vio";
-	regulator-min-microvolt = <1800000>;
-	regulator-max-microvolt = <1800000>;
+ 	regulator-name = "vio";
+ 	regulator-min-microvolt = <1800000>;
+ 	regulator-max-microvolt = <1800000>;
 +	regulator-always-on; /* needed for Atmel maXTouch */
  };
-
+ 
  &i2c2 {
 @@ -283,6 +293,18 @@
-			led-max-microamp = <10000>;
-		};
-	};
+ 			led-max-microamp = <10000>;
+ 		};
+ 	};
 +
 +	touch@4b {
 +		compatible = "atmel,maxtouch";
@@ -63,7 +63,8 @@ index 12fbb3da5fce..f615428b9f4d 100644
 +		reset-gpios = <&gpio3 17 0>;             /* gpio_81 */
 +	};
  };
-
+ 
  &i2c3 {
---
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0009-misc-apds990x-Add-device-tree-support.patch b/device/linux-nokia-n9/0008-misc-apds990x-Add-device-tree-support.patch
similarity index 85%
rename from device/linux-nokia-n9/0009-misc-apds990x-Add-device-tree-support.patch
rename to device/linux-nokia-n9/0008-misc-apds990x-Add-device-tree-support.patch
index 645f3dca9..825513868 100644
--- a/device/linux-nokia-n9/0009-misc-apds990x-Add-device-tree-support.patch
+++ b/device/linux-nokia-n9/0008-misc-apds990x-Add-device-tree-support.patch
@@ -1,7 +1,7 @@
-From 260d242959b20570b2a6e5dbc4709c0933ccb722 Mon Sep 17 00:00:00 2001
+From aca9cbfc6f2bf8a3dc6b30d6b7e78e9790a9875f Mon Sep 17 00:00:00 2001
 From: filippz <filip.matijevic.pz@gmail.com>
 Date: Thu, 28 Dec 2017 06:57:45 +0100
-Subject: [PATCH 09/12] misc: apds990x: Add device tree support
+Subject: [PATCH 08/11] misc: apds990x: Add device tree support
 
 Signed-off-by: filippz <filip.matijevic.pz@gmail.com>
 ---
@@ -58,7 +58,7 @@ index 000000000000..480c0b1c570d
 +		avago,ppcount	= <5>;
 +	};
 diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
-index c9f07032c2fc..77c168d928f8 100644
+index ed9412d750b7..7bb9cd76110a 100644
 --- a/drivers/misc/apds990x.c
 +++ b/drivers/misc/apds990x.c
 @@ -33,6 +33,8 @@
@@ -67,24 +67,24 @@ index c9f07032c2fc..77c168d928f8 100644
  #include <linux/platform_data/apds990x.h>
 +#include <linux/gpio.h>
 +#include <linux/of_gpio.h>
-
+ 
  /* Register map */
  #define APDS990X_ENABLE	 0x00 /* Enable of states and interrupts */
 @@ -195,8 +197,8 @@ static const u16 arates_hz[] = {10, 5, 2, 1};
  static const u8 apersis[] = {1, 2, 4, 5};
-
+ 
  /* Regulators */
 -static const char reg_vcc[] = "Vdd";
 -static const char reg_vled[] = "Vled";
 +static const char reg_vcc[] = "vdd";
 +static const char reg_vled[] = "vled";
-
+ 
  static int apds990x_read_byte(struct apds990x_chip *chip, u8 reg, u8 *data)
  {
-@@ -1055,11 +1057,71 @@ static const struct attribute_group apds990x_attribute_group[] = {
-	{.attrs = sysfs_attrs_ctrl },
+@@ -1066,11 +1068,71 @@ static const struct attribute_group apds990x_attribute_group[] = {
+ 	{.attrs = sysfs_attrs_ctrl },
  };
-
+ 
 +static const int apds990x_parse_dt(struct device *dev,
 +				struct apds990x_platform_data *pdata)
 +{
@@ -146,18 +146,18 @@ index c9f07032c2fc..77c168d928f8 100644
 +}
 +
  static int apds990x_probe(struct i2c_client *client,
-				const struct i2c_device_id *id)
+ 				const struct i2c_device_id *id)
  {
-	struct apds990x_chip *chip;
+ 	struct apds990x_chip *chip;
 -	int err;
 +	int err = 0;
-
-	chip = kzalloc(sizeof *chip, GFP_KERNEL);
-	if (!chip)
-@@ -1072,6 +1134,16 @@ static int apds990x_probe(struct i2c_client *client,
-	mutex_init(&chip->mutex);
-	chip->pdata	= client->dev.platform_data;
-
+ 
+ 	chip = kzalloc(sizeof *chip, GFP_KERNEL);
+ 	if (!chip)
+@@ -1083,6 +1145,16 @@ static int apds990x_probe(struct i2c_client *client,
+ 	mutex_init(&chip->mutex);
+ 	chip->pdata	= client->dev.platform_data;
+ 
 +	if (chip->pdata == NULL) {
 +		chip->pdata = devm_kzalloc(&client->dev, sizeof(*chip->pdata),
 +									GFP_KERNEL);
@@ -168,13 +168,13 @@ index c9f07032c2fc..77c168d928f8 100644
 +	if (err < 0)
 +		return err;
 +
-	if (chip->pdata == NULL) {
-		dev_err(&client->dev, "platform data is mandatory\n");
-		err = -EINVAL;
-@@ -1272,9 +1344,16 @@ static const struct dev_pm_ops apds990x_pm_ops = {
-			NULL)
+ 	if (chip->pdata == NULL) {
+ 		dev_err(&client->dev, "platform data is mandatory\n");
+ 		err = -EINVAL;
+@@ -1283,9 +1355,16 @@ static const struct dev_pm_ops apds990x_pm_ops = {
+ 			NULL)
  };
-
+ 
 +static const struct of_device_id apds990x_of_match[] = {
 +	{.compatible = "avago,apds990x" },
 +	{}
@@ -182,11 +182,12 @@ index c9f07032c2fc..77c168d928f8 100644
 +MODULE_DEVICE_TABLE(of, apds990x_of_match);
 +
  static struct i2c_driver apds990x_driver = {
-	.driver	 = {
-		.name	= "apds990x",
+ 	.driver	 = {
+ 		.name	= "apds990x",
 +		.of_match_table	= apds990x_of_match,
-		.pm	= &apds990x_pm_ops,
-	},
-	.probe	  = apds990x_probe,
---
+ 		.pm	= &apds990x_pm_ops,
+ 	},
+ 	.probe	  = apds990x_probe,
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0010-misc-apds990x-convert-to-iio.patch b/device/linux-nokia-n9/0009-misc-apds990x-convert-to-iio.patch
similarity index 86%
rename from device/linux-nokia-n9/0010-misc-apds990x-convert-to-iio.patch
rename to device/linux-nokia-n9/0009-misc-apds990x-convert-to-iio.patch
index 30e77c100..e4b35eac5 100644
--- a/device/linux-nokia-n9/0010-misc-apds990x-convert-to-iio.patch
+++ b/device/linux-nokia-n9/0009-misc-apds990x-convert-to-iio.patch
@@ -1,15 +1,18 @@
-From c73c38789362ca9d4903b7afffdca550d2afb691 Mon Sep 17 00:00:00 2001
-From: filippz <filip.matijevic.pz@gmail.com>
-Date: Thu, 28 Dec 2017 06:58:40 +0100
-Subject: [PATCH 10/12] misc: apds990x: convert to iio
+From b8d6cddfec87f35e49d4bc54020e59a4c71dc31e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
+Date: Sat, 10 Feb 2018 21:28:19 +0100
+Subject: [PATCH 09/11] misc: apds990x: convert to iio
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-Signed-off-by: filippz <filip.matijevic.pz@gmail.com>
+Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
 ---
- drivers/misc/apds990x.c | 956 +++++++++++++++++++++++++-----------------------
- 1 file changed, 495 insertions(+), 461 deletions(-)
+ drivers/misc/apds990x.c | 959 +++++++++++++++++++++++++-----------------------
+ 1 file changed, 493 insertions(+), 466 deletions(-)
 
 diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
-index 77c168d928f8..3e4c664b602d 100644
+index 7bb9cd76110a..363a6bf85a6c 100644
 --- a/drivers/misc/apds990x.c
 +++ b/drivers/misc/apds990x.c
 @@ -1,4 +1,5 @@
@@ -28,45 +31,45 @@ index 77c168d928f8..3e4c664b602d 100644
 +
 +#define APDS990X_DRV_NAME	"apds990x"
 +#define APDS990X_SLEEP_DELAY_MS 3000
-
+ 
  /* Register map */
  #define APDS990X_ENABLE	 0x00 /* Enable of states and interrupts */
 @@ -130,10 +137,12 @@ struct apds990x_chip {
-	struct i2c_client		*client;
-	struct mutex			mutex; /* avoid parallel access */
-	struct regulator_bulk_data	regs[2];
+ 	struct i2c_client		*client;
+ 	struct mutex			mutex; /* avoid parallel access */
+ 	struct regulator_bulk_data	regs[2];
 -	wait_queue_head_t		wait;
 +	wait_queue_head_t		wait_lux;
 +	wait_queue_head_t		wait_prox;
-
+ 
 -	int	prox_en;
 -	bool	prox_continuous_mode;
 +	bool    lux_en;
 +	bool    prox_en;
 +	bool	prox_wait_fresh_res;
-	bool	lux_wait_fresh_res;
-
-	/* Chip parameters */
+ 	bool	lux_wait_fresh_res;
+ 
+ 	/* Chip parameters */
 @@ -207,7 +216,6 @@ static int apds990x_read_byte(struct apds990x_chip *chip, u8 reg, u8 *data)
-
-	reg &= ~APDS990x_CMD_TYPE_MASK;
-	reg |= APDS990x_CMD | APDS990x_CMD_TYPE_RB;
+ 
+ 	reg &= ~APDS990x_CMD_TYPE_MASK;
+ 	reg |= APDS990x_CMD | APDS990x_CMD_TYPE_RB;
 -
-	ret = i2c_smbus_read_byte_data(client, reg);
-	*data = ret;
-	return (int)ret;
+ 	ret = i2c_smbus_read_byte_data(client, reg);
+ 	*data = ret;
+ 	return (int)ret;
 @@ -233,7 +241,6 @@ static int apds990x_write_byte(struct apds990x_chip *chip, u8 reg, u8 data)
-
-	reg &= ~APDS990x_CMD_TYPE_MASK;
-	reg |= APDS990x_CMD | APDS990x_CMD_TYPE_RB;
+ 
+ 	reg &= ~APDS990x_CMD_TYPE_MASK;
+ 	reg |= APDS990x_CMD | APDS990x_CMD_TYPE_RB;
 -
-	ret = i2c_smbus_write_byte_data(client, reg, data);
-	return (int)ret;
+ 	ret = i2c_smbus_write_byte_data(client, reg, data);
+ 	return (int)ret;
  }
 @@ -250,18 +257,6 @@ static int apds990x_write_word(struct apds990x_chip *chip, u8 reg, u16 data)
-	return (int)ret;
+ 	return (int)ret;
  }
-
+ 
 -static int apds990x_mode_on(struct apds990x_chip *chip)
 -{
 -	/* ALS is mandatory, proximity optional */
@@ -81,35 +84,35 @@ index 77c168d928f8..3e4c664b602d 100644
 -
  static u16 apds990x_lux_to_threshold(struct apds990x_chip *chip, u32 lux)
  {
-	u32 thres;
+ 	u32 thres;
 @@ -346,10 +341,7 @@ static int apds990x_refresh_pthres(struct apds990x_chip *chip, int data)
-		hi = chip->prox_thres;
-	} else {
-		lo = chip->prox_thres - APDS_PROX_HYSTERESIS;
+ 		hi = chip->prox_thres;
+ 	} else {
+ 		lo = chip->prox_thres - APDS_PROX_HYSTERESIS;
 -		if (chip->prox_continuous_mode)
 -			hi = chip->prox_thres;
 -		else
 -			hi = APDS_RANGE;
 +		hi = APDS_RANGE;
-	}
-
-	ret = apds990x_write_word(chip, APDS990X_PILTL, lo);
+ 	}
+ 
+ 	ret = apds990x_write_word(chip, APDS990X_PILTL, lo);
 @@ -490,8 +482,10 @@ static int apds990x_ack_int(struct apds990x_chip *chip, u8 mode)
-
+ 
  static irqreturn_t apds990x_irq(int irq, void *data)
  {
 -	struct apds990x_chip *chip = data;
 +	struct iio_dev *indio_dev = data;
 +	struct apds990x_chip *chip = iio_priv(indio_dev);
-	u8 status;
+ 	u8 status;
 +	int ev_dir = IIO_EV_DIR_EITHER;
-
-	apds990x_read_byte(chip, APDS990X_STATUS, &status);
-	apds990x_ack_int(chip, status);
+ 
+ 	apds990x_read_byte(chip, APDS990X_STATUS, &status);
+ 	apds990x_ack_int(chip, status);
 @@ -514,14 +508,25 @@ static irqreturn_t apds990x_irq(int irq, void *data)
-				/* Result is valid */
-				chip->lux = chip->lux_raw;
-				chip->lux_wait_fresh_res = false;
+ 				/* Result is valid */
+ 				chip->lux = chip->lux_raw;
+ 				chip->lux_wait_fresh_res = false;
 -				wake_up(&chip->wait);
 -				sysfs_notify(&chip->client->dev.kobj,
 -					NULL, "lux0_input");
@@ -126,31 +129,31 @@ index 77c168d928f8..3e4c664b602d 100644
 +													ev_dir),
 +								iio_get_time_ns(indio_dev));
 +				}
-			}
-		}
-
+ 			}
+ 		}
+ 
 -		if ((status & APDS990X_ST_PINT) && chip->prox_en) {
 +		if (status & APDS990X_ST_PINT) {
-			u16 clr_ch;
+ 			u16 clr_ch;
 +			bool prox_ok = false;
-
-			apds990x_read_word(chip, APDS990X_CDATAL, &clr_ch);
-			/*
+ 
+ 			apds990x_read_word(chip, APDS990X_CDATAL, &clr_ch);
+ 			/*
 @@ -529,27 +534,58 @@ static irqreturn_t apds990x_irq(int irq, void *data)
-			 * proximity gives false posivite values.
-			 * Just ignore them.
-			 */
+ 			 * proximity gives false posivite values.
+ 			 * Just ignore them.
+ 			 */
 -			if (chip->again_meas == 0 &&
 -				clr_ch == chip->a_max_result)
 +			if ((chip->again_meas == 0)
 +					&& (clr_ch == chip->a_max_result)) {
-				chip->prox_data = 0;
+ 				chip->prox_data = 0;
 -			else
 +			} else {
 +				prox_ok = true;
-				apds990x_read_word(chip,
-						APDS990X_PDATAL,
-						&chip->prox_data);
+ 				apds990x_read_word(chip,
+ 						APDS990X_PDATAL,
+ 						&chip->prox_data);
 +				if (chip->prox_data < chip->prox_thres) {
 +					chip->prox_data = 0;
 +					ev_dir = IIO_EV_DIR_FALLING;
@@ -161,8 +164,8 @@ index 77c168d928f8..3e4c664b602d 100644
 +				chip->prox_wait_fresh_res = false;
 +				wake_up(&chip->wait_prox);
 +			}
-
-			apds990x_refresh_pthres(chip, chip->prox_data);
+ 
+ 			apds990x_refresh_pthres(chip, chip->prox_data);
 -			if (chip->prox_data < chip->prox_thres)
 -				chip->prox_data = 0;
 -			else if (!chip->prox_continuous_mode)
@@ -176,12 +179,12 @@ index 77c168d928f8..3e4c664b602d 100644
 +												ev_dir),
 +							iio_get_time_ns(indio_dev));
 +			}
-		}
-	}
-	mutex_unlock(&chip->mutex);
-	return IRQ_HANDLED;
+ 		}
+ 	}
+ 	mutex_unlock(&chip->mutex);
+ 	return IRQ_HANDLED;
  }
-
+ 
 +static int apds990x_set_mode(struct apds990x_chip *chip)
 +{
 +	u8 reg = 0;
@@ -203,19 +206,19 @@ index 77c168d928f8..3e4c664b602d 100644
 +
  static int apds990x_configure(struct apds990x_chip *chip)
  {
-	/* It is recommended to use disabled mode during these operations */
+ 	/* It is recommended to use disabled mode during these operations */
 @@ -577,6 +613,7 @@ static int apds990x_configure(struct apds990x_chip *chip)
-			(chip->pdiode << 4) |
-			(chip->pgain << 2) |
-			(chip->again_next << 0));
+ 			(chip->pdiode << 4) |
+ 			(chip->pgain << 2) |
+ 			(chip->again_next << 0));
 +
-	return 0;
+ 	return 0;
  }
-
+ 
 @@ -611,106 +648,8 @@ static int apds990x_detect(struct apds990x_chip *chip)
-	return ret;
+ 	return ret;
  }
-
+ 
 -#ifdef CONFIG_PM
 -static int apds990x_chip_on(struct apds990x_chip *chip)
 -{
@@ -318,28 +321,29 @@ index 77c168d928f8..3e4c664b602d 100644
 -		apds990x_lux_calib_store);
 +static IIO_CONST_ATTR(intensity_calibscale_default,
 +						__stringify(APDS_CALIB_SCALER));
-
+ 
  static ssize_t apds990x_rate_avail(struct device *dev,
-				   struct device_attribute *attr, char *buf)
-@@ -723,12 +662,8 @@ static ssize_t apds990x_rate_avail(struct device *dev,
-	return pos;
+ 				   struct device_attribute *attr, char *buf)
+@@ -724,13 +663,8 @@ static ssize_t apds990x_rate_avail(struct device *dev,
+ 	return pos;
  }
-
+ 
 -static ssize_t apds990x_rate_show(struct device *dev,
 -				   struct device_attribute *attr, char *buf)
 -{
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
+-
 -	return sprintf(buf, "%d\n", chip->arate);
 -}
 +static IIO_DEVICE_ATTR(intensity_rate_avail, S_IRUGO,
 +						apds990x_rate_avail, NULL, 0);
-
+ 
  static int apds990x_set_arate(struct apds990x_chip *chip, int rate)
  {
-@@ -755,306 +690,417 @@ static int apds990x_set_arate(struct apds990x_chip *chip, int rate)
-			(chip->prox_persistence << APDS990X_PPERS_SHIFT));
+@@ -757,315 +691,420 @@ static int apds990x_set_arate(struct apds990x_chip *chip, int rate)
+ 			(chip->prox_persistence << APDS990X_PPERS_SHIFT));
  }
-
+ 
 -static ssize_t apds990x_rate_store(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t len)
@@ -349,14 +353,14 @@ index 77c168d928f8..3e4c664b602d 100644
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
 -	unsigned long value;
 -	int ret;
--
+ 
 -	ret = kstrtoul(buf, 0, &value);
 -	if (ret)
 -		return ret;
 +	if (thresh > APDS_RANGE)
 +		return -EINVAL;
-
-	mutex_lock(&chip->mutex);
+ 
+ 	mutex_lock(&chip->mutex);
 -	ret = apds990x_set_arate(chip, value);
 +	*target = thresh;
 +	/*
@@ -365,14 +369,14 @@ index 77c168d928f8..3e4c664b602d 100644
 +	 */
 +	if (!chip->lux_wait_fresh_res)
 +		apds990x_refresh_athres(chip);
-	mutex_unlock(&chip->mutex);
+ 	mutex_unlock(&chip->mutex);
 -
 -	if (ret < 0)
 -		return ret;
 -	return len;
 +	return 0;
  }
-
+ 
 -static DEVICE_ATTR(lux0_rate_avail, S_IRUGO, apds990x_rate_avail, NULL);
 -
 -static DEVICE_ATTR(lux0_rate, S_IRUGO | S_IWUSR, apds990x_rate_show,
@@ -385,21 +389,22 @@ index 77c168d928f8..3e4c664b602d 100644
  {
 -	ssize_t ret;
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
+ 
 -	if (pm_runtime_suspended(dev) || !chip->prox_en)
 -		return -EIO;
 +	if ((thresh > APDS_RANGE) || (thresh == 0) ||
 +		(thresh < APDS_PROX_HYSTERESIS))
 +		return -EINVAL;
-
-	mutex_lock(&chip->mutex);
+ 
+ 	mutex_lock(&chip->mutex);
 -	ret = sprintf(buf, "%d\n", chip->prox_data);
 -	mutex_unlock(&chip->mutex);
 -	return ret;
 -}
-+	chip->prox_thres = thresh;
-
--static DEVICE_ATTR(prox0_raw, S_IRUGO, apds990x_prox_show, NULL);
 -
+-static DEVICE_ATTR(prox0_raw, S_IRUGO, apds990x_prox_show, NULL);
++	chip->prox_thres = thresh;
+ 
 -static ssize_t apds990x_prox_range_show(struct device *dev,
 -				 struct device_attribute *attr, char *buf)
 -{
@@ -408,20 +413,21 @@ index 77c168d928f8..3e4c664b602d 100644
 +	mutex_unlock(&chip->mutex);
 +	return 0;
  }
-
+ 
 -static DEVICE_ATTR(prox0_sensor_range, S_IRUGO, apds990x_prox_range_show, NULL);
 -
 -static ssize_t apds990x_prox_enable_show(struct device *dev,
 +static ssize_t apds990x_chip_id_show(struct device *dev,
-				   struct device_attribute *attr, char *buf)
+ 				   struct device_attribute *attr, char *buf)
  {
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
--	return sprintf(buf, "%d\n", chip->prox_en);
 +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 +	struct apds990x_chip *chip = iio_priv(indio_dev);
+ 
+-	return sprintf(buf, "%d\n", chip->prox_en);
 +	return sprintf(buf, "%s %d\n", chip->chipname, chip->revision);
  }
-
+ 
 -static ssize_t apds990x_prox_enable_store(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t len)
@@ -435,11 +441,11 @@ index 77c168d928f8..3e4c664b602d 100644
 -		return ret;
 +static IIO_DEVICE_ATTR(chip_id, S_IRUGO,
 +						apds990x_chip_id_show, NULL, 0);
-
+ 
 -	mutex_lock(&chip->mutex);
 +#define APDS990X_CONST_ATTR(name) (&iio_const_attr_##name.dev_attr.attr)
 +#define APDS990X_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
-
+ 
 -	if (!chip->prox_en)
 -		chip->prox_data = 0;
 +static struct attribute *sysfs_attrs_ctrl[] = {
@@ -448,7 +454,7 @@ index 77c168d928f8..3e4c664b602d 100644
 +	APDS990X_DEV_ATTR(chip_id),
 +	NULL,
 +};
-
+ 
 -	if (value)
 -		chip->prox_en++;
 -	else if (chip->prox_en > 0)
@@ -456,7 +462,7 @@ index 77c168d928f8..3e4c664b602d 100644
 +static struct attribute_group apds990x_attribute_group = {
 +	.attrs = sysfs_attrs_ctrl,
 +};
-
+ 
 -	if (!pm_runtime_suspended(dev))
 -		apds990x_mode_on(chip);
 -	mutex_unlock(&chip->mutex);
@@ -476,7 +482,7 @@ index 77c168d928f8..3e4c664b602d 100644
 +						 BIT(IIO_EV_INFO_ENABLE),
 +	},
 +};
-
+ 
 -static DEVICE_ATTR(prox0_raw_en, S_IRUGO | S_IWUSR, apds990x_prox_enable_show,
 -						   apds990x_prox_enable_store);
 +static const struct iio_event_spec apds990x_prox_event_spec[] = {
@@ -487,7 +493,7 @@ index 77c168d928f8..3e4c664b602d 100644
 +						 BIT(IIO_EV_INFO_ENABLE),
 +	},
 +};
-
+ 
 -static const char *reporting_modes[] = {"trigger", "periodic"};
 +static const struct iio_chan_spec apds990x_channels[] = {
 +	{
@@ -507,30 +513,27 @@ index 77c168d928f8..3e4c664b602d 100644
 +		.num_event_specs = ARRAY_SIZE(apds990x_prox_event_spec),
 +	},
 +};
-
+ 
 -static ssize_t apds990x_prox_reporting_mode_show(struct device *dev,
 -				   struct device_attribute *attr, char *buf)
 +static int apds990x_set_power_state(struct apds990x_chip *chip, bool on)
  {
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
++	struct device *dev = &chip->client->dev;
++	int ret = 0;
+ 
 -	return sprintf(buf, "%s\n",
 -		reporting_modes[!!chip->prox_continuous_mode]);
 -}
-+	struct device *dev = &chip->client->dev;
-+	int ret = 0;
-
++	mutex_lock(&chip->mutex);
++	apds990x_set_mode(chip);
+ 
 -static ssize_t apds990x_prox_reporting_mode_store(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t len)
 -{
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
 -	int ret;
-+	mutex_lock(&chip->mutex);
-+	apds990x_set_mode(chip);
-
--	ret = sysfs_match_string(reporting_modes, buf);
--	if (ret < 0)
--		return ret;
 +	if (on) {
 +		ret = pm_runtime_get_sync(dev);
 +		if (ret < 0)
@@ -539,18 +542,21 @@ index 77c168d928f8..3e4c664b602d 100644
 +		pm_runtime_mark_last_busy(dev);
 +		ret = pm_runtime_put_autosuspend(dev);
 +	}
-
+ 
+-	ret = sysfs_match_string(reporting_modes, buf);
+-	if (ret < 0)
+-		return ret;
++	mutex_unlock(&chip->mutex);
+ 
 -	chip->prox_continuous_mode = ret;
 -	return len;
--}
-+	mutex_unlock(&chip->mutex);
-
++	return ret;
+ }
+ 
 -static DEVICE_ATTR(prox0_reporting_mode, S_IRUGO | S_IWUSR,
 -		apds990x_prox_reporting_mode_show,
 -		apds990x_prox_reporting_mode_store);
-+	return ret;
-+}
-
+-
 -static ssize_t apds990x_prox_reporting_avail_show(struct device *dev,
 -				   struct device_attribute *attr, char *buf)
 +static int apds990x_read_raw(struct iio_dev *indio_dev,
@@ -559,13 +565,14 @@ index 77c168d928f8..3e4c664b602d 100644
  {
 -	return sprintf(buf, "%s %s\n", reporting_modes[0], reporting_modes[1]);
 -}
+-
+-static DEVICE_ATTR(prox0_reporting_mode_avail, S_IRUGO | S_IWUSR,
+-		apds990x_prox_reporting_avail_show, NULL);
 +	struct apds990x_chip *chip = iio_priv(indio_dev);
 +	long timeout;
 +	u32 result;
 +	int ret;
-
--static DEVICE_ATTR(prox0_reporting_mode_avail, S_IRUGO | S_IWUSR,
--		apds990x_prox_reporting_avail_show, NULL);
+ 
 +	switch (mask) {
 +	case IIO_CHAN_INFO_PROCESSED:
 +		switch (chan->type) {
@@ -581,16 +588,16 @@ index 77c168d928f8..3e4c664b602d 100644
 +				if (!timeout)
 +					return -EIO;
 +			}
-
-+			mutex_lock(&chip->mutex);
-+			result = (chip->lux * chip->lux_calib) / APDS_CALIB_SCALER;
-+			if (result > (APDS_RANGE * APDS990X_LUX_OUTPUT_SCALE))
-+				result = APDS_RANGE * APDS990X_LUX_OUTPUT_SCALE;
-
+ 
 -static ssize_t apds990x_lux_thresh_above_show(struct device *dev,
 -				   struct device_attribute *attr, char *buf)
 -{
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
++			mutex_lock(&chip->mutex);
++			result = (chip->lux * chip->lux_calib) / APDS_CALIB_SCALER;
++			if (result > (APDS_RANGE * APDS990X_LUX_OUTPUT_SCALE))
++				result = APDS_RANGE * APDS990X_LUX_OUTPUT_SCALE;
+ 
 -	return sprintf(buf, "%d\n", chip->lux_thres_hi);
 -}
 +			*val = result;
@@ -617,12 +624,11 @@ index 77c168d928f8..3e4c664b602d 100644
 +				if (!timeout)
 +					return -EIO;
 +			}
-
+ 
 -static ssize_t apds990x_lux_thresh_below_show(struct device *dev,
 -				   struct device_attribute *attr, char *buf)
 -{
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
--	return sprintf(buf, "%d\n", chip->lux_thres_lo);
 +			mutex_lock(&chip->mutex);
 +			*val = chip->prox_data;
 +			mutex_unlock(&chip->mutex);
@@ -672,10 +678,11 @@ index 77c168d928f8..3e4c664b602d 100644
 +	default:
 +		return -EINVAL;
 +	}
-+
+ 
+-	return sprintf(buf, "%d\n", chip->lux_thres_lo);
 +	return ret;
  }
-
+ 
 -static ssize_t apds990x_set_lux_thresh(struct apds990x_chip *chip, u32 *target,
 -				const char *buf)
 +static int apds990x_write_raw(struct iio_dev *indio_dev,
@@ -684,15 +691,27 @@ index 77c168d928f8..3e4c664b602d 100644
  {
 -	unsigned long thresh;
 +	struct apds990x_chip *chip = iio_priv(indio_dev);
-	int ret;
-
+ 	int ret;
+ 
 -	ret = kstrtoul(buf, 0, &thresh);
 -	if (ret)
 -		return ret;
-+	mutex_lock(&chip->mutex);
-
+-
 -	if (thresh > APDS_RANGE)
 -		return -EINVAL;
+-
+ 	mutex_lock(&chip->mutex);
+-	*target = thresh;
+-	/*
+-	 * Don't update values in HW if we are still waiting for
+-	 * first interrupt to come after device handle open call.
+-	 */
+-	if (!chip->lux_wait_fresh_res)
+-		apds990x_refresh_athres(chip);
+-	mutex_unlock(&chip->mutex);
+-	return ret;
+ 
+-}
 +	switch (mask) {
 +	case IIO_CHAN_INFO_SAMP_FREQ:
 +		switch (chan->type) {
@@ -726,32 +745,21 @@ index 77c168d928f8..3e4c664b602d 100644
 +		ret = -EINVAL;
 +		break;
 +	}
-
--	mutex_lock(&chip->mutex);
--	*target = thresh;
--	/*
--	 * Don't update values in HW if we are still waiting for
--	 * first interrupt to come after device handle open call.
--	 */
--	if (!chip->lux_wait_fresh_res)
--		apds990x_refresh_athres(chip);
-	mutex_unlock(&chip->mutex);
--	return ret;
--
--}
-
+ 
 -static ssize_t apds990x_lux_thresh_above_store(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t len)
 -{
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
 -	int ret = apds990x_set_lux_thresh(chip, &chip->lux_thres_hi, buf);
++	mutex_unlock(&chip->mutex);
+ 
 -	if (ret < 0)
 -		return ret;
 -	return len;
 +	return ret;
  }
-
+ 
 -static ssize_t apds990x_lux_thresh_below_store(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t len)
@@ -762,19 +770,25 @@ index 77c168d928f8..3e4c664b602d 100644
  {
 -	struct apds990x_chip *chip =  dev_get_drvdata(dev);
 -	int ret = apds990x_set_lux_thresh(chip, &chip->lux_thres_lo, buf);
+-
 -	if (ret < 0)
 -		return ret;
 -	return len;
 -}
--
++	struct apds990x_chip *chip = iio_priv(indio_dev);
+ 
 -static DEVICE_ATTR(lux0_thresh_above_value, S_IRUGO | S_IWUSR,
 -		apds990x_lux_thresh_above_show,
 -		apds990x_lux_thresh_above_store);
-+	struct apds990x_chip *chip = iio_priv(indio_dev);
-
+-
 -static DEVICE_ATTR(lux0_thresh_below_value, S_IRUGO | S_IWUSR,
 -		apds990x_lux_thresh_below_show,
 -		apds990x_lux_thresh_below_store);
+-
+-static ssize_t apds990x_prox_threshold_show(struct device *dev,
+-				   struct device_attribute *attr, char *buf)
+-{
+-	struct apds990x_chip *chip =  dev_get_drvdata(dev);
 +	switch (chan->type) {
 +	case IIO_INTENSITY:
 +		switch (dir) {
@@ -793,15 +807,11 @@ index 77c168d928f8..3e4c664b602d 100644
 +	default:
 +		return -EINVAL;
 +	}
-
--static ssize_t apds990x_prox_threshold_show(struct device *dev,
--				   struct device_attribute *attr, char *buf)
--{
--	struct apds990x_chip *chip =  dev_get_drvdata(dev);
+ 
 -	return sprintf(buf, "%d\n", chip->prox_thres);
 +	return IIO_VAL_INT;
  }
-
+ 
 -static ssize_t apds990x_prox_threshold_store(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t len)
@@ -814,8 +824,8 @@ index 77c168d928f8..3e4c664b602d 100644
 -	unsigned long value;
 +	struct apds990x_chip *chip = iio_priv(indio_dev);
 +	u32 *thresh;
-	int ret;
-
+ 	int ret;
+ 
 -	ret = kstrtoul(buf, 0, &value);
 -	if (ret)
 -		return ret;
@@ -850,9 +860,9 @@ index 77c168d928f8..3e4c664b602d 100644
 +		}
 +		break;
 +	default:
-		return -EINVAL;
+ 		return -EINVAL;
 +	}
-
+ 
 -	mutex_lock(&chip->mutex);
 -	chip->prox_thres = value;
 -
@@ -861,7 +871,7 @@ index 77c168d928f8..3e4c664b602d 100644
 -	return len;
 +	return ret;
  }
-
+ 
 -static DEVICE_ATTR(prox0_thresh_above_value, S_IRUGO | S_IWUSR,
 -		apds990x_prox_threshold_show,
 -		apds990x_prox_threshold_store);
@@ -885,9 +895,9 @@ index 77c168d928f8..3e4c664b602d 100644
 +		return -EINVAL;
 +	}
 +
-	return 0;
+ 	return 0;
  }
-
+ 
 -static ssize_t apds990x_power_state_store(struct device *dev,
 -				  struct device_attribute *attr,
 -				  const char *buf, size_t len)
@@ -900,22 +910,16 @@ index 77c168d928f8..3e4c664b602d 100644
 -	unsigned long value;
 -	int ret;
 +	struct apds990x_chip *chip = iio_priv(indio_dev);
-
+ 
 -	ret = kstrtoul(buf, 0, &value);
 -	if (ret)
 -		return ret;
 +	state = !!state;
-
+ 
 -	if (value) {
 -		pm_runtime_get_sync(dev);
 -		mutex_lock(&chip->mutex);
-+	switch (chan->type) {
-+	case IIO_INTENSITY:
-+		if (chip->lux_en == state)
-+			return -EINVAL;
-+
-+		chip->lux_en = state;
-		chip->lux_wait_fresh_res = true;
+-		chip->lux_wait_fresh_res = true;
 -		apds990x_force_a_refresh(chip);
 -		apds990x_force_p_refresh(chip);
 -		mutex_unlock(&chip->mutex);
@@ -925,15 +929,26 @@ index 77c168d928f8..3e4c664b602d 100644
 -	}
 -	return len;
 -}
++	switch (chan->type) {
++	case IIO_INTENSITY:
++		if (chip->lux_en == state)
++			return -EINVAL;
+ 
+-static DEVICE_ATTR(power_state, S_IRUGO | S_IWUSR,
+-		apds990x_power_state_show,
+-		apds990x_power_state_store);
++		chip->lux_en = state;
++		chip->lux_wait_fresh_res = true;
 +		apds990x_set_mode(chip);
 +		break;
 +	case IIO_PROXIMITY:
 +		if (chip->prox_en == state)
 +			return -EINVAL;
-
--static DEVICE_ATTR(power_state, S_IRUGO | S_IWUSR,
--		apds990x_power_state_show,
--		apds990x_power_state_store);
+ 
+-static ssize_t apds990x_chip_id_show(struct device *dev,
+-				   struct device_attribute *attr, char *buf)
+-{
+-	struct apds990x_chip *chip =  dev_get_drvdata(dev);
 +		chip->prox_en = state;
 +		chip->prox_wait_fresh_res = true;
 +		apds990x_set_mode(chip);
@@ -941,15 +956,11 @@ index 77c168d928f8..3e4c664b602d 100644
 +	default:
 +		return -EINVAL;
 +	}
-
--static ssize_t apds990x_chip_id_show(struct device *dev,
--				   struct device_attribute *attr, char *buf)
--{
--	struct apds990x_chip *chip =  dev_get_drvdata(dev);
+ 
 -	return sprintf(buf, "%s %d\n", chip->chipname, chip->revision);
 +	return 0;
  }
-
+ 
 -static DEVICE_ATTR(chip_id, S_IRUGO, apds990x_chip_id_show, NULL);
 -
 -static struct attribute *sysfs_attrs_ctrl[] = {
@@ -983,21 +994,21 @@ index 77c168d928f8..3e4c664b602d 100644
 +	.write_event_config = apds990x_write_event_config,
 +	.attrs = &apds990x_attribute_group,
  };
-
+ 
  static const int apds990x_parse_dt(struct device *dev,
-@@ -1121,16 +1167,27 @@ static int apds990x_probe(struct i2c_client *client,
-				const struct i2c_device_id *id)
+@@ -1132,16 +1171,27 @@ static int apds990x_probe(struct i2c_client *client,
+ 				const struct i2c_device_id *id)
  {
-	struct apds990x_chip *chip;
+ 	struct apds990x_chip *chip;
 +	struct iio_dev *indio_dev;
-	int err = 0;
-
+ 	int err = 0;
+ 
 -	chip = kzalloc(sizeof *chip, GFP_KERNEL);
 -	if (!chip)
 +	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
 +	if (!indio_dev)
-		return -ENOMEM;
-
+ 		return -ENOMEM;
+ 
 -	i2c_set_clientdata(client, chip);
 -	chip->client  = client;
 +	indio_dev->info = &apds990x_info;
@@ -1006,7 +1017,7 @@ index 77c168d928f8..3e4c664b602d 100644
 +	indio_dev->channels = apds990x_channels;
 +	indio_dev->num_channels = ARRAY_SIZE(apds990x_channels);
 +	indio_dev->modes = INDIO_DIRECT_MODE;
-
+ 
 -	init_waitqueue_head(&chip->wait);
 +	chip = iio_priv(indio_dev);
 +	i2c_set_clientdata(client, indio_dev);
@@ -1015,75 +1026,75 @@ index 77c168d928f8..3e4c664b602d 100644
 +
 +	init_waitqueue_head(&chip->wait_lux);
 +	init_waitqueue_head(&chip->wait_prox);
-	mutex_init(&chip->mutex);
-	chip->pdata	= client->dev.platform_data;
-
-@@ -1146,8 +1203,7 @@ static int apds990x_probe(struct i2c_client *client,
-
-	if (chip->pdata == NULL) {
-		dev_err(&client->dev, "platform data is mandatory\n");
+ 	mutex_init(&chip->mutex);
+ 	chip->pdata	= client->dev.platform_data;
+ 
+@@ -1157,8 +1207,7 @@ static int apds990x_probe(struct i2c_client *client,
+ 
+ 	if (chip->pdata == NULL) {
+ 		dev_err(&client->dev, "platform data is mandatory\n");
 -		err = -EINVAL;
 -		goto fail1;
 +		return -EINVAL;
-	}
-
-	if (chip->pdata->cf.ga == 0) {
-@@ -1186,22 +1242,23 @@ static int apds990x_probe(struct i2c_client *client,
-	chip->pgain = APDS_PGAIN_1X;
-	chip->prox_calib = APDS_PROX_NEUTRAL_CALIB_VALUE;
-	chip->prox_persistence = APDS_DEFAULT_PROX_PERS;
+ 	}
+ 
+ 	if (chip->pdata->cf.ga == 0) {
+@@ -1197,22 +1246,23 @@ static int apds990x_probe(struct i2c_client *client,
+ 	chip->pgain = APDS_PGAIN_1X;
+ 	chip->prox_calib = APDS_PROX_NEUTRAL_CALIB_VALUE;
+ 	chip->prox_persistence = APDS_DEFAULT_PROX_PERS;
 -	chip->prox_continuous_mode = false;
-
-	chip->regs[0].supply = reg_vcc;
-	chip->regs[1].supply = reg_vled;
-
+ 
+ 	chip->regs[0].supply = reg_vcc;
+ 	chip->regs[1].supply = reg_vled;
+ 
 -	err = regulator_bulk_get(&client->dev,
 +	chip->lux_en = true;
 +
 +	err = devm_regulator_bulk_get(&client->dev,
-				 ARRAY_SIZE(chip->regs), chip->regs);
-	if (err < 0) {
-		dev_err(&client->dev, "Cannot get regulators\n");
+ 				 ARRAY_SIZE(chip->regs), chip->regs);
+ 	if (err < 0) {
+ 		dev_err(&client->dev, "Cannot get regulators\n");
 -		goto fail1;
 +		return err;
-	}
-
-	err = regulator_bulk_enable(ARRAY_SIZE(chip->regs), chip->regs);
-	if (err < 0) {
-		dev_err(&client->dev, "Cannot enable regulators\n");
+ 	}
+ 
+ 	err = regulator_bulk_enable(ARRAY_SIZE(chip->regs), chip->regs);
+ 	if (err < 0) {
+ 		dev_err(&client->dev, "Cannot enable regulators\n");
 -		goto fail2;
 +		return err;
-	}
-
-	usleep_range(APDS_STARTUP_DELAY, 2 * APDS_STARTUP_DELAY);
-@@ -1209,141 +1266,119 @@ static int apds990x_probe(struct i2c_client *client,
-	err = apds990x_detect(chip);
-	if (err < 0) {
-		dev_err(&client->dev, "APDS990X not found\n");
+ 	}
+ 
+ 	usleep_range(APDS_STARTUP_DELAY, 2 * APDS_STARTUP_DELAY);
+@@ -1220,141 +1270,119 @@ static int apds990x_probe(struct i2c_client *client,
+ 	err = apds990x_detect(chip);
+ 	if (err < 0) {
+ 		dev_err(&client->dev, "APDS990X not found\n");
 -		goto fail3;
 +		goto fail1;
-	}
-
+ 	}
+ 
 -	pm_runtime_set_active(&client->dev);
 -
 -	apds990x_configure(chip);
 -	apds990x_set_arate(chip, APDS_LUX_DEFAULT_RATE);
 -	apds990x_mode_on(chip);
 -
-	pm_runtime_enable(&client->dev);
+ 	pm_runtime_enable(&client->dev);
 +	pm_runtime_set_autosuspend_delay(&client->dev,
 +									APDS990X_SLEEP_DELAY_MS);
 +	pm_runtime_use_autosuspend(&client->dev);
-
-	if (chip->pdata->setup_resources) {
-		err = chip->pdata->setup_resources();
-		if (err) {
-			err = -EINVAL;
+ 
+ 	if (chip->pdata->setup_resources) {
+ 		err = chip->pdata->setup_resources();
+ 		if (err) {
+ 			err = -EINVAL;
 -			goto fail3;
 +			goto fail1;
-		}
-	}
-
+ 		}
+ 	}
+ 
 -	err = sysfs_create_group(&chip->client->dev.kobj,
 -				apds990x_attribute_group);
 -	if (err < 0) {
@@ -1099,12 +1110,12 @@ index 77c168d928f8..3e4c664b602d 100644
 +	err = devm_request_threaded_irq(&client->dev, client->irq, NULL,
 +				apds990x_irq, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW |
 +				IRQF_ONESHOT, "apds990x", indio_dev);
-	if (err) {
-		dev_err(&client->dev, "could not get IRQ %d\n",
-			client->irq);
+ 	if (err) {
+ 		dev_err(&client->dev, "could not get IRQ %d\n",
+ 			client->irq);
 -		goto fail5;
 +		goto fail2;
-	}
+ 	}
 -	return err;
 -fail5:
 -	sysfs_remove_group(&chip->client->dev.kobj,
@@ -1117,8 +1128,8 @@ index 77c168d928f8..3e4c664b602d 100644
 +
 +	return 0;
 +fail2:
-	if (chip->pdata && chip->pdata->release_resources)
-		chip->pdata->release_resources();
+ 	if (chip->pdata && chip->pdata->release_resources)
+ 		chip->pdata->release_resources();
 -fail3:
 -	regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs);
 -fail2:
@@ -1127,9 +1138,9 @@ index 77c168d928f8..3e4c664b602d 100644
 -	kfree(chip);
 +	regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs);
 +
-	return err;
+ 	return err;
  }
-
+ 
  static int apds990x_remove(struct i2c_client *client)
  {
 -	struct apds990x_chip *chip = i2c_get_clientdata(client);
@@ -1139,23 +1150,23 @@ index 77c168d928f8..3e4c664b602d 100644
 -			apds990x_attribute_group);
 +	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 +	struct apds990x_chip *chip = iio_priv(indio_dev);
-
-	if (chip->pdata && chip->pdata->release_resources)
-		chip->pdata->release_resources();
-
+ 
+ 	if (chip->pdata && chip->pdata->release_resources)
+ 		chip->pdata->release_resources();
+ 
 -	if (!pm_runtime_suspended(&client->dev))
 -		apds990x_chip_off(chip);
 -
-	pm_runtime_disable(&client->dev);
-	pm_runtime_set_suspended(&client->dev);
+ 	pm_runtime_disable(&client->dev);
+ 	pm_runtime_set_suspended(&client->dev);
 +	regulator_bulk_disable(ARRAY_SIZE(chip->regs), chip->regs);
-
+ 
 -	regulator_bulk_free(ARRAY_SIZE(chip->regs), chip->regs);
 -
 -	kfree(chip);
-	return 0;
+ 	return 0;
  }
-
+ 
 -#ifdef CONFIG_PM_SLEEP
 -static int apds990x_suspend(struct device *dev)
 +static int apds990x_set_power(struct apds990x_chip *chip, bool on)
@@ -1163,7 +1174,7 @@ index 77c168d928f8..3e4c664b602d 100644
 -	struct i2c_client *client = to_i2c_client(dev);
 -	struct apds990x_chip *chip = i2c_get_clientdata(client);
 +	int ret = 0;
-
+ 
 -	apds990x_chip_off(chip);
 -	return 0;
 -}
@@ -1172,13 +1183,13 @@ index 77c168d928f8..3e4c664b602d 100644
 +					chip->regs);
 +		if (ret < 0)
 +			return ret;
-
+ 
 -static int apds990x_resume(struct device *dev)
 -{
 -	struct i2c_client *client = to_i2c_client(dev);
 -	struct apds990x_chip *chip = i2c_get_clientdata(client);
 +		usleep_range(APDS_STARTUP_DELAY, 2 * APDS_STARTUP_DELAY);
-
+ 
 -	/*
 -	 * If we were enabled at suspend time, it is expected
 -	 * everything works nice and smoothly. Chip_on is enough
@@ -1186,7 +1197,7 @@ index 77c168d928f8..3e4c664b602d 100644
 -	apds990x_chip_on(chip);
 +		apds990x_configure(chip);
 +		apds990x_set_arate(chip, APDS_LUX_DEFAULT_RATE);
-
+ 
 -	return 0;
 +		chip->lux_wait_fresh_res = true;
 +		chip->prox_wait_fresh_res = true;
@@ -1201,7 +1212,7 @@ index 77c168d928f8..3e4c664b602d 100644
 +	return ret;
  }
 -#endif
-
+ 
 -#ifdef CONFIG_PM
  static int apds990x_runtime_suspend(struct device *dev)
  {
@@ -1209,24 +1220,24 @@ index 77c168d928f8..3e4c664b602d 100644
 -	struct apds990x_chip *chip = i2c_get_clientdata(client);
 +	struct apds990x_chip *chip =
 +					iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
-
+ 
 -	apds990x_chip_off(chip);
 +	apds990x_set_power(chip, false);
-	return 0;
+ 	return 0;
  }
-
+ 
  static int apds990x_runtime_resume(struct device *dev)
  {
 -	struct i2c_client *client = to_i2c_client(dev);
 -	struct apds990x_chip *chip = i2c_get_clientdata(client);
 +	struct apds990x_chip *chip =
 +					iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
-
+ 
 -	apds990x_chip_on(chip);
 +	apds990x_set_power(chip, true);
-	return 0;
+ 	return 0;
  }
-
+ 
 -#endif
 +static const struct dev_pm_ops apds990x_pm_ops = {
 +	SET_SYSTEM_SLEEP_PM_OPS(apds990x_runtime_suspend,
@@ -1234,14 +1245,14 @@ index 77c168d928f8..3e4c664b602d 100644
 +	SET_RUNTIME_PM_OPS(apds990x_runtime_suspend,
 +					   apds990x_runtime_resume, NULL)
 +};
-
+ 
  static const struct i2c_device_id apds990x_id[] = {
-	{"apds990x", 0 },
-	{}
+ 	{"apds990x", 0 },
+ 	{}
  };
 -
  MODULE_DEVICE_TABLE(i2c, apds990x_id);
-
+ 
 -static const struct dev_pm_ops apds990x_pm_ops = {
 -	SET_SYSTEM_SLEEP_PM_OPS(apds990x_suspend, apds990x_resume)
 -	SET_RUNTIME_PM_OPS(apds990x_runtime_suspend,
@@ -1250,24 +1261,25 @@ index 77c168d928f8..3e4c664b602d 100644
 -};
 -
  static const struct of_device_id apds990x_of_match[] = {
-	{.compatible = "avago,apds990x" },
-	{}
-@@ -1352,7 +1387,7 @@ MODULE_DEVICE_TABLE(of, apds990x_of_match);
-
+ 	{.compatible = "avago,apds990x" },
+ 	{}
+@@ -1363,7 +1391,7 @@ MODULE_DEVICE_TABLE(of, apds990x_of_match);
+ 
  static struct i2c_driver apds990x_driver = {
-	.driver	 = {
+ 	.driver	 = {
 -		.name	= "apds990x",
 +		.name	= APDS990X_DRV_NAME,
-		.of_match_table	= apds990x_of_match,
-		.pm	= &apds990x_pm_ops,
-	},
-@@ -1360,7 +1395,6 @@ static struct i2c_driver apds990x_driver = {
-	.remove	  = apds990x_remove,
-	.id_table = apds990x_id,
+ 		.of_match_table	= apds990x_of_match,
+ 		.pm	= &apds990x_pm_ops,
+ 	},
+@@ -1371,7 +1399,6 @@ static struct i2c_driver apds990x_driver = {
+ 	.remove	  = apds990x_remove,
+ 	.id_table = apds990x_id,
  };
 -
  module_i2c_driver(apds990x_driver);
-
+ 
  MODULE_DESCRIPTION("APDS990X combined ALS and proximity sensor");
---
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch b/device/linux-nokia-n9/0010-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
similarity index 78%
rename from device/linux-nokia-n9/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
rename to device/linux-nokia-n9/0010-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
index a77efdd6b..6ce89e5b7 100644
--- a/device/linux-nokia-n9/0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
+++ b/device/linux-nokia-n9/0010-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
@@ -1,7 +1,7 @@
-From f9b31361e92f0e7e48a4972ecf919443631ff8ff Mon Sep 17 00:00:00 2001
+From ad23767da90b149a650ebb38a797056f81728507 Mon Sep 17 00:00:00 2001
 From: filippz <filip.matijevic.pz@gmail.com>
 Date: Thu, 28 Dec 2017 07:00:11 +0100
-Subject: [PATCH 11/12] ARM: dts: N9: Add support for apds990x ALS/PS
+Subject: [PATCH 10/11] ARM: dts: N9: Add support for apds990x ALS/PS
 
 Signed-off-by: filippz <filip.matijevic.pz@gmail.com>
 ---
@@ -10,13 +10,13 @@ Signed-off-by: filippz <filip.matijevic.pz@gmail.com>
  2 files changed, 38 insertions(+)
 
 diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
-index 9e417ba08deb..b0b4a49da016 100644
+index 613ada9a982a..1143a6eef736 100644
 --- a/arch/arm/boot/dts/omap3-n9.dts
 +++ b/arch/arm/boot/dts/omap3-n9.dts
 @@ -57,6 +57,30 @@
-			};
-		};
-	};
+ 			};
+ 		};
+ 	};
 +
 +	als_ps@39 {
 +		compatible = "avago,apds990x";
@@ -42,16 +42,16 @@ index 9e417ba08deb..b0b4a49da016 100644
 +		avago,ppcount	= /bits/ 8 <5>;
 +	};
  };
-
+ 
  &isp {
 diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
-index f615428b9f4d..6192b47b18ca 100644
+index 219519812050..7ac45b833d1d 100644
 --- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
 +++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
 @@ -39,6 +39,14 @@
-		enable-active-high;
-	};
-
+ 		enable-active-high;
+ 	};
+ 
 +	vbat: fixedregulator1 {
 +		compatible = "regulator-fixed";
 +		regulator-name = "VBAT";
@@ -60,13 +60,13 @@ index f615428b9f4d..6192b47b18ca 100644
 +		regulator-boot-on;
 +	};
 +
-	vwlan_fixed: fixedregulator2 {
-		compatible = "regulator-fixed";
-		regulator-name = "VWLAN";
+ 	vwlan_fixed: fixedregulator2 {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "VWLAN";
 @@ -157,6 +165,12 @@
-			OMAP3630_CORE2_IOPAD(0x25ec, PIN_OUTPUT | MUX_MODE4)         /* gpio_23 (cmt_en) */
-		>;
-	};
+ 			OMAP3630_CORE2_IOPAD(0x25ec, PIN_OUTPUT | MUX_MODE4)         /* gpio_23 (cmt_en) */
+ 		>;
+ 	};
 +
 +	als_ps_gpio: pinmux_als_ps_gpio {
 +		pinctrl-single,pins = <
@@ -74,7 +74,8 @@ index f615428b9f4d..6192b47b18ca 100644
 +		>;
 +	};
  };
-
+ 
  &i2c1 {
---
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch b/device/linux-nokia-n9/0011-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
similarity index 80%
rename from device/linux-nokia-n9/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
rename to device/linux-nokia-n9/0011-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
index 3702177ed..ff388aae8 100644
--- a/device/linux-nokia-n9/0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
+++ b/device/linux-nokia-n9/0011-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
@@ -1,7 +1,7 @@
-From 2a8dfb35dea840d1759ad8dbae12408c3017f721 Mon Sep 17 00:00:00 2001
+From d619104c857f0938801a34acf1ba2d46fd41e521 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= <filip.matijevic.pz@gmail.com>
 Date: Sat, 16 Dec 2017 07:41:32 +0100
-Subject: [PATCH 12/12] HACK: export dma access functions needed by PVR drivers
+Subject: [PATCH 11/11] HACK: export dma access functions needed by PVR drivers
 
 ---
  arch/arm/mm/dma-mapping.c | 7 +++++++
@@ -12,8 +12,8 @@ index ada8eb206a90..877f7f96462d 100644
 --- a/arch/arm/mm/dma-mapping.c
 +++ b/arch/arm/mm/dma-mapping.c
 @@ -2409,3 +2409,10 @@ void arch_teardown_dma_ops(struct device *dev)
-
-	arm_teardown_iommu_dma_ops(dev);
+ 
+ 	arm_teardown_iommu_dma_ops(dev);
  }
 +
 +/* export the cache management functions */
@@ -22,5 +22,6 @@ index ada8eb206a90..877f7f96462d 100644
 +EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area));
 +EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range));
 +#endif
---
+-- 
 2.14.1
+
diff --git a/device/linux-nokia-n9/APKBUILD b/device/linux-nokia-n9/APKBUILD
index 9ece8500d..5588c8571 100644
--- a/device/linux-nokia-n9/APKBUILD
+++ b/device/linux-nokia-n9/APKBUILD
@@ -2,7 +2,7 @@ _flavor=nokia-n9
 _config="config-${_flavor}.armhf"
 
 pkgname=linux-${_flavor}
-pkgver=4.15_rc6
+pkgver=4.16_rc3
 _pkgver=${pkgver/_/-}
 _kernver=${pkgver%_rc*}
 _mainver=${_kernver%.*}
@@ -17,23 +17,22 @@ arch="armhf"
 pkgdesc="Nokia N9 kernel"
 url="https://kernel.org"
 depends=""
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers openssl-dev"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers openssl-dev flex bison"
 options="!strip !check !tracedeps"
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v$_mainver.x/linux-$_basever.tar.xz
 	linux-v$_basever-v$_pkgver.patch::https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/rawdiff/?id=v$_pkgver&id2=v$_basever
-	0001-SEB.patch
+	0001-SREv2.patch
 	0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch
 	0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch
 	0004-ARM-dts-n9-add-display-support.patch
 	0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch
 	0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch
-	0007-ARM-dts-N9-Add-support-for-volume-keys.patch
-	0008-ARM-dts-N9-N950-Add-touchscreen-support.patch
-	0009-misc-apds990x-Add-device-tree-support.patch
-	0010-misc-apds990x-convert-to-iio.patch
-	0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
-	0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
+	0007-ARM-dts-N9-N950-Add-touchscreen-support.patch
+	0008-misc-apds990x-Add-device-tree-support.patch
+	0009-misc-apds990x-convert-to-iio.patch
+	0010-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
+	0011-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
 	$_config
 	RM-696_Pyrenees_SMD_V1_6.raw
 "
@@ -51,8 +50,10 @@ prepare() {
 	local _patch_failed=
 	cd "$ksrcdir"
 
+	source_patches="linux-v$_basever-v$_pkgver.patch
+	$source"
 	# first apply patches in specified order
-	for i in $source; do
+	for i in $source_patches; do
 		case $i in
 		*.patch)
 			msg "Applying $i..."
@@ -115,19 +116,18 @@ package() {
 		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1
 }
 
-sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
-5d05754adc696f180405acda79e2678075f99d12252fc1f7e6af46f5ab39076de926db6de900c28b2e05dd3753df60d3515bb805b71d3bff991a5ed040b91167  linux-v4.14-v4.15-rc6.patch
-bb34025e9487957b2fd14168bf406d8c96fe1d2e3e025d7468b785c1960acde165a3b3a8fbe0271ef7e6b35ee0bf1c49d9e8e005c2fce1ecdc3915f872bd5aec  0001-SEB.patch
-b92039d222e43d372c7ca3d5d117154800b83216b04d972b038accd9fce7c38a9da48e838391808d7ddb436252eab537f2e61d70656a767b933c5131b6b95afe  0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch
-afd2f16e058e576c441263554701afce37c3f0ee9cacced55b60add9c3fb258f9dda911ca52997ea3acdc933468ac279851e3d5c3f7862449fc17f638a887b16  0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch
-ef272ab381ceba0f8226017d46b96545971092938d12a3f58444b87b07e273c24c9af0368b5f5bc3db91df5a271cb49dc727b08eaec70687c874ce9f7e2ca75c  0004-ARM-dts-n9-add-display-support.patch
-b4b01583d639c75b3667398a917e0db57dee128af7def919ff859568ca812336a9c7b349dc9cb8b6f0e4b69afb806d7d5b761631e328b49d9402e3ed43c09ef0  0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch
-5b9e3b550feee69cd93945abb6e07cbd1067078b978617ff375fd6f1aa8f4731ad7abc314a3e15e3830c248da6c79c80654891803b24e3fef46940278827838a  0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch
-34930e488871e660d55b0174cda7778f45f381cf4bfaccab266f9cbc37858627330bdf0631bb78ebf51249003881ac814a3441c2ae0a96a000c9a5de1e4c945b  0007-ARM-dts-N9-Add-support-for-volume-keys.patch
-d1ae4758f669de894b4c612e2d6e4599226e0be5c9e2f61d67a0885c30a8de1e3bf0832a57951c604c9098197fe730e7adb6ddfab7cec60a1af9ef993a4b100b  0008-ARM-dts-N9-N950-Add-touchscreen-support.patch
-9006182627f533621b4b272c9a5160c8e530a1b6c7fe63a352da1e2ae42347a2dc9222833fd916f2d61ce178a70ca2a848fdd0c6f40f0832f10440a5ade681e1  0009-misc-apds990x-Add-device-tree-support.patch
-4600c0ef918c03c22ce1f280d4c7e329e0e5b8e9fabea4cee29f5e521e521b08ff7f7b0cc0937e92acf16af130218b9eab66e212cc108c0d5163399b4d87a6e1  0010-misc-apds990x-convert-to-iio.patch
-acc0399f7f3fda4d8c1e0a0c0ac7c36d27e8704d8aac4f085ad3a0c6460e55ce51dd541d692aa8d79e239d9005e9859d4263a599b058801f4dc43e0e75ae18e9  0011-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
-02da1c4538cc16b344745f6b7dab76a42286e9e17e549229273930557b5498f70628aa1a24654dbbdbb504942a8d502037f4e722d6119921a20bb14be21e3784  0012-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
+sha512sums="c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea  linux-4.15.tar.xz
+b5b4bc53a245725806d7f46d53e5715e8b8505536c96465cd8ea9dc506ed7b1c02a518114c3025786d10ab72c1454c03e85380bddd753f48946ca71bc0ed6f17  linux-v4.15-v4.16-rc3.patch
+1c2904c09954a88c3e3afe7bc962a460ceb4bb2503a8a69ff6e84786c3a36a86e60b7f6577ba37d57a9e06db65b0ce922d8a9807d6dae6d5fafa3fe54b17e4bd  0001-SREv2.patch
+3f3e4608958a0ef65283fe04cd4cb88b8074f9af5626cb27dafa7ab21e62e9069822d0f018fd3636bba830b6f6f44e47911987713f91b3763fe4703e75158065  0002-drm-add-rename-MIPI_DCS_SET_PARTIAL_XXX.patch
+b8d627d53e4d32568afa0c2fb5900487616b14c5ce9a14639894bd27aeb8c2a1d5de02435a0af136bd90cbc785c8862f4a9525f1dedd25a901e045c314fbd6d0  0003-drm-omap-panel-dsi-cm-use-defines-from-mipi_display..patch
+3b321910172d0699efd756d77c852f32884f95bea518821f1643b6cbef0eaa3934ca778450bdcfe0d0e341b6fc6e7eb9f6677a3f0c6ab953a493e0fca1fcd30e  0004-ARM-dts-n9-add-display-support.patch
+0eda9ca295aaa2ee038644eac5227585cd853573b2d8d79def2cf020f6dd9f40238f3957d27d1f55fef55f4c70f3ee76c3b8823231a3f8942bac6532a097ea8a  0005-Revert-drm-omap-work-around-for-omap3-display-enable.patch
+98b495c08d5fc4c87688b73aa9cc373a8dfe9303e39c05e22541e09dba688c361a61a8de92f82ded06033106a2a387f9cf0a3099cc89966de73954c063a116dd  0006-HACK-drm-omap-panel-dsi-cm-force-0xff-for-brigthness.patch
+09cb6c0527e697d663b08a26ca67541b4116a96d8f3b31b681f4ded14f0d2fd9c7eacab6f7c9d7dfee4d991ca6d2cd24d7ea607bd7f389f87998c56e00dd5d98  0007-ARM-dts-N9-N950-Add-touchscreen-support.patch
+f48757a26498da4b3625091f44f3e7a02a3e08bd18bc9b25f7b61bf66add3622c3841c00c689a3bf1fecfae84fe55c577adab974c5ba947a460a0bbe6811bb63  0008-misc-apds990x-Add-device-tree-support.patch
+187be299cd742b836b4831da2d12a0e2c6b6b2a815ee25c2d9ef2ba2300e389cb03243d4c862868eee222db2988dbe8c33c27cf5188f49c1d93501f096562609  0009-misc-apds990x-convert-to-iio.patch
+73fb2aae3ca58dba512dc2b252affb7fdda8ad33973ab964e73ff40f8f5de0d3192ca6f36c971a07fd5a14a279cab37eaad6bb92b918d1e9a1b8bc5725d758c2  0010-ARM-dts-N9-Add-support-for-apds990x-ALS-PS.patch
+74642fffa8d93add2e9aa07e463bfc9989776c29c293aca82015ea86bc52be73a5a4987c48f837988b2df877395b9f3a21be8c4b7ccdfc480a362daa46b7cd0d  0011-HACK-export-dma-access-functions-needed-by-PVR-drive.patch
 b666d18e505bdf9f806f133b0930555ab911cd8625f84b6d2a9caa9cffa805c6fc2c9c0485f9e3dea19b29c7c43cd688d4a5f2d3722d33f67b6435944a164ee0  config-nokia-n9.armhf
 a9b2eba95ead1226108bf664f49bcad70be99df7284ba807abdbd86a8dc68ebda6fc5d88c15846009f7748f1ae4d6735477d316bb9f298e7728071dad506b35f  RM-696_Pyrenees_SMD_V1_6.raw"