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

Commit 8fcacc03 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'sunxi-fixes-for-4.4' of... 

Merge tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Merge "Allwinner fixes for 4.4" from Maxime Ripard:

Allwinner fixes for 4.4

Two patches, one to fix the touchscreen axis on one Allwinner board, and
the other one fixing a mutex unlocking issue on one error path in the RSB
driver.

* tag 'sunxi-fixes-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
  ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property
parents 7f4c9778 43675ffa

arch/arm/boot/dts/sun6i-a31s-primo81.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ 
		reg = <0x5d>;

		reg = <0x5d>;

		interrupt-parent = <&pio>;

		interrupt-parent = <&pio>;

		interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */

		interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>; /* PA3 */

		touchscreen-swapped-x-y;

	};

	};

};

};

drivers/bus/sunxi-rsb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -342,13 +342,13 @@ static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr, 




	ret = _sunxi_rsb_run_xfer(rsb);

	ret = _sunxi_rsb_run_xfer(rsb);

	if (ret)

	if (ret)

		goto out;

		goto unlock;





	*buf = readl(rsb->regs + RSB_DATA);

	*buf = readl(rsb->regs + RSB_DATA);





unlock:

	mutex_unlock(&rsb->lock);

	mutex_unlock(&rsb->lock);





out:

	return ret;

	return ret;

}

}