From: broonie@kernel.org (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default
Date: Mon, 25 Nov 2013 12:15:08 +0000 [thread overview]
Message-ID: <1385381710-5212-1-git-send-email-broonie@kernel.org> (raw)
From: Mark Brown <broonie@linaro.org>
Rather than requiring each board to explicitly disable the SPI controllers
it is not using instead require boards to enable those that they are using.
This is less work overall since normally at most one of the controllers is
in use and avoids issues caused by inappropriate pinmuxing.
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Tomasz Figa <t.figa@samsung.com>
---
arch/arm/boot/dts/cros5250-common.dtsi | 9 +--------
arch/arm/boot/dts/exynos5250-arndale.dts | 12 ------------
arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 ++----
arch/arm/boot/dts/exynos5250.dtsi | 3 +++
4 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index dc259e8b8a73..0fcca2930c61 100644
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -286,19 +286,12 @@
};
};
- spi_0: spi at 12d20000 {
- status = "disabled";
- };
-
spi_1: spi at 12d30000 {
+ status = "okay";
samsung,spi-src-clk = <0>;
num-cs = <1>;
};
- spi_2: spi at 12d40000 {
- status = "disabled";
- };
-
hdmi {
hpd-gpio = <&gpx3 7 0>;
};
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 684527087aa4..0385b58116ec 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -434,18 +434,6 @@
status = "okay";
};
- spi_0: spi at 12d20000 {
- status = "disabled";
- };
-
- spi_1: spi at 12d30000 {
- status = "disabled";
- };
-
- spi_2: spi at 12d40000 {
- status = "disabled";
- };
-
gpio_keys {
compatible = "gpio-keys";
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index f86d56760a45..5d0395e07eee 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -189,6 +189,8 @@
};
spi_1: spi at 12d30000 {
+ status = "okay";
+
w25q80bw at 0 {
#address-cells = <1>;
#size-cells = <1>;
@@ -214,10 +216,6 @@
};
};
- spi_2: spi at 12d40000 {
- status = "disabled";
- };
-
hdmi {
hpd-gpio = <&gpx3 7 0>;
};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 9db5047812f3..9b58532854e1 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -349,6 +349,7 @@
spi_0: spi at 12d20000 {
compatible = "samsung,exynos4210-spi";
+ status = "disabled";
reg = <0x12d20000 0x100>;
interrupts = <0 66 0>;
dmas = <&pdma0 5
@@ -364,6 +365,7 @@
spi_1: spi@12d30000 {
compatible = "samsung,exynos4210-spi";
+ status = "disabled";
reg = <0x12d30000 0x100>;
interrupts = <0 67 0>;
dmas = <&pdma1 5
@@ -379,6 +381,7 @@
spi_2: spi@12d40000 {
compatible = "samsung,exynos4210-spi";
+ status = "disabled";
reg = <0x12d40000 0x100>;
interrupts = <0 68 0>;
dmas = <&pdma0 7
--
1.8.4.4
next reply other threads:[~2013-11-25 12:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-25 12:15 Mark Brown [this message]
2013-11-25 12:15 ` [PATCH 2/3] ARM: dts: Disable I2C controllers by default on Exynos5250 Mark Brown
2013-11-25 12:15 ` [PATCH 3/3] ARM: dts: Rename Exynos5250 ChromeOS common file to have exynos prefix Mark Brown
2013-12-20 23:09 ` Kukjin Kim
2013-12-20 23:37 ` Kukjin Kim
2013-12-21 0:57 ` Doug Anderson
2013-12-21 1:11 ` Kukjin Kim
2013-12-09 15:23 ` [PATCH 1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default Tomasz Figa
2013-12-09 21:07 ` Kukjin Kim
2013-12-10 0:48 ` Doug Anderson
2013-12-10 0:57 ` Doug Anderson
2013-12-10 11:13 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2013-12-10 11:07 Mark Brown
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=1385381710-5212-1-git-send-email-broonie@kernel.org \
--to=broonie@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).