[PATCH 0/3] ARM: OMAP2+: AM43x: Enable in OMAP2PLUS and add ID for ES1.1
This patch series enables AM43XX SOC in omap2plus_deconfig along with updating clocksource and adding support for ES1.1. With this series using omap2plus_defconfig alone boots on AM43XX. Tested on: AM4372 EPOS EVM Afzal Mohammed (1): ARM: OMAP2+: AM43x: enable in default config Lokesh Vutla (1): ARM: OMAP2+: AM43x: Add ID for ES1.1 Rajendra Nayak (1): ARM: OMAP2+: AM43x: Use gptimer as clocksource arch/arm/configs/omap2plus_defconfig |1 + arch/arm/mach-omap2/board-generic.c |2 +- arch/arm/mach-omap2/id.c | 14 -- arch/arm/mach-omap2/soc.h|3 ++- arch/arm/mach-omap2/timer.c |3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/3] ARM: OMAP2+: AM43x: Enable in default config
From: Afzal Mohammed af...@ti.com Enable AM43x SoC in omap2plus_defconfig Signed-off-by: Afzal Mohammed af...@ti.com Signed-off-by: Lokesh Vutla lokeshvu...@ti.com --- arch/arm/configs/omap2plus_defconfig |1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 3a0b53d..364ba38 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -28,6 +28,7 @@ CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y +CONFIG_SOC_AM43XX=y CONFIG_SOC_DRA7XX=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_ERRATA_411920=y -- 1.7.9.5 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/3] ARM: OMAP2+: AM43x: Enable in OMAP2PLUS and add ID for ES1.1
This patch series enables AM43XX SOC in omap2plus_deconfig along with updating clocksource and adding support for ES1.1. With this series using omap2plus_defconfig alone boots on AM43XX. Tested on: AM4372 EPOS EVM Afzal Mohammed (1): ARM: OMAP2+: AM43x: enable in default config Lokesh Vutla (1): ARM: OMAP2+: AM43x: Add ID for ES1.1 Rajendra Nayak (1): ARM: OMAP2+: AM43x: Use gptimer as clocksource arch/arm/configs/omap2plus_defconfig |1 + arch/arm/mach-omap2/board-generic.c |2 +- arch/arm/mach-omap2/id.c | 14 -- arch/arm/mach-omap2/soc.h|3 ++- arch/arm/mach-omap2/timer.c |3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] ARM: OMAP2+: AM43x: Use gptimer as clocksource
From: Rajendra Nayak rna...@ti.com The SyncTimer in AM43x is clocked using the following two sources: 1) An inaccuarte 32k clock (CLK_32KHZ) derived from PER DPLL, causing system time to go slowly (~10% deviation). 2) external 32KHz RTC clock, which may not always be available on board like in the case of ePOS EVM Use gptimer as clocksource instead, as is done in the case of AM335x (which does not have a SyncTimer). With this, system time keeping works accurately. Signed-off-by: Rajendra Nayak rna...@ti.com Signed-off-by: Lokesh Vutla lokeshvu...@ti.com --- arch/arm/mach-omap2/board-generic.c |2 +- arch/arm/mach-omap2/timer.c |3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 8e3daa1..5679464a 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -229,7 +229,7 @@ DT_MACHINE_START(AM43_DT, Generic AM43 (Flattened Device Tree)) .init_late = am43xx_init_late, .init_irq = omap_gic_of_init, .init_machine = omap_generic_init, - .init_time = omap3_sync32k_timer_init, + .init_time = omap3_gptimer_timer_init, .dt_compat = am43_boards_compat, MACHINE_END #endif diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 74044aa..b62de9f 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -604,7 +604,8 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, secure_32k_fck, ti,timer-secure, 2, timer_sys_ck, NULL); #endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \ + defined(CONFIG_SOC_AM43XX) OMAP_SYS_GP_TIMER_INIT(3, 2, timer_sys_ck, NULL, 1, timer_sys_ck, ti,timer-alwon); #endif -- 1.7.9.5 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/3] ARM: OMAP2+: AM43x: Add ID for ES1.1
Adding ID for AM437x ES1.1 silicon.
Signed-off-by: Lokesh Vutla lokeshvu...@ti.com
---
arch/arm/mach-omap2/id.c | 14 --
arch/arm/mach-omap2/soc.h |3 ++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 9428c5f..8a05eaf 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -465,8 +465,18 @@ void __init omap3xxx_check_revision(void)
}
break;
case 0xb98c:
- omap_revision = AM437X_REV_ES1_0;
- cpu_rev = 1.0;
+ switch (rev) {
+ case 0:
+ omap_revision = AM437X_REV_ES1_0;
+ cpu_rev = 1.0;
+ break;
+ case 1:
+ /* FALLTHROUGH */
+ default:
+ omap_revision = AM437X_REV_ES1_1;
+ cpu_rev = 1.1;
+ break;
+ }
break;
case 0xb8f2:
switch (rev) {
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 076bd90..30abcc8 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -438,7 +438,8 @@ IS_OMAP_TYPE(3430, 0x3430)
#define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 8))
#define AM437X_CLASS 0x4370
-#define AM437X_REV_ES1_0 AM437X_CLASS
+#define AM437X_REV_ES1_0 (AM437X_CLASS | (0x10 8))
+#define AM437X_REV_ES1_1 (AM437X_CLASS | (0x11 8))
#define OMAP443X_CLASS 0x44300044
#define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 8))
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: next boot: 34 pass, 5 fail (next-20140122)
Hi Kevin, On 02/05/2014 04:23 PM, Kevin Hilman wrote: On Fri, Jan 24, 2014 at 10:13 AM, Florian Vaussard florian.vauss...@epfl.ch wrote: Hi, On 01/24/2014 07:11 PM, Tony Lindgren wrote: * Florian Vaussard florian.vauss...@epfl.ch [140123 01:17]: I just tested next-20140123 with an OMAP3630 ES1.2 Overo/Tobi. Changing the include to omap36xx.dtsi do not fix the issue. I still get the external abort on non-linefetch (full log here [1]). I think the issue here is that you need to have ti,omap36xx in the compatible string in addition to including omap36xx.dtsi. Otherwise ti,omap3 will initialize things for 34xx. For the initial minimal fix, I suggest we do something like the following. This should fix things for 36xx based tobi, then 34xx based tobi support can be added later on. Untested as I don't have one. You are probably right. I will test Monday. Any progress on this? We still have the 36xx Tobi boards failing basic boot tests -next, but now also in mainline. Thanks for the reminder. Tony's patch fixes the problem for 36xx Overo, but makes 35xx Overo to fail. I did a patch to split the Tobi between a common include file, and model-specific DTS. Will send it in a couple of minutes. Regards, Florian -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/3] ARM: dts: Fixes for Overo/Tobi against 3.14-rc1
OMAP36xx-based Overo (Storm and alike) are now failing to boot with 3.14-rc1
[1].
This series fixes this, by moving model-agnostic DT into a common dtsi file,
and creating model-specific DT files:
- omap3-overo-tobi.dts - older OMAP35xx Overo
- omap3-overo-storm-tobi.dts - newer OMAP36xx/AM37xx/DM37xx Overo
People will have to use the right Overo / expansion board combination.
(Patch 2 in an unrelated fix that was waiting in my queue.)
omap3-overo-tobi.dts tested with Overo Sand (OMAP3503) and
omap3-overo-storm-tobi.dts
tested with Overo EarthStorm (AM3703). Both boot. With the Overo Sand, I cannot
mount the ext3 rootfs, but this seems unrelated to the current topic, maybe
a missing errata.
Regards,
Florian
[1] http://thread.gmane.org/gmane.linux.ports.arm.omap/110006
Florian Vaussard (3):
ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
ARM: dts: omap3-tobi: Use the correct vendor prefix
ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 22 ++
...omap3-tobi.dts = omap3-overo-tobi-common.dtsi} | 3 ---
arch/arm/boot/dts/omap3-overo-tobi.dts | 22 ++
arch/arm/boot/dts/omap3-overo.dtsi | 3 ---
5 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobi.dts
rename arch/arm/boot/dts/{omap3-tobi.dts = omap3-overo-tobi-common.dtsi} (94%)
create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dts
--
1.8.1.2
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/3] ARM: dts: omap3-tobi: Use the correct vendor prefix
Gumstix is the correct vendor for all Overo related products.
Reported-by: Javier Martinez Canillas javier.marti...@collabora.co.uk
Signed-off-by: Florian Vaussard florian.vauss...@epfl.ch
---
arch/arm/boot/dts/omap3-tobi.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts
index 0e3b8bf..c742afa 100644
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-tobi.dts
@@ -17,7 +17,7 @@
/ {
model = TI OMAP3 Gumstix Overo on Tobi;
- compatible = ti,omap3-tobi, ti,omap3-overo, ti,omap36xx,
ti,omap3;
+ compatible = gumstix,omap3-tobi, gumstix,omap3-overo,
ti,omap36xx, ti,omap3;
leds {
compatible = gpio-leds;
--
1.8.1.2
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/3] ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
Tobi expansion board can be used with both OMAP35xx-based Overo,
and OMAP36xx-based Overo. Currently the boot is broken with newer
OMAP36xx-based Overo (Storm and alike). Fix include file and
compatible string to be able to boot newer models.
This will break older models. This will be addressed later.
Signed-off-by: Tony Lindgren t...@atomide.com
Signed-off-by: Florian Vaussard florian.vauss...@epfl.ch
---
arch/arm/boot/dts/omap3-overo.dtsi | 3 ---
arch/arm/boot/dts/omap3-tobi.dts | 5 -
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-overo.dtsi
b/arch/arm/boot/dts/omap3-overo.dtsi
index a461d2f..5970999 100644
--- a/arch/arm/boot/dts/omap3-overo.dtsi
+++ b/arch/arm/boot/dts/omap3-overo.dtsi
@@ -9,9 +9,6 @@
/*
* The Gumstix Overo must be combined with an expansion board.
*/
-/dts-v1/;
-
-#include omap34xx.dtsi
/ {
pwmleds {
diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts
index 7e4ad2a..0e3b8bf 100644
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-tobi.dts
@@ -10,11 +10,14 @@
* Tobi expansion board is manufactured by Gumstix Inc.
*/
+/dts-v1/;
+
+#include omap36xx.dtsi
#include omap3-overo.dtsi
/ {
model = TI OMAP3 Gumstix Overo on Tobi;
- compatible = ti,omap3-tobi, ti,omap3-overo, ti,omap3;
+ compatible = ti,omap3-tobi, ti,omap3-overo, ti,omap36xx,
ti,omap3;
leds {
compatible = gpio-leds;
--
1.8.1.2
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
Unfortunatly the device tree for older OMAP35xx Overo cannot be used
with newer OMAP36xx and vice-versa. To address this issue, move most of
the Tobi DTS to a common include file, and create model-specific Tobi
DTS.
Signed-off-by: Florian Vaussard florian.vauss...@epfl.ch
---
arch/arm/boot/dts/Makefile | 3 ++-
arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 22 ++
...omap3-tobi.dts = omap3-overo-tobi-common.dtsi} | 6 --
arch/arm/boot/dts/omap3-overo-tobi.dts | 22 ++
4 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobi.dts
rename arch/arm/boot/dts/{omap3-tobi.dts = omap3-overo-tobi-common.dtsi} (91%)
create mode 100644 arch/arm/boot/dts/omap3-overo-tobi.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b9d6a8b..e8355f4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -208,7 +208,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
omap3-n900.dtb \
omap3-n9.dtb \
omap3-n950.dtb \
- omap3-tobi.dtb \
+ omap3-overo-tobi.dtb \
+ omap3-overo-storm-tobi.dtb \
omap3-gta04.dtb \
omap3-igep0020.dtb \
omap3-igep0030.dtb \
diff --git a/arch/arm/boot/dts/omap3-overo-storm-tobi.dts
b/arch/arm/boot/dts/omap3-overo-storm-tobi.dts
new file mode 100644
index 000..966b5c9
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-overo-storm-tobi.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * Tobi expansion board is manufactured by Gumstix Inc.
+ */
+
+/dts-v1/;
+
+#include omap36xx.dtsi
+#include omap3-overo-tobi-common.dtsi
+
+/ {
+ model = OMAP36xx/AM37xx/DM37xx Gumstix Overo on Tobi;
+ compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap36xx, ti,omap3;
+};
+
diff --git a/arch/arm/boot/dts/omap3-tobi.dts
b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
similarity index 91%
rename from arch/arm/boot/dts/omap3-tobi.dts
rename to arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
index c742afa..4edc013 100644
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
@@ -10,15 +10,9 @@
* Tobi expansion board is manufactured by Gumstix Inc.
*/
-/dts-v1/;
-
-#include omap36xx.dtsi
#include omap3-overo.dtsi
/ {
- model = TI OMAP3 Gumstix Overo on Tobi;
- compatible = gumstix,omap3-tobi, gumstix,omap3-overo,
ti,omap36xx, ti,omap3;
-
leds {
compatible = gpio-leds;
heartbeat {
diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts
b/arch/arm/boot/dts/omap3-overo-tobi.dts
new file mode 100644
index 000..2f82192
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-overo-tobi.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * Tobi expansion board is manufactured by Gumstix Inc.
+ */
+
+/dts-v1/;
+
+#include omap34xx.dtsi
+#include omap3-overo-tobi-common.dtsi
+
+/ {
+ model = OMAP35xx Gumstix Overo on Tobi;
+ compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap3;
+};
+
--
1.8.1.2
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP4: hwmod: Fix SOFTRESET logic for OMAP4
Hi Illia,
On 02/05/2014 05:06 PM, Illia Smyrnov wrote:
Commit 313a76e (ARM: OMAP2+: hwmod: Fix SOFTRESET logic) introduced
softreset bit cleaning right after set one. It is caused L3 error for
OMAP4 ISS because ISS register write occurs when ISS reset process is in
progress. Avoid this situation by cleaning softreset bit later, when reset
process is successfully finished.
Signed-off-by: Illia Smyrnov illia.smyr...@globallogic.com
Thanks for the patch. Could you please send --cc this to stable as well. Thanks.
cheers,
-roger
---
arch/arm/mach-omap2/omap_hwmod.c | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c
b/arch/arm/mach-omap2/omap_hwmod.c
index 42d8188..1f33f5d 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1947,29 +1947,31 @@ static int _ocp_softreset(struct omap_hwmod *oh)
goto dis_opt_clks;
_write_sysconfig(v, oh);
- ret = _clear_softreset(oh, v);
- if (ret)
- goto dis_opt_clks;
-
- _write_sysconfig(v, oh);
if (oh-class-sysc-srst_udelay)
udelay(oh-class-sysc-srst_udelay);
c = _wait_softreset_complete(oh);
- if (c == MAX_MODULE_SOFTRESET_WAIT)
+ if (c == MAX_MODULE_SOFTRESET_WAIT) {
pr_warning(omap_hwmod: %s: softreset failed (waited %d
usec)\n,
oh-name, MAX_MODULE_SOFTRESET_WAIT);
- else
+ ret = -ETIMEDOUT;
+ goto dis_opt_clks;
+ } else {
pr_debug(omap_hwmod: %s: softreset in %d usec\n, oh-name, c);
+ }
+
+ ret = _clear_softreset(oh, v);
+ if (ret)
+ goto dis_opt_clks;
+
+ _write_sysconfig(v, oh);
/*
* XXX add _HWMOD_STATE_WEDGED for modules that don't come back from
* _wait_target_ready() or _reset()
*/
- ret = (c == MAX_MODULE_SOFTRESET_WAIT) ? -ETIMEDOUT : 0;
-
dis_opt_clks:
if (oh-flags HWMOD_CONTROL_OPT_CLKS_IN_RESET)
_disable_optional_clocks(oh);
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/4] MFD: TPS65218: Add driver for the TPS65218 PMIC
The TPS65218 chip is a power management IC for Portable Navigation Systems and Tablet Computing devices. It contains the following components: - Regulators. - Over Temperature warning and Shut down. This patch adds support for tps65218 mfd device. At this time only the regulator functionality is made available. Signed-off-by: Keerthy j-keer...@ti.com --- drivers/mfd/Kconfig | 15 +++ drivers/mfd/Makefile |1 + drivers/mfd/tps65218.c | 281 + How much different is the TPS65218 to all the other TPS drivers? drivers/mfd/tps6105x.c drivers/mfd/tps65010.c drivers/mfd/tps6507x.c drivers/mfd/tps65090.c drivers/mfd/tps65217.c drivers/mfd/tps6586x.c drivers/mfd/tps65910.c drivers/mfd/tps65911-comparator.c drivers/mfd/tps65912-core.c drivers/mfd/tps65912-i2c.c drivers/mfd/tps65912-irq.c drivers/mfd/tps65912-spi.c drivers/mfd/tps80031.c Perhaps some consolidating might be in order? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/3] ARM: OMAP2+: AM43x: Add ID for ES1.1
On 02/06/2014 02:45 AM, Lokesh Vutla wrote:
Adding ID for AM437x ES1.1 silicon.
Signed-off-by: Lokesh Vutla lokeshvu...@ti.com
---
arch/arm/mach-omap2/id.c | 14 --
arch/arm/mach-omap2/soc.h |3 ++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 9428c5f..8a05eaf 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -465,8 +465,18 @@ void __init omap3xxx_check_revision(void)
}
break;
case 0xb98c:
- omap_revision = AM437X_REV_ES1_0;
- cpu_rev = 1.0;
+ switch (rev) {
+ case 0:
+ omap_revision = AM437X_REV_ES1_0;
+ cpu_rev = 1.0;
+ break;
+ case 1:
+ /* FALLTHROUGH */
+ default:
+ omap_revision = AM437X_REV_ES1_1;
+ cpu_rev = 1.1;
+ break;
+ }
break;
case 0xb8f2:
switch (rev) {
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 076bd90..30abcc8 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -438,7 +438,8 @@ IS_OMAP_TYPE(3430, 0x3430)
#define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 8))
#define AM437X_CLASS 0x4370
-#define AM437X_REV_ES1_0 AM437X_CLASS
+#define AM437X_REV_ES1_0 (AM437X_CLASS | (0x10 8))
+#define AM437X_REV_ES1_1 (AM437X_CLASS | (0x11 8))
#define OMAP443X_CLASS 0x44300044
#define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 8))
can you also check if socbus shows proper results?
I had http://slexy.org/view/s20e3OsIVx with v3.14-rc1
--
Regards,
Nishanth Menon
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
On 02/06/2014 03:10 AM, Florian Vaussard wrote:
Unfortunatly the device tree for older OMAP35xx Overo cannot be used
Unfortunately ?
with newer OMAP36xx and vice-versa. To address this issue, move most of
the Tobi DTS to a common include file, and create model-specific Tobi
DTS.
[...]
diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts
b/arch/arm/boot/dts/omap3-overo-tobi.dts
new file mode 100644
index 000..2f82192
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-overo-tobi.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * Tobi expansion board is manufactured by Gumstix Inc.
+ */
+
+/dts-v1/;
+
+#include omap34xx.dtsi
+#include omap3-overo-tobi-common.dtsi
+
+/ {
+ model = OMAP35xx Gumstix Overo on Tobi;
+ compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap3;
To reduce any future problems, I suggest:
compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap3430, ti,omap3;
+};
+
--
Regards,
Nishanth Menon
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP4: hwmod: Fix SOFTRESET logic for OMAP4
On 02/05/2014 05:06 PM, Illia Smyrnov wrote:
Commit 313a76e (ARM: OMAP2+: hwmod: Fix SOFTRESET logic) introduced
softreset bit cleaning right after set one. It is caused L3 error for
OMAP4 ISS because ISS register write occurs when ISS reset process is in
progress. Avoid this situation by cleaning softreset bit later, when reset
process is successfully finished.
Signed-off-by: Illia Smyrnov illia.smyr...@globallogic.com
Acked-by: Roger Quadros rog...@ti.com
---
arch/arm/mach-omap2/omap_hwmod.c | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c
b/arch/arm/mach-omap2/omap_hwmod.c
index 42d8188..1f33f5d 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1947,29 +1947,31 @@ static int _ocp_softreset(struct omap_hwmod *oh)
goto dis_opt_clks;
_write_sysconfig(v, oh);
- ret = _clear_softreset(oh, v);
- if (ret)
- goto dis_opt_clks;
-
- _write_sysconfig(v, oh);
if (oh-class-sysc-srst_udelay)
udelay(oh-class-sysc-srst_udelay);
c = _wait_softreset_complete(oh);
- if (c == MAX_MODULE_SOFTRESET_WAIT)
+ if (c == MAX_MODULE_SOFTRESET_WAIT) {
pr_warning(omap_hwmod: %s: softreset failed (waited %d
usec)\n,
oh-name, MAX_MODULE_SOFTRESET_WAIT);
- else
+ ret = -ETIMEDOUT;
+ goto dis_opt_clks;
+ } else {
pr_debug(omap_hwmod: %s: softreset in %d usec\n, oh-name, c);
+ }
+
+ ret = _clear_softreset(oh, v);
+ if (ret)
+ goto dis_opt_clks;
+
+ _write_sysconfig(v, oh);
/*
* XXX add _HWMOD_STATE_WEDGED for modules that don't come back from
* _wait_target_ready() or _reset()
*/
- ret = (c == MAX_MODULE_SOFTRESET_WAIT) ? -ETIMEDOUT : 0;
-
dis_opt_clks:
if (oh-flags HWMOD_CONTROL_OPT_CLKS_IN_RESET)
_disable_optional_clocks(oh);
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
On 02/06/2014 03:35 PM, Nishanth Menon wrote:
On 02/06/2014 03:10 AM, Florian Vaussard wrote:
Unfortunatly the device tree for older OMAP35xx Overo cannot be used
Unfortunately ?
Indeed
with newer OMAP36xx and vice-versa. To address this issue, move most of
the Tobi DTS to a common include file, and create model-specific Tobi
DTS.
[...]
diff --git a/arch/arm/boot/dts/omap3-overo-tobi.dts
b/arch/arm/boot/dts/omap3-overo-tobi.dts
new file mode 100644
index 000..2f82192
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-overo-tobi.dts
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 Florian Vaussard, EPFL Mobots group
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * Tobi expansion board is manufactured by Gumstix Inc.
+ */
+
+/dts-v1/;
+
+#include omap34xx.dtsi
+#include omap3-overo-tobi-common.dtsi
+
+/ {
+model = OMAP35xx Gumstix Overo on Tobi;
+compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap3;
To reduce any future problems, I suggest:
compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap3430, ti,omap3;
This was also my first thought, but ti,omap3430 is not documented in
Documentation/devicetree/bindings/arm/omap/omap.txt. It is said that
ti,omap3 defaults to OMAP3430. I do not know if omap35xx would be more
accurate, as these Overo are using OMAP3503 and OMAP3530.
Regards,
Florian
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/3] ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
On 02/06/2014 09:13 AM, Florian Vaussard wrote:
[...]
+#include omap34xx.dtsi
+#include omap3-overo-tobi-common.dtsi
+
+/ {
+ model = OMAP35xx Gumstix Overo on Tobi;
+ compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap3;
To reduce any future problems, I suggest:
compatible = gumstix,omap3-overo-tobi, gumstix,omap3-overo,
ti,omap3430, ti,omap3;
This was also my first thought, but ti,omap3430 is not documented in
Documentation/devicetree/bindings/arm/omap/omap.txt. It is said that
ti,omap3 defaults to OMAP3430. I do not know if omap35xx would be more
accurate, as these Overo are using OMAP3503 and OMAP3530.
3430 should have been now documented with commit
89b6eef0d859bad4bcf7ad64560aa2891d6a37a0
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/arm/omap/omap.txt#n64
We have not pulled out 3730 or 3530 separately out in linux as of
today as they are nothing but a packaging difference for larger board
community - there should be no internal differences - the only
functional variation has been am3517 - which got it's own compatible
property.
--
Regards,
Nishanth Menon
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: multi_v7_defconfig: Select CONFIG_SOC_DRA7XX
Select CONFIG_SOC_DRA7XX so that we can boot dra7-evm. DRA7 family are A15 based processors that supports LPAE and an evolutionary update to the OMAP5 generation of processors. Signed-off-by: Nishanth Menon n...@ti.com --- based on v3.13-rc1 kernel tag - tested on v3.14-rc1 and next-20140206 arch/arm/configs/multi_v7_defconfig |1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 845bc74..ee69829 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -29,6 +29,7 @@ CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y +CONFIG_SOC_DRA7XX=y CONFIG_SOC_AM43XX=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SOCFPGA=y -- 1.7.9.5 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
AM3517 EVM
I have been trying to get the WFI working on my AM3517 and wondering about the nohlt command I have in the boot args and wondering if I should be able to boot 3.6.11 kernel on the AM3517EVM without the nohlt arg ? What config should I use (omap2plus_defconfig and then select the AM3517EVM option) ? I would like to get the EVM system working properly with the sleep and wake before I apply the changes to my AM3517 system. Thanks for any feedback Marc -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/4] MFD: TPS65218: Add driver for the TPS65218 PMIC
On Thursday 06 February 2014 08:07 PM, Lee Jones wrote: The TPS65218 chip is a power management IC for Portable Navigation Systems and Tablet Computing devices. It contains the following components: - Regulators. - Over Temperature warning and Shut down. This patch adds support for tps65218 mfd device. At this time only the regulator functionality is made available. Signed-off-by: Keerthy j-keer...@ti.com --- drivers/mfd/Kconfig | 15 +++ drivers/mfd/Makefile |1 + drivers/mfd/tps65218.c | 281 + How much different is the TPS65218 to all the other TPS drivers? drivers/mfd/tps6105x.c drivers/mfd/tps65010.c drivers/mfd/tps6507x.c drivers/mfd/tps65090.c drivers/mfd/tps65217.c drivers/mfd/tps6586x.c drivers/mfd/tps65910.c drivers/mfd/tps65911-comparator.c drivers/mfd/tps65912-core.c drivers/mfd/tps65912-i2c.c drivers/mfd/tps65912-irq.c drivers/mfd/tps65912-spi.c drivers/mfd/tps80031.c Perhaps some consolidating might be in order? Well the closest one is tps65217.c but then register space is different and components are different. So a new driver. -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv5] omap3: Add basic support for 720MHz part
Hi all, On Friday 22 June 2012 11:33:51 Laurent Pinchart wrote: On Thursday 10 February 2011 08:45:00 Kevin Hilman wrote: Sanjeev Premi pr...@ti.com writes: This patch adds support for speed enhanced variant of OMAP35x processors. These parts allow ARM and IVA running at 720MHz and 520MHz respectively. These parts can be detected at runtime by reading contents of PRODID.SKUID[3:0] at 0x4830A20C [1]. This patch specifically does following: * Add new OPP to omap34xx_opp_def_list[] - disabled by default. * Detect devices capable of running at new OPP. * Enable new OPP only if device supports it. * Check for presence of IVA before attempting to enable the corresponding OPP. [1] http://focus.ti.com/lit/ug/spruff1d/spruff1d.pdf It appears from discussions (on this patch) that a variant of OMAP3430 supports this OPP but lacks runtime detection. This OPP can be enabled for these device by either: 1) Setting the bit corresponding to OMAP3_HAS_720MHZ in 'omap3_features'. (Refer changes to id.c) 2) Removing check for omap3_has_720mhz() before enabling the OPP. (Refer changes to opp3xxx_data.c) 3) Calling opp_enable() for 720MHz/VDD1 and 520MHz/VDD2 in the board file. (Refer changes to opp3xxx_data.c). This should, ideally, be done before omap3_opp_init() is called during device_initcall(). CAUTION: This should be done for identified parts only. Else, the device could be damaged permanently. Signed-off-by: Sanjeev Premi pr...@ti.com Reviewed-by: G, Manjunath Kondaiah manj...@ti.com Acked-by: Kevin Hilman khil...@ti.com This patch seems to never have made it upstream. Is there a reason for that ? Ping ? -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/3] ARM: OMAP2+: AM43x: Add ID for ES1.1
Hi Nishanth,
On Thursday 06 February 2014 08:08 PM, Nishanth Menon wrote:
On 02/06/2014 02:45 AM, Lokesh Vutla wrote:
Adding ID for AM437x ES1.1 silicon.
Signed-off-by: Lokesh Vutla lokeshvu...@ti.com
---
arch/arm/mach-omap2/id.c | 14 --
arch/arm/mach-omap2/soc.h |3 ++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 9428c5f..8a05eaf 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -465,8 +465,18 @@ void __init omap3xxx_check_revision(void)
}
break;
case 0xb98c:
-omap_revision = AM437X_REV_ES1_0;
-cpu_rev = 1.0;
+switch (rev) {
+case 0:
+omap_revision = AM437X_REV_ES1_0;
+cpu_rev = 1.0;
+break;
+case 1:
+/* FALLTHROUGH */
+default:
+omap_revision = AM437X_REV_ES1_1;
+cpu_rev = 1.1;
+break;
+}
break;
case 0xb8f2:
switch (rev) {
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 076bd90..30abcc8 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -438,7 +438,8 @@ IS_OMAP_TYPE(3430, 0x3430)
#define AM335X_REV_ES2_1(AM335X_CLASS | (0x2 8))
#define AM437X_CLASS0x4370
-#define AM437X_REV_ES1_0AM437X_CLASS
+#define AM437X_REV_ES1_0(AM437X_CLASS | (0x10 8))
+#define AM437X_REV_ES1_1(AM437X_CLASS | (0x11 8))
#define OMAP443X_CLASS 0x44300044
#define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 8))
can you also check if socbus shows proper results?
I had http://slexy.org/view/s20e3OsIVx with v3.14-rc1
Oopsmissed out formating and sending AM43x : determine features patch.
Thanks for pointing it out. ll update and send a v2 for this series.
Thanks and regards,
Lokesh
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
