Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59209c9a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v3.15-rockchip-fixes1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 9dbb7e24 5c4348c1

arch/arm/boot/dts/rk3188.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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>;

				};

arch/arm/mach-rockchip/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}