Fix am33xx cpsw ethernet (Beagle Bone)

This commit is contained in:
Peter Robinson 2013-12-11 22:09:20 +00:00
parent f623d15c9c
commit e364528a6b
2 changed files with 28 additions and 0 deletions

23
arm-am33xx-cpsw.patch Normal file
View File

@ -0,0 +1,23 @@
Bugzilla: 1012025
Upstream-status: An initial work around for the cpsw driver issue trying to access HW registers
with clock disabled. Upstream is working on a proper fix with the hope to land it in 3.13.
--- linux-3.12.4-1.fc20.x86_64/drivers/net/ethernet/ti/cpsw.c.orig 2013-12-11 20:52:41.576478796 +0000
+++ linux-3.12.4-1.fc20.x86_64/drivers/net/ethernet/ti/cpsw.c 2013-12-11 20:55:14.418692261 +0000
@@ -2001,6 +2001,8 @@
goto clean_cpsw_iores_ret;
}
priv->regs = ss_regs;
+
+ pm_runtime_get_sync(&pdev->dev);
priv->version = __raw_readl(&priv->regs->id_ver);
priv->host_port = HOST_PORT_NUM;
@@ -2161,6 +2163,7 @@
goto clean_irq_ret;
}
}
+ pm_runtime_put_sync(&pdev->dev);
return 0;

View File

@ -694,6 +694,7 @@ Patch21025: arm-imx6-utilite.patch
# scheduled for 3.13. The others should be landing via other trees
Patch21030: arm-am33xx-arm-soc-upstream.patch
Patch21031: arm-am33xx-bblack.patch
Patch21032: arm-am33xx-cpsw.patch
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@ -1294,6 +1295,7 @@ ApplyPatch arm-imx6-utilite.patch
ApplyPatch arm-am33xx-arm-soc-upstream.patch
ApplyPatch arm-am33xx-bblack.patch
ApplyPatch arm-am33xx-cpsw.patch
#
# bugfixes to drivers and filesystems
@ -2241,6 +2243,9 @@ fi
# ||----w |
# || ||
%changelog
* Wed Dec 11 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Fix am33xx cpsw ethernet (Beagle Bone)
* Wed Dec 11 2013 Josh Boyer <jwboyer@fedoraproject.org>
- Add patches to support ETPS/2 Elantech touchpads (rhbz 1030802)