Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-06 05:02:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reset: uniphier: Add NX1 reset support

Browse Source 
Add basic reset data for UniPhier NX1 SoC.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Link: https://lore.kernel.org/r/1633399842-1402-4-git-send-email-hayashi.kunihiko@socionext.com
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Kunihiko Hayashi 2021-10-05 11:10:42 +09:00 committed by Philipp Zabel
parent 659b83ccda
commit 3440b8fa06
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/reset/reset-uniphier-glue.c
View File

@ -155,6 +155,10 @@ static const struct of_device_id uniphier_glue_reset_match[] = {
.compatible = "socionext,uniphier-pxs3-usb3-reset", .compatible = "socionext,uniphier-pxs3-usb3-reset",
.data = &uniphier_pxs2_data, .data = &uniphier_pxs2_data,
}, },
{
.compatible = "socionext,uniphier-nx1-usb3-reset",
.data = &uniphier_pxs2_data,
},
{ {
.compatible = "socionext,uniphier-pro4-ahci-reset", .compatible = "socionext,uniphier-pro4-ahci-reset",
.data = &uniphier_pro4_data, .data = &uniphier_pro4_data,

25
drivers/reset/reset-uniphier.c
View File

@ -141,6 +141,19 @@ static const struct uniphier_reset_data uniphier_pxs3_sys_reset_data[] = {
UNIPHIER_RESET_END, UNIPHIER_RESET_END,
}; };
static const struct uniphier_reset_data uniphier_nx1_sys_reset_data[] = {
UNIPHIER_RESETX(4, 0x2008, 8), /* eMMC */
UNIPHIER_RESETX(6, 0x200c, 0), /* Ether */
UNIPHIER_RESETX(12, 0x200c, 16), /* USB30 link */
UNIPHIER_RESETX(16, 0x200c, 24), /* USB30-PHY0 */
UNIPHIER_RESETX(17, 0x200c, 25), /* USB30-PHY1 */
UNIPHIER_RESETX(18, 0x200c, 26), /* USB30-PHY2 */
UNIPHIER_RESETX(24, 0x200c, 8), /* PCIe */
UNIPHIER_RESETX(52, 0x2010, 0), /* VOC */
UNIPHIER_RESETX(58, 0x2010, 8), /* HDMI-Tx */
UNIPHIER_RESET_END,
};
/* Media I/O reset data */ /* Media I/O reset data */
#define UNIPHIER_MIO_RESET_SD(id, ch) \ #define UNIPHIER_MIO_RESET_SD(id, ch) \
UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0) UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0)
@ -402,6 +415,10 @@ static const struct of_device_id uniphier_reset_match[] = {
.compatible = "socionext,uniphier-pxs3-reset", .compatible = "socionext,uniphier-pxs3-reset",
.data = uniphier_pxs3_sys_reset_data, .data = uniphier_pxs3_sys_reset_data,
}, },
{
.compatible = "socionext,uniphier-nx1-reset",
.data = uniphier_nx1_sys_reset_data,
},
/* Media I/O reset, SD reset */ /* Media I/O reset, SD reset */
{ {
.compatible = "socionext,uniphier-ld4-mio-reset", .compatible = "socionext,uniphier-ld4-mio-reset",
@ -439,6 +456,10 @@ static const struct of_device_id uniphier_reset_match[] = {
.compatible = "socionext,uniphier-pxs3-sd-reset", .compatible = "socionext,uniphier-pxs3-sd-reset",
.data = uniphier_pro5_sd_reset_data, .data = uniphier_pro5_sd_reset_data,
}, },
{
.compatible = "socionext,uniphier-nx1-sd-reset",
.data = uniphier_pro5_sd_reset_data,
},
/* Peripheral reset */ /* Peripheral reset */
{ {
.compatible = "socionext,uniphier-ld4-peri-reset", .compatible = "socionext,uniphier-ld4-peri-reset",
@ -472,6 +493,10 @@ static const struct of_device_id uniphier_reset_match[] = {
.compatible = "socionext,uniphier-pxs3-peri-reset", .compatible = "socionext,uniphier-pxs3-peri-reset",
.data = uniphier_pro4_peri_reset_data, .data = uniphier_pro4_peri_reset_data,
}, },
{
.compatible = "socionext,uniphier-nx1-peri-reset",
.data = uniphier_pro4_peri_reset_data,
},
/* Analog signal amplifiers reset */ /* Analog signal amplifiers reset */
{ {
.compatible = "socionext,uniphier-ld11-adamv-reset", .compatible = "socionext,uniphier-ld11-adamv-reset",