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

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5255/1: Update jornada ssp to remove build errors/warnings
  [ARM] omap: back out 'internal_clock' support
  [ARM] 5249/1: davinci: remove redundant check in davinci_psc_config()
parents 1cce92ae 58005b32

arch/arm/mach-davinci/psc.c

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ void davinci_psc_config(unsigned int domain, unsigned int id, char enable) 
{

	u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask;



	if (id < 0)

		return;



	mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id);

	if (enable)

		mdctl |= 0x00000003;	/* Enable Module */

arch/arm/mach-sa1100/include/mach/jornada720.h

+8 −3
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-sa1100/include/mach/jornada720.h

 *

 * This file contains SSP/MCU communication definitions for HP Jornada 710/720/728

 * SSP/MCU communication definitions for HP Jornada 710/720/728

 *

 * Copyright (C) 2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>

 *  Copyright (C) 2000 John Ankcorn <jca@lcs.mit.edu>

 * Copyright 2007,2008 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>

 *  Copyright 2000 John Ankcorn <jca@lcs.mit.edu>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -25,3 +25,8 @@ 
#define PWMOFF			0xDF

#define TXDUMMY			0x11

#define ERRORCODE		0x00



extern void jornada_ssp_start(void);

extern void jornada_ssp_end(void);

extern int jornada_ssp_inout(u8 byte);

extern int jornada_ssp_byte(u8 byte);

arch/arm/mach-sa1100/jornada720_ssp.c

+5 −5
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#include <linux/slab.h>



#include <mach/hardware.h>

#include <asm/hardware/ssp.h>

#include <mach/jornada720.h>

#include <asm/hardware/ssp.h>



static DEFINE_SPINLOCK(jornada_ssp_lock);

static unsigned long jornada_ssp_flags;
@@ -109,12 +109,12 @@ EXPORT_SYMBOL(jornada_ssp_inout); 
 * jornada_ssp_start - enable mcu

 *

 */

int jornada_ssp_start()

void jornada_ssp_start(void)

{

	spin_lock_irqsave(&jornada_ssp_lock, jornada_ssp_flags);

	GPCR = GPIO_GPIO25;

	udelay(50);

	return 0;

	return;

};

EXPORT_SYMBOL(jornada_ssp_start);
@@ -122,11 +122,11 @@ EXPORT_SYMBOL(jornada_ssp_start); 
 * jornada_ssp_end - disable mcu and turn off lock

 *

 */

int jornada_ssp_end()

void jornada_ssp_end(void)

{

	GPSR = GPIO_GPIO25;

	spin_unlock_irqrestore(&jornada_ssp_lock, jornada_ssp_flags);

	return 0;

	return;

};

EXPORT_SYMBOL(jornada_ssp_end);

arch/arm/plat-omap/devices.c

+0 −13
Original line number Diff line number Diff line
@@ -316,19 +316,6 @@ static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf) 
				omap_cfg_reg(MMC_DAT3);

			}

		}

#if defined(CONFIG_ARCH_OMAP2420)

		if (mmc_conf->mmc[0].internal_clock) {

			/*

			 * Use internal loop-back in MMC/SDIO

			 * Module Input Clock selection

			 */

			if (cpu_is_omap24xx()) {

				u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

				v |= (1 << 24); /* not used in 243x */

				omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);

			}

		}

#endif

	}



#ifdef	CONFIG_ARCH_OMAP16XX