diff for duplicates of <20171215132102.435-6-nm@ti.com> diff --git a/a/1.txt b/N1/1.txt index f66d31b..79de9b2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - chipstmxptclk: chipstmxptclk { -+ chipstmxptclk: chipstmxptclk at 2310164 { ++ chipstmxptclk: chipstmxptclk@2310164 { #clock-cells = <0>; compatible = "ti,keystone,pll-divider-clock"; clocks = <&mainmuxclk>; @@ -26,7 +26,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkmodrst0: clkmodrst0 { -+ clkmodrst0: clkmodrst0 at 2350000 { ++ clkmodrst0: clkmodrst0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -35,7 +35,7 @@ index 2391e3e4d234..0d735e0288db 100644 - clkusb: clkusb { -+ clkusb: clkusb at 2350008 { ++ clkusb: clkusb@2350008 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -44,7 +44,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkaemifspi: clkaemifspi { -+ clkaemifspi: clkaemifspi at 235000c { ++ clkaemifspi: clkaemifspi@235000c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -53,7 +53,7 @@ index 2391e3e4d234..0d735e0288db 100644 - clkdebugsstrc: clkdebugsstrc { -+ clkdebugsstrc: clkdebugsstrc at 2350014 { ++ clkdebugsstrc: clkdebugsstrc@2350014 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -62,7 +62,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clktetbtrc: clktetbtrc { -+ clktetbtrc: clktetbtrc at 2350018 { ++ clktetbtrc: clktetbtrc@2350018 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -71,7 +71,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkpa: clkpa { -+ clkpa: clkpa at 235001c { ++ clkpa: clkpa@235001c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&paclk13>; @@ -80,7 +80,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkcpgmac: clkcpgmac { -+ clkcpgmac: clkcpgmac at 2350020 { ++ clkcpgmac: clkcpgmac@2350020 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -89,7 +89,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clksa: clksa { -+ clksa: clksa at 2350024 { ++ clksa: clksa@2350024 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -98,7 +98,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkpcie: clkpcie { -+ clkpcie: clkpcie at 2350028 { ++ clkpcie: clkpcie@2350028 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -107,7 +107,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clksr: clksr { -+ clksr: clksr at 2350034 { ++ clksr: clksr@2350034 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1rstiso112>; @@ -116,7 +116,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkgem0: clkgem0 { -+ clkgem0: clkgem0 at 235003c { ++ clkgem0: clkgem0@235003c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1>; @@ -125,7 +125,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkddr30: clkddr30 { -+ clkddr30: clkddr30 at 235005c { ++ clkddr30: clkddr30@235005c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -134,7 +134,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer0: clkwdtimer0 { -+ clkwdtimer0: clkwdtimer0 at 2350000 { ++ clkwdtimer0: clkwdtimer0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -143,7 +143,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer1: clkwdtimer1 { -+ clkwdtimer1: clkwdtimer1 at 2350000 { ++ clkwdtimer1: clkwdtimer1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -152,7 +152,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer2: clkwdtimer2 { -+ clkwdtimer2: clkwdtimer2 at 2350000 { ++ clkwdtimer2: clkwdtimer2@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -161,7 +161,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer3: clkwdtimer3 { -+ clkwdtimer3: clkwdtimer3 at 2350000 { ++ clkwdtimer3: clkwdtimer3@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -170,7 +170,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clktimer15: clktimer15 { -+ clktimer15: clktimer15 at 2350000 { ++ clktimer15: clktimer15@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -179,7 +179,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkuart0: clkuart0 { -+ clkuart0: clkuart0 at 2350000 { ++ clkuart0: clkuart0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -188,7 +188,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkuart1: clkuart1 { -+ clkuart1: clkuart1 at 2350000 { ++ clkuart1: clkuart1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -197,7 +197,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkaemif: clkaemif { -+ clkaemif: clkaemif at 2350000 { ++ clkaemif: clkaemif@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -206,7 +206,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkusim: clkusim { -+ clkusim: clkusim at 2350000 { ++ clkusim: clkusim@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -215,7 +215,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clki2c: clki2c { -+ clki2c: clki2c at 2350000 { ++ clki2c: clki2c@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -224,7 +224,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkspi: clkspi { -+ clkspi: clkspi at 2350000 { ++ clkspi: clkspi@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -233,7 +233,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkgpio: clkgpio { -+ clkgpio: clkgpio at 2350000 { ++ clkgpio: clkgpio@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -242,7 +242,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkkeymgr: clkkeymgr { -+ clkkeymgr: clkkeymgr at 2350000 { ++ clkkeymgr: clkkeymgr@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; diff --git a/a/content_digest b/N1/content_digest index 42bdaa7..a5d839f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,15 @@ "ref\020171215132102.435-1-nm@ti.com\0" - "From\0nm@ti.com (Nishanth Menon)\0" + "From\0Nishanth Menon <nm@ti.com>\0" "Subject\0[PATCH 5/8] ARM: dts: keystone-clocks: Add missing unit name to clock nodes that have regs\0" "Date\0Fri, 15 Dec 2017 07:20:59 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Russell King <linux@armlinux.org.uk>" + Mark Rutland <mark.rutland@arm.com> + Rob Herring <robh+dt@kernel.org> + " Santosh Shilimkar <ssantosh@kernel.org>\0" + "Cc\0Nishanth Menon <nm@ti.com>" + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add the control register as the base for the clock nodes which are\n" @@ -24,7 +31,7 @@ " \t};\n" " \n" "-\tchipstmxptclk: chipstmxptclk {\n" - "+\tchipstmxptclk: chipstmxptclk at 2310164 {\n" + "+\tchipstmxptclk: chipstmxptclk@2310164 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,pll-divider-clock\";\n" " \t\tclocks = <&mainmuxclk>;\n" @@ -33,7 +40,7 @@ " \t};\n" " \n" "-\tclkmodrst0: clkmodrst0 {\n" - "+\tclkmodrst0: clkmodrst0 at 2350000 {\n" + "+\tclkmodrst0: clkmodrst0@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk16>;\n" @@ -42,7 +49,7 @@ " \n" " \n" "-\tclkusb: clkusb {\n" - "+\tclkusb: clkusb at 2350008 {\n" + "+\tclkusb: clkusb@2350008 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk16>;\n" @@ -51,7 +58,7 @@ " \t};\n" " \n" "-\tclkaemifspi: clkaemifspi {\n" - "+\tclkaemifspi: clkaemifspi at 235000c {\n" + "+\tclkaemifspi: clkaemifspi@235000c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk16>;\n" @@ -60,7 +67,7 @@ " \n" " \n" "-\tclkdebugsstrc: clkdebugsstrc {\n" - "+\tclkdebugsstrc: clkdebugsstrc at 2350014 {\n" + "+\tclkdebugsstrc: clkdebugsstrc@2350014 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk13>;\n" @@ -69,7 +76,7 @@ " \t};\n" " \n" "-\tclktetbtrc: clktetbtrc {\n" - "+\tclktetbtrc: clktetbtrc at 2350018 {\n" + "+\tclktetbtrc: clktetbtrc@2350018 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk13>;\n" @@ -78,7 +85,7 @@ " \t};\n" " \n" "-\tclkpa: clkpa {\n" - "+\tclkpa: clkpa at 235001c {\n" + "+\tclkpa: clkpa@235001c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&paclk13>;\n" @@ -87,7 +94,7 @@ " \t};\n" " \n" "-\tclkcpgmac: clkcpgmac {\n" - "+\tclkcpgmac: clkcpgmac at 2350020 {\n" + "+\tclkcpgmac: clkcpgmac@2350020 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkpa>;\n" @@ -96,7 +103,7 @@ " \t};\n" " \n" "-\tclksa: clksa {\n" - "+\tclksa: clksa at 2350024 {\n" + "+\tclksa: clksa@2350024 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkpa>;\n" @@ -105,7 +112,7 @@ " \t};\n" " \n" "-\tclkpcie: clkpcie {\n" - "+\tclkpcie: clkpcie at 2350028 {\n" + "+\tclkpcie: clkpcie@2350028 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk12>;\n" @@ -114,7 +121,7 @@ " \t};\n" " \n" "-\tclksr: clksr {\n" - "+\tclksr: clksr at 2350034 {\n" + "+\tclksr: clksr@2350034 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk1rstiso112>;\n" @@ -123,7 +130,7 @@ " \t};\n" " \n" "-\tclkgem0: clkgem0 {\n" - "+\tclkgem0: clkgem0 at 235003c {\n" + "+\tclkgem0: clkgem0@235003c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk1>;\n" @@ -132,7 +139,7 @@ " \t};\n" " \n" "-\tclkddr30: clkddr30 {\n" - "+\tclkddr30: clkddr30 at 235005c {\n" + "+\tclkddr30: clkddr30@235005c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk12>;\n" @@ -141,7 +148,7 @@ " \t};\n" " \n" "-\tclkwdtimer0: clkwdtimer0 {\n" - "+\tclkwdtimer0: clkwdtimer0 at 2350000 {\n" + "+\tclkwdtimer0: clkwdtimer0@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -150,7 +157,7 @@ " \t};\n" " \n" "-\tclkwdtimer1: clkwdtimer1 {\n" - "+\tclkwdtimer1: clkwdtimer1 at 2350000 {\n" + "+\tclkwdtimer1: clkwdtimer1@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -159,7 +166,7 @@ " \t};\n" " \n" "-\tclkwdtimer2: clkwdtimer2 {\n" - "+\tclkwdtimer2: clkwdtimer2 at 2350000 {\n" + "+\tclkwdtimer2: clkwdtimer2@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -168,7 +175,7 @@ " \t};\n" " \n" "-\tclkwdtimer3: clkwdtimer3 {\n" - "+\tclkwdtimer3: clkwdtimer3 at 2350000 {\n" + "+\tclkwdtimer3: clkwdtimer3@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -177,7 +184,7 @@ " \t};\n" " \n" "-\tclktimer15: clktimer15 {\n" - "+\tclktimer15: clktimer15 at 2350000 {\n" + "+\tclktimer15: clktimer15@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -186,7 +193,7 @@ " \t};\n" " \n" "-\tclkuart0: clkuart0 {\n" - "+\tclkuart0: clkuart0 at 2350000 {\n" + "+\tclkuart0: clkuart0@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -195,7 +202,7 @@ " \t};\n" " \n" "-\tclkuart1: clkuart1 {\n" - "+\tclkuart1: clkuart1 at 2350000 {\n" + "+\tclkuart1: clkuart1@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -204,7 +211,7 @@ " \t};\n" " \n" "-\tclkaemif: clkaemif {\n" - "+\tclkaemif: clkaemif at 2350000 {\n" + "+\tclkaemif: clkaemif@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkaemifspi>;\n" @@ -213,7 +220,7 @@ " \t};\n" " \n" "-\tclkusim: clkusim {\n" - "+\tclkusim: clkusim at 2350000 {\n" + "+\tclkusim: clkusim@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -222,7 +229,7 @@ " \t};\n" " \n" "-\tclki2c: clki2c {\n" - "+\tclki2c: clki2c at 2350000 {\n" + "+\tclki2c: clki2c@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -231,7 +238,7 @@ " \t};\n" " \n" "-\tclkspi: clkspi {\n" - "+\tclkspi: clkspi at 2350000 {\n" + "+\tclkspi: clkspi@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkaemifspi>;\n" @@ -240,7 +247,7 @@ " \t};\n" " \n" "-\tclkgpio: clkgpio {\n" - "+\tclkgpio: clkgpio at 2350000 {\n" + "+\tclkgpio: clkgpio@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -249,11 +256,11 @@ " \t};\n" " \n" "-\tclkkeymgr: clkkeymgr {\n" - "+\tclkkeymgr: clkkeymgr at 2350000 {\n" + "+\tclkkeymgr: clkkeymgr@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" "-- \n" 2.14.1 -10e3540a1e3ade9f5d193e1f224286f605276d4d8b37c878372025cce02b2e5d +9b9560f5334c114f24565da910d4e7d40b34765316b92fc416db8d7e329af88c
diff --git a/a/1.txt b/N2/1.txt index f66d31b..79de9b2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,7 +17,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - chipstmxptclk: chipstmxptclk { -+ chipstmxptclk: chipstmxptclk at 2310164 { ++ chipstmxptclk: chipstmxptclk@2310164 { #clock-cells = <0>; compatible = "ti,keystone,pll-divider-clock"; clocks = <&mainmuxclk>; @@ -26,7 +26,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkmodrst0: clkmodrst0 { -+ clkmodrst0: clkmodrst0 at 2350000 { ++ clkmodrst0: clkmodrst0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -35,7 +35,7 @@ index 2391e3e4d234..0d735e0288db 100644 - clkusb: clkusb { -+ clkusb: clkusb at 2350008 { ++ clkusb: clkusb@2350008 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -44,7 +44,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkaemifspi: clkaemifspi { -+ clkaemifspi: clkaemifspi at 235000c { ++ clkaemifspi: clkaemifspi@235000c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -53,7 +53,7 @@ index 2391e3e4d234..0d735e0288db 100644 - clkdebugsstrc: clkdebugsstrc { -+ clkdebugsstrc: clkdebugsstrc at 2350014 { ++ clkdebugsstrc: clkdebugsstrc@2350014 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -62,7 +62,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clktetbtrc: clktetbtrc { -+ clktetbtrc: clktetbtrc at 2350018 { ++ clktetbtrc: clktetbtrc@2350018 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -71,7 +71,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkpa: clkpa { -+ clkpa: clkpa at 235001c { ++ clkpa: clkpa@235001c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&paclk13>; @@ -80,7 +80,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkcpgmac: clkcpgmac { -+ clkcpgmac: clkcpgmac at 2350020 { ++ clkcpgmac: clkcpgmac@2350020 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -89,7 +89,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clksa: clksa { -+ clksa: clksa at 2350024 { ++ clksa: clksa@2350024 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -98,7 +98,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkpcie: clkpcie { -+ clkpcie: clkpcie at 2350028 { ++ clkpcie: clkpcie@2350028 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -107,7 +107,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clksr: clksr { -+ clksr: clksr at 2350034 { ++ clksr: clksr@2350034 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1rstiso112>; @@ -116,7 +116,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkgem0: clkgem0 { -+ clkgem0: clkgem0 at 235003c { ++ clkgem0: clkgem0@235003c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1>; @@ -125,7 +125,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkddr30: clkddr30 { -+ clkddr30: clkddr30 at 235005c { ++ clkddr30: clkddr30@235005c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -134,7 +134,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer0: clkwdtimer0 { -+ clkwdtimer0: clkwdtimer0 at 2350000 { ++ clkwdtimer0: clkwdtimer0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -143,7 +143,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer1: clkwdtimer1 { -+ clkwdtimer1: clkwdtimer1 at 2350000 { ++ clkwdtimer1: clkwdtimer1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -152,7 +152,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer2: clkwdtimer2 { -+ clkwdtimer2: clkwdtimer2 at 2350000 { ++ clkwdtimer2: clkwdtimer2@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -161,7 +161,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkwdtimer3: clkwdtimer3 { -+ clkwdtimer3: clkwdtimer3 at 2350000 { ++ clkwdtimer3: clkwdtimer3@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -170,7 +170,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clktimer15: clktimer15 { -+ clktimer15: clktimer15 at 2350000 { ++ clktimer15: clktimer15@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -179,7 +179,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkuart0: clkuart0 { -+ clkuart0: clkuart0 at 2350000 { ++ clkuart0: clkuart0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -188,7 +188,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkuart1: clkuart1 { -+ clkuart1: clkuart1 at 2350000 { ++ clkuart1: clkuart1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -197,7 +197,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkaemif: clkaemif { -+ clkaemif: clkaemif at 2350000 { ++ clkaemif: clkaemif@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -206,7 +206,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkusim: clkusim { -+ clkusim: clkusim at 2350000 { ++ clkusim: clkusim@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -215,7 +215,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clki2c: clki2c { -+ clki2c: clki2c at 2350000 { ++ clki2c: clki2c@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -224,7 +224,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkspi: clkspi { -+ clkspi: clkspi at 2350000 { ++ clkspi: clkspi@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -233,7 +233,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkgpio: clkgpio { -+ clkgpio: clkgpio at 2350000 { ++ clkgpio: clkgpio@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -242,7 +242,7 @@ index 2391e3e4d234..0d735e0288db 100644 }; - clkkeymgr: clkkeymgr { -+ clkkeymgr: clkkeymgr at 2350000 { ++ clkkeymgr: clkkeymgr@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; diff --git a/a/content_digest b/N2/content_digest index 42bdaa7..39417d6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,15 @@ "ref\020171215132102.435-1-nm@ti.com\0" - "From\0nm@ti.com (Nishanth Menon)\0" - "Subject\0[PATCH 5/8] ARM: dts: keystone-clocks: Add missing unit name to clock nodes that have regs\0" + "From\0Nishanth Menon <nm@ti.com>\0" + "Subject\0[PATCH 5/8] ARM: dts: keystone-clocks: Add missing unit name to clock nodes that have regs\0" "Date\0Fri, 15 Dec 2017 07:20:59 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Russell King <linux@armlinux.org.uk>" + Mark Rutland <mark.rutland@arm.com> + Rob Herring <robh+dt@kernel.org> + " Santosh Shilimkar <ssantosh@kernel.org>\0" + "Cc\0<linux-kernel@vger.kernel.org>" + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " Nishanth Menon <nm@ti.com>\0" "\00:1\0" "b\0" "Add the control register as the base for the clock nodes which are\n" @@ -24,7 +31,7 @@ " \t};\n" " \n" "-\tchipstmxptclk: chipstmxptclk {\n" - "+\tchipstmxptclk: chipstmxptclk at 2310164 {\n" + "+\tchipstmxptclk: chipstmxptclk@2310164 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,pll-divider-clock\";\n" " \t\tclocks = <&mainmuxclk>;\n" @@ -33,7 +40,7 @@ " \t};\n" " \n" "-\tclkmodrst0: clkmodrst0 {\n" - "+\tclkmodrst0: clkmodrst0 at 2350000 {\n" + "+\tclkmodrst0: clkmodrst0@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk16>;\n" @@ -42,7 +49,7 @@ " \n" " \n" "-\tclkusb: clkusb {\n" - "+\tclkusb: clkusb at 2350008 {\n" + "+\tclkusb: clkusb@2350008 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk16>;\n" @@ -51,7 +58,7 @@ " \t};\n" " \n" "-\tclkaemifspi: clkaemifspi {\n" - "+\tclkaemifspi: clkaemifspi at 235000c {\n" + "+\tclkaemifspi: clkaemifspi@235000c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk16>;\n" @@ -60,7 +67,7 @@ " \n" " \n" "-\tclkdebugsstrc: clkdebugsstrc {\n" - "+\tclkdebugsstrc: clkdebugsstrc at 2350014 {\n" + "+\tclkdebugsstrc: clkdebugsstrc@2350014 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk13>;\n" @@ -69,7 +76,7 @@ " \t};\n" " \n" "-\tclktetbtrc: clktetbtrc {\n" - "+\tclktetbtrc: clktetbtrc at 2350018 {\n" + "+\tclktetbtrc: clktetbtrc@2350018 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk13>;\n" @@ -78,7 +85,7 @@ " \t};\n" " \n" "-\tclkpa: clkpa {\n" - "+\tclkpa: clkpa at 235001c {\n" + "+\tclkpa: clkpa@235001c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&paclk13>;\n" @@ -87,7 +94,7 @@ " \t};\n" " \n" "-\tclkcpgmac: clkcpgmac {\n" - "+\tclkcpgmac: clkcpgmac at 2350020 {\n" + "+\tclkcpgmac: clkcpgmac@2350020 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkpa>;\n" @@ -96,7 +103,7 @@ " \t};\n" " \n" "-\tclksa: clksa {\n" - "+\tclksa: clksa at 2350024 {\n" + "+\tclksa: clksa@2350024 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkpa>;\n" @@ -105,7 +112,7 @@ " \t};\n" " \n" "-\tclkpcie: clkpcie {\n" - "+\tclkpcie: clkpcie at 2350028 {\n" + "+\tclkpcie: clkpcie@2350028 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk12>;\n" @@ -114,7 +121,7 @@ " \t};\n" " \n" "-\tclksr: clksr {\n" - "+\tclksr: clksr at 2350034 {\n" + "+\tclksr: clksr@2350034 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk1rstiso112>;\n" @@ -123,7 +130,7 @@ " \t};\n" " \n" "-\tclkgem0: clkgem0 {\n" - "+\tclkgem0: clkgem0 at 235003c {\n" + "+\tclkgem0: clkgem0@235003c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk1>;\n" @@ -132,7 +139,7 @@ " \t};\n" " \n" "-\tclkddr30: clkddr30 {\n" - "+\tclkddr30: clkddr30 at 235005c {\n" + "+\tclkddr30: clkddr30@235005c {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&chipclk12>;\n" @@ -141,7 +148,7 @@ " \t};\n" " \n" "-\tclkwdtimer0: clkwdtimer0 {\n" - "+\tclkwdtimer0: clkwdtimer0 at 2350000 {\n" + "+\tclkwdtimer0: clkwdtimer0@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -150,7 +157,7 @@ " \t};\n" " \n" "-\tclkwdtimer1: clkwdtimer1 {\n" - "+\tclkwdtimer1: clkwdtimer1 at 2350000 {\n" + "+\tclkwdtimer1: clkwdtimer1@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -159,7 +166,7 @@ " \t};\n" " \n" "-\tclkwdtimer2: clkwdtimer2 {\n" - "+\tclkwdtimer2: clkwdtimer2 at 2350000 {\n" + "+\tclkwdtimer2: clkwdtimer2@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -168,7 +175,7 @@ " \t};\n" " \n" "-\tclkwdtimer3: clkwdtimer3 {\n" - "+\tclkwdtimer3: clkwdtimer3 at 2350000 {\n" + "+\tclkwdtimer3: clkwdtimer3@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -177,7 +184,7 @@ " \t};\n" " \n" "-\tclktimer15: clktimer15 {\n" - "+\tclktimer15: clktimer15 at 2350000 {\n" + "+\tclktimer15: clktimer15@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -186,7 +193,7 @@ " \t};\n" " \n" "-\tclkuart0: clkuart0 {\n" - "+\tclkuart0: clkuart0 at 2350000 {\n" + "+\tclkuart0: clkuart0@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -195,7 +202,7 @@ " \t};\n" " \n" "-\tclkuart1: clkuart1 {\n" - "+\tclkuart1: clkuart1 at 2350000 {\n" + "+\tclkuart1: clkuart1@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -204,7 +211,7 @@ " \t};\n" " \n" "-\tclkaemif: clkaemif {\n" - "+\tclkaemif: clkaemif at 2350000 {\n" + "+\tclkaemif: clkaemif@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkaemifspi>;\n" @@ -213,7 +220,7 @@ " \t};\n" " \n" "-\tclkusim: clkusim {\n" - "+\tclkusim: clkusim at 2350000 {\n" + "+\tclkusim: clkusim@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -222,7 +229,7 @@ " \t};\n" " \n" "-\tclki2c: clki2c {\n" - "+\tclki2c: clki2c at 2350000 {\n" + "+\tclki2c: clki2c@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -231,7 +238,7 @@ " \t};\n" " \n" "-\tclkspi: clkspi {\n" - "+\tclkspi: clkspi at 2350000 {\n" + "+\tclkspi: clkspi@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkaemifspi>;\n" @@ -240,7 +247,7 @@ " \t};\n" " \n" "-\tclkgpio: clkgpio {\n" - "+\tclkgpio: clkgpio at 2350000 {\n" + "+\tclkgpio: clkgpio@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" @@ -249,11 +256,11 @@ " \t};\n" " \n" "-\tclkkeymgr: clkkeymgr {\n" - "+\tclkkeymgr: clkkeymgr at 2350000 {\n" + "+\tclkkeymgr: clkkeymgr@2350000 {\n" " \t\t#clock-cells = <0>;\n" " \t\tcompatible = \"ti,keystone,psc-clock\";\n" " \t\tclocks = <&clkmodrst0>;\n" "-- \n" 2.14.1 -10e3540a1e3ade9f5d193e1f224286f605276d4d8b37c878372025cce02b2e5d +18ca401db450c80a4b20a028896d4ea8e7ba32a5d22ed3d5762843ec1cd7aaff
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.