Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 21:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing uart-rx pull settings and a copy'n'paste error in a smp message

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJTTPmsAAoJEPOmecmc0R2BiGgIAIY5YgfTSzKn7Khmko/gtStC
 s3LUiCB3u9exlLLsP41IZYm+TvQ2f+qBHNmANmK3JE48xf0CDFjzRdA8l2epHQj5
 eWcBBnaFH3r9kIijK9af2wnC6EerzPKHejaQqizN7lMMLZlr9YHSZvSp+d8mOZ5A
 jMkWvFnhoht5H2+hj0EHv1S6mdzLM9sYwsegvtEv5mAvtvO7++1WFx1aauteat9a
 4jhgYE+ZPc31yER9bO+j4VQBc10tuwvmUP5LBfgpMMVP2efFzZqY1g5ElAtw5ApN
 HUoCRAsnd29tE5W8pjkFsi6kPlRh5uMmCRnzWudccGgU8MO3nmPbsFQtMj1gGM8=
 =TAVy
 -----END PGP SIGNATURE-----

Merge tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Fixing uart-rx pull settings and a copy'n'paste error in a smp message

* tag 'v3.15-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: fix copy'n'paste error in smp error messages
  ARM: rockchip: rk3188: enable pull-ups on UART RX pins

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2014-04-24 15:33:31 +02:00
commit 59209c9a34
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/rk3188.dtsi
View File

@ -149,7 +149,7 @@
uart0 {
uart0_xfer: uart0-xfer {
rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_none>,
rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
<RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>;
};
@ -164,7 +164,7 @@
uart1 {
uart1_xfer: uart1-xfer {
rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_none>,
rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>,
<RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>;
};
@ -179,7 +179,7 @@
uart2 {
uart2_xfer: uart2-xfer {
rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_none>,
rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>,
<RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>;
};
/* no rts / cts for uart2 */
@ -187,7 +187,7 @@
uart3 {
uart3_xfer: uart3-xfer {
rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_none>,
rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>,
<RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>;
};

2
arch/arm/mach-rockchip/platsmp.c
View File

@ -152,7 +152,7 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
node = of_find_compatible_node(NULL, NULL, "rockchip,rk3066-pmu");
if (!node) {
pr_err("%s: could not find sram dt node\n", __func__);
pr_err("%s: could not find pmu dt node\n", __func__);
return;
}