Commit 6d7ed21d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'defcfg' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6647/1: add Versatile Express defconfig
  ARM: 6644/1: mach-ux500: update the U8500 defconfig

* 'drivers' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6764/1: pl011: factor out FIFO to TTY code
  ARM: 6763/1: pl011: add optional RX DMA to PL011 v2
  ARM: 6758/1: amba: support pm ops
  ARM: amba: make amba_driver id_table const
  ARM: amba: make internal ID table handling const
  ARM: amba: make probe() functions take const id tables
  ARM: 6662/1: amba: make amba_bustype non-static
  ARM: mmci: add dmaengine-based DMA support
  ARM: mmci: no need for separate host->data_xfered
  ARM: mmci: avoid unnecessary switch to data available PIO interrupts
  ARM: mmci: no need to call flush_dcache_page() with sg_miter API
  ARM: mmci: avoid reporting too many completed bytes on fifo overrun
  ALSA: AACI: make fifo variables more explanitory
  ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period
  ALSA: AACI: use snd_pcm_lib_period_bytes()
  ALSA: AACI: clean up AACI announcement printk
  ALSA: AACI: fix channel mask selection
  ALSA: AACI: fix number of channels for record
  ALSA: AACI: fix multiple IRQ claiming

* 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm:
  VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()
  VIDEO: cyberpro: remove useless function extreg pointers
  VIDEO: cyberpro: update handling of device structures
  VIDEO: cyberpro: add support for video capture I2C
  VIDEO: cyberpro: make 'reg_b0_lock' always present
  VIDEO: cyberpro: add I2C support
  VIDEO: cyberpro: select lowest multipler/divisor for PLL
parents ec0afc93 bafc8205 9c9585e0 bfddc1c3

arch/arm/configs/u8500_defconfig

+51 −8
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y
@@ -13,43 +12,89 @@ CONFIG_UX500_SOC_DB5500=y 
CONFIG_UX500_SOC_DB8500=y

CONFIG_MACH_U8500=y

CONFIG_MACH_U5500=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HOTPLUG_CPU=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_NET=y

CONFIG_PHONET=y

CONFIG_PHONET_PIPECTRLR=y

# CONFIG_WIRELESS is not set

CONFIG_CAIF=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

# CONFIG_MISC_DEVICES is not set

CONFIG_MISC_DEVICES=y

CONFIG_AB8500_PWM=y

CONFIG_SENSORS_BH1780=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_NOMADIK=y

CONFIG_KEYBOARD_STMPE=y

CONFIG_KEYBOARD_TC3589X=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_BU21013=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_AB8500_PONKEY=y

# CONFIG_SERIO is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_I2C=y

CONFIG_I2C_NOMADIK=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_STMPE=y

CONFIG_GPIO_TC3589X=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_MFD_STMPE=y

CONFIG_MFD_TC3589X=y

CONFIG_AB8500_CORE=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_AB8500=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_ARMMMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_LP5521=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AB8500=y

CONFIG_RTC_DRV_PL031=y

CONFIG_DMADEVICES=y

CONFIG_STE_DMA40=y

CONFIG_STAGING=y

# CONFIG_STAGING_EXCLUDE_BUILD is not set

CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_INOTIFY=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CONFIGFS_FS=m

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set
@@ -58,5 +103,3 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y
 
CONFIG_CRC_T10DIF=m

# CONFIG_CRC32 is not set

arch/arm/configs/vexpress_defconfig

0 → 100644
+140 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_CPUSETS=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_VEXPRESS=y

CONFIG_ARCH_VEXPRESS_CA9X4=y

# CONFIG_SWP_EMULATE is not set

CONFIG_SMP=y

CONFIG_VMSPLIT_2G=y

CONFIG_HOTPLUG_CPU=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_ARM_INTEGRATOR=y

CONFIG_MISC_DEVICES=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_ATA=y

# CONFIG_SATA_PMP is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_AMBAKMI=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_LEGACY_PTY_COUNT=16

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

# CONFIG_SND_DRIVERS is not set

CONFIG_SND_ARMAACI=y

CONFIG_HID_DRAGONRISE=y

CONFIG_HID_GYRATION=y

CONFIG_HID_TWINHAN=y

CONFIG_HID_NTRIG=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

CONFIG_HID_SMARTJOYPLUS=y

CONFIG_HID_TOPSEED=y

CONFIG_HID_THRUSTMASTER=y

CONFIG_HID_ZEROPLUS=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_MON=y

CONFIG_USB_ISP1760_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_ARMMMCI=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PL031=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

