leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-dm

Browse Source
This commit is contained in:
Tom Rini 2014-10-28 12:39:26 -04:00
commit 93575c30ac
10 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/exynos4210-pinctrl-uboot.dtsi
View File

@ -14,7 +14,7 @@
pinctrl_1: pinctrl@11000000 {
#address-cells = <1>;
#size-cells = <0>;
gpy0: gpy0 {
gpx0: gpx0 {
reg = <0xc00>;
};
};

4
arch/arm/dts/exynos4210-trats.dts
View File

@ -101,7 +101,7 @@
sdhci@12510000 {
samsung,bus-width = <8>;
samsung,timing = <1 3 3>;
pwr-gpios = <&gpio 0xA2 0>;
pwr-gpios = <&gpio 146 0>;
};
sdhci@12520000 {
@ -111,7 +111,7 @@
sdhci@12530000 {
samsung,bus-width = <4>;
samsung,timing = <1 2 3>;
cd-gpios = <&gpio 0x39C 0>;
cd-gpios = <&gpio 284 0>;
};
sdhci@12540000 {

4
arch/arm/dts/exynos4210-universal_c210.dts
View File

@ -24,7 +24,7 @@
sdhci@12510000 {
samsung,bus-width = <8>;
samsung,timing = <1 3 3>;
pwr-gpios = <&gpio 0xA2 0>;
pwr-gpios = <&gpio 146 0>;
};
sdhci@12520000 {
@ -34,7 +34,7 @@
sdhci@12530000 {
samsung,bus-width = <4>;
samsung,timing = <1 2 3>;
cd-gpios = <&gpio 0x39C 0>;
cd-gpios = <&gpio 284 0>;
};
sdhci@12540000 {

4
arch/arm/dts/exynos4412-odroid.dts
View File

@ -8,7 +8,7 @@
*/
/dts-v1/;
#include "exynos4.dtsi"
#include "exynos4412.dtsi"
/ {
model = "Odroid based on Exynos4412";
@ -51,7 +51,7 @@
sdhci@12530000 {
samsung,bus-width = <4>;
samsung,timing = <1 2 3>;
cd-gpios = <&gpio 0xC2 0>;
cd-gpios = <&gpio 122 0>;
};
sdhci@12540000 {

6
arch/arm/dts/exynos4412-trats2.dts
View File

@ -416,7 +416,7 @@
sdhci@12510000 {
samsung,bus-width = <8>;
samsung,timing = <1 3 3>;
pwr-gpios = <&gpio 0xB2 0>;
pwr-gpios = <&gpio 0x6a 0>;
status = "disabled";
};
@ -427,7 +427,7 @@
sdhci@12530000 {
samsung,bus-width = <4>;
samsung,timing = <1 2 3>;
cd-gpios = <&gpio 0x3BC 0>;
cd-gpios = <&gpio 0x7a 0>;
};
sdhci@12540000 {
@ -437,7 +437,7 @@
dwmmc@12550000 {
samsung,bus-width = <8>;
samsung,timing = <2 1 0>;
pwr-gpios = <&gpio 0xB2 0>;
pwr-gpios = <&gpio 0x6a 0>;
fifoth_val = <0x203f0040>;
bus_hz = <400000000>;
div = <0x3>;

5
arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi
View File

@ -9,7 +9,7 @@
#address-cells = <1>;
#size-cells = <0>;
gpf0: gpf0 {
reg = <0xc180>;
reg = <0x180>;
};
gpj0: gpj0 {
reg = <0x240>;
@ -25,9 +25,6 @@
gpm0: gpm0 {
reg = <0x260>;
};
gpy0: gpy0 {
reg = <0x120>;
};
gpx0: gpx0 {
reg = <0xc00>;
};

70
arch/arm/dts/exynos4x12-pinctrl.dtsi
View File

@ -176,6 +176,41 @@
#interrupt-cells = <2>;
};
gpy0: gpy0 {
gpio-controller;
#gpio-cells = <2>;
};
gpy1: gpy1 {
gpio-controller;
#gpio-cells = <2>;
};
gpy2: gpy2 {
gpio-controller;
#gpio-cells = <2>;
};
gpy3: gpy3 {
gpio-controller;
#gpio-cells = <2>;
};
gpy4: gpy4 {
gpio-controller;
#gpio-cells = <2>;
};
gpy5: gpy5 {
gpio-controller;
#gpio-cells = <2>;
};
gpy6: gpy6 {
gpio-controller;
#gpio-cells = <2>;
};
gpm0: gpm0 {
gpio-controller;
#gpio-cells = <2>;
@ -216,41 +251,6 @@
#interrupt-cells = <2>;
};
gpy0: gpy0 {
gpio-controller;
#gpio-cells = <2>;
};
gpy1: gpy1 {
gpio-controller;
#gpio-cells = <2>;
};
gpy2: gpy2 {
gpio-controller;
#gpio-cells = <2>;
};
gpy3: gpy3 {
gpio-controller;
#gpio-cells = <2>;
};
gpy4: gpy4 {
gpio-controller;
#gpio-cells = <2>;
};
gpy5: gpy5 {
gpio-controller;
#gpio-cells = <2>;
};
gpy6: gpy6 {
gpio-controller;
#gpio-cells = <2>;
};
gpx0: gpx0 {
gpio-controller;
#gpio-cells = <2>;

9
board/samsung/universal_c210/universal.c
View File

@ -328,6 +328,8 @@ void exynos_enable_ldo(unsigned int onoff)
int exynos_init(void)
{
char buf[16];
gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
switch (get_hwrev()) {
@ -352,6 +354,13 @@ int exynos_init(void)
break;
}
/* Request soft I2C gpios */
sprintf(buf, "soft_i2c_scl");
gpio_request(CONFIG_SOFT_I2C_GPIO_SCL, buf);
sprintf(buf, "soft_i2c_sda");
gpio_request(CONFIG_SOFT_I2C_GPIO_SDA, buf);
check_hw_revision();
printf("HW Revision:\t0x%x\n", board_rev);

2
drivers/mmc/s5p_sdhci.c
View File

@ -123,7 +123,7 @@ static int do_sdhci_init(struct sdhci_host *host)
if (fdt_gpio_isvalid(&host->cd_gpio)) {
sprintf(str, "sdhci%d_cd", host->index & 0xf);
gpio_request(host->cd_gpio.gpio, str);
gpio_direction_output(host->cd_gpio.gpio, 1);
gpio_direction_input(host->cd_gpio.gpio);
if (gpio_get_value(host->cd_gpio.gpio))
return -ENODEV;

1
include/configs/exynos-common.h
View File

@ -75,6 +75,7 @@
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
#define CONFIG_FAT_WRITE
#define CONFIG_CMD_FS_GENERIC
#define CONFIG_DOS_PARTITION
#define CONFIG_EFI_PARTITION