From: heiko@sntech.de (Heiko Stuebner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: rockchip: drop rk3288 jtag/mmc switch handling
Date: Mon, 23 May 2016 16:58:59 +0200 [thread overview]
Message-ID: <1464015539-19521-4-git-send-email-heiko@sntech.de> (raw)
In-Reply-To: <1464015539-19521-1-git-send-email-heiko@sntech.de>
We moved that functionality to a more generic place where it can also
be used for other socs, so drop it from architecture code.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm/mach-rockchip/rockchip.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c
index beb71da..e7b2aa7 100644
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@ -29,13 +29,11 @@
#include "core.h"
#include "pm.h"
-#define RK3288_GRF_SOC_CON0 0x244
#define RK3288_TIMER6_7_PHYS 0xff810000
static void __init rockchip_timer_init(void)
{
if (of_machine_is_compatible("rockchip,rk3288")) {
- struct regmap *grf;
void __iomem *reg_base;
/*
@@ -54,16 +52,6 @@ static void __init rockchip_timer_init(void)
} else {
pr_err("rockchip: could not map timer7 registers\n");
}
-
- /*
- * Disable auto jtag/sdmmc switching that causes issues
- * with the mmc controllers making them unreliable
- */
- grf = syscon_regmap_lookup_by_compatible("rockchip,rk3288-grf");
- if (!IS_ERR(grf))
- regmap_write(grf, RK3288_GRF_SOC_CON0, 0x10000000);
- else
- pr_err("rockchip: could not get grf syscon\n");
}
of_clk_init(NULL);
--
2.6.4
next prev parent reply other threads:[~2016-05-23 14:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-23 14:58 [PATCH 0/3] Rockchip: generalize GRF setup Heiko Stuebner
2016-05-23 14:58 ` [PATCH 1/3] dt-bindings: add used but undocumented rockchip grf compatible values Heiko Stuebner
2016-05-23 20:47 ` Doug Anderson
2016-05-23 21:38 ` Rob Herring
2016-05-24 2:05 ` Shawn Lin
2016-05-23 14:58 ` [PATCH 2/3] soc: rockchip: add driver handling grf setup Heiko Stuebner
2016-05-23 20:46 ` Doug Anderson
2016-05-24 2:22 ` Shawn Lin
2016-05-24 13:07 ` Heiko Stuebner
2016-05-23 14:58 ` Heiko Stuebner [this message]
2016-05-23 20:47 ` [PATCH 3/3] ARM: rockchip: drop rk3288 jtag/mmc switch handling Doug Anderson
2016-05-24 2:09 ` Shawn Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464015539-19521-4-git-send-email-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox