dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'u-boot-samsung/master'

Browse Source 
Conflicts:
	boards.cfg

Conflict was trivial between goni maintainer change and
lager_nor removal.
This commit is contained in:
Albert ARIBAUD
2014-07-01 20:52:51 +02:00
parent 019b57cc1d 5287d59544
commit 304f936aea
23 changed files with 717 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/power/pmic/pmic_max77686.c
View File

@@ -210,6 +210,10 @@ int pmic_init(unsigned char bus)
{
static const char name[] = "MAX77686_PMIC";
struct pmic *p = pmic_alloc();
#ifdef CONFIG_OF_CONTROL
const void *blob = gd->fdt_blob;
int node, parent, tmp;
#endif
if (!p) {
printf("%s: POWER allocation error!\n", __func__);
@@ -217,9 +221,6 @@ int pmic_init(unsigned char bus)
}
#ifdef CONFIG_OF_CONTROL
const void *blob = gd->fdt_blob;
int node, parent;
node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC);
if (node < 0) {
debug("PMIC: No node for PMIC Chip in device tree\n");
@@ -233,11 +234,13 @@ int pmic_init(unsigned char bus)
return -1;
}
p->bus = i2c_get_bus_num_fdt(parent);
if (p->bus < 0) {
/* tmp since p->bus is unsigned */
tmp = i2c_get_bus_num_fdt(parent);
if (tmp < 0) {
debug("%s: Cannot find I2C bus\n", __func__);
return -1;
}
p->bus = tmp;
p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9);
#else
p->bus = bus;

5
drivers/spi/exynos_spi.c
View File

@@ -302,7 +302,10 @@ static int spi_rx_tx(struct exynos_spi_slave *spi_slave, int todo,
}
} else {
if (rxp || stopping) {
*rxp = temp;
if (step == 4)
*(uint32_t *)rxp = temp;
else
*rxp = temp;
rxp += step;
}
in_bytes -= step;