brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch '2020-02-10-master-imports'

Browse Source 
- Regulator fix
- Documentation fix
- Correct LOGLEVEL range
This commit is contained in:
Tom Rini 2020-02-11 07:32:44 -05:00
commit ae347120ee
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Kconfig
View File

@ -469,7 +469,7 @@ config IDENT_STRING
config LOGLEVEL config LOGLEVEL
int "loglevel" int "loglevel"
default 4 default 4
range 0 8 range 0 10
help help
All Messages with a loglevel smaller than the console loglevel will All Messages with a loglevel smaller than the console loglevel will
be compiled in. The loglevels are defined as follows: be compiled in. The loglevels are defined as follows:

8
doc/driver-model/design.rst
View File

@ -231,7 +231,7 @@ You should see something like this::
What is going on? What is going on?
----------------- -----------------
Let's start at the top. The demo command is in common/cmd_demo.c. It does Let's start at the top. The demo command is in cmd/demo.c. It does
the usual command processing and then: the usual command processing and then:
.. code-block:: c .. code-block:: c
@ -402,7 +402,7 @@ in the board file.
.. code-block:: c .. code-block:: c
static const struct dm_demo_cdata red_square = { static const struct dm_demo_pdata red_square = {
.colour = "red", .colour = "red",
.sides = 4. .sides = 4.
}; };
@ -489,12 +489,12 @@ The demo uclass is declared like this:
.. code-block:: c .. code-block:: c
U_BOOT_CLASS(demo) = { UCLASS_DRIVER(demo) = {
.id = UCLASS_DEMO, .id = UCLASS_DEMO,
}; };
It is also possible to specify special methods for probe, etc. The uclass It is also possible to specify special methods for probe, etc. The uclass
numbering comes from include/dm/uclass.h. To add a new uclass, add to the numbering comes from include/dm/uclass-id.h. To add a new uclass, add to the
end of the enum there, then declare your uclass as above. end of the enum there, then declare your uclass as above.

3
drivers/power/regulator/regulator-uclass.c
View File

@ -464,6 +464,9 @@ static int regulator_pre_probe(struct udevice *dev)
(uc_pdata->min_uA == uc_pdata->max_uA)) (uc_pdata->min_uA == uc_pdata->max_uA))
uc_pdata->flags |= REGULATOR_FLAG_AUTOSET_UA; uc_pdata->flags |= REGULATOR_FLAG_AUTOSET_UA;
if (uc_pdata->boot_on)
regulator_set_enable(dev, uc_pdata->boot_on);
return 0; return 0;
} }

5
drivers/power/regulator/regulator_common.c
View File

@ -12,16 +12,11 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev,
struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name) struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name)
{ {
struct gpio_desc *gpio; struct gpio_desc *gpio;
struct dm_regulator_uclass_platdata *uc_pdata;
int flags = GPIOD_IS_OUT; int flags = GPIOD_IS_OUT;
int ret; int ret;
uc_pdata = dev_get_uclass_platdata(dev);
if (!dev_read_bool(dev, "enable-active-high")) if (!dev_read_bool(dev, "enable-active-high"))
flags |= GPIOD_ACTIVE_LOW; flags |= GPIOD_ACTIVE_LOW;
if (uc_pdata->boot_on)
flags |= GPIOD_IS_OUT_ACTIVE;
/* Get optional enable GPIO desc */ /* Get optional enable GPIO desc */
gpio = &dev_pdata->gpio; gpio = &dev_pdata->gpio;