mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
- button: adc: fix treshold typo
- configs: meson64: add fdtoverlay_addr_r -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmBF8l4ACgkQd9zb2sjI SdENzQ/+INYm7lPVl2dgeroaJu/d4A1UkFCxDo7U3ak/MGMbpRmIcSpR6wS58L42 WZGnIqqxfRPNRI1pdlrR0Hx3N9FTVSPFIOYa3bM46yHng55mkP9HsaeNTaLeCJAy hgvu5Xr5LgVhUCOK5cBsHROlgD1UpnlqjKSDUS16GzN3k+DWZ6MLDxrKdE49kv8P c4UMCVM8tdFlS9POt3qGJobkv73pztNZ5RPU86q9XFHRfBadRhedHdiNF4McBk8p bFemlqyskK4V8QLIJdHgELLAgezUzFMPq/RpGvTpv89quwQDj+lAzdWmIxh9tMW3 ZeWv3C33aydX6mWzjLb5eWRmtVt3NNUCvC4oXBRr60/W4B3UssIFAa5ZXD49TjG7 kPnLvh+1ahFPuRK4oVUDMwZoJAOeq49MWBgSiW2OIT8aRjFIzRhsR72YEPsIxLAn qXpk4Dn+nuiJxjwGwiTcCe6OZYGn69fTs76ONELm891MBVsACAxzpnGDbjI/47E9 P0bpaASPoYttK+F3FWW3UPz69NHyys/ZSAhIUlyUZKClt2gGCkma+bC1Vlg9IEdA OQTXT4LGAP6J48cdGphBJ5W8LF4QeXMUlGAIEmfrqW1X2fHgBxju8UN0q9dochmz 1fkn0glc0JavfaV16SIrNnrx8MdNBWFtQoZ7nriUsRVOWDY9mgA= =wFWd -----END PGP SIGNATURE----- Merge tag 'u-boot-amlogic-20210308' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic - button: adc: fix treshold typo - configs: meson64: add fdtoverlay_addr_r
This commit is contained in:
commit
472c5484bc
2 changed files with 8 additions and 7 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue