diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-25 21:20:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-25 21:20:36 +0200 |
| commit | c64064ce9376a404e0888ca4a2985c8a4c16cec3 (patch) | |
| tree | f34d3b84ca970fdb381dad9a195c1367ce5d10f4 /arch/xtensa/boot/boot-redboot/bootstrap.S | |
| parent | ALSA: als3000: check for the kzalloc return value (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/ux500' and 'asoc/fix/wm8994' into fo... (diff) | |
| download | linux-c64064ce9376a404e0888ca4a2985c8a4c16cec3.tar.xz linux-c64064ce9376a404e0888ca4a2985c8a4c16cec3.zip | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A couple of driver fixes, one that improves the interoperability of
WM8994 with controllers that are sensitive to extra BCLK cycles and some
build break fixes for ux500.
Diffstat (limited to 'arch/xtensa/boot/boot-redboot/bootstrap.S')
| -rw-r--r-- | arch/xtensa/boot/boot-redboot/bootstrap.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/boot/boot-redboot/bootstrap.S b/arch/xtensa/boot/boot-redboot/bootstrap.S index 4c316cd28a54..86c34dbc9cd0 100644 --- a/arch/xtensa/boot/boot-redboot/bootstrap.S +++ b/arch/xtensa/boot/boot-redboot/bootstrap.S @@ -51,17 +51,17 @@ _start: /* 'reset' window registers */ movi a4, 1 - wsr a4, PS + wsr a4, ps rsync - rsr a5, WINDOWBASE + rsr a5, windowbase ssl a5 sll a4, a4 - wsr a4, WINDOWSTART + wsr a4, windowstart rsync movi a4, 0x00040000 - wsr a4, PS + wsr a4, ps rsync /* copy the loader to its address |