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

Merge tag 'u-boot-amlogic-20210222' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic

Browse Source 
- adds adc-keys button driver
- fix meson-saradc driver to get reference voltage
- add adc-keys test for sandbox
- enable adc-keys for VIM3 & VIM3L boards
- fix button.h build
This commit is contained in:
Tom Rini
2021-02-22 12:37:02 -05:00
parent bced796e2d 2d339efb1f
commit 8f7a16aac3
11 changed files with 325 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test/dm/button.c
View File

@@ -7,7 +7,10 @@
#include <common.h>
#include <dm.h>
#include <adc.h>
#include <button.h>
#include <power/regulator.h>
#include <power/sandbox_pmic.h>
#include <asm/gpio.h>
#include <dm/test.h>
#include <test/ut.h>
@@ -17,11 +20,20 @@ static int dm_test_button_base(struct unit_test_state *uts)
{
struct udevice *dev;
/* Get the top-level device */
/* Get the top-level gpio buttons device */
ut_assertok(uclass_get_device(UCLASS_BUTTON, 0, &dev));
/* Get the 2 gpio buttons */
ut_assertok(uclass_get_device(UCLASS_BUTTON, 1, &dev));
ut_assertok(uclass_get_device(UCLASS_BUTTON, 2, &dev));
ut_asserteq(-ENODEV, uclass_get_device(UCLASS_BUTTON, 3, &dev));
/* Get the top-level adc buttons device */
ut_assertok(uclass_get_device(UCLASS_BUTTON, 3, &dev));
/* Get the 3 adc buttons */
ut_assertok(uclass_get_device(UCLASS_BUTTON, 4, &dev));
ut_assertok(uclass_get_device(UCLASS_BUTTON, 5, &dev));
ut_assertok(uclass_get_device(UCLASS_BUTTON, 6, &dev));
ut_asserteq(-ENODEV, uclass_get_device(UCLASS_BUTTON, 7, &dev));
return 0;
}
@@ -72,3 +84,37 @@ static int dm_test_button_label(struct unit_test_state *uts)
return 0;
}
DM_TEST(dm_test_button_label, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
/* Test adc-keys driver */
static int dm_test_button_keys_adc(struct unit_test_state *uts)
{
struct udevice *supply;
struct udevice *dev;
int uV;
ut_assertok(uclass_get_device_by_name(UCLASS_ADC, "adc@0", &dev));
ut_assertok(regulator_get_by_devname(SANDBOX_BUCK2_DEVNAME, &supply));
ut_assertok(regulator_set_value(supply, SANDBOX_BUCK2_SET_UV));
ut_asserteq(SANDBOX_BUCK2_SET_UV, regulator_get_value(supply));
/* Update ADC plat and get new Vdd value */
ut_assertok(adc_vdd_value(dev, &uV));
ut_asserteq(SANDBOX_BUCK2_SET_UV, uV);
/*
* sandbox-adc returns constant value on channel 3, is used by adc-keys:
* SANDBOX_ADC_CHANNEL3_DATA * SANDBOX_BUCK2_SET_UV / SANDBOX_ADC_DATA_MASK =
* 0x3000 * 3300000 / 0xffff = 618759uV
* This means that button3 and button4 are released and button5
* is pressed.
*/
ut_assertok(button_get_by_label("button3", &dev));
ut_asserteq(BUTTON_OFF, button_get_state(dev));
ut_assertok(button_get_by_label("button4", &dev));
ut_asserteq(BUTTON_OFF, button_get_state(dev));
ut_assertok(button_get_by_label("button5", &dev));
ut_asserteq(BUTTON_ON, button_get_state(dev));
return 0;
}
DM_TEST(dm_test_button_keys_adc, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);