Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 09:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allwinner drivers changes for 4.6

Browse Source 
Some minor fixes for the RSB and SRAM controller drivers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJW0Ki1AAoJEBx+YmzsjxAgL/oP/2uBsxDoIbaZP77nPtH7S6/1
 k7t7J3NGek8r/FeRpo8Gqu4jt5D9RTypJABOknSXg1mXyYuKuReZt/91MiLFUpnz
 ILcwQ8pMdNiHXxXh56JqIDv6NPCyheaMxkOcVwPPDRsJIgzUNB5CyH8ewlIVXXiK
 wma3L3Yj7h3yrwKe6dLySvbaw1/gwcax8jVh2Tttj2kT+AQYCIIMd5C/g5hz5LDy
 zKCi/ejJ+3s9RQCHx0gdxITOKz2Ue50LUlSInpuetrvUFbWzAb3DPSZN+lueCw+Y
 3SFQVg48SrGaQSYBtdnzPROE2SFf17I2FN/vH5qfgE9lAfQPM5BGfUGxB75gTldg
 ZYsNGg0vK8+Pqy5ouQClxti3WbY3TQpYPlWPD/RId/1IkcKfEg+qQntWprX+2rU/
 yHXJZKticB3gx9z/0mRFYSKkiZlA7Z0rmU5+jYbChHwbKtFAmE+NjoKgp2lW7Sgj
 y0gdDCdt8pRLfQEl5MifIjWKXmBO0RslZY3MnE08IAOmtrT97EYwrb/36MQzPktL
 Rl8BhfZBc+VfFG++cXpQh3ZkNttGqvg9tl5sj/3CuIAAEENVCmaQUbY2jrlBQsIp
 MVAvdDTFZ5vbD8923XUH3N6t/E5Tmx8M66KyPPE6Vkv1MLXKLDto6O0GIEeZXje5
 Y6RxAKdHpPWJ8DkDIs0g
 =5Ffk
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-drivers-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/drivers

Merge "Allwinner drivers changes for 4.6" from Maxime Ripard:

Some minor fixes for the RSB and SRAM controller drivers

* tag 'sunxi-drivers-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  drivers: soc: sunxi: Fix mask generation for SRAM mapping
  drivers: sunxi-rsb: fix error output type
This commit is contained in:
Arnd Bergmann 2016-03-01 00:34:41 +01:00
commit 87023bc2ed
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bus/sunxi-rsb.c
View File

@ -330,7 +330,7 @@ static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr,
cmd = RSB_CMD_RD32;
break;
default:
dev_err(rsb->dev, "Invalid access width: %d\n", len);
dev_err(rsb->dev, "Invalid access width: %zd\n", len);
return -EINVAL;
}
@ -372,7 +372,7 @@ static int sunxi_rsb_write(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr,
cmd = RSB_CMD_WR32;
break;
default:
dev_err(rsb->dev, "Invalid access width: %d\n", len);
dev_err(rsb->dev, "Invalid access width: %zd\n", len);
return -EINVAL;
}

5
drivers/soc/sunxi/sunxi_sram.c
View File

@ -117,7 +117,7 @@ static int sunxi_sram_show(struct seq_file *s, void *data)
val = readl(base + sram_data->reg);
val >>= sram_data->offset;
val &= sram_data->width;
val &= GENMASK(sram_data->width - 1, 0);
for (func = sram_data->func; func->func; func++) {
seq_printf(s, "\t\t%s%c\n", func->func,
@ -208,7 +208,8 @@ int sunxi_sram_claim(struct device *dev)
return -EBUSY;
}
mask = GENMASK(sram_data->offset + sram_data->width, sram_data->offset);
mask = GENMASK(sram_data->offset + sram_data->width - 1,
sram_data->offset);
val = readl(base + sram_data->reg);
val &= ~mask;
writel(val | ((device << sram_data->offset) & mask),