diff options
| -rw-r--r-- | arch/arm/dts/am335x-olimex.dtsi | 13 | ||||
| -rw-r--r-- | board/olimex/am335x_som/board.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/omap_hsmmc.c | 4 | ||||
| -rw-r--r-- | include/configs/olimex_am335x_som.h | 8 |
4 files changed, 15 insertions, 11 deletions
diff --git a/arch/arm/dts/am335x-olimex.dtsi b/arch/arm/dts/am335x-olimex.dtsi index ac16e9d0f4..cdd84b7b64 100644 --- a/arch/arm/dts/am335x-olimex.dtsi +++ b/arch/arm/dts/am335x-olimex.dtsi @@ -46,16 +46,9 @@ }; &am33xx_pinmux { - - mmc1_pins_default: mmc1_pins_default { + mmc1_pins: pinmux_mmc1_pins { pinctrl-single,pins = < - 0x100 ( PIN_INPUT | MUX_MODE0 ) /* (G17) mmc0_clk.mmc0_clk */ - 0x104 ( PIN_INPUT | MUX_MODE0 ) /* (G18) mmc0_cmd.mmc0_cmd */ - 0xfc ( PIN_INPUT | MUX_MODE0 ) /* (G16) mmc0_dat0.mmc0_dat0 */ - 0xf8 ( PIN_INPUT | MUX_MODE0 ) /* (G15) mmc0_dat1.mmc0_dat1 */ - 0xf4 ( PIN_INPUT | MUX_MODE0 ) /* (F18) mmc0_dat2.mmc0_dat2 */ - 0xf0 ( PIN_INPUT_PULLUP | MUX_MODE0 ) /* (F17) mmc0_dat3.mmc0_dat3 */ - 0x160 ( PIN_INPUT | MUX_MODE7 ) /* (C15) spi0_cs1.mmc0_sdcd */ + 0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */ >; }; @@ -77,7 +70,7 @@ status = "okay"; bus-width = <0x4>; pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_default>; + pinctrl-0 = <&mmc1_pins>; cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; cd-inverted; vmmc-supply = <&dummy_reg>; diff --git a/board/olimex/am335x_som/board.c b/board/olimex/am335x_som/board.c index 6847757f3c..5413cca6b4 100644 --- a/board/olimex/am335x_som/board.c +++ b/board/olimex/am335x_som/board.c @@ -164,7 +164,6 @@ int ft_board_setup(void *fdt, struct bd_info *bd) int board_fit_config_name_match(const char *name) { - printf("here!\n"); if (!strcmp(name, "olimex,am335x_som")) return 0; diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 715eee0e3e..8690166435 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -1459,10 +1459,14 @@ static int omap_hsmmc_getcd(struct udevice *dev) struct omap_hsmmc_data *priv = dev_get_priv(dev); value = dm_gpio_get_value(&priv->cd_gpio); #endif + /* if no CD return as 1 */ if (value < 0) return 1; + //dgp hack + value = 1; + return value; } diff --git a/include/configs/olimex_am335x_som.h b/include/configs/olimex_am335x_som.h index d113ad5b3e..6d6051bbd8 100644 --- a/include/configs/olimex_am335x_som.h +++ b/include/configs/olimex_am335x_som.h @@ -53,6 +53,7 @@ #endif #ifndef CONFIG_SPL_BUILD +#if 0 #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "boot_fdt=try\0" \ @@ -109,6 +110,13 @@ "fi;\0" \ NANDARGS /*DFUARGS*/ +#else +#define CONFIG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x82000000\0" \ + "fdtaddr=0x88000000\0" \ + "bootargs=console=ttyO0,115200n8 rootwait root=/dev/mmcblk0p1\0" \ + "bootcmd=ext4load mmc 0:1 $loadaddr /boot/zImage; ext4load mmc 0:1 $fdtaddr /boot/am335x-olimex-som.dtb; bootz $loadaddr - $fdtaddr\0" +#endif #endif /* NS16550 Configuration */ |