spi: pxa2xx: Introduce is_mmp2_ssp() helper (41c98841) · Commits · 戴 / test

drivers/spi/spi-pxa2xx.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -185,6 +185,11 @@ static bool is_quark_x1000_ssp(const struct driver_data *drv_data)
		return drv_data->ssp_type == QUARK_X1000_SSP;
		}

		static bool is_mmp2_ssp(const struct driver_data *drv_data)
		{
		return drv_data->ssp_type == MMP2_SSP;
		}

		static u32 pxa2xx_spi_get_ssrc1_change_mask(const struct driver_data *drv_data)
		{
		switch (drv_data->ssp_type) {
		@@ -463,8 +468,8 @@ int pxa2xx_spi_flush(struct driver_data *drv_data)

		static void pxa2xx_spi_off(struct driver_data *drv_data)
		{
		/* On MMP, disabling SSE seems to corrupt the rx fifo */
		if (drv_data->ssp_type == MMP2_SSP)
		/* On MMP, disabling SSE seems to corrupt the Rx FIFO */
		if (is_mmp2_ssp(drv_data))
		return;

		pxa2xx_spi_write(drv_data, SSCR0,
		@@ -1070,7 +1075,7 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,
		\|\| (pxa2xx_spi_read(drv_data, SSCR1) & change_mask)
		!= (cr1 & change_mask)) {
		/* stop the SSP, and update the other bits */
		if (drv_data->ssp_type != MMP2_SSP)
		if (!is_mmp2_ssp(drv_data))
		pxa2xx_spi_write(drv_data, SSCR0, cr0 & ~SSCR0_SSE);
		if (!pxa25x_ssp_comp(drv_data))
		pxa2xx_spi_write(drv_data, SSTO, chip->timeout);
		@@ -1084,7 +1089,7 @@ static int pxa2xx_spi_transfer_one(struct spi_controller *controller,
		pxa2xx_spi_write(drv_data, SSTO, chip->timeout);
		}

		if (drv_data->ssp_type == MMP2_SSP) {
		if (is_mmp2_ssp(drv_data)) {
		u8 tx_level = (pxa2xx_spi_read(drv_data, SSSR)
		& SSSR_TFL_MASK) >> 8;