History

Merge tag 'phy-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into usb-next

Kishon writes: phy: for 5.8 *) Add new PHY driver to support Cadence SALVO PHY which supports USB3 & USB2 *) Add new PHY driver to support Intel ComboPhy which supports PCIe, SATA and EMAC *) Add new PHY driver for Qualcomm IPQ40xx USB PHY *) Add new PHY driver for Synopsys FemtoPHY V2 driver used in Qualcomm SOCs *) Add support for Qualcomm SM8250 UFS PHY and SM8150 QMP USB3 PHY in qcom-qmp-phy driver *) Add support for Amlogic USB2 PHY on Meson8m2 in phy-meson8b-usb2 driver *) Add DisplayPort mode support in Wiz (TI Cadence PHY wrapper), to enable eDP in TI's J721E SoC *) Add support for super speed USB PHY in TI's AM654 SoC *) Add fix in Broadcom Stingray USB PHY to get USB PHY PLL lock reliably *) Add fix in Samsung phy-s5pv210-usb2 to get USB working on s5pv210 *) Add fix in Amlogic phy-meson8b-usb2 to get host only mode working on Meson8 *) Add fix in Cadence phy-cadence-sierra to get USB3 device disconnect issue *) Convert meson8b-usb2-phy, qcom-qmp-phy, rcar-gen3-phy-usb2 and rcar-gen3-phy-usb3 device tree binding to YAML schema *) Minor fixes and cleanups in phy-cpcap-usb, j721e-wiz, omap-usb2, phy-bcm-sr-usb, phy-brcm-usb PHY driver Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> * tag 'phy-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (43 commits) phy: intel: Add driver support for ComboPhy dt-bindings: phy: Add YAML schemas for Intel ComboPhy dt-bindings: phy: Add PHY_TYPE_XPCS definition phy: qcom-qmp: Add QMP V3 USB3 PHY support for SC7180 dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SC7180 dt-bindings: phy: qcom,qmp-usb3-dp: Add dt bindings for USB3 DP PHY dt-bindings: phy: qcom,qmp: Convert QMP PHY bindings to yaml phy: cadence: sierra: Fix for USB3 U1/U2 state phy: ti: am654: add support for USB super-speed phy: ti: am654: show up in regmap debugfs drivers: phy: sr-usb: do not use internal fsm for USB2 phy init dt-bindings: phy: renesas: usb3-phy: add r8a77961 support dt-bindings: phy: renesas: usb3-phy: convert bindings to json-schema dt-bindings: phy: renesas: usb2-phy: add r8a77961 support dt-bindings: phy: renesas: usb2-phy: convert bindings to json-schema phy: qcom-qmp: Ensure register indirection arrays initialized phy: omap-usb2: Clean up exported header phy: phy-bcm-ns2-usbdrd: Constify phy_ops phy: phy-brcm-usb: Constify static structs phy: sr-usb: Constify phy_ops ...

Greg Kroah-Hartman committed 6 years ago

Commit 14f3a5c2 parents e9ccc35 ac0a95a38 files · +3228 −644Browse files

Showing the changes to include/linux (1 of 38 files). Show all

Unified · Split

include/linux/phy/omap_usb.h+2−67
@@ -2,68 +2,14 @@ · 1 unmodified line
2/*2/*
3 * omap_usb.h -- omap usb2 phy header file3 * omap_usb.h -- omap usb2 phy header file
4 *4 *
5 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com5 * Copyright (C) 2012-2020 Texas Instruments Incorporated - http://www.ti.com
6 * Author: Kishon Vijay Abraham I <kishon@ti.com>6 * Author: Kishon Vijay Abraham I <kishon@ti.com>
7 */7 */
8 8
9#ifndef __DRIVERS_OMAP_USB2_H9#ifndef __DRIVERS_OMAP_USB2_H
10#define __DRIVERS_OMAP_USB2_H10#define __DRIVERS_OMAP_USB2_H
11 11
12#include <linux/io.h>12#include <linux/usb/phy_companion.h>
13#include <linux/usb/otg.h>
14
15struct usb_dpll_params {
16 u16 m;
17 u8 n;
18 u8 freq:3;
19 u8 sd;
20 u32 mf;
21};
22
23enum omap_usb_phy_type {
24 TYPE_USB2, /* USB2_PHY, power down in CONTROL_DEV_CONF */
25 TYPE_DRA7USB2, /* USB2 PHY, power and power_aux e.g. DRA7 */
26 TYPE_AM437USB2, /* USB2 PHY, power e.g. AM437x */
27};
28
29struct omap_usb {
30 struct usb_phy phy;
31 struct phy_companion *comparator;
32 void __iomem *pll_ctrl_base;
33 void __iomem *phy_base;
34 struct device *dev;
35 struct device *control_dev;
36 struct clk *wkupclk;
37 struct clk *optclk;
38 u8 flags;
39 enum omap_usb_phy_type type;
40 struct regmap *syscon_phy_power; /* ctrl. reg. acces */
41 unsigned int power_reg; /* power reg. index within syscon */
42 u32 mask;
43 u32 power_on;
44 u32 power_off;
45};
46
47struct usb_phy_data {
48 const char *label;
49 u8 flags;
50 u32 mask;
51 u32 power_on;
52 u32 power_off;
53};
54
55/* Driver Flags */
56#define OMAP_USB2_HAS_START_SRP (1 << 0)
57#define OMAP_USB2_HAS_SET_VBUS (1 << 1)
58#define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT (1 << 2)
59
60#define OMAP_DEV_PHY_PD BIT(0)
61#define OMAP_USB2_PHY_PD BIT(28)
62
63#define AM437X_USB2_PHY_PD BIT(0)
64#define AM437X_USB2_OTG_PD BIT(1)
65#define AM437X_USB2_OTGVDET_EN BIT(19)
66#define AM437X_USB2_OTGSESSEND_EN BIT(20)
67 13
68#define phy_to_omapusb(x) container_of((x), struct omap_usb, phy)14#define phy_to_omapusb(x) container_of((x), struct omap_usb, phy)
69 15
@@ -76,15 +22,4 @@ static inline int omap_usb2_set_comparator(struct phy_companion *comparator) · 6 unmodified lines
76}22}
77#endif23#endif
78 24
79static inline u32 omap_usb_readl(void __iomem *addr, unsigned offset)
80{
81 return __raw_readl(addr + offset);
82}
83
84static inline void omap_usb_writel(void __iomem *addr, unsigned offset,
85 u32 data)
86{
87 __raw_writel(data, addr + offset);
88}
89
90#endif /* __DRIVERS_OMAP_USB_H */25#endif /* __DRIVERS_OMAP_USB_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t