static int mipi_dbi_typec1_command(struct mipi_dbi *dbi, u8 *cmd,
                                   u8 *parameters, size_t num)
 {
-       unsigned int bpw = (*cmd == MIPI_DCS_WRITE_MEMORY_START) ? 16 : 8;
+       unsigned int bpw = 8;
        int ret;
 
        if (mipi_dbi_command_is_read(dbi, *cmd))
        if (ret || !num)
                return ret;
 
+       if (*cmd == MIPI_DCS_WRITE_MEMORY_START)
+               bpw = dbi->write_memory_bpw;
+
        return mipi_dbi_spi1_transfer(dbi, 1, parameters, num, bpw);
 }
 
        if (ret || !num)
                return ret;
 
-       if (*cmd == MIPI_DCS_WRITE_MEMORY_START && !dbi->swap_bytes)
-               bpw = 16;
+       if (*cmd == MIPI_DCS_WRITE_MEMORY_START)
+               bpw = dbi->write_memory_bpw;
 
        spi_bus_lock(spi->controller);
        gpiod_set_value_cansleep(dbi->dc, 1);
 
        dbi->spi = spi;
        dbi->read_commands = mipi_dbi_dcs_read_commands;
+       dbi->write_memory_bpw = 16;
 
        if (dc) {
                dbi->command = mipi_dbi_typec3_command;
                dbi->dc = dc;
-               if (!spi_is_bpw_supported(spi, 16))
+               if (!spi_is_bpw_supported(spi, 16)) {
+                       dbi->write_memory_bpw = 8;
                        dbi->swap_bytes = true;
+               }
        } else {
                dbi->command = mipi_dbi_typec1_command;
                dbi->tx_buf9_len = SZ_16K;