diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-11-04 10:05:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-11-04 10:05:07 +0100 |
commit | ebfe1068f9ca4d0f25beca7a65d652380c40f226 (patch) | |
tree | 109cfece95e42345d915c4c13e3bb1697ff02f65 /drivers/net/ethernet/renesas/sh_eth.c | |
parent | 023838542dc8a4eac9650f98942671078a4ce73d (diff) | |
parent | 71d0c3a876e007f68fc2ed433119dd4f4dc408a7 (diff) | |
download | linux-ebfe1068f9ca4d0f25beca7a65d652380c40f226.tar.bz2 |
Merge tag 'asoc-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.13
A few final updates for v3.13, all driver updates apart from some DPCM
and Coverity fixes which should have minor impact on practical systems.
Diffstat (limited to 'drivers/net/ethernet/renesas/sh_eth.c')
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 5cd831ebfa83..b57c278d3b46 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -688,12 +688,16 @@ static struct sh_eth_cpu_data r8a7740_data = { .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | EESR_RFE | EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, + .fdr_value = 0x0000070f, + .rmcr_value = 0x00000001, .apr = 1, .mpr = 1, .tpauser = 1, .bculr = 1, .hw_swap = 1, + .rpadir = 1, + .rpadir_value = 2 << 16, .no_trimd = 1, .no_ade = 1, .tsu = 1, |