[PATCH v2 0/3] Meson8/Meson8b reset improvements

[PATCH v2 0/3] Meson8/Meson8b reset improvements

[Martin Blumenstingl]

Recently reset level support (.assert/.deassert) was added to the
reset-meson driver.
This prepares Meson8b to enable level resets as well (for this we
have to grow the memory zone of the reset controller).

I also noticed that Meson8 does not have the reset controller in it's
.dtsi yet, so this series adds that as well.
It also adds the USB reset lines on Meson8 afterwards to stay
consistent with Meson8b.

changes since v1 at [0]:
- added Neil's Reviewed-by (thank you)
- updated cover-letter since the reset-meson driver changes which
  add level reset support also for Meson8b are queued for v4.16


[0] http://lists.infradead.org/pipermail/linux-amlogic/2017-December/005865.html


Martin Blumenstingl (3):
  ARM: dts: meson8b: grow the reset controller memory zone
  ARM: dts: meson8: add the reset controller
  ARM: dts: meson8: add the USB reset line

 arch/arm/boot/dts/meson8.dtsi  | 9 +++++++++
 arch/arm/boot/dts/meson8b.dtsi | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

-- 
2.16.0

[PATCH v2 1/3] ARM: dts: meson8b: grow the reset controller memory zone

[Martin Blumenstingl]

The reset controller in the Meson8b SoCs also supports level resets.
These use the same defines (from
dt-bindings/reset/amlogic,meson8b-reset.h) as the reset pulses.

The reset-meson driver internally handles the difference if a consumer
requests a reset pulse or a level reset. However, for this to work we
must extend the memory zone of the reset controller.

Suggested-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm/boot/dts/meson8b.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index c0f35acb5b4b..ac161a77aa40 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -152,7 +152,7 @@
 
 	reset: reset-controller at 4404 {
 		compatible = "amlogic,meson8b-reset";
-		reg = <0x4404 0x20>;
+		reg = <0x4404 0x9c>;
 		#reset-cells = <1>;
 	};
 
-- 
2.16.0

[PATCH v2 2/3] ARM: dts: meson8: add the reset controller

[Martin Blumenstingl]

Meson8 uses the same reset controller as Meson8b. Add the node along
with the #include for the reset lines to meson8.dtsi so we can use it
from there as well.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm/boot/dts/meson8.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index 7544cbd1ec1d..efd854c0f9e3 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -46,6 +46,7 @@
 #include <dt-bindings/clock/meson8b-clkc.h>
 #include <dt-bindings/gpio/meson8-gpio.h>
 #include <dt-bindings/reset/amlogic,meson8b-clkc-reset.h>
+#include <dt-bindings/reset/amlogic,meson8b-reset.h>
 #include "meson.dtsi"
 
 / {
@@ -187,6 +188,12 @@
 		reg = <0x8000 0x4>, <0x4000 0x460>;
 	};
 
+	reset: reset-controller at 4404 {
+		compatible = "amlogic,meson8b-reset";
+		reg = <0x4404 0x9c>;
+		#reset-cells = <1>;
+	};
+
 	analog_top: analog-top at 81a8 {
 		compatible = "amlogic,meson8-analog-top", "syscon";
 		reg = <0x81a8 0x14>;
-- 
2.16.0

[PATCH v2 3/3] ARM: dts: meson8: add the USB reset line

[Martin Blumenstingl]

Now that we support the reset controller on Meson8 we can add the reset
line to the USB PHYs (just like on Meson8b).

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm/boot/dts/meson8.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index efd854c0f9e3..1c6647685655 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -391,10 +391,12 @@
 	compatible = "amlogic,meson8-usb2-phy", "amlogic,meson-mx-usb2-phy";
 	clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB0>;
 	clock-names = "usb_general", "usb";
+	resets = <&reset RESET_USB_OTG>;
 };
 
 &usb1_phy {
 	compatible = "amlogic,meson8-usb2-phy", "amlogic,meson-mx-usb2-phy";
 	clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1>;
 	clock-names = "usb_general", "usb";
+	resets = <&reset RESET_USB_OTG>;
 };
-- 
2.16.0

[PATCH v2 0/3] Meson8/Meson8b reset improvements

[Kevin Hilman]

Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes:

> Recently reset level support (.assert/.deassert) was added to the
> reset-meson driver.
> This prepares Meson8b to enable level resets as well (for this we
> have to grow the memory zone of the reset controller).
>
> I also noticed that Meson8 does not have the reset controller in it's
> .dtsi yet, so this series adds that as well.
> It also adds the USB reset lines on Meson8 afterwards to stay
> consistent with Meson8b.
>
> changes since v1 at [0]:
> - added Neil's Reviewed-by (thank you)
> - updated cover-letter since the reset-meson driver changes which
>   add level reset support also for Meson8b are queued for v4.16

Applied to v4.17/dt,

Thanks,

Kevin