| Message ID | 20180308080929.30982-1-suzuki.katsuhiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | b06b631c8b67aafd57cfbc0313bdfec0db62cacb |
| Headers | show |
| Series | reset: uniphier: add Pro4/Pro5/PXs2 audio systems reset control | expand |
2018-03-08 17:09 GMT+09:00 Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>: > Add reset lines for audio subsystem (AIO) on UniPhier > Pro4/Pro5/PXs2 SoCs. > > Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> > --- Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> > drivers/reset/reset-uniphier.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c > index e8bb023ff15e..0fa23129d343 100644 > --- a/drivers/reset/reset-uniphier.c > +++ b/drivers/reset/reset-uniphier.c > @@ -63,6 +63,7 @@ static const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = { > UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (Ether, SATA, USB3) */ > UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */ > UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */ > + UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */ > UNIPHIER_RESET_END, > }; > > @@ -72,6 +73,7 @@ static const struct uniphier_reset_data uniphier_pro5_sys_reset_data[] = { > UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (PCIe, USB3) */ > UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */ > UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */ > + UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */ > UNIPHIER_RESET_END, > }; > > @@ -88,6 +90,7 @@ static const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = { > UNIPHIER_RESETX(21, 0x2014, 1), /* USB31-PHY1 */ > UNIPHIER_RESETX(28, 0x2014, 12), /* SATA */ > UNIPHIER_RESET(29, 0x2014, 8), /* SATA-PHY (active high) */ > + UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */ > UNIPHIER_RESET_END, > }; > > -- > 2.16.1 > -- Best Regards Masahiro Yamada
On Thu, 2018-03-08 at 17:12 +0900, Masahiro Yamada wrote: > 2018-03-08 17:09 GMT+09:00 Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>: > > Add reset lines for audio subsystem (AIO) on UniPhier > > Pro4/Pro5/PXs2 SoCs. > > > > Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> > > --- > > > Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> Thank you, applied to reset/next. regards Philipp
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index e8bb023ff15e..0fa23129d343 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -63,6 +63,7 @@ static const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = { UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (Ether, SATA, USB3) */ UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */ UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */ + UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */ UNIPHIER_RESET_END, }; @@ -72,6 +73,7 @@ static const struct uniphier_reset_data uniphier_pro5_sys_reset_data[] = { UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (PCIe, USB3) */ UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */ UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */ + UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */ UNIPHIER_RESET_END, }; @@ -88,6 +90,7 @@ static const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = { UNIPHIER_RESETX(21, 0x2014, 1), /* USB31-PHY1 */ UNIPHIER_RESETX(28, 0x2014, 12), /* SATA */ UNIPHIER_RESET(29, 0x2014, 8), /* SATA-PHY (active high) */ + UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */ UNIPHIER_RESET_END, };
Add reset lines for audio subsystem (AIO) on UniPhier Pro4/Pro5/PXs2 SoCs. Signed-off-by: Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com> --- drivers/reset/reset-uniphier.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.16.1