dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-11-01 19:05:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

gpio: turris_omnia_mcu: Update firmware features reading

Browse Source 
Update firmware features reading to try reading 32 bits of features and
fallback to reading 16 bits.

Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Behún
2024-04-04 09:51:02 +02:00
committed by Stefan Roese
parent c07206fb8b
commit 68e09ae19e
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpio/turris_omnia_mcu.c
View File

@@ -10,7 +10,7 @@
#include <linux/log2.h>
struct turris_omnia_mcu_info {
u16 features;
u32 features;
};
static int turris_omnia_mcu_get_function(struct udevice *dev, uint offset)
@@ -228,25 +228,37 @@ static int turris_omnia_mcu_probe(struct udevice *dev)
{
struct turris_omnia_mcu_info *info = dev_get_plat(dev);
struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
u16 val;
u32 dword;
u16 word;
int ret;
ret = dm_i2c_read(dev, CMD_GET_STATUS_WORD, (void *)&val, sizeof(val));
ret = dm_i2c_read(dev, CMD_GET_STATUS_WORD, (void *)&word, sizeof(word));
if (ret < 0) {
printf("Error: turris_omnia_mcu CMD_GET_STATUS_WORD failed: %d\n",
ret);
return ret;
}
if (le16_to_cpu(val) & STS_FEATURES_SUPPORTED) {
ret = dm_i2c_read(dev, CMD_GET_FEATURES, (void *)&val,
sizeof(val));
if (le16_to_cpu(word) & STS_FEATURES_SUPPORTED) {
/* try read 32-bit features */
ret = dm_i2c_read(dev, CMD_GET_FEATURES, (void *)&dword,
sizeof(dword));
if (ret < 0) {
printf("Error: turris_omnia_mcu CMD_GET_FEATURES failed: %d\n",
ret);
return ret;
/* try read 16-bit features */
ret = dm_i2c_read(dev, CMD_GET_FEATURES, (void *)&word,
sizeof(word));
if (ret < 0) {
printf("Error: turris_omnia_mcu CMD_GET_FEATURES failed: %d\n",
ret);
return ret;
}
info->features = le16_to_cpu(word);
} else {
info->features = le32_to_cpu(dword);
if (info->features & FEAT_FROM_BIT_16_INVALID)
info->features &= GENMASK(15, 0);
}
info->features = le16_to_cpu(val);
}
uc_priv->bank_name = "mcu_";