Message ID | 1412879767-24326-1-git-send-email-javier.martinez@collabora.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Javier Martinez Canillas <javier.martinez@collabora.co.uk> writes: > Commit 43eeaa42e03a ("ARM: exynos_defconfig: savedefconfig") removed a > set of Kconfig symbols. For most of them there were no functional change > since are selected by other Kconfig options or were deprecated but some > options are not explicitly selected so they should not had been removed. > > The options that have to be enabled are USB gadget and the MAX77802 PMIC > support which were enabled in commits: > > 508423bebcda ("ARM: exynos_defconfig: enable USB gadget support") > 6e80e3d87549 ("ARM: exynos_defconfig: Enable MAX77802") > > Enable those options to leave the config in the state before the change. > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Acked-by: Kevin Hilman <khilman@linaro.org> Tested-by: Kevin Hilman <khilman@linaro.org> This is needed to get RTC wakeup from suspend working on exynos5800-peach-pi. Note that the s3c-rtc works fine, but the max77802-rtc doesn't seem to work be functional for me: [ 2.408178] max77802-rtc max77802-rtc: rtc core: registered max77802-rtc as rtc0 [ 3.595485] s3c-rtc 101e0000.rtc: rtc core: registered s3c as rtc1 root@(none):/# hwclock --rtc /dev/rtc0 hwclock: ioctl(RTC_RD_TIME) to /dev/rtc0 to read the time failed: Invalid argument root@(none):/# hwclock --rtc /dev/rtc1 Thu Oct 9 23:33:06 2014 -0.111978 seconds Kevin
Hello Kevin, On Fri, Oct 10, 2014 at 1:34 AM, Kevin Hilman <khilman@kernel.org> wrote: > Javier Martinez Canillas <javier.martinez@collabora.co.uk> writes: > >> Commit 43eeaa42e03a ("ARM: exynos_defconfig: savedefconfig") removed a >> set of Kconfig symbols. For most of them there were no functional change >> since are selected by other Kconfig options or were deprecated but some >> options are not explicitly selected so they should not had been removed. >> >> The options that have to be enabled are USB gadget and the MAX77802 PMIC >> support which were enabled in commits: >> >> 508423bebcda ("ARM: exynos_defconfig: enable USB gadget support") >> 6e80e3d87549 ("ARM: exynos_defconfig: Enable MAX77802") >> >> Enable those options to leave the config in the state before the change. >> >> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > > Acked-by: Kevin Hilman <khilman@linaro.org> > Tested-by: Kevin Hilman <khilman@linaro.org> Thanks for testing. > > This is needed to get RTC wakeup from suspend working on > exynos5800-peach-pi. > > Note that the s3c-rtc works fine, but the max77802-rtc doesn't seem to > work be functional for me: > > [ 2.408178] max77802-rtc max77802-rtc: rtc core: registered max77802-rtc as rtc0 > [ 3.595485] s3c-rtc 101e0000.rtc: rtc core: registered s3c as rtc1 > > root@(none):/# hwclock --rtc /dev/rtc0 > hwclock: ioctl(RTC_RD_TIME) to /dev/rtc0 to read the time failed: > Invalid argument > root@(none):/# hwclock --rtc /dev/rtc1 > Thu Oct 9 23:33:06 2014 -0.111978 seconds > Strange, I don't get that error when testing on my Peach Pit with linux-next + $subject [ 2.311591] max77802-rtc max77802-rtc: rtc core: registered max77802-rtc as rtc0 [ 3.594438] s3c-rtc 101e0000.rtc: rtc core: registered s3c as rtc1 # hwclock --rtc /dev/rtc0 Fri 10 Oct 2014 12:19:23 PM UTC -0.909103 seconds # hwclock --rtc /dev/rtc1 Fri 10 Oct 2014 12:19:26 PM UTC -0.719862 seconds I'll take a look but if you have a test case that makes it fail consistently that would be really helpful. Best regards, Javier
Javier Martinez Canillas <javier@dowhile0.org> writes: > Hello Kevin, > > On Fri, Oct 10, 2014 at 1:34 AM, Kevin Hilman <khilman@kernel.org> wrote: >> Javier Martinez Canillas <javier.martinez@collabora.co.uk> writes: >> >>> Commit 43eeaa42e03a ("ARM: exynos_defconfig: savedefconfig") removed a >>> set of Kconfig symbols. For most of them there were no functional change >>> since are selected by other Kconfig options or were deprecated but some >>> options are not explicitly selected so they should not had been removed. >>> >>> The options that have to be enabled are USB gadget and the MAX77802 PMIC >>> support which were enabled in commits: >>> >>> 508423bebcda ("ARM: exynos_defconfig: enable USB gadget support") >>> 6e80e3d87549 ("ARM: exynos_defconfig: Enable MAX77802") >>> >>> Enable those options to leave the config in the state before the change. >>> >>> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> >> >> Acked-by: Kevin Hilman <khilman@linaro.org> >> Tested-by: Kevin Hilman <khilman@linaro.org> > > Thanks for testing. > >> >> This is needed to get RTC wakeup from suspend working on >> exynos5800-peach-pi. >> >> Note that the s3c-rtc works fine, but the max77802-rtc doesn't seem to >> work be functional for me: >> >> [ 2.408178] max77802-rtc max77802-rtc: rtc core: registered max77802-rtc as rtc0 >> [ 3.595485] s3c-rtc 101e0000.rtc: rtc core: registered s3c as rtc1 >> >> root@(none):/# hwclock --rtc /dev/rtc0 >> hwclock: ioctl(RTC_RD_TIME) to /dev/rtc0 to read the time failed: >> Invalid argument >> root@(none):/# hwclock --rtc /dev/rtc1 >> Thu Oct 9 23:33:06 2014 -0.111978 seconds >> > > Strange, I don't get that error when testing on my Peach Pit with > linux-next + $subject > > [ 2.311591] max77802-rtc max77802-rtc: rtc core: registered > max77802-rtc as rtc0 > [ 3.594438] s3c-rtc 101e0000.rtc: rtc core: registered s3c as rtc1 > > # hwclock --rtc /dev/rtc0 > Fri 10 Oct 2014 12:19:23 PM UTC -0.909103 seconds > # hwclock --rtc /dev/rtc1 > Fri 10 Oct 2014 12:19:26 PM UTC -0.719862 seconds > > I'll take a look but if you have a test case that makes it fail > consistently that would be really helpful. I'm using: - next-20141010 + $subject patch - exynos_defconfig - exynos5800-peach-pi - ubuntu-based rootfs, but booting with init=/bin/bash, so not much userspace involved Boot-time RTC-related messages: root@(none):/# dmesg |grep rtc [ 2.349742] s3c-rtc 101e0000.rtc: failed to find rtc source clock [ 2.349795] platform 101e0000.rtc: Driver s3c-rtc requests probe deferral [ 2.373313] max77802-rtc max77802-rtc: rtc core: registered max77802-rtc as rtc0 [ 3.590520] s3c-rtc 101e0000.rtc: rtc core: registered s3c as rtc1 [ 3.925792] max77802-rtc max77802-rtc: hctosys: unable to read the hardware clock Note there was an "unable to read" failure during boot too. Then it fails like this every time when trying from userspace: oot@(none):/# hwclock --rtc /dev/rtc0 hwclock: ioctl(RTC_RD_TIME) to /dev/rtc0 to read the time failed: Invalid argument root@(none):/# hwclock --rtc /dev/rtc1 Fri Oct 10 22:09:47 2014 -0.375445 seconds FWIW, I don't think this problem should hold up $SUBJECT patch from being merged, as it's not directly related. Kevin
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index b14d8c3..a36fe1c 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -54,6 +54,7 @@ CONFIG_SMSC911X=y CONFIG_USB_USBNET=y CONFIG_USB_NET_SMSC75XX=y CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_GADGET=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_CROS_EC=y @@ -97,6 +98,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y CONFIG_REGULATOR_MAX8997=y CONFIG_REGULATOR_MAX77686=y +CONFIG_REGULATOR_MAX77802=y CONFIG_REGULATOR_MAX77693=y CONFIG_REGULATOR_S2MPA01=y CONFIG_REGULATOR_S2MPS11=y @@ -133,11 +135,13 @@ CONFIG_MMC_DW_IDMAC=y CONFIG_MMC_DW_EXYNOS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_MAX77686=y +CONFIG_RTC_DRV_MAX77802=y CONFIG_RTC_DRV_S5M=y CONFIG_RTC_DRV_S3C=y CONFIG_DMADEVICES=y CONFIG_PL330_DMA=y CONFIG_COMMON_CLK_MAX77686=y +CONFIG_COMMON_CLK_MAX77802=y CONFIG_COMMON_CLK_S2MPS11=y CONFIG_EXYNOS_IOMMU=y CONFIG_IIO=y
Commit 43eeaa42e03a ("ARM: exynos_defconfig: savedefconfig") removed a set of Kconfig symbols. For most of them there were no functional change since are selected by other Kconfig options or were deprecated but some options are not explicitly selected so they should not had been removed. The options that have to be enabled are USB gadget and the MAX77802 PMIC support which were enabled in commits: 508423bebcda ("ARM: exynos_defconfig: enable USB gadget support") 6e80e3d87549 ("ARM: exynos_defconfig: Enable MAX77802") Enable those options to leave the config in the state before the change. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> --- arch/arm/configs/exynos_defconfig | 4 ++++ 1 file changed, 4 insertions(+)