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

Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"

Browse Source 
This reverts commit 5d3a21df66, reversing
changes made to 56d37f1c56.

Unfortunately this is causing CI failures:
https://travis-ci.org/github/trini/u-boot/jobs/711313649

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2020-07-24 08:42:06 -04:00
parent 5d3a21df66
commit 7208396bbf
319 changed files with 653 additions and 2503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
drivers/soc/soc-uclass.c
View File

@@ -1,102 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/
* Dave Gerlach <d-gerlach@ti.com>
*/
#include <common.h>
#include <soc.h>
#include <dm.h>
#include <errno.h>
#include <dm/lists.h>
#include <dm/root.h>
int soc_get(struct udevice **devp)
{
return uclass_first_device_err(UCLASS_SOC, devp);
}
int soc_get_machine(struct udevice *dev, char *buf, int size)
{
struct soc_ops *ops = soc_get_ops(dev);
if (!ops->get_machine)
return -ENOSYS;
return ops->get_machine(dev, buf, size);
}
int soc_get_family(struct udevice *dev, char *buf, int size)
{
struct soc_ops *ops = soc_get_ops(dev);
if (!ops->get_family)
return -ENOSYS;
return ops->get_family(dev, buf, size);
}
int soc_get_revision(struct udevice *dev, char *buf, int size)
{
struct soc_ops *ops = soc_get_ops(dev);
if (!ops->get_revision)
return -ENOSYS;
return ops->get_revision(dev, buf, size);
}
const struct soc_attr *
soc_device_match(const struct soc_attr *matches)
{
bool match;
struct udevice *soc;
char str[SOC_MAX_STR_SIZE];
if (!matches)
return NULL;
if (soc_get(&soc))
return NULL;
while (1) {
if (!(matches->machine || matches->family ||
matches->revision))
break;
match = true;
if (matches->machine) {
if (!soc_get_machine(soc, str, SOC_MAX_STR_SIZE)) {
if (strcmp(matches->machine, str))
match = false;
}
}
if (matches->family) {
if (!soc_get_family(soc, str, SOC_MAX_STR_SIZE)) {
if (strcmp(matches->family, str))
match = false;
}
}
if (matches->revision) {
if (!soc_get_revision(soc, str, SOC_MAX_STR_SIZE)) {
if (strcmp(matches->revision, str))
match = false;
}
}
if (match)
return matches;
matches++;
}
return NULL;
}
UCLASS_DRIVER(soc) = {
.id = UCLASS_SOC,
.name = "soc",
};