mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
USB patches for 3.20-rc1
Here's the big pull request for the USB driver tree for 3.20-rc1. Nothing major happening here, just lots of gadget driver updates, new device ids, and a bunch of cleanups. All of these have been in linux-next for a while with no reported issues. Signed-off-by: Greg Kroah-Hartman <[email protected]> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlTgtrcACgkQMUfUDdst+yn0tACgygJPNvu1l3ukNJCCpWuOErIj 3KsAnjiEXv90DLYJiVLJ4EbLPw0V9wAv =DrJx -----END PGP SIGNATURE----- Merge tag 'usb-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB patches from Greg KH: "Here's the big pull request for the USB driver tree for 3.20-rc1. Nothing major happening here, just lots of gadget driver updates, new device ids, and a bunch of cleanups. All of these have been in linux-next for a while with no reported issues" * tag 'usb-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (299 commits) usb: musb: fix device hotplug behind hub usb: dwc2: Fix a bug in reading the endpoint directions from reg. staging: emxx_udc: fix the build error usb: Retry port status check on resume to work around RH bugs Revert "usb: Reset USB-3 devices on USB-3 link bounce" uhci-hub: use HUB_CHAR_* usb: kconfig: replace PPC_OF with PPC ehci-pci: disable for Intel MID platforms (update) usb: gadget: Kconfig: use bool instead of boolean usb: musb: blackfin: remove incorrect __exit_p() USB: fix use-after-free bug in usb_hcd_unlink_urb() ehci-pci: disable for Intel MID platforms usb: host: pci_quirks: joing string literals USB: add flag for HCDs that can't receive wakeup requests (isp1760-hcd) USB: usbfs: allow URBs to be reaped after disconnection cdc-acm: kill unnecessary messages cdc-acm: add sanity checks usb: phy: phy-generic: Fix USB PHY gpio reset usb: dwc2: fix USB core dependencies usb: renesas_usbhs: fix NULL pointer dereference in dma_release_channel() ...
This commit is contained in:
Linus Torvalds
commit
e29876723f
184 changed files with 9309 additions and 3050 deletions
|
|
@ -26,6 +26,7 @@ Required properties (port (child) node):
|
|||
filled in "reg". It can also contain the offset of the system configuration
|
||||
registers used as glue-logic to setup the device for SATA/PCIe or USB3
|
||||
devices.
|
||||
- st,syscfg : Offset of the parent configuration register.
|
||||
- resets : phandle to the parent reset controller.
|
||||
- reset-names : Associated name must be "miphy-sw-rst".
|
||||
|
||||
|
|
@ -54,18 +55,12 @@ example:
|
|||
phy_port0: port@9b22000 {
|
||||
reg = <0x9b22000 0xff>,
|
||||
<0x9b09000 0xff>,
|
||||
<0x9b04000 0xff>,
|
||||
<0x114 0x4>, /* sysctrl MiPHY cntrl */
|
||||
<0x818 0x4>, /* sysctrl MiPHY status*/
|
||||
<0xe0 0x4>, /* sysctrl PCIe */
|
||||
<0xec 0x4>; /* sysctrl SATA */
|
||||
<0x9b04000 0xff>;
|
||||
reg-names = "sata-up",
|
||||
"pcie-up",
|
||||
"pipew",
|
||||
"miphy-ctrl-glue",
|
||||
"miphy-status-glue",
|
||||
"pcie-glue",
|
||||
"sata-glue";
|
||||
"pipew";
|
||||
|
||||
st,syscfg = <0x114 0x818 0xe0 0xec>;
|
||||
#phy-cells = <1>;
|
||||
st,osc-rdy;
|
||||
reset-names = "miphy-sw-rst";
|
||||
|
|
@ -75,18 +70,13 @@ example:
|
|||
phy_port1: port@9b2a000 {
|
||||
reg = <0x9b2a000 0xff>,
|
||||
<0x9b19000 0xff>,
|
||||
<0x9b14000 0xff>,
|
||||
<0x118 0x4>,
|
||||
<0x81c 0x4>,
|
||||
<0xe4 0x4>,
|
||||
<0xf0 0x4>;
|
||||
<0x9b14000 0xff>;
|
||||
reg-names = "sata-up",
|
||||
"pcie-up",
|
||||
"pipew",
|
||||
"miphy-ctrl-glue",
|
||||
"miphy-status-glue",
|
||||
"pcie-glue",
|
||||
"sata-glue";
|
||||
"pipew";
|
||||
|
||||
st,syscfg = <0x118 0x81c 0xe4 0xf0>;
|
||||
|
||||
#phy-cells = <1>;
|
||||
st,osc-force-ext;
|
||||
reset-names = "miphy-sw-rst";
|
||||
|
|
@ -95,13 +85,12 @@ example:
|
|||
|
||||
phy_port2: port@8f95000 {
|
||||
reg = <0x8f95000 0xff>,
|
||||
<0x8f90000 0xff>,
|
||||
<0x11c 0x4>,
|
||||
<0x820 0x4>;
|
||||
<0x8f90000 0xff>;
|
||||
reg-names = "pipew",
|
||||
"usb3-up",
|
||||
"miphy-ctrl-glue",
|
||||
"miphy-status-glue";
|
||||
"usb3-up";
|
||||
|
||||
st,syscfg = <0x11c 0x820>;
|
||||
|
||||
#phy-cells = <1>;
|
||||
reset-names = "miphy-sw-rst";
|
||||
resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
|
||||
|
|
@ -125,4 +114,4 @@ example:
|
|||
|
||||
Macro definitions for the supported miphy configuration can be found in:
|
||||
|
||||
include/dt-bindings/phy/phy-miphy28lp.h
|
||||
include/dt-bindings/phy/phy.h
|
||||
|
|
|
|||
37
Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
Normal file
37
Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
ROCKCHIP USB2 PHY
|
||||
|
||||
Required properties:
|
||||
- compatible: rockchip,rk3288-usb-phy
|
||||
- rockchip,grf : phandle to the syscon managing the "general
|
||||
register files"
|
||||
- #address-cells: should be 1
|
||||
- #size-cells: should be 0
|
||||
|
||||
Sub-nodes:
|
||||
Each PHY should be represented as a sub-node.
|
||||
|
||||
Sub-nodes
|
||||
required properties:
|
||||
- #phy-cells: should be 0
|
||||
- reg: PHY configure reg address offset in GRF
|
||||
"0x320" - for PHY attach to OTG controller
|
||||
"0x334" - for PHY attach to HOST0 controller
|
||||
"0x348" - for PHY attach to HOST1 controller
|
||||
|
||||
Optional Properties:
|
||||
- clocks : phandle + clock specifier for the phy clocks
|
||||
- clock-names: string, clock name, must be "phyclk"
|
||||
|
||||
Example:
|
||||
|
||||
usbphy: phy {
|
||||
compatible = "rockchip,rk3288-usb-phy";
|
||||
rockchip,grf = <&grf>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
usbphy0: usb-phy0 {
|
||||
#phy-cells = <0>;
|
||||
reg = <0x320>;
|
||||
};
|
||||
};
|
||||
|
|
@ -3,8 +3,8 @@ Samsung S5P/EXYNOS SoC series MIPI CSIS/DSIM DPHY
|
|||
|
||||
Required properties:
|
||||
- compatible : should be "samsung,s5pv210-mipi-video-phy";
|
||||
- reg : offset and length of the MIPI DPHY register set;
|
||||
- #phy-cells : from the generic phy bindings, must be 1;
|
||||
- syscon - phandle to the PMU system controller;
|
||||
|
||||
For "samsung,s5pv210-mipi-video-phy" compatible PHYs the second cell in
|
||||
the PHY specifier identifies the PHY and its meaning is as follows:
|
||||
|
|
|
|||
|
|
@ -51,7 +51,10 @@ usb1: gadget@fffa4000 {
|
|||
Atmel High-Speed USB device controller
|
||||
|
||||
Required properties:
|
||||
- compatible: Should be "atmel,at91sam9rl-udc"
|
||||
- compatible: Should be one of the following
|
||||
"at91sam9rl-udc"
|
||||
"at91sam9g45-udc"
|
||||
"sama5d3-udc"
|
||||
- reg: Address and length of the register set for the device
|
||||
- interrupts: Should contain usba interrupt
|
||||
- ep childnode: To specify the number of endpoints and their properties.
|
||||
|
|
|
|||
|
|
@ -20,6 +20,10 @@ Optional properties:
|
|||
Refer to phy/phy-bindings.txt for generic phy consumer properties
|
||||
- dr_mode: shall be one of "host", "peripheral" and "otg"
|
||||
Refer to usb/generic.txt
|
||||
- g-use-dma: enable dma usage in gadget driver.
|
||||
- g-rx-fifo-size: size of rx fifo size in gadget mode.
|
||||
- g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
|
||||
- g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
|
||||
|
||||
Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ Optional properties:
|
|||
function should be enabled
|
||||
- phys: phandle + phy specifier pair
|
||||
- phy-names: must be "usb"
|
||||
- dmas: Must contain a list of references to DMA specifiers.
|
||||
- dma-names : Must contain a list of DMA names, "tx" or "rx".
|
||||
|
||||
Example:
|
||||
usbhs: usb@e6590000 {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ Optional properties:
|
|||
- big-endian-regs : boolean, set this for hcds with big-endian registers
|
||||
- big-endian-desc : boolean, set this for hcds with big-endian descriptors
|
||||
- big-endian : boolean, for hcds with big-endian-regs + big-endian-desc
|
||||
- needs-reset-on-resume : boolean, set this to force EHCI reset after resume
|
||||
- clocks : a list of phandle + clock specifier pairs
|
||||
- phys : phandle + phy specifier pair
|
||||
- phy-names : "usb"
|
||||
|
|
|
|||
|
|
@ -13,10 +13,15 @@ Optional properties:
|
|||
- clock-frequency: the clock frequency (in Hz) that the PHY clock must
|
||||
be configured to.
|
||||
|
||||
- vcc-supply: phandle to the regulator that provides RESET to the PHY.
|
||||
- vcc-supply: phandle to the regulator that provides power to the PHY.
|
||||
|
||||
- reset-gpios: Should specify the GPIO for reset.
|
||||
|
||||
- vbus-detect-gpio: should specify the GPIO detecting a VBus insertion
|
||||
(see Documentation/devicetree/bindings/gpio/gpio.txt)
|
||||
- vbus-regulator : should specifiy the regulator supplying current drawn from
|
||||
the VBus line (see Documentation/devicetree/bindings/regulator/regulator.txt).
|
||||
|
||||
Example:
|
||||
|
||||
hsusb1_phy {
|
||||
|
|
@ -26,8 +31,11 @@ Example:
|
|||
clock-names = "main_clk";
|
||||
vcc-supply = <&hsusb1_vcc_regulator>;
|
||||
reset-gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
|
||||
vbus-detect-gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>;
|
||||
vbus-regulator = <&vbus_regulator>;
|
||||
};
|
||||
|
||||
hsusb1_phy is a NOP USB PHY device that gets its clock from an oscillator
|
||||
and expects that clock to be configured to 19.2MHz by the NOP PHY driver.
|
||||
hsusb1_vcc_regulator provides power to the PHY and GPIO 7 controls RESET.
|
||||
GPIO 13 detects VBus insertion, and accordingly notifies the vbus-regulator.
|
||||
|
|
|
|||
Loading…
Reference in a new issue