spi: spi-gpio: fix SPI_CS_HIGH capability

spi: spi-gpio: fix SPI_CS_HIGH capability

spi-gpio is capable of dealing with active-high chip-selects.
Unfortunately, commit cf766ebea85b ("spi: spi-gpio: add SPI_3WIRE
support") broke this by setting master->mode_bits, which overrides
the setting in the spi-bitbang code.  Fix this.

[Fixed a trivial conflict with SPI_3WIRE_HIZ support -- broonie]

Fixes: cf766ebea85b ("spi: spi-gpio: add SPI_3WIRE support")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org