* OMAP patches
@ 2011-10-13 15:18 Sascha Hauer
2011-10-13 15:18 ` [PATCH 1/2] mci omap: do not fail on nonexistent pdata Sascha Hauer
2011-10-13 15:18 ` [PATCH 2/2] ARM panda: fix default env path in config Sascha Hauer
0 siblings, 2 replies; 3+ messages in thread
From: Sascha Hauer @ 2011-10-13 15:18 UTC (permalink / raw)
To: barebox
Two omap patches targeted for master.
Sascha Hauer (2):
mci omap: do not fail on nonexistent pdata
ARM panda: fix default env path in config
arch/arm/configs/panda_defconfig | 2 +-
drivers/mci/omap_hsmmc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/2] mci omap: do not fail on nonexistent pdata
2011-10-13 15:18 OMAP patches Sascha Hauer
@ 2011-10-13 15:18 ` Sascha Hauer
2011-10-13 15:18 ` [PATCH 2/2] ARM panda: fix default env path in config Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2011-10-13 15:18 UTC (permalink / raw)
To: barebox
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mci/omap_hsmmc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c
index 3f70e22..d171c1d 100644
--- a/drivers/mci/omap_hsmmc.c
+++ b/drivers/mci/omap_hsmmc.c
@@ -569,7 +569,7 @@ static int omap_mmc_probe(struct device_d *dev)
hsmmc->mci.f_min = 400000;
pdata = (struct omap_hsmmc_platform_data *)dev->platform_data;
- if (pdata->f_max)
+ if (pdata && pdata->f_max)
hsmmc->mci.f_max = pdata->f_max;
else
hsmmc->mci.f_max = 52000000;
--
1.7.7
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM panda: fix default env path in config
2011-10-13 15:18 OMAP patches Sascha Hauer
2011-10-13 15:18 ` [PATCH 1/2] mci omap: do not fail on nonexistent pdata Sascha Hauer
@ 2011-10-13 15:18 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2011-10-13 15:18 UTC (permalink / raw)
To: barebox
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/configs/panda_defconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/configs/panda_defconfig b/arch/arm/configs/panda_defconfig
index 38cc958..3ea2466 100644
--- a/arch/arm/configs/panda_defconfig
+++ b/arch/arm/configs/panda_defconfig
@@ -17,7 +17,7 @@ CONFIG_AUTO_COMPLETE=y
# CONFIG_TIMESTAMP is not set
CONFIG_PARTITION=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm049/env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/panda/env"
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
--
1.7.7
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-13 15:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-13 15:18 OMAP patches Sascha Hauer
2011-10-13 15:18 ` [PATCH 1/2] mci omap: do not fail on nonexistent pdata Sascha Hauer
2011-10-13 15:18 ` [PATCH 2/2] ARM panda: fix default env path in config Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox