diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:29 +0200 |
| commit | 910306c89142014afc6a02c5c85d75c808701548 (patch) | |
| tree | a6bf5c80f0164265e1e0b50d76d7c154d2b3347e /arch | |
| parent | 4db5b72d0c8f7b7fc0d5d430a60c155c7220200c (diff) | |
| parent | dfb895cc0d9e0115bddc8a6463def03139881dfd (diff) | |
| download | barebox-910306c89142014afc6a02c5c85d75c808701548.tar.gz barebox-910306c89142014afc6a02c5c85d75c808701548.tar.xz | |
Merge branch 'for-next/am335x'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/phytec-som-am335x/board.c | 5 | ||||
| -rw-r--r-- | arch/arm/dts/am33xx-strip.dtsi | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boards/phytec-som-am335x/board.c b/arch/arm/boards/phytec-som-am335x/board.c index 74e39d70fc..7a878415f8 100644 --- a/arch/arm/boards/phytec-som-am335x/board.c +++ b/arch/arm/boards/phytec-som-am335x/board.c @@ -68,7 +68,10 @@ static int physom_devices_init(void) of_device_enable_path("/chosen/environment-spi"); break; case BOOTSOURCE_MMC: - omap_set_bootmmc_devname("mmc0"); + if (bootsource_get_instance() == 0) + omap_set_bootmmc_devname("mmc0"); + else + omap_set_bootmmc_devname("mmc1"); break; default: of_device_enable_path("/chosen/environment-nand"); diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-strip.dtsi index 3dc9a5798a..04cf3151ea 100644 --- a/arch/arm/dts/am33xx-strip.dtsi +++ b/arch/arm/dts/am33xx-strip.dtsi @@ -11,8 +11,6 @@ aliases { /delete-property/ i2c1; /delete-property/ i2c2; - /delete-property/ mmc0; - /delete-property/ mmc1; /delete-property/ mmc2; /delete-property/ d_can0; /delete-property/ d_can1; @@ -21,7 +19,6 @@ /delete-node/ &i2c1; /delete-node/ &i2c2; -/delete-node/ &mmc2; /delete-node/ &mmc3; /delete-node/ &hwspinlock; /delete-node/ &wdt2; @@ -46,3 +43,5 @@ /delete-node/ &mcasp0; /delete-node/ &mcasp1; /delete-node/ &rng; +/delete-node/ &rtc; +/delete-node/ &wkup_m3; |