#include <linux/amba/clcd-regs.h>
 #include <linux/device.h>
 #include <linux/of.h>
+#include <linux/of_platform.h>
 #include <linux/regmap.h>
 #include <linux/mfd/syscon.h>
 #include <linux/bitops.h>
 #include <linux/module.h>
 #include <drm/drmP.h>
 #include "pl111_versatile.h"
+#include "pl111_vexpress.h"
 #include "pl111_drm.h"
 
 static struct regmap *versatile_syscon_map;
        REALVIEW_CLCD_PB11MP,
        REALVIEW_CLCD_PBA8,
        REALVIEW_CLCD_PBX,
+       VEXPRESS_CLCD_V2M,
 };
 
 static const struct of_device_id versatile_clcd_of_match[] = {
                .compatible = "arm,realview-pbx-syscon",
                .data = (void *)REALVIEW_CLCD_PBX,
        },
+       {
+               .compatible = "arm,vexpress-muxfpga",
+               .data = (void *)VEXPRESS_CLCD_V2M,
+       },
        {},
 };
 
        .fb_bpp = 16,
 };
 
+/*
+ * Versatile Express PL111 variant, again we just push the maximum
+ * BPP to 16 to be able to get 1024x768 without saturating the memory
+ * bus. The clockdivider also seems broken on the Versatile Express.
+ */
+static const struct pl111_variant_data pl111_vexpress = {
+       .name = "PL111 Versatile Express",
+       .formats = pl111_realview_pixel_formats,
+       .nformats = ARRAY_SIZE(pl111_realview_pixel_formats),
+       .fb_bpp = 16,
+       .broken_clockdivider = true,
+};
+
 int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv)
 {
        const struct of_device_id *clcd_id;
        enum versatile_clcd versatile_clcd_type;
        struct device_node *np;
        struct regmap *map;
+       int ret;
 
        np = of_find_matching_node_and_match(NULL, versatile_clcd_of_match,
                                             &clcd_id);
        }
        versatile_clcd_type = (enum versatile_clcd)clcd_id->data;
 
-       map = syscon_node_to_regmap(np);
+       /* Versatile Express special handling */
+       if (versatile_clcd_type == VEXPRESS_CLCD_V2M) {
+               struct platform_device *pdev;
+
+               /* Call into deep Vexpress configuration API */
+               pdev = of_find_device_by_node(np);
+               if (!pdev) {
+                       dev_err(dev, "can't find the sysreg device, deferring\n");
+                       return -EPROBE_DEFER;
+               }
+               map = dev_get_drvdata(&pdev->dev);
+               if (!map) {
+                       dev_err(dev, "sysreg has not yet probed\n");
+                       platform_device_put(pdev);
+                       return -EPROBE_DEFER;
+               }
+       } else {
+               map = syscon_node_to_regmap(np);
+       }
+
        if (IS_ERR(map)) {
                dev_err(dev, "no Versatile syscon regmap\n");
                return PTR_ERR(map);
                priv->variant_display_disable = pl111_realview_clcd_disable;
                dev_info(dev, "set up callbacks for RealView PL111\n");
                break;
+       case VEXPRESS_CLCD_V2M:
+               priv->variant = &pl111_vexpress;
+               dev_info(dev, "initializing Versatile Express PL111\n");
+               ret = pl111_vexpress_clcd_init(dev, priv, map);
+               if (ret)
+                       return ret;
+               break;
        default:
                dev_info(dev, "unknown Versatile system controller\n");
                break;
 
--- /dev/null
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Versatile Express PL111 handling
+ * Copyright (C) 2018 Linus Walleij
+ *
+ * This module binds to the "arm,vexpress-muxfpga" device on the
+ * Versatile Express configuration bus and sets up which CLCD instance
+ * gets muxed out on the DVI bridge.
+ */
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/vexpress.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include "pl111_drm.h"
+#include "pl111_vexpress.h"
+
+#define VEXPRESS_FPGAMUX_MOTHERBOARD           0x00
+#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_1       0x01
+#define VEXPRESS_FPGAMUX_DAUGHTERBOARD_2       0x02
+
+int pl111_vexpress_clcd_init(struct device *dev,
+                            struct pl111_drm_dev_private *priv,
+                            struct regmap *map)
+{
+       struct device_node *root;
+       struct device_node *child;
+       struct device_node *ct_clcd = NULL;
+       bool has_coretile_clcd = false;
+       bool has_coretile_hdlcd = false;
+       bool mux_motherboard = true;
+       u32 val;
+       int ret;
+
+       /*
+        * Check if we have a CLCD or HDLCD on the core tile by checking if a
+        * CLCD or HDLCD is available in the root of the device tree.
+        */
+       root = of_find_node_by_path("/");
+       if (!root)
+               return -EINVAL;
+
+       for_each_available_child_of_node(root, child) {
+               if (of_device_is_compatible(child, "arm,pl111")) {
+                       has_coretile_clcd = true;
+                       ct_clcd = child;
+                       break;
+               }
+               if (of_device_is_compatible(child, "arm,hdlcd")) {
+                       has_coretile_hdlcd = true;
+                       break;
+               }
+       }
+
+       /*
+        * If there is a coretile HDLCD and it has a driver,
+        * do not mux the CLCD on the motherboard to the DVI.
+        */
+       if (has_coretile_hdlcd && IS_ENABLED(CONFIG_DRM_HDLCD))
+               mux_motherboard = false;
+
+       /*
+        * On the Vexpress CA9 we let the CLCD on the coretile
+        * take precedence, so also in this case do not mux the
+        * motherboard to the DVI.
+        */
+       if (has_coretile_clcd)
+               mux_motherboard = false;
+
+       if (mux_motherboard) {
+               dev_info(dev, "DVI muxed to motherboard CLCD\n");
+               val = VEXPRESS_FPGAMUX_MOTHERBOARD;
+       } else if (ct_clcd == dev->of_node) {
+               dev_info(dev,
+                        "DVI muxed to daughterboard 1 (core tile) CLCD\n");
+               val = VEXPRESS_FPGAMUX_DAUGHTERBOARD_1;
+       } else {
+               dev_info(dev, "core tile graphics present\n");
+               dev_info(dev, "this device will be deactivated\n");
+               return -ENODEV;
+       }
+
+       ret = regmap_write(map, 0, val);
+       if (ret) {
+               dev_err(dev, "error setting DVI muxmode\n");
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+/*
+ * This sets up the regmap pointer that will then be retrieved by
+ * the detection code in pl111_versatile.c and passed in to the
+ * pl111_vexpress_clcd_init() function above.
+ */
+static int vexpress_muxfpga_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct regmap *map;
+
+       map = devm_regmap_init_vexpress_config(&pdev->dev);
+       if (IS_ERR(map))
+               return PTR_ERR(map);
+       dev_set_drvdata(dev, map);
+
+       return 0;
+}
+
+static const struct of_device_id vexpress_muxfpga_match[] = {
+       { .compatible = "arm,vexpress-muxfpga", }
+};
+
+static struct platform_driver vexpress_muxfpga_driver = {
+       .driver = {
+               .name = "vexpress-muxfpga",
+               .of_match_table = of_match_ptr(vexpress_muxfpga_match),
+       },
+       .probe = vexpress_muxfpga_probe,
+};
+
+builtin_platform_driver(vexpress_muxfpga_driver);