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

Commit d3e458d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)
  ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
  ALSA: aloop - Fix possible IRQ lock inversion
  ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
  ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
  ALSA: firewire - msleep needs delay.h
  ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
  ALSA: firewire-lib: allocate DMA buffer separately
  ALSA: firewire-lib: use no-info SYT for packets without SYT sample
  ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
  ALSA: hda - Remove an unused variable in patch_realtek.c
  ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
  ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
  ALSA: hda - Move default input-src selection to init part
  ALSA: hda - Initialize special cases for input src in init phase
  ALSA: ctxfi - Clear input settings before initialization
  ALSA: ctxfi - Fix SPDIF status retrieval
  ALSA: ctxfi - Fix incorrect SPDIF status bit mask
  ALSA: ctxfi - Fix microphone boost codes/comments
  ALSA: atiixp - Fix wrong time-out checks during ac-link reset
  ALSA: intel8x0m: append 'm' to "r_intel8x0"
  ...
parents f2e1fbb5 d351cf46

arch/arm/mach-shmobile/board-ag5evm.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -119,13 +119,6 @@ static struct platform_device keysc_device = { 
};

};





/* FSI A */

/* FSI A */

static struct sh_fsi_platform_info fsi_info = {

	.porta_flags = SH_FSI_OUT_SLAVE_MODE	|

		       SH_FSI_IN_SLAVE_MODE	|

		       SH_FSI_OFMT(I2S)		|

		       SH_FSI_IFMT(I2S),

};



static struct resource fsi_resources[] = {

static struct resource fsi_resources[] = {

	[0] = {

	[0] = {

		.name	= "FSI",

		.name	= "FSI",
@@ -144,9 +137,6 @@ static struct platform_device fsi_device = { 
	.id		= -1,

	.id		= -1,

	.num_resources	= ARRAY_SIZE(fsi_resources),

	.num_resources	= ARRAY_SIZE(fsi_resources),

	.resource	= fsi_resources,

	.resource	= fsi_resources,

	.dev	= {

		.platform_data	= &fsi_info,

	},

};

};





static struct resource sh_mmcif_resources[] = {

static struct resource sh_mmcif_resources[] = {

arch/arm/mach-shmobile/board-ap4evb.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -673,16 +673,12 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable) 
}

}





static struct sh_fsi_platform_info fsi_info = {

static struct sh_fsi_platform_info fsi_info = {

	.porta_flags = SH_FSI_BRS_INV |

	.porta_flags = SH_FSI_BRS_INV,

		       SH_FSI_OUT_SLAVE_MODE |

		       SH_FSI_IN_SLAVE_MODE |

		       SH_FSI_OFMT(PCM) |

		       SH_FSI_IFMT(PCM),





	.portb_flags = SH_FSI_BRS_INV |

	.portb_flags = SH_FSI_BRS_INV |

		       SH_FSI_BRM_INV |

		       SH_FSI_BRM_INV |

		       SH_FSI_LRS_INV |

		       SH_FSI_LRS_INV |

		       SH_FSI_OFMT(SPDIF),

		       SH_FSI_FMT_SPDIF,

	.set_rate = fsi_set_rate,

	.set_rate = fsi_set_rate,

};

};
@@ -783,6 +779,10 @@ static struct platform_device hdmi_device = { 
	},

	},

};

};





static struct platform_device fsi_hdmi_device = {

	.name		= "sh_fsi2_b_hdmi",

};



static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,

static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,

				unsigned long *parent_freq)

				unsigned long *parent_freq)

{

{
@@ -936,6 +936,7 @@ static struct platform_device *ap4evb_devices[] __initdata = { 
	&usb1_host_device,

	&usb1_host_device,

	&fsi_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&sh_mmcif_device,

	&sh_mmcif_device,

	&lcdc1_device,

	&lcdc1_device,

	&lcdc_device,

	&lcdc_device,

arch/arm/mach-shmobile/board-mackerel.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -399,6 +399,10 @@ static struct platform_device hdmi_device = { 
	},

	},

};

};





static struct platform_device fsi_hdmi_device = {

	.name		= "sh_fsi2_b_hdmi",

};



static int __init hdmi_init_pm_clock(void)

static int __init hdmi_init_pm_clock(void)

{

{

	struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");

	struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");
@@ -609,16 +613,12 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable) 
}

}





static struct sh_fsi_platform_info fsi_info = {

static struct sh_fsi_platform_info fsi_info = {

	.porta_flags =	SH_FSI_BRS_INV		|

	.porta_flags =	SH_FSI_BRS_INV,

			SH_FSI_OUT_SLAVE_MODE	|

			SH_FSI_IN_SLAVE_MODE	|

			SH_FSI_OFMT(PCM)	|

			SH_FSI_IFMT(PCM),





	.portb_flags =	SH_FSI_BRS_INV	|

	.portb_flags =	SH_FSI_BRS_INV	|

			SH_FSI_BRM_INV	|

			SH_FSI_BRM_INV	|

			SH_FSI_LRS_INV	|

			SH_FSI_LRS_INV	|

			SH_FSI_OFMT(SPDIF),

			SH_FSI_FMT_SPDIF,





	.set_rate = fsi_set_rate,

	.set_rate = fsi_set_rate,

};

};
@@ -921,6 +921,7 @@ static struct platform_device *mackerel_devices[] __initdata = { 
	&leds_device,

	&leds_device,

	&fsi_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&sdhi0_device,

	&sdhi0_device,

#if !defined(CONFIG_MMC_SH_MMCIF)

#if !defined(CONFIG_MMC_SH_MMCIF)

	&sdhi1_device,

	&sdhi1_device,

arch/sh/boards/mach-ecovec24/setup.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -725,11 +725,7 @@ static struct platform_device camera_devices[] = { 




/* FSI */

/* FSI */

static struct sh_fsi_platform_info fsi_info = {

static struct sh_fsi_platform_info fsi_info = {

	.portb_flags = SH_FSI_BRS_INV |

	.portb_flags = SH_FSI_BRS_INV,

		       SH_FSI_OUT_SLAVE_MODE |

		       SH_FSI_IN_SLAVE_MODE |

		       SH_FSI_OFMT(I2S) |

		       SH_FSI_IFMT(I2S),

};

};





static struct resource fsi_resources[] = {

static struct resource fsi_resources[] = {

arch/sh/boards/mach-se/7724/setup.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -286,11 +286,7 @@ static struct platform_device ceu1_device = { 
/* FSI */

/* FSI */

/* change J20, J21, J22 pin to 1-2 connection to use slave mode */

/* change J20, J21, J22 pin to 1-2 connection to use slave mode */

static struct sh_fsi_platform_info fsi_info = {

static struct sh_fsi_platform_info fsi_info = {

	.porta_flags = SH_FSI_BRS_INV |

	.porta_flags = SH_FSI_BRS_INV,

		       SH_FSI_OUT_SLAVE_MODE |

		       SH_FSI_IN_SLAVE_MODE |

		       SH_FSI_OFMT(PCM) |

		       SH_FSI_IFMT(PCM),

};

};





static struct resource fsi_resources[] = {

static struct resource fsi_resources[] = {