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

Commit 592b15ba authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare input updates for 4.21 merge window.
parents 7db54c89 1e3c336a

Documentation/devicetree/bindings/input/touchscreen/raspberrypi,firmware-ts.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Raspberry Pi firmware based 7" touchscreen

=====================================



Required properties:

 - compatible: "raspberrypi,firmware-ts"



Optional properties:

 - firmware: Reference to RPi's firmware device node

 - touchscreen-size-x: See touchscreen.txt

 - touchscreen-size-y: See touchscreen.txt

 - touchscreen-inverted-x: See touchscreen.txt

 - touchscreen-inverted-y: See touchscreen.txt

 - touchscreen-swapped-x-y: See touchscreen.txt



Example:



firmware: firmware-rpi {

	compatible = "raspberrypi,bcm2835-firmware";

	mboxes = <&mailbox>;



	ts: touchscreen {

		compatible = "raspberrypi,firmware-ts";

		touchscreen-size-x = <800>;

		touchscreen-size-y = <480>;

	};

};

Documentation/devicetree/bindings/serio/olpc,ap-sp.txt

+4 −0
Original line number Diff line number Diff line
@@ -4,10 +4,14 @@ Required properties: 
- compatible : "olpc,ap-sp"

- reg : base address and length of SoC's WTM registers

- interrupts : SP-AP interrupt

- clocks : phandle + clock-specifier for the clock that drives the WTM

- clock-names:  should be "sp"



Example:

	ap-sp@d4290000 {

		compatible = "olpc,ap-sp";

		reg = <0xd4290000 0x1000>;

		interrupts = <40>;

		clocks = <&soc_clocks MMP2_CLK_SP>;

		clock-names = "sp";

	}

drivers/clk/mmp/clk-of-mmp2.c

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define APMU_DISP1	0x110

#define APMU_CCIC0	0x50

#define APMU_CCIC1	0xf4

#define APMU_SP		0x68

#define MPMU_UART_PLL	0x14



struct mmp2_clk_unit {
@@ -209,6 +210,8 @@ static struct mmp_clk_mix_config ccic1_mix_config = { 
	.reg_info = DEFINE_MIX_REG_INFO(4, 16, 2, 6, 32),

};



static DEFINE_SPINLOCK(sp_lock);



static struct mmp_param_mux_clk apmu_mux_clks[] = {

	{MMP2_CLK_DISP0_MUX, "disp0_mux", disp_parent_names, ARRAY_SIZE(disp_parent_names), CLK_SET_RATE_PARENT, APMU_DISP0, 6, 2, 0, &disp0_lock},

	{MMP2_CLK_DISP1_MUX, "disp1_mux", disp_parent_names, ARRAY_SIZE(disp_parent_names), CLK_SET_RATE_PARENT, APMU_DISP1, 6, 2, 0, &disp1_lock},
@@ -239,6 +242,7 @@ static struct mmp_param_gate_clk apmu_gate_clks[] = { 
	{MMP2_CLK_CCIC1, "ccic1_clk", "ccic1_mix_clk", CLK_SET_RATE_PARENT, APMU_CCIC1, 0x1b, 0x1b, 0x0, 0, &ccic1_lock},

	{MMP2_CLK_CCIC1_PHY, "ccic1_phy_clk", "ccic1_mix_clk", CLK_SET_RATE_PARENT, APMU_CCIC1, 0x24, 0x24, 0x0, 0, &ccic1_lock},

	{MMP2_CLK_CCIC1_SPHY, "ccic1_sphy_clk", "ccic1_sphy_div", CLK_SET_RATE_PARENT, APMU_CCIC1, 0x300, 0x300, 0x0, 0, &ccic1_lock},

	{MMP2_CLK_SP, "sp_clk", NULL, CLK_SET_RATE_PARENT, APMU_SP, 0x1b, 0x1b, 0x0, 0, &sp_lock},

};



static void mmp2_axi_periph_clk_init(struct mmp2_clk_unit *pxa_unit)

drivers/input/keyboard/nomadik-ske-keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int __init ske_keypad_chip_init(struct ske_keypad *keypad) 
	while ((readl(keypad->reg_base + SKE_RIS) != 0x00000000) && timeout--)

		cpu_relax();



	if (!timeout)

	if (timeout == -1)

		return -EINVAL;



	/*

drivers/input/misc/rotary_encoder.c

+4 −2
Original line number Diff line number Diff line
@@ -240,8 +240,10 @@ static int rotary_encoder_probe(struct platform_device *pdev) 


	encoder->gpios = devm_gpiod_get_array(dev, NULL, GPIOD_IN);

	if (IS_ERR(encoder->gpios)) {

		dev_err(dev, "unable to get gpios\n");

		return PTR_ERR(encoder->gpios);

		err = PTR_ERR(encoder->gpios);

		if (err != -EPROBE_DEFER)

			dev_err(dev, "unable to get gpios: %d\n", err);

		return err;

	}

	if (encoder->gpios->ndescs < 2) {

		dev_err(dev, "not enough gpios found\n");