Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 48936
b: refs/heads/master
c: 0dcfc32
h: refs/heads/master
v: v3
  • Loading branch information
Arnaud Patard authored and Russell King committed Feb 14, 2007
1 parent e590c6a commit 47764f7
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b05f87172f904b28bd5ac058ebfb4e216b843efe
refs/heads/master: 0dcfc328ccd1d475f10a33c0ccf10bda869d4a83
15 changes: 15 additions & 0 deletions trunk/arch/arm/plat-s3c24xx/devs.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <asm/irq.h>

#include <asm/arch/regs-serial.h>
#include <asm/arch/udc.h>

#include <asm/plat-s3c24xx/devs.h>
#include <asm/plat-s3c24xx/cpu.h>
Expand Down Expand Up @@ -230,6 +231,20 @@ struct platform_device s3c_device_usbgadget = {

EXPORT_SYMBOL(s3c_device_usbgadget);

void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *pd)
{
struct s3c2410_udc_mach_info *npd;

npd = kmalloc(sizeof(*npd), GFP_KERNEL);
if (npd) {
memcpy(npd, pd, sizeof(*npd));
s3c_device_usbgadget.dev.platform_data = npd;
} else {
printk(KERN_ERR "no memory for udc platform data\n");
}
}


/* Watchdog */

static struct resource s3c_wdt_resource[] = {
Expand Down
34 changes: 34 additions & 0 deletions trunk/include/asm-arm/arch-s3c2410/udc.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/* linux/include/asm/arch-s3c2410/udc.h
*
* Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
*
*
* 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
* published by the Free Software Foundation.
*
*
* Changelog:
* 14-Mar-2005 RTP Created file
* 02-Aug-2005 RTP File rename
* 07-Sep-2005 BJD Minor cleanups, changed cmd to enum
*/

#ifndef __ASM_ARM_ARCH_UDC_H
#define __ASM_ARM_ARCH_UDC_H

enum s3c2410_udc_cmd_e {
S3C2410_UDC_P_ENABLE = 1, /* Pull-up enable */
S3C2410_UDC_P_DISABLE = 2, /* Pull-up disable */
S3C2410_UDC_P_RESET = 3, /* UDC reset, in case of */
};

struct s3c2410_udc_mach_info {
void (*udc_command)(enum s3c2410_udc_cmd_e);
unsigned int vbus_pin;
unsigned char vbus_pin_inverted;
};

extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);

#endif /* __ASM_ARM_ARCH_UDC_H */

0 comments on commit 47764f7

Please sign in to comment.