arch/arm/kernel/etm.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static struct miscdevice etb_miscdev = { 
	.fops = &etb_fops,

};



static int __init etb_probe(struct amba_device *dev, struct amba_id *id)

static int __init etb_probe(struct amba_device *dev, const struct amba_id *id)

{

	struct tracectx *t = &tracer;

	int ret = 0;
@@ -530,7 +530,7 @@ static ssize_t trace_mode_store(struct kobject *kobj, 
static struct kobj_attribute trace_mode_attr =

	__ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store);



static int __init etm_probe(struct amba_device *dev, struct amba_id *id)

static int __init etm_probe(struct amba_device *dev, const struct amba_id *id)

{

	struct tracectx *t = &tracer;

	int ret = 0;

drivers/amba/bus.c

+321 −27
Original line number Diff line number Diff line
@@ -13,16 +13,17 @@ 
#include <linux/string.h>

#include <linux/slab.h>

#include <linux/io.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/amba/bus.h>



#include <asm/irq.h>

#include <asm/sizes.h>



#define to_amba_device(d)	container_of(d, struct amba_device, dev)

#define to_amba_driver(d)	container_of(d, struct amba_driver, drv)



static struct amba_id *

amba_lookup(struct amba_id *table, struct amba_device *dev)

static const struct amba_id *

amba_lookup(const struct amba_id *table, struct amba_device *dev)

{

	int ret = 0;
@@ -57,26 +58,6 @@ static int amba_uevent(struct device *dev, struct kobj_uevent_env *env) 
#define amba_uevent NULL

#endif



static int amba_suspend(struct device *dev, pm_message_t state)

{

	struct amba_driver *drv = to_amba_driver(dev->driver);

	int ret = 0;



	if (dev->driver && drv->suspend)

		ret = drv->suspend(to_amba_device(dev), state);

	return ret;

}



static int amba_resume(struct device *dev)

{

	struct amba_driver *drv = to_amba_driver(dev->driver);

	int ret = 0;



	if (dev->driver && drv->resume)

		ret = drv->resume(to_amba_device(dev));

	return ret;

}



#define amba_attr_func(name,fmt,arg...)					\

static ssize_t name##_show(struct device *_dev,				\

			   struct device_attribute *attr, char *buf)	\
@@ -102,17 +83,330 @@ static struct device_attribute amba_dev_attrs[] = { 
	__ATTR_NULL,

};



#ifdef CONFIG_PM_SLEEP



static int amba_legacy_suspend(struct device *dev, pm_message_t mesg)

{

	struct amba_driver *adrv = to_amba_driver(dev->driver);

	struct amba_device *adev = to_amba_device(dev);

	int ret = 0;



	if (dev->driver && adrv->suspend)

		ret = adrv->suspend(adev, mesg);



	return ret;

}



static int amba_legacy_resume(struct device *dev)

{

	struct amba_driver *adrv = to_amba_driver(dev->driver);

	struct amba_device *adev = to_amba_device(dev);

	int ret = 0;



	if (dev->driver && adrv->resume)

		ret = adrv->resume(adev);



	return ret;

}



static int amba_pm_prepare(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (drv && drv->pm && drv->pm->prepare)

		ret = drv->pm->prepare(dev);



	return ret;

}



static void amba_pm_complete(struct device *dev)

{

	struct device_driver *drv = dev->driver;



	if (drv && drv->pm && drv->pm->complete)

		drv->pm->complete(dev);

}



#else /* !CONFIG_PM_SLEEP */



#define amba_pm_prepare		NULL

#define amba_pm_complete		NULL



#endif /* !CONFIG_PM_SLEEP */



#ifdef CONFIG_SUSPEND



static int amba_pm_suspend(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->suspend)

			ret = drv->pm->suspend(dev);

	} else {

		ret = amba_legacy_suspend(dev, PMSG_SUSPEND);

	}



	return ret;

}



static int amba_pm_suspend_noirq(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->suspend_noirq)

			ret = drv->pm->suspend_noirq(dev);

	}



	return ret;

}



static int amba_pm_resume(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->resume)

			ret = drv->pm->resume(dev);

	} else {

		ret = amba_legacy_resume(dev);

	}



	return ret;

}



static int amba_pm_resume_noirq(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->resume_noirq)

			ret = drv->pm->resume_noirq(dev);

	}



	return ret;

}



#else /* !CONFIG_SUSPEND */



#define amba_pm_suspend		NULL

#define amba_pm_resume		NULL

#define amba_pm_suspend_noirq	NULL

