diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-10-31 20:19:27 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-11-02 02:11:19 +0100 |
| commit | 7a5897268008a85c3843ae522b2b274911a9eec0 (patch) | |
| tree | 63fb9c4aecb720286599da6dbfe4816b6b319932 /package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch | |
| parent | 12d15fa8a5096913927d75958d0ed3af9d963e73 (diff) | |
| download | upstream-7a5897268008a85c3843ae522b2b274911a9eec0.tar.gz upstream-7a5897268008a85c3843ae522b2b274911a9eec0.tar.bz2 upstream-7a5897268008a85c3843ae522b2b274911a9eec0.zip | |
uboot-sunxi: fix default config for OLIMEX A13 SOM (FS#239)
The current uboot default config for the A13 SOM erroneously enables support
for the AXP209 power regulator IC which is not present on the board.
This superfluous support module sets an incorrect initial clock frequency and
confuses the kernel, ultimately leading to a boot failure later on.
Properly disable the PMIC support and enable the EHCI support by translating
the deprecated SYS_EXTRA_OPTIONS values into proper SUNXI_NO_PMIC and
USB_EHCI_HCD symbols respectively.
Also rename 002-add-olimex-a13-som.diff to 002-add-olimex-a13-som.patch and
refresh the remaining patches of the series while we're at it.
Reported-by: Mario Fischer <mario-fischer@web.de>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
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; |