diff for duplicates of <1258051427.2280.1@antares> diff --git a/a/1.txt b/N1/1.txt index a7e1f2e..22edfaf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,51 +1,40 @@ Add the "fsl,wdt-on-boot" OF property as to reserve a GPT as WDT which may be a requirement in safety-related (e.g. ISO/EN 61508) applications. -Signed-off-by: Albrecht Dre=DF <albrecht.dress@arcor.de> +Signed-off-by: Albrecht Dreß <albrecht.dress@arcor.de> --- Change against v1: rename the new property. - Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 17 ++++++++++++++++= -- + Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) -diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documenta= -tion/powerpc/dts-bindings/fsl/mpc5200.txt +diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt index 8447fd7..ddd5ee3 100644 --- a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt +++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt @@ -103,7 +103,22 @@ fsl,mpc5200-gpt nodes --------------------- - On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the boar= -d + On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board design supports the internal wdt, then the device node for GPT0 should -include the empty property 'fsl,has-wdt'. -+include the empty property 'fsl,has-wdt'. Note that this does not activat= -e -+the watchdog. The timer will function as a GPT if the timer api is used, = -and ++include the empty property 'fsl,has-wdt'. Note that this does not activate ++the watchdog. The timer will function as a GPT if the timer api is used, and +it will function as watchdog if the watchdog device is used. The watchdog -+mode has priority over the gpt mode, i.e. if the watchdog is activated, an= -y ++mode has priority over the gpt mode, i.e. if the watchdog is activated, any +gpt api call to this timer will fail with -EBUSY. + +If you add the property -+ fsl,wdt-on-boot =3D <n>; -+GPT0 will be marked as in-use watchdog, i.e. blocking every gpt access to = -it. -+If n>0, the watchdog is started with a timeout of n seconds. If n=3D0, th= -e -+configuration of the watchdog is not touched. This is useful in two cases= -: -+- just mark GPT0 as watchdog, blocking gpt accesses, and configure it late= -r; -+- do not touch a configuration assigned by the boot loader which supervise= -s ++ fsl,wdt-on-boot = <n>; ++GPT0 will be marked as in-use watchdog, i.e. blocking every gpt access to it. ++If n>0, the watchdog is started with a timeout of n seconds. If n=0, the ++configuration of the watchdog is not touched. This is useful in two cases: ++- just mark GPT0 as watchdog, blocking gpt accesses, and configure it later; ++- do not touch a configuration assigned by the boot loader which supervises + the boot process itself. + +The watchdog will respect the CONFIG_WATCHDOG_NOWAYOUT option. -=20 + An mpc5200-gpt can be used as a single line GPIO controller. To do so, add the following properties to the gpt node: diff --git a/a/content_digest b/N1/content_digest index 3b1979c..3b1ed1a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,53 +11,42 @@ "Add the \"fsl,wdt-on-boot\" OF property as to reserve a GPT as WDT which may\n" "be a requirement in safety-related (e.g. ISO/EN 61508) applications.\n" "\n" - "Signed-off-by: Albrecht Dre=DF <albrecht.dress@arcor.de>\n" + "Signed-off-by: Albrecht Dre\303\237 <albrecht.dress@arcor.de>\n" "\n" "---\n" "\n" "Change against v1: rename the new property.\n" "\n" - " Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 17 ++++++++++++++++=\n" - "-\n" + " Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 17 ++++++++++++++++-\n" " 1 files changed, 16 insertions(+), 1 deletions(-)\n" "\n" - "diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documenta=\n" - "tion/powerpc/dts-bindings/fsl/mpc5200.txt\n" + "diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt\n" "index 8447fd7..ddd5ee3 100644\n" "--- a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt\n" "+++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt\n" "@@ -103,7 +103,22 @@ fsl,mpc5200-gpt nodes\n" " ---------------------\n" - " On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the boar=\n" - "d\n" + " On the mpc5200 and 5200b, GPT0 has a watchdog timer function. If the board\n" " design supports the internal wdt, then the device node for GPT0 should\n" "-include the empty property 'fsl,has-wdt'.\n" - "+include the empty property 'fsl,has-wdt'. Note that this does not activat=\n" - "e\n" - "+the watchdog. The timer will function as a GPT if the timer api is used, =\n" - "and\n" + "+include the empty property 'fsl,has-wdt'. Note that this does not activate\n" + "+the watchdog. The timer will function as a GPT if the timer api is used, and\n" "+it will function as watchdog if the watchdog device is used. The watchdog\n" - "+mode has priority over the gpt mode, i.e. if the watchdog is activated, an=\n" - "y\n" + "+mode has priority over the gpt mode, i.e. if the watchdog is activated, any\n" "+gpt api call to this timer will fail with -EBUSY.\n" "+\n" "+If you add the property\n" - "+\tfsl,wdt-on-boot =3D <n>;\n" - "+GPT0 will be marked as in-use watchdog, i.e. blocking every gpt access to =\n" - "it.\n" - "+If n>0, the watchdog is started with a timeout of n seconds. If n=3D0, th=\n" - "e\n" - "+configuration of the watchdog is not touched. This is useful in two cases=\n" - ":\n" - "+- just mark GPT0 as watchdog, blocking gpt accesses, and configure it late=\n" - "r;\n" - "+- do not touch a configuration assigned by the boot loader which supervise=\n" - "s\n" + "+\tfsl,wdt-on-boot = <n>;\n" + "+GPT0 will be marked as in-use watchdog, i.e. blocking every gpt access to it.\n" + "+If n>0, the watchdog is started with a timeout of n seconds. If n=0, the\n" + "+configuration of the watchdog is not touched. This is useful in two cases:\n" + "+- just mark GPT0 as watchdog, blocking gpt accesses, and configure it later;\n" + "+- do not touch a configuration assigned by the boot loader which supervises\n" "+ the boot process itself.\n" "+\n" "+The watchdog will respect the CONFIG_WATCHDOG_NOWAYOUT option.\n" - "=20\n" + " \n" " An mpc5200-gpt can be used as a single line GPIO controller. To do so,\n" add the following properties to the gpt node: -6d3832491d4512c5726223ccd3f87f69013dc811bf0b6535434c5ae7196af531 +00820e97e2fe5e2ff9d70667c024a2bfd38648d5d61f9eb5ec2ded7398688519
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.