#define amba_pm_resume_noirq	NULL



#endif /* !CONFIG_SUSPEND */



#ifdef CONFIG_HIBERNATION



static int amba_pm_freeze(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->freeze)

			ret = drv->pm->freeze(dev);

	} else {

		ret = amba_legacy_suspend(dev, PMSG_FREEZE);

	}



	return ret;

}



static int amba_pm_freeze_noirq(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->freeze_noirq)

			ret = drv->pm->freeze_noirq(dev);

	}



	return ret;

}



static int amba_pm_thaw(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->thaw)

			ret = drv->pm->thaw(dev);

	} else {

		ret = amba_legacy_resume(dev);

	}



	return ret;

}



static int amba_pm_thaw_noirq(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->thaw_noirq)

			ret = drv->pm->thaw_noirq(dev);

	}



	return ret;

}



static int amba_pm_poweroff(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->poweroff)

			ret = drv->pm->poweroff(dev);

	} else {

		ret = amba_legacy_suspend(dev, PMSG_HIBERNATE);

	}



	return ret;

}



static int amba_pm_poweroff_noirq(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->poweroff_noirq)

			ret = drv->pm->poweroff_noirq(dev);

	}



	return ret;

}



static int amba_pm_restore(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->restore)

			ret = drv->pm->restore(dev);

	} else {

		ret = amba_legacy_resume(dev);

	}



	return ret;

}



static int amba_pm_restore_noirq(struct device *dev)

{

	struct device_driver *drv = dev->driver;

	int ret = 0;



	if (!drv)

		return 0;



	if (drv->pm) {

		if (drv->pm->restore_noirq)

			ret = drv->pm->restore_noirq(dev);

	}



	return ret;

}



#else /* !CONFIG_HIBERNATION */



#define amba_pm_freeze		NULL

#define amba_pm_thaw		NULL

#define amba_pm_poweroff		NULL

#define amba_pm_restore		NULL

#define amba_pm_freeze_noirq	NULL

#define amba_pm_thaw_noirq		NULL

#define amba_pm_poweroff_noirq	NULL

#define amba_pm_restore_noirq	NULL



#endif /* !CONFIG_HIBERNATION */



#ifdef CONFIG_PM



static const struct dev_pm_ops amba_pm = {

	.prepare	= amba_pm_prepare,

	.complete	= amba_pm_complete,

	.suspend	= amba_pm_suspend,

	.resume		= amba_pm_resume,

	.freeze		= amba_pm_freeze,

	.thaw		= amba_pm_thaw,

	.poweroff	= amba_pm_poweroff,

	.restore	= amba_pm_restore,

	.suspend_noirq	= amba_pm_suspend_noirq,

	.resume_noirq	= amba_pm_resume_noirq,

	.freeze_noirq	= amba_pm_freeze_noirq,

	.thaw_noirq	= amba_pm_thaw_noirq,

	.poweroff_noirq	= amba_pm_poweroff_noirq,

	.restore_noirq	= amba_pm_restore_noirq,

	SET_RUNTIME_PM_OPS(

		pm_generic_runtime_suspend,

		pm_generic_runtime_resume,

		pm_generic_runtime_idle

	)

};



#define AMBA_PM (&amba_pm)



#else /* !CONFIG_PM */



#define AMBA_PM	NULL



#endif /* !CONFIG_PM */



/*

 * Primecells are part of the Advanced Microcontroller Bus Architecture,

 * so we call the bus "amba".

 */

static struct bus_type amba_bustype = {

struct bus_type amba_bustype = {

	.name		= "amba",

	.dev_attrs	= amba_dev_attrs,

	.match		= amba_match,

	.uevent		= amba_uevent,

	.suspend	= amba_suspend,

	.resume		= amba_resume,

	.pm		= AMBA_PM,

};



static int __init amba_init(void)
@@ -188,7 +482,7 @@ static int amba_probe(struct device *dev) 
{

	struct amba_device *pcdev = to_amba_device(dev);

	struct amba_driver *pcdrv = to_amba_driver(dev->driver);

	struct amba_id *id = amba_lookup(pcdrv->id_table, pcdev);

	const struct amba_id *id = amba_lookup(pcdrv->id_table, pcdev);

	int ret;



	do {

drivers/char/hw_random/nomadik-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static struct hwrng nmk_rng = { 
	.read		= nmk_rng_read,

};



static int nmk_rng_probe(struct amba_device *dev, struct amba_id *id)

static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)

{

	void __iomem *base;

	int ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE