static int rpi_touchscreen_write(struct rpi_touchscreen *ts, u16 reg, u32 val)
 {
-#if 0
-       /* The firmware uses LP DSI transactions like this to bring up
-        * the hardware, which should be faster than using I2C to then
-        * pass to the Toshiba.  However, I was unable to get it to
-        * work.
-        */
        u8 msg[] = {
                reg,
                reg >> 8,
                val >> 24,
        };
 
-       mipi_dsi_dcs_write_buffer(ts->dsi, msg, sizeof(msg));
-#else
-       rpi_touchscreen_i2c_write(ts, REG_WR_ADDRH, reg >> 8);
-       rpi_touchscreen_i2c_write(ts, REG_WR_ADDRL, reg);
-       rpi_touchscreen_i2c_write(ts, REG_WRITEH, val >> 8);
-       rpi_touchscreen_i2c_write(ts, REG_WRITEL, val);
-#endif
+       mipi_dsi_generic_write(ts->dsi, msg, sizeof(msg));
 
        return 0;
 }