linux-next: manual merge of the v4l-dvb tree with Linus' tree

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-shmobile/board-bockw.c between commit fa3e0cee12fb ("ARM:
shmobile: BOCK-W: fix SDHI0 PFC settings") from Linus' tree and commit
9c43952d0f1e ("[media] ARM: shmobile: BOCK-W: add VIN and ML86V7667
support") from the v4l-dvb tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-shmobile/board-bockw.c
index 3354a85,7d44f66..0000000
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -167,13 -188,17 +188,23 @@@ static const struct pinctrl_map bockw_p
  				  "usb1", "usb1"),
  	/* SDHI0 */
  	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 -				  "sdhi0", "sdhi0"),
 +				  "sdhi0_data4", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_ctrl", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_cd", "sdhi0"),
 +	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +				  "sdhi0_wp", "sdhi0"),
+ 	/* VIN0 */
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ 				  "vin0_clk", "vin0"),
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+ 				  "vin0_data8", "vin0"),
+ 	/* VIN1 */
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ 				  "vin1_clk", "vin1"),
+ 	PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+ 				  "vin1_data8", "vin1"),
  };
  
  #define FPGA	0x18200000

Attachment: pgp00000.pgp
Description: PGP signature