diff for duplicates of <20170113132315.GC6864@dell> diff --git a/a/1.txt b/N1/1.txt index 6ef9262..6b3eb17 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,10 +1,10 @@ On Wed, 11 Jan 2017, Enric Balletbo i Serra wrote: > From: Stephen Barber <smbarber@chromium.org> ->=20 +> > The EC can function as a simple RT, this patch adds the RTC related > definitions needed by the rtc-cros-ec driver. ->=20 +> > Signed-off-by: Stephen Barber <smbarber@chromium.org> > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > --- @@ -13,56 +13,42 @@ On Wed, 11 Jan 2017, Enric Balletbo i Serra wrote: Acked-by: Lee Jones <lee.jones@linaro.org> -> diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cro= -s_ec_commands.h +> diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h > index 80d401d..73f7a62 100644 > --- a/include/linux/mfd/cros_ec_commands.h > +++ b/include/linux/mfd/cros_ec_commands.h > @@ -286,6 +286,9 @@ enum host_event_code { > /* Hang detect logic detected a hang and warm rebooted the AP */ -> EC_HOST_EVENT_HANG_REBOOT =3D 21, -> =20 +> EC_HOST_EVENT_HANG_REBOOT = 21, +> > + /* EC RTC event occurred */ -> + EC_HOST_EVENT_RTC =3D 26, +> + EC_HOST_EVENT_RTC = 26, > + > /* > * The high bit of the event mask is not used as a host event code. If > * it reads back as set, then the entire event mask should be > @@ -790,6 +793,8 @@ enum ec_feature_code { -> EC_FEATURE_USB_MUX =3D 23, +> EC_FEATURE_USB_MUX = 23, > /* Motion Sensor code has an internal software FIFO */ -> EC_FEATURE_MOTION_SENSE_FIFO =3D 24, +> EC_FEATURE_MOTION_SENSE_FIFO = 24, > + /* EC has RTC feature that can be controlled by host commands */ -> + EC_FEATURE_RTC =3D 27, +> + EC_FEATURE_RTC = 27, > }; -> =20 +> > #define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32)) > @@ -1682,6 +1687,9 @@ struct ec_response_rtc { > #define EC_CMD_RTC_SET_VALUE 0x46 > #define EC_CMD_RTC_SET_ALARM 0x47 -> =20 +> > +/* Pass as param to SET_ALARM to clear the current alarm */ > +#define EC_RTC_ALARM_CLEAR 0 > + -> /***********************************************************************= -******/ +> /*****************************************************************************/ > /* Port80 log access */ -> =20 +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N1/content_digest index ef257f4..68d9a61 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020170111165221.17337-1-enric.balletbo@collabora.com\0" "ref\020170111165221.17337-2-enric.balletbo@collabora.com\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH 2/4] mfd: cros_ec: Introduce RTC commands and events definitions.\0" + "Subject\0Re: [PATCH 2/4] mfd: cros_ec: Introduce RTC commands and events definitions.\0" "Date\0Fri, 13 Jan 2017 13:23:15 +0000\0" "To\0Enric Balletbo i Serra <enric.balletbo@collabora.com>\0" "Cc\0linux-kernel@vger.kernel.org" @@ -15,10 +15,10 @@ "On Wed, 11 Jan 2017, Enric Balletbo i Serra wrote:\n" "\n" "> From: Stephen Barber <smbarber@chromium.org>\n" - ">=20\n" + "> \n" "> The EC can function as a simple RT, this patch adds the RTC related\n" "> definitions needed by the rtc-cros-ec driver.\n" - ">=20\n" + "> \n" "> Signed-off-by: Stephen Barber <smbarber@chromium.org>\n" "> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>\n" "> ---\n" @@ -27,58 +27,44 @@ "\n" "Acked-by: Lee Jones <lee.jones@linaro.org>\n" "\n" - "> diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cro=\n" - "s_ec_commands.h\n" + "> diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h\n" "> index 80d401d..73f7a62 100644\n" "> --- a/include/linux/mfd/cros_ec_commands.h\n" "> +++ b/include/linux/mfd/cros_ec_commands.h\n" "> @@ -286,6 +286,9 @@ enum host_event_code {\n" "> \t/* Hang detect logic detected a hang and warm rebooted the AP */\n" - "> \tEC_HOST_EVENT_HANG_REBOOT =3D 21,\n" - "> =20\n" + "> \tEC_HOST_EVENT_HANG_REBOOT = 21,\n" + "> \n" "> +\t/* EC RTC event occurred */\n" - "> +\tEC_HOST_EVENT_RTC =3D 26,\n" + "> +\tEC_HOST_EVENT_RTC = 26,\n" "> +\n" "> \t/*\n" "> \t * The high bit of the event mask is not used as a host event code. If\n" "> \t * it reads back as set, then the entire event mask should be\n" "> @@ -790,6 +793,8 @@ enum ec_feature_code {\n" - "> \tEC_FEATURE_USB_MUX =3D 23,\n" + "> \tEC_FEATURE_USB_MUX = 23,\n" "> \t/* Motion Sensor code has an internal software FIFO */\n" - "> \tEC_FEATURE_MOTION_SENSE_FIFO =3D 24,\n" + "> \tEC_FEATURE_MOTION_SENSE_FIFO = 24,\n" "> +\t/* EC has RTC feature that can be controlled by host commands */\n" - "> +\tEC_FEATURE_RTC =3D 27,\n" + "> +\tEC_FEATURE_RTC = 27,\n" "> };\n" - "> =20\n" + "> \n" "> #define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32))\n" "> @@ -1682,6 +1687,9 @@ struct ec_response_rtc {\n" "> #define EC_CMD_RTC_SET_VALUE 0x46\n" "> #define EC_CMD_RTC_SET_ALARM 0x47\n" - "> =20\n" + "> \n" "> +/* Pass as param to SET_ALARM to clear the current alarm */\n" "> +#define EC_RTC_ALARM_CLEAR 0\n" "> +\n" - "> /***********************************************************************=\n" - "******/\n" + "> /*****************************************************************************/\n" "> /* Port80 log access */\n" - "> =20\n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" - "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" + Follow Linaro: Facebook | Twitter | Blog -483939c37bc5b1300dd106360750b699ba0962c98a706e2c7430a02770959a75 +2ae22bebeee9e63376f059efd6746edd3fce09790452160af0260ce62a0d4337
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.