diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-08 07:41:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-08 07:41:50 -0500 |
| commit | 472c5484bca41a477f8b86a263e559f6e992c7f8 (patch) | |
| tree | 81cd0e06894ef472beb43bf0665e753ae76b8cce | |
| parent | b0a75dda7e542c9ddea685ceb2251118638829d5 (diff) | |
| parent | 266637db88e37686b160722e183571567c61ad1a (diff) | |
| download | u-boot-WIP/08Mar2021.tar.gz | |
Merge tag 'u-boot-amlogic-20210308' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogicWIP/08Mar2021
- button: adc: fix treshold typo
- configs: meson64: add fdtoverlay_addr_r
| -rw-r--r-- | drivers/button/button-adc.c | 14 | ||||
| -rw-r--r-- | include/configs/meson64.h | 1 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/button/button-adc.c b/drivers/button/button-adc.c index eed86564fb..fd896c76f9 100644 --- a/drivers/button/button-adc.c +++ b/drivers/button/button-adc.c @@ -55,7 +55,7 @@ static int button_adc_of_to_plat(struct udevice *dev) struct button_uc_plat *uc_plat = dev_get_uclass_plat(dev); struct button_adc_priv *priv = dev_get_priv(dev); struct ofnode_phandle_args args; - u32 treshold, up_treshold, t; + u32 threshold, up_threshold, t; ofnode node; int ret; @@ -73,12 +73,12 @@ static int button_adc_of_to_plat(struct udevice *dev) return ret; ret = ofnode_read_u32(dev_ofnode(dev->parent), - "keyup-threshold-microvolt", &up_treshold); + "keyup-threshold-microvolt", &up_threshold); if (ret) return ret; ret = ofnode_read_u32(dev_ofnode(dev), "press-threshold-microvolt", - &treshold); + &threshold); if (ret) return ret; @@ -87,13 +87,13 @@ static int button_adc_of_to_plat(struct udevice *dev) if (ret) return ret; - if (t > treshold) - up_treshold = t; + if (t > threshold) + up_threshold = t; } priv->channel = args.args[0]; - priv->min = treshold; - priv->max = up_treshold; + priv->min = threshold; + priv->max = up_threshold; return ret; } diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 52cc01f73d..7e97f89052 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -80,6 +80,7 @@ "scriptaddr=0x08000000\0" \ "kernel_addr_r=0x08080000\0" \ "pxefile_addr_r=0x01080000\0" \ + "fdtoverlay_addr_r=0x01000000\0" \ "ramdisk_addr_r=0x13000000\0" \ "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ BOOTENV |