diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-11-23 19:41:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 19:41:24 +0100 |
| commit | fee8b58d42c5b155d91929a2148033eac0b26018 (patch) | |
| tree | 90c6e6efe69a480f1ed9cb7ded42548fab0ef4c2 /package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch | |
| parent | 10ccba1ba8759e1f1bbfb5471e9fe6b197979139 (diff) | |
| parent | 9e2f8fa1e5df297c172ce1472eb076c3c0b27cad (diff) | |
| download | master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.tar.gz master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.tar.bz2 master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.zip | |
Merge pull request #241 from wigyori/sunxi-uboot-fixes
uboot-sunxi: fix default config for OLIMEX A13 SOM
Diffstat (limited to 'package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch')
| -rw-r--r-- | package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch b/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch index 2d49194781..95a77c68d6 100644 --- a/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch +++ b/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch @@ -16,8 +16,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> drivers/usb/host/ohci-sunxi.c | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) -diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c -index cf3dcc4..677a5d3 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -17,6 +17,14 @@ @@ -35,7 +33,7 @@ index cf3dcc4..677a5d3 100644 struct ehci_sunxi_priv { struct ehci_ctrl ehci; int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ -@@ -39,8 +47,9 @@ static int ehci_usb_probe(struct udevice *dev) +@@ -39,8 +47,9 @@ static int ehci_usb_probe(struct udevice #ifdef CONFIG_MACH_SUN8I_H3 priv->ahb_gate_mask |= 1 << AHB_GATE_OFFSET_USB_OHCI0; #endif @@ -47,8 +45,6 @@ index cf3dcc4..677a5d3 100644 setbits_le32(&ccm->ahb_gate0, priv->ahb_gate_mask); #ifdef CONFIG_SUNXI_GEN_SUN6I -diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c -index 1b1f651..d4fb95a 100644 --- a/drivers/usb/host/ohci-sunxi.c +++ b/drivers/usb/host/ohci-sunxi.c @@ -17,6 +17,14 @@ @@ -66,7 +62,7 @@ index 1b1f651..d4fb95a 100644 struct ohci_sunxi_priv { ohci_t ohci; int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ -@@ -42,9 +50,10 @@ static int ohci_usb_probe(struct udevice *dev) +@@ -42,9 +50,10 @@ static int ohci_usb_probe(struct udevice priv->ahb_gate_mask |= 1 << AHB_GATE_OFFSET_USB_EHCI0; #endif priv->usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK; |