diff for duplicates of <20140618152824.GF15956@lee--X1> diff --git a/a/1.txt b/N1/1.txt index cd9d446..cb43517 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,14 +19,14 @@ index 06473c5..f95e469 100644 + clocks = <&clk_sysin>; }; - i2c@fed40000 { + i2c at fed40000 { @@ -236,5 +236,45 @@ resets = <&powerdown STIH416_KEYSCAN_POWERDOWN>, <&softreset STIH416_KEYSCAN_SOFTRESET>; }; + + /* SAS PWM Module */ -+ pwm0: pwm@fed10000 { ++ pwm0: pwm at fed10000 { + compatible = "st,sti-pwm"; + status = "disabled"; + #pwm-cells = <2>; @@ -43,7 +43,7 @@ index 06473c5..f95e469 100644 + }; + + /* SBC PWM Module */ -+ pwm1: pwm@fe510000 { ++ pwm1: pwm at fe510000 { + compatible = "st,sti-pwm"; + status = "disabled"; + #pwm-cells = <2>; diff --git a/a/content_digest b/N1/content_digest index 0fd1d26..42e2326 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\01403103172-19856-1-git-send-email-lee.jones@linaro.org\0" "ref\01403103172-19856-3-git-send-email-lee.jones@linaro.org\0" - "From\0Lee Jones <lee.jones@linaro.org>\0" + "From\0lee.jones@linaro.org (Lee Jones)\0" "Subject\0[PATCH v2 3/7] ARM: stih416: Add DT nodes for PWM\0" "Date\0Wed, 18 Jun 2014 16:28:24 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org" - " linux-kernel@vger.kernel.org\0" - "Cc\0kernel@stlinux.com" - thierry.reding@gmail.com - linux-pwm@vger.kernel.org - maxime.coquelin@st.com - patrice.chotard@st.com - srinivas.kandagatla@gmail.com - devicetree@vger.kernel.org - " ajitpal.singh@st.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "ARM: stih416: Add DT nodes for PWM\n" @@ -36,14 +27,14 @@ "+\t\t\tclocks\t\t= <&clk_sysin>;\n" " \t\t};\n" " \n" - " \t\ti2c@fed40000 {\n" + " \t\ti2c at fed40000 {\n" "@@ -236,5 +236,45 @@\n" " \t\t\tresets\t= <&powerdown STIH416_KEYSCAN_POWERDOWN>,\n" " \t\t\t\t <&softreset STIH416_KEYSCAN_SOFTRESET>;\n" " \t\t};\n" "+\n" "+\t\t/* SAS PWM Module */\n" - "+\t\tpwm0: pwm@fed10000 {\n" + "+\t\tpwm0: pwm at fed10000 {\n" "+\t\t\tcompatible\t= \"st,sti-pwm\";\n" "+\t\t\tstatus\t\t= \"disabled\";\n" "+\t\t\t#pwm-cells\t= <2>;\n" @@ -60,7 +51,7 @@ "+\t\t};\n" "+\n" "+\t\t/* SBC PWM Module */\n" - "+\t\tpwm1: pwm@fe510000 {\n" + "+\t\tpwm1: pwm at fe510000 {\n" "+\t\t\tcompatible\t= \"st,sti-pwm\";\n" "+\t\t\tstatus\t\t= \"disabled\";\n" "+\t\t\t#pwm-cells\t= <2>;\n" @@ -84,4 +75,4 @@ " \t};\n" }; -de70aa994fb7055055cef113d781d86eec1f47147a9b6c06701ca4b7419453c6 +4e1915a3a50404af07743f935114246c3a88f67b5b2eb3ef5eb6a73c86d811b1
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.