TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'renesas-phy-rcar-usb-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Browse Source 
From Simon Horman:
Renesas USB updates for v3.11

These updates are by Sergei Shtylyov to clean-up USB support
present for R8A7779/Marzen and then extend USB support coverage to
R8A7778/BOCK-W.

* tag 'renesas-phy-rcar-usb-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: BOCK-W: add USB support
  ARM: shmobile: r8a7778: add USB support
  phy-rcar-usb: add R8A7778 support
  phy-rcar-usb: handle platform data
  ARM: shmobile: Marzen: pass platform data to USB PHY device
  phy-rcar-usb: add platform data
  phy-rcar-usb: correct base address
  ARM: shmobile: r8a7779: remove USB PHY 2nd memory resource
  phy-rcar-usb: remove EHCI internal buffer setup
  ARM: shmobile: r8a7779: setup EHCI internal buffer
  ehci-platform: add pre_setup() method to platform data
  ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code

Conflicts:
	arch/arm/mach-shmobile/board-marzen.c
	arch/arm/mach-shmobile/setup-r8a7778.c

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2013-06-14 17:36:30 -07:00
parent 5ae13ef4e1 1a87b01d3b
commit a114926964
13 changed files with 448 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/platform_data/usb-rcar-phy.h
+28
View File
@@ -0,0 +1,28 @@
/*
* Copyright (C) 2013 Renesas Solutions Corp.
* Copyright (C) 2013 Cogent Embedded, Inc.
*
* 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.
*/
#ifndef __USB_RCAR_PHY_H
#define __USB_RCAR_PHY_H
#include <linux/types.h>
struct rcar_phy_platform_data {
bool ferrite_bead:1; /* (R8A7778 only) */
bool port1_func:1; /* true: port 1 used by function, false: host */
unsigned penc1:1; /* Output of the PENC1 pin in function mode */
struct { /* Overcurrent pin control for ports 0..2 */
bool select_3_3v:1; /* true: USB_OVCn pin, false: OVCn pin */
/* Set to false on port 1 in function mode */
bool active_high:1; /* true: active high, false: active low */
/* Set to true on port 1 in function mode */
} ovc_pin[3]; /* (R8A7778 only has 2 ports) */
};
#endif /* __USB_RCAR_PHY_H */