reset: uniphier: add PXs3 reset data

Add basic reset data for Socionext's new SoC PXs3.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/Documentation/devicetree/bindings/reset/uniphier-reset.txt b/Documentation/devicetree/bindings/reset/uniphier-reset.txt
index 68a6f487c4092f205eb4cae09ca962195c15c06e..93efed629900c65f9c9b1d74265cb4d2c7936245 100644 (file)
--- a/Documentation/devicetree/bindings/reset/uniphier-reset.txt
+++ b/Documentation/devicetree/bindings/reset/uniphier-reset.txt
@@ -13,6 +13,7 @@ Required properties:
     "socionext,uniphier-pxs2-reset" - for PXs2/LD6b SoC
     "socionext,uniphier-ld11-reset" - for LD11 SoC
     "socionext,uniphier-ld20-reset" - for LD20 SoC
+    "socionext,uniphier-pxs3-reset" - for PXs3 SoC
 - #reset-cells: should be 1.
 
 Example:
@@ -44,6 +45,7 @@ Required properties:
     "socionext,uniphier-ld11-mio-reset" - for LD11 SoC (MIO)
     "socionext,uniphier-ld11-sd-reset"  - for LD11 SoC (SD)
     "socionext,uniphier-ld20-sd-reset"  - for LD20 SoC
+    "socionext,uniphier-pxs3-sd-reset"  - for PXs3 SoC
 - #reset-cells: should be 1.
 
 Example:
@@ -74,6 +76,7 @@ Required properties:
     "socionext,uniphier-pxs2-peri-reset" - for PXs2/LD6b SoC
     "socionext,uniphier-ld11-peri-reset" - for LD11 SoC
     "socionext,uniphier-ld20-peri-reset" - for LD20 SoC
+    "socionext,uniphier-pxs3-peri-reset" - for PXs3 SoC
 - #reset-cells: should be 1.
 
 Example:

diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 6e40f7db4243543bba58ded7ed85238dae42351d..e8bb023ff15e12adb853e2adfb72edf4d188141d 100644 (file)
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -118,6 +118,20 @@ static const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = {
        UNIPHIER_RESET_END,
 };
 
+static const struct uniphier_reset_data uniphier_pxs3_sys_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(16, 0x200c, 16),        /* USB30-PHY0 */
+       UNIPHIER_RESETX(17, 0x200c, 18),        /* USB30-PHY1 */
+       UNIPHIER_RESETX(18, 0x200c, 20),        /* USB30-PHY2 */
+       UNIPHIER_RESETX(20, 0x200c, 17),        /* USB31-PHY0 */
+       UNIPHIER_RESETX(21, 0x200c, 19),        /* USB31-PHY1 */
+       UNIPHIER_RESET_END,
+};
+
 /* Media I/O reset data */
 #define UNIPHIER_MIO_RESET_SD(id, ch)                  \
        UNIPHIER_RESETX((id), 0x110 + 0x200 * (ch), 0)
@@ -363,6 +377,10 @@ static const struct of_device_id uniphier_reset_match[] = {
                .compatible = "socionext,uniphier-ld20-reset",
                .data = uniphier_ld20_sys_reset_data,
        },
+       {
+               .compatible = "socionext,uniphier-pxs3-reset",
+               .data = uniphier_pxs3_sys_reset_data,
+       },
        /* Media I/O reset, SD reset */
        {
                .compatible = "socionext,uniphier-ld4-mio-reset",
@@ -396,6 +414,10 @@ static const struct of_device_id uniphier_reset_match[] = {
                .compatible = "socionext,uniphier-ld20-sd-reset",
                .data = uniphier_pro5_sd_reset_data,
        },
+       {
+               .compatible = "socionext,uniphier-pxs3-sd-reset",
+               .data = uniphier_pro5_sd_reset_data,
+       },
        /* Peripheral reset */
        {
                .compatible = "socionext,uniphier-ld4-peri-reset",
@@ -425,6 +447,10 @@ static const struct of_device_id uniphier_reset_match[] = {
                .compatible = "socionext,uniphier-ld20-peri-reset",
                .data = uniphier_pro4_peri_reset_data,
        },
+       {
+               .compatible = "socionext,uniphier-pxs3-peri-reset",
+               .data = uniphier_pro4_peri_reset_data,
+       },
        /* Analog signal amplifiers reset */
        {
                .compatible = "socionext,uniphier-ld11-adamv-reset",