* [PATCH 1/8] ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
2012-10-25 9:57 ` [PATCH 2/8] ARM: ux500: Rename references to the ccu9540 dev board accordingly Lee Jones
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
The u9540 supports 3 MMC devices. This patch enables two of them
and updates the configuration of the already enabled SDI4 port.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/u9540.dts | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
index 2dade76..95892ec 100644
--- a/arch/arm/boot/dts/u9540.dts
+++ b/arch/arm/boot/dts/u9540.dts
@@ -33,10 +33,35 @@
status = "okay";
};
+ // External Micro SD slot
+ sdi0_per1 at 80126000 {
+ arm,primecell-periphid = <0x10480180>;
+ max-frequency = <100000000>;
+ bus-width = <4>;
+ mmc-cap-sd-highspeed;
+ mmc-cap-mmc-highspeed;
+ vmmc-supply = <&ab8500_ldo_aux3_reg>;
+
+ cd-gpios = <&gpio7 6 0x4>; // 230
+ cd-inverted;
+
+ status = "okay";
+ };
+
+
+ // WLAN SDIO channel
+ sdi1_per2 at 80118000 {
+ arm,primecell-periphid = <0x10480180>;
+ max-frequency = <50000000>;
+ bus-width = <4>;
+
+ status = "okay";
+ };
+
// On-board eMMC
sdi4_per2 at 80114000 {
arm,primecell-periphid = <0x10480180>;
- max-frequency = <50000000>;
+ max-frequency = <100000000>;
bus-width = <8>;
mmc-cap-mmc-highspeed;
vmmc-supply = <&ab8500_ldo_aux2_reg>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/8] ARM: ux500: Rename references to the ccu9540 dev board accordingly
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
2012-10-25 9:57 ` [PATCH 1/8] ARM: ux500: Enable all MMC devices on the u9540 when booting with DT Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
2012-10-25 9:57 ` [PATCH 3/8] ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic Lee Jones
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
When enabling ST-Ericsson's ccu9540 development board the board's
full name has not been used. This patch adapts all references of
the board's short name to how it should be referenced.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/{u9540.dts => ccu9540.dts} | 4 ++--
arch/arm/mach-ux500/cpu-db8500.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
rename arch/arm/boot/dts/{u9540.dts => ccu9540.dts} (93%)
diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/ccu9540.dts
similarity index 93%
rename from arch/arm/boot/dts/u9540.dts
rename to arch/arm/boot/dts/ccu9540.dts
index 95892ec..26dfe83 100644
--- a/arch/arm/boot/dts/u9540.dts
+++ b/arch/arm/boot/dts/ccu9540.dts
@@ -13,8 +13,8 @@
/include/ "dbx5x0.dtsi"
/ {
- model = "ST-Ericsson U9540 platform with Device Tree";
- compatible = "st-ericsson,u9540";
+ model = "ST-Ericsson CCU9540 platform with Device Tree";
+ compatible = "st-ericsson,ccu9540";
memory {
reg = <0x00000000 0x20000000>;
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 0b15591..6e9a06d 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -320,8 +320,8 @@ static void __init u8500_init_machine(void)
snowball_pinmaps_init();
else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
hrefv60_pinmaps_init();
- else if (of_machine_is_compatible("st-ericsson,u9540")) {}
- /* TODO: Add u9540 pinmaps. */
+ else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
+ /* TODO: Add pinmaps for ccu9540 board. */
/* TODO: Export SoC, USB, cpu-freq and DMA40 */
parent = u8500_of_init_devices();
@@ -334,7 +334,7 @@ static const char * u8500_dt_board_compat[] = {
"calaosystems,snowball-a9500",
"st-ericsson,hrefv60+",
"st-ericsson,mop500",
- "st-ericsson,u9540",
+ "st-ericsson,ccu9540",
NULL,
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/8] ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
2012-10-25 9:57 ` [PATCH 1/8] ARM: ux500: Enable all MMC devices on the u9540 when booting with DT Lee Jones
2012-10-25 9:57 ` [PATCH 2/8] ARM: ux500: Rename references to the ccu9540 dev board accordingly Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
2012-10-25 9:57 ` [PATCH 4/8] ARM: ux500: List DT compatibility using platform names rather than by board Lee Jones
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
The u8500 and u9540 DT_MACHINE_START calls are almost identical
at the moment, referencing exactly the same function pointers.
Until this changes we may as well convert the original one to
be more generic and use that instead.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/cpu-db8500.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 6e9a06d..472b49f 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -338,7 +338,7 @@ static const char * u8500_dt_board_compat[] = {
NULL,
};
-DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
+DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
.map_io = u8500_map_io,
.init_irq = ux500_init_irq,
/* we re-use nomadik timer here */
@@ -349,14 +349,4 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
.dt_compat = u8500_dt_board_compat,
MACHINE_END
-DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
- .map_io = u8500_map_io,
- .init_irq = ux500_init_irq,
- .timer = &ux500_timer,
- .handle_irq = gic_handle_irq,
- .init_machine = u8500_init_machine,
- .init_late = NULL,
- .dt_compat = u8500_dt_board_compat,
-MACHINE_END
-
#endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/8] ARM: ux500: List DT compatibility using platform names rather than by board
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
` (2 preceding siblings ...)
2012-10-25 9:57 ` [PATCH 3/8] ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
2012-10-25 9:57 ` [PATCH 5/8] ARM: ux500: Add node for the MMC GPIO regulator Lee Jones
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
So far, each ST-Ericsson board supported by Device Tree has been similar
enough to run though a single DT_MACHINE_INIT call. On the back of that
it has been suggested that we should reduce the number of compatible
strings in our dt_compat structure. After subsequent discussion with Arnd
Bergmann the conclusion was to list entries by platform as opposed to by
board.
The other suggestion was to use a single string which would cover all
supported platforms, but any wildcard entries would include unsupported
chipsets, such as the u5500 and potential new chips which no not yet have
DT functionality. Hence, the best solution which encompasses all supported
platforms, but no unsupported ones was to list the currently enabled four
chipsets; u8500, u8540, u9500 and u9540 instead.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/ccu9540.dts | 2 +-
arch/arm/boot/dts/hrefprev60.dts | 2 +-
arch/arm/boot/dts/hrefv60plus.dts | 2 +-
arch/arm/boot/dts/snowball.dts | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 12 ++++++------
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ccu9540.dts
index 26dfe83..0430546 100644
--- a/arch/arm/boot/dts/ccu9540.dts
+++ b/arch/arm/boot/dts/ccu9540.dts
@@ -14,7 +14,7 @@
/ {
model = "ST-Ericsson CCU9540 platform with Device Tree";
- compatible = "st-ericsson,ccu9540";
+ compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";
memory {
reg = <0x00000000 0x20000000>;
diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
index cd9e535..b398946 100644
--- a/arch/arm/boot/dts/hrefprev60.dts
+++ b/arch/arm/boot/dts/hrefprev60.dts
@@ -16,7 +16,7 @@
/ {
model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
- compatible = "st-ericsson,mop500";
+ compatible = "st-ericsson,mop500", "st-ericsson,u8500";
gpio_keys {
button at 1 {
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
index 82103a2..a01ac8f 100644
--- a/arch/arm/boot/dts/hrefv60plus.dts
+++ b/arch/arm/boot/dts/hrefv60plus.dts
@@ -16,7 +16,7 @@
/ {
model = "ST-Ericsson HREF (v60+) platform with Device Tree";
- compatible = "st-ericsson,hrefv60+";
+ compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
gpio_keys {
button at 1 {
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 6a2b58b..9e02a91 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -14,7 +14,7 @@
/ {
model = "Calao Systems Snowball platform with device tree";
- compatible = "calaosystems,snowball-a9500";
+ compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
memory {
reg = <0x00000000 0x20000000>;
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 472b49f..c65e7e3 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -330,11 +330,11 @@ static void __init u8500_init_machine(void)
of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
}
-static const char * u8500_dt_board_compat[] = {
- "calaosystems,snowball-a9500",
- "st-ericsson,hrefv60+",
- "st-ericsson,mop500",
- "st-ericsson,ccu9540",
+static const char * stericsson_dt_platform_compat[] = {
+ "st-ericsson,u8500",
+ "st-ericsson,u8540",
+ "st-ericsson,u9500",
+ "st-ericsson,u9540",
NULL,
};
@@ -346,7 +346,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
.handle_irq = gic_handle_irq,
.init_machine = u8500_init_machine,
.init_late = NULL,
- .dt_compat = u8500_dt_board_compat,
+ .dt_compat = stericsson_dt_platform_compat,
MACHINE_END
#endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/8] ARM: ux500: Add node for the MMC GPIO regulator
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
` (3 preceding siblings ...)
2012-10-25 9:57 ` [PATCH 4/8] ARM: ux500: List DT compatibility using platform names rather than by board Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
2012-10-25 9:57 ` [PATCH 6/8] ARM: ux500: Change the type of interrupt to something compatible Lee Jones
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
There is a very simple mechanism to change and SDI's voltage which
consists of toggling some GPIOs. This scenario can be better handled
if we convert it to a GPIO regulator. This patch provides one which
can be read from Device Tree.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/dbx5x0.dtsi | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 07a085b..536df5d 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -614,5 +614,19 @@
ranges = <0 0x50000000 0x4000000>;
status = "disabled";
};
+
+ vmmci: regulator-gpio {
+ compatible = "regulator-gpio";
+
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2600000>;
+ regulator-name = "mmci-reg";
+ regulator-type = "voltage";
+
+ gpios = <&tc3589x_gpio 18 0x4>;
+ gpio-enable = <&tc3589x_gpio 17 0x4>;
+ states = <1800000 0x1
+ 2900000 0x0>;
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/8] ARM: ux500: Change the type of interrupt to something compatible
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
` (4 preceding siblings ...)
2012-10-25 9:57 ` [PATCH 5/8] ARM: ux500: Add node for the MMC GPIO regulator Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
2012-10-25 9:57 ` [PATCH 7/8] ARM: ux500: CONFIG: Enable GPIO Regulators Lee Jones
2012-10-25 9:57 ` [PATCH 8/8] ARM: ux500: Convert DT_MACHINE_START to use SMP operations Lee Jones
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
On boot the Nomadik GPIO controller complains that an IRQ can't be
configured as active high level-sensitive, so this patch converts
it to be low-to-high edge triggered instead.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/stuib.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/stuib.dtsi
index 6c7e492..39446a2 100644
--- a/arch/arm/boot/dts/stuib.dtsi
+++ b/arch/arm/boot/dts/stuib.dtsi
@@ -15,7 +15,7 @@
stmpe1601: stmpe1601 at 40 {
compatible = "st,stmpe1601";
reg = <0x40>;
- interrupts = <26 0x4>;
+ interrupts = <26 0x1>;
interrupt-parent = <&gpio6>;
interrupt-controller;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 7/8] ARM: ux500: CONFIG: Enable GPIO Regulators
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
` (5 preceding siblings ...)
2012-10-25 9:57 ` [PATCH 6/8] ARM: ux500: Change the type of interrupt to something compatible Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
2012-10-25 9:57 ` [PATCH 8/8] ARM: ux500: Convert DT_MACHINE_START to use SMP operations Lee Jones
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
It is the intention to convert the MMC voltage changing from
GPIO flipping to using a proper GPIO regulator interface. A
prerequisite of that is to enable the GPIO regulator
functionality. As this affects all ux5x0 based boards we'll
do it here instead of in the Kconfigs.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/configs/u8500_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 0575d8a..50d3c22 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -76,6 +76,7 @@ CONFIG_AB8500_CORE=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_AB8500=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_GPIO=y
# CONFIG_HID_SUPPORT is not set
CONFIG_USB_GADGET=y
CONFIG_AB8500_USB=y
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 8/8] ARM: ux500: Convert DT_MACHINE_START to use SMP operations
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
` (6 preceding siblings ...)
2012-10-25 9:57 ` [PATCH 7/8] ARM: ux500: CONFIG: Enable GPIO Regulators Lee Jones
@ 2012-10-25 9:57 ` Lee Jones
7 siblings, 0 replies; 9+ messages in thread
From: Lee Jones @ 2012-10-25 9:57 UTC (permalink / raw)
To: linux-arm-kernel
The Device Tree machine description for the ux5x0 was moved
recently and as a consequence missed the addition of SMP
operations. Without this patch SMP doesn't work and only one
CPU is present after booting.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/cpu-db8500.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index c65e7e3..4a0c40a 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -339,6 +339,7 @@ static const char * stericsson_dt_platform_compat[] = {
};
DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
+ .smp = smp_ops(ux500_smp_ops),
.map_io = u8500_map_io,
.init_irq = ux500_init_irq,
/* we re-use nomadik timer here */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread