| Message ID | 1434032318-3557-1-git-send-email-johan@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Johan Hovold <johan@kernel.org> [150611 07:20]: > This reverts commit 3d76be5b933e2a66d85a2f7444e68e99e8a48ad4. > > The latest revision of Beaglebone Black does not support RTC-only mode. > > To avoid potential hardware damage, RTC-only mode was disabled by > default by commit 7a6cb0abe1aa ("ARM: dts: am335x-boneblack: disable > RTC-only sleep to avoid hardware damage"). > > Unfortunately, an incorrect fix had already been applied, which instead > of just disabling RTC-only mode, prevents the Beaglebone from powering > down at all. > > Revert this patch to fix the power-off regression. > > Signed-off-by: Johan Hovold <johan@kernel.org> > --- > > The offending patch was incorrectly applied after Matthijs initial fix > was posted and before the final fix (which only added some comments) was > applied. > > Note that the final version of the fix 7a6cb0abe1aa ("ARM: dts: > am335x-boneblack: disable RTC-only sleep to avoid hardware damage") > indicates that it should be backported to 3.12 even though RTC-only mode > was first enabled in 3.19. Applying this now into omap-for-v4.2/fixes. Regards, Tony
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 901739fcb85a..5c42d259fa68 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -80,3 +80,7 @@ status = "okay"; }; }; + +&rtc { + system-power-controller; +};
This reverts commit 3d76be5b933e2a66d85a2f7444e68e99e8a48ad4. The latest revision of Beaglebone Black does not support RTC-only mode. To avoid potential hardware damage, RTC-only mode was disabled by default by commit 7a6cb0abe1aa ("ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage"). Unfortunately, an incorrect fix had already been applied, which instead of just disabling RTC-only mode, prevents the Beaglebone from powering down at all. Revert this patch to fix the power-off regression. Signed-off-by: Johan Hovold <johan@kernel.org> --- The offending patch was incorrectly applied after Matthijs initial fix was posted and before the final fix (which only added some comments) was applied. Note that the final version of the fix 7a6cb0abe1aa ("ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage") indicates that it should be backported to 3.12 even though RTC-only mode was first enabled in 3.19. Johan arch/arm/boot/dts/am335x-boneblack.dts | 4 ++++ 1 file changed, 4 insertions(+)