Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

reset: uniphier: Add NX1 reset support

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>

authored by

Kunihiko Hayashi and committed by
Philipp Zabel
3440b8fa 659b83cc

+29
+4
drivers/reset/reset-uniphier-glue.c
··· 156 156 .data = &uniphier_pxs2_data, 157 157 }, 158 158 { 159 + .compatible = "socionext,uniphier-nx1-usb3-reset", 160 + .data = &uniphier_pxs2_data, 161 + }, 162 + { 159 163 .compatible = "socionext,uniphier-pro4-ahci-reset", 160 164 .data = &uniphier_pro4_data, 161 165 },
+25
drivers/reset/reset-uniphier.c
··· 141 141 UNIPHIER_RESET_END, 142 142 }; 143 143 144 + static const struct uniphier_reset_data uniphier_nx1_sys_reset_data[] = { 145 + UNIPHIER_RESETX(4, 0x2008, 8), /* eMMC */ 146 + UNIPHIER_RESETX(6, 0x200c, 0), /* Ether */ 147 + UNIPHIER_RESETX(12, 0x200c, 16), /* USB30 link */ 148 + UNIPHIER_RESETX(16, 0x200c, 24), /* USB30-PHY0 */ 149 + UNIPHIER_RESETX(17, 0x200c, 25), /* USB30-PHY1 */ 150 + UNIPHIER_RESETX(18, 0x200c, 26), /* USB30-PHY2 */ 151 + UNIPHIER_RESETX(24, 0x200c, 8), /* PCIe */ 152 + UNIPHIER_RESETX(52, 0x2010, 0), /* VOC */ 153 + UNIPHIER_RESETX(58, 0x2010, 8), /* HDMI-Tx */ 154 + UNIPHIER_RESET_END, 155 + }; 156 + 144 157 /* Media I/O reset data */ 145 158 #define UNIPHIER_MIO_RESET_SD(id, ch) \ 146 159 UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0) ··· 415 402 .compatible = "socionext,uniphier-pxs3-reset", 416 403 .data = uniphier_pxs3_sys_reset_data, 417 404 }, 405 + { 406 + .compatible = "socionext,uniphier-nx1-reset", 407 + .data = uniphier_nx1_sys_reset_data, 408 + }, 418 409 /* Media I/O reset, SD reset */ 419 410 { 420 411 .compatible = "socionext,uniphier-ld4-mio-reset", ··· 456 439 .compatible = "socionext,uniphier-pxs3-sd-reset", 457 440 .data = uniphier_pro5_sd_reset_data, 458 441 }, 442 + { 443 + .compatible = "socionext,uniphier-nx1-sd-reset", 444 + .data = uniphier_pro5_sd_reset_data, 445 + }, 459 446 /* Peripheral reset */ 460 447 { 461 448 .compatible = "socionext,uniphier-ld4-peri-reset", ··· 491 470 }, 492 471 { 493 472 .compatible = "socionext,uniphier-pxs3-peri-reset", 473 + .data = uniphier_pro4_peri_reset_data, 474 + }, 475 + { 476 + .compatible = "socionext,uniphier-nx1-peri-reset", 494 477 .data = uniphier_pro4_peri_reset_data, 495 478 }, 496 479 /* Analog signal amplifiers reset */