| From foo@baz Sun Jun 17 12:07:33 CEST 2018 |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Date: Thu, 12 Apr 2018 11:16:10 +0900 |
| Subject: reset: uniphier: fix USB clock line for LD20 |
| |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| |
| [ Upstream commit e6914365fd280fce303a89b8a8d4529af5a2e0f9 ] |
| |
| For LD20, the bit 5 of the offset 0x200c turned out to be a USB3 |
| reset. The hardware document says it is the GIO reset despite LD20 |
| has no GIO bus, confusingly. |
| |
| Also, fix confusing comments for PXs3. |
| |
| Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/reset/reset-uniphier.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/reset/reset-uniphier.c |
| +++ b/drivers/reset/reset-uniphier.c |
| @@ -107,7 +107,7 @@ static const struct uniphier_reset_data |
| UNIPHIER_RESETX(4, 0x200c, 2), /* eMMC */ |
| UNIPHIER_RESETX(6, 0x200c, 6), /* Ether */ |
| UNIPHIER_RESETX(8, 0x200c, 8), /* STDMAC (HSC) */ |
| - UNIPHIER_RESETX(12, 0x200c, 5), /* GIO (PCIe, USB3) */ |
| + UNIPHIER_RESETX(14, 0x200c, 5), /* USB30 */ |
| UNIPHIER_RESETX(16, 0x200c, 12), /* USB30-PHY0 */ |
| UNIPHIER_RESETX(17, 0x200c, 13), /* USB30-PHY1 */ |
| UNIPHIER_RESETX(18, 0x200c, 14), /* USB30-PHY2 */ |
| @@ -122,8 +122,8 @@ static const struct uniphier_reset_data |
| UNIPHIER_RESETX(2, 0x200c, 0), /* NAND */ |
| UNIPHIER_RESETX(4, 0x200c, 2), /* eMMC */ |
| UNIPHIER_RESETX(8, 0x200c, 12), /* STDMAC */ |
| - UNIPHIER_RESETX(12, 0x200c, 4), /* USB30 link (GIO0) */ |
| - UNIPHIER_RESETX(13, 0x200c, 5), /* USB31 link (GIO1) */ |
| + UNIPHIER_RESETX(12, 0x200c, 4), /* USB30 link */ |
| + UNIPHIER_RESETX(13, 0x200c, 5), /* USB31 link */ |
| UNIPHIER_RESETX(16, 0x200c, 16), /* USB30-PHY0 */ |
| UNIPHIER_RESETX(17, 0x200c, 18), /* USB30-PHY1 */ |
| UNIPHIER_RESETX(18, 0x200c, 20), /* USB30-PHY2 */ |