Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa64cfd2 authored by Reinhard Nißl's avatar Reinhard Nißl Committed by Mauro Carvalho Chehab
Browse files

[media] stb0899: enable auto inversion handling unconditionally 



It seems that current inversion handling addresses only the signal
routing on the PCB, i. e. IQ signals are either swapped or not.
But when the device is operated in a Satellite Channel Router (SCR)
environment, an additional inversion is required due to the way how
the SCR works. Therefore it makes sense to me to always enable auto
inversion handling and drop the enum value IQ_SWAP_AUTO.

Signed-off-by: default avatarReinhard Nißl <rnissl@gmx.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2eeed77f

drivers/media/dvb-frontends/stb0899_algo.c

+29 −34
Original line number Diff line number Diff line
@@ -1373,9 +1373,6 @@ enum stb0899_status stb0899_dvbs2_algo(struct stb0899_state *state) 
	case IQ_SWAP_ON:

		STB0899_SETFIELD_VAL(SPECTRUM_INVERT, reg, 1);

		break;

	case IQ_SWAP_AUTO:	/* use last successful search first	*/

		STB0899_SETFIELD_VAL(SPECTRUM_INVERT, reg, 1);

		break;

	}

	stb0899_write_s2reg(state, STB0899_S2DEMOD, STB0899_BASE_DMD_CNTRL2, STB0899_OFF0_DMD_CNTRL2, reg);

	stb0899_dvbs2_reacquire(state);
@@ -1405,7 +1402,6 @@ enum stb0899_status stb0899_dvbs2_algo(struct stb0899_state *state) 
	}



	if (internal->status != DVBS2_FEC_LOCK) {

		if (internal->inversion == IQ_SWAP_AUTO) {

		reg = STB0899_READ_S2REG(STB0899_S2DEMOD, DMD_CNTRL2);

		iqSpectrum = STB0899_GETFIELD(SPECTRUM_INVERT, reg);

		/* IQ Spectrum Inversion	*/
@@ -1440,7 +1436,6 @@ enum stb0899_status stb0899_dvbs2_algo(struct stb0899_state *state) 
			pParams->IQLocked = !iqSpectrum;

*/

	}

	}

	if (internal->status == DVBS2_FEC_LOCK) {

		dprintk(state->verbose, FE_DEBUG, 1, "----------------> DVB-S2 FEC Lock !");

		reg = STB0899_READ_S2REG(STB0899_S2DEMOD, UWP_STAT2);

drivers/media/dvb-frontends/stb0899_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ struct stb0899_s2_reg { 
enum stb0899_inversion {

	IQ_SWAP_OFF	= 0,

	IQ_SWAP_ON,

	IQ_SWAP_AUTO

};



#define STB0899_GPIO00				0xf140