Meson8/Meson8b reset improvements
Subsystems (2)
Martin Blumenstingl
reviewerv2 cover Meson8/Meson8b reset improvements
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(-)
Signature · 1 line
2.16.0
Martin Blumenstingl
reviewerPATCH v2 1/3 ARM: dts: meson8b: grow the reset controller memory zone
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.
--- arch/arm/boot/dts/meson8b.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/meson8b.dtsi +1 -1
@@ -152,7 +152,7 @@ reset: reset-controller at 4404 { compatible = "amlogic,meson8b-reset"; - reg = <0x4404 0x20>; + reg = <0x4404 0x9c>; #reset-cells = <1>; };
Signature · 1 line
2.16.0
Martin Blumenstingl
reviewerPATCH v2 2/3 ARM: dts: meson8: add the reset controller
In reply to Martin BlumenstinglMeson8 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.
--- arch/arm/boot/dts/meson8.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/meson8.dtsi +7 -0
@@ -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>;
Signature · 1 line
2.16.0
Martin Blumenstingl
reviewerPATCH v2 3/3 ARM: dts: meson8: add the USB reset line
In reply to Martin BlumenstinglNow that we support the reset controller on Meson8 we can add the reset line to the USB PHYs (just like on Meson8b).
--- arch/arm/boot/dts/meson8.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/meson8.dtsi +2 -0
@@ -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>; };
Signature · 1 line
2.16.0
v2 cover Meson8/Meson8b reset improvements
In reply to Martin BlumenstinglQuoted 10 lines · 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.
Quoted 4 lines
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