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

Commit 24e71ef6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into fixes

parents af726172 45fc4cce

arch/arm/mach-davinci/board-da850-evm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -753,7 +753,7 @@ static struct snd_platform_data da850_evm_snd_data = { 
	.num_serializer	= ARRAY_SIZE(da850_iis_serializer_direction),

	.num_serializer	= ARRAY_SIZE(da850_iis_serializer_direction),

	.tdm_slots	= 2,

	.tdm_slots	= 2,

	.serial_dir	= da850_iis_serializer_direction,

	.serial_dir	= da850_iis_serializer_direction,

	.asp_chan_q	= EVENTQ_1,

	.asp_chan_q	= EVENTQ_0,

	.version	= MCASP_VERSION_2,

	.version	= MCASP_VERSION_2,

	.txnumevt	= 1,

	.txnumevt	= 1,

	.rxnumevt	= 1,

	.rxnumevt	= 1,

arch/arm/mach-davinci/board-dm365-evm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ static struct mtd_partition davinci_nand_partitions[] = { 
		/* UBL (a few copies) plus U-Boot */

		/* UBL (a few copies) plus U-Boot */

		.name		= "bootloader",

		.name		= "bootloader",

		.offset		= 0,

		.offset		= 0,

		.size		= 28 * NAND_BLOCK_SIZE,

		.size		= 30 * NAND_BLOCK_SIZE,

		.mask_flags	= MTD_WRITEABLE, /* force read-only */

		.mask_flags	= MTD_WRITEABLE, /* force read-only */

	}, {

	}, {

		/* U-Boot environment */

		/* U-Boot environment */

arch/arm/mach-davinci/board-dm646x-evm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -564,7 +564,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) 
	int val;

	int val;

	u32 value;

	u32 value;





	if (!vpif_vsclkdis_reg || !cpld_client)

	if (!vpif_vidclkctl_reg || !cpld_client)

		return -ENXIO;

		return -ENXIO;





	val = i2c_smbus_read_byte(cpld_client);

	val = i2c_smbus_read_byte(cpld_client);
@@ -572,7 +572,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) 
		return val;

		return val;





	spin_lock_irqsave(&vpif_reg_lock, flags);

	spin_lock_irqsave(&vpif_reg_lock, flags);

	value = __raw_readl(vpif_vsclkdis_reg);

	value = __raw_readl(vpif_vidclkctl_reg);

	if (mux_mode) {

	if (mux_mode) {

		val &= VPIF_INPUT_TWO_CHANNEL;

		val &= VPIF_INPUT_TWO_CHANNEL;

		value |= VIDCH1CLK;

		value |= VIDCH1CLK;
@@ -580,7 +580,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) 
		val |= VPIF_INPUT_ONE_CHANNEL;

		val |= VPIF_INPUT_ONE_CHANNEL;

		value &= ~VIDCH1CLK;

		value &= ~VIDCH1CLK;

	}

	}

	__raw_writel(value, vpif_vsclkdis_reg);

	__raw_writel(value, vpif_vidclkctl_reg);

	spin_unlock_irqrestore(&vpif_reg_lock, flags);

	spin_unlock_irqrestore(&vpif_reg_lock, flags);





	err = i2c_smbus_write_byte(cpld_client, val);

	err = i2c_smbus_write_byte(cpld_client, val);

arch/arm/mach-davinci/dm646x.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -161,7 +161,6 @@ static struct clk dsp_clk = { 
	.name = "dsp",

	.name = "dsp",

	.parent = &pll1_sysclk1,

	.parent = &pll1_sysclk1,

	.lpsc = DM646X_LPSC_C64X_CPU,

	.lpsc = DM646X_LPSC_C64X_CPU,

	.flags = PSC_DSP,

	.usecount = 1,			/* REVISIT how to disable? */

	.usecount = 1,			/* REVISIT how to disable? */

};

};

arch/arm/mach-davinci/include/mach/psc.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -233,7 +233,7 @@ 
#define PTCMD		0x120

#define PTCMD		0x120

#define PTSTAT		0x128

#define PTSTAT		0x128

#define PDSTAT		0x200

#define PDSTAT		0x200

#define PDCTL1		0x304

#define PDCTL		0x300

#define MDSTAT		0x800

#define MDSTAT		0x800

#define MDCTL		0xA00

#define MDCTL		0xA00
@@ -244,7 +244,10 @@ 
#define PSC_STATE_ENABLE	3

#define PSC_STATE_ENABLE	3





#define MDSTAT_STATE_MASK	0x3f

#define MDSTAT_STATE_MASK	0x3f

#define PDSTAT_STATE_MASK	0x1f

#define MDCTL_FORCE		BIT(31)

#define MDCTL_FORCE		BIT(31)

#define PDCTL_NEXT		BIT(1)

#define PDCTL_EPCGOOD		BIT(8)





#ifndef __ASSEMBLER__

#ifndef __ASSEMBLER__