linux-next: manual merge of the arm-soc tree with the input tree

linux-next: manual merge of the arm-soc tree with the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/board-armadillo800eva.c between commit
cbaf7f808081 ("ARM - shmobile: Armadillo800EVA: Move st1232 reset pin
handling") from the input tree and commits ead10fed8b4b ("ARM: shmobile:
armadillo: Replace GPIO_PORTx enum with GPIO port numbers") and
0b7d78202260 ("ARM: shmobile: r8a7740: Migrate from INTC to GIC") from
the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
index 881e5c0,81db74a..0000000
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@ -890,8 -1000,7 +1009,8 @@@ static struct st1232_pdata st1232_i2c0_
  static struct i2c_board_info i2c0_devices[] = {
  	{
  		I2C_BOARD_INFO("st1232-ts", 0x55),
- 		.irq = evt2irq(0x0340),
+ 		.irq = irq_pin(10),
 +		.platform_data = &st1232_i2c0_pdata,
  	},
  	{
  		I2C_BOARD_INFO("wm8978", 0x1a),

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/tegra-kbc.c between commit 9eee07d39fa6 ("Input:
tegra-kbc - require CONFIG_OF, remove platform data") from the input tree
and commit 61fd290d213e ("ARM: tegra: migrate to new clock code") from
the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/keyboard/tegra-kbc.c
index d89e7d39,54ac1dc..0000000
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@@ -29,16 -29,9 +29,16 @@@
  #include <linux/of.h>
  #include <linux/clk.h>
  #include <linux/slab.h>
 -#include <linux/input/tegra_kbc.h>
 +#include <linux/input/matrix_keypad.h>
- #include <mach/clk.h>
+ #include <linux/clk/tegra.h>
  
 +#define KBC_MAX_GPIO	24
 +#define KBC_MAX_KPENT	8
 +
 +#define KBC_MAX_ROW	16
 +#define KBC_MAX_COL	8
 +#define KBC_MAX_KEY	(KBC_MAX_ROW * KBC_MAX_COL)
 +
  #define KBC_MAX_DEBOUNCE_CNT	0x3ffu
  
  /* KBC row scan time and delay for beginning the row scan. */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/input/keyboard/omap-keypad.c between commit 9e14f36bb577 ("Input:
omap-keypad - fixed formatting") from the input tree and commit
f799a3d8fe17 ("Input: omap-keypad: Remove dependencies to mach includes")
from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).  Please resist white space only patches :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/keyboard/omap-keypad.c
index b03c5b9,2bda5f0b..0000000
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@@ -421,10 -346,9 +346,9 @@@ err4
  err3:
  	device_remove_file(&pdev->dev, &dev_attr_enable);
  err2:
 -	for (i = row_idx - 1; i >=0; i--)
 +	for (i = row_idx - 1; i >= 0; i--)
  		gpio_free(row_gpios[i]);
- err1:
 -	for (i = col_idx - 1; i >=0; i--)
 +	for (i = col_idx - 1; i >= 0; i--)
  		gpio_free(col_gpios[i]);
  
  	kfree(omap_kp);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]