diff for duplicates of <20171216204040.18017-6-nm@ti.com> diff --git a/a/1.txt b/N1/1.txt index 2011eda..36eec16 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ index f23147093fd8..457515b0736a 100644 }; - chipstmxptclk: chipstmxptclk { -+ chipstmxptclk: chipstmxptclk at 2310164 { ++ chipstmxptclk: chipstmxptclk@2310164 { #clock-cells = <0>; compatible = "ti,keystone,pll-divider-clock"; clocks = <&mainmuxclk>; @@ -30,7 +30,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkmodrst0: clkmodrst0 { -+ clkmodrst0: clkmodrst0 at 2350000 { ++ clkmodrst0: clkmodrst0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -39,7 +39,7 @@ index f23147093fd8..457515b0736a 100644 - clkusb: clkusb { -+ clkusb: clkusb at 2350008 { ++ clkusb: clkusb@2350008 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -48,7 +48,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkaemifspi: clkaemifspi { -+ clkaemifspi: clkaemifspi at 235000c { ++ clkaemifspi: clkaemifspi@235000c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -57,7 +57,7 @@ index f23147093fd8..457515b0736a 100644 - clkdebugsstrc: clkdebugsstrc { -+ clkdebugsstrc: clkdebugsstrc at 2350014 { ++ clkdebugsstrc: clkdebugsstrc@2350014 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -66,7 +66,7 @@ index f23147093fd8..457515b0736a 100644 }; - clktetbtrc: clktetbtrc { -+ clktetbtrc: clktetbtrc at 2350018 { ++ clktetbtrc: clktetbtrc@2350018 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -75,7 +75,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkpa: clkpa { -+ clkpa: clkpa at 235001c { ++ clkpa: clkpa@235001c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&paclk13>; @@ -84,7 +84,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkcpgmac: clkcpgmac { -+ clkcpgmac: clkcpgmac at 2350020 { ++ clkcpgmac: clkcpgmac@2350020 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -93,7 +93,7 @@ index f23147093fd8..457515b0736a 100644 }; - clksa: clksa { -+ clksa: clksa at 2350024 { ++ clksa: clksa@2350024 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -102,7 +102,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkpcie: clkpcie { -+ clkpcie: clkpcie at 2350028 { ++ clkpcie: clkpcie@2350028 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -111,7 +111,7 @@ index f23147093fd8..457515b0736a 100644 }; - clksr: clksr { -+ clksr: clksr at 2350034 { ++ clksr: clksr@2350034 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1rstiso112>; @@ -120,7 +120,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkgem0: clkgem0 { -+ clkgem0: clkgem0 at 235003c { ++ clkgem0: clkgem0@235003c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1>; @@ -129,7 +129,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkddr30: clkddr30 { -+ clkddr30: clkddr30 at 235005c { ++ clkddr30: clkddr30@235005c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -138,7 +138,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer0: clkwdtimer0 { -+ clkwdtimer0: clkwdtimer0 at 2350000 { ++ clkwdtimer0: clkwdtimer0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -147,7 +147,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer1: clkwdtimer1 { -+ clkwdtimer1: clkwdtimer1 at 2350000 { ++ clkwdtimer1: clkwdtimer1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -156,7 +156,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer2: clkwdtimer2 { -+ clkwdtimer2: clkwdtimer2 at 2350000 { ++ clkwdtimer2: clkwdtimer2@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -165,7 +165,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer3: clkwdtimer3 { -+ clkwdtimer3: clkwdtimer3 at 2350000 { ++ clkwdtimer3: clkwdtimer3@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -174,7 +174,7 @@ index f23147093fd8..457515b0736a 100644 }; - clktimer15: clktimer15 { -+ clktimer15: clktimer15 at 2350000 { ++ clktimer15: clktimer15@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -183,7 +183,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkuart0: clkuart0 { -+ clkuart0: clkuart0 at 2350000 { ++ clkuart0: clkuart0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -192,7 +192,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkuart1: clkuart1 { -+ clkuart1: clkuart1 at 2350000 { ++ clkuart1: clkuart1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -201,7 +201,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkaemif: clkaemif { -+ clkaemif: clkaemif at 2350000 { ++ clkaemif: clkaemif@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -210,7 +210,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkusim: clkusim { -+ clkusim: clkusim at 2350000 { ++ clkusim: clkusim@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -219,7 +219,7 @@ index f23147093fd8..457515b0736a 100644 }; - clki2c: clki2c { -+ clki2c: clki2c at 2350000 { ++ clki2c: clki2c@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -228,7 +228,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkspi: clkspi { -+ clkspi: clkspi at 2350000 { ++ clkspi: clkspi@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -237,7 +237,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkgpio: clkgpio { -+ clkgpio: clkgpio at 2350000 { ++ clkgpio: clkgpio@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -246,7 +246,7 @@ index f23147093fd8..457515b0736a 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 8c74417..0f00684 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\020171215132102.435-1-nm@ti.com\0" "ref\020171216204040.18017-1-nm@ti.com\0" - "From\0nm@ti.com (Nishanth Menon)\0" + "From\0Nishanth Menon <nm@ti.com>\0" "Subject\0[PATCH V2 5/8] ARM: dts: keystone-clocks: Add missing unit name to clock nodes that have regs\0" "Date\0Sat, 16 Dec 2017 14:40:37 -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\0linux-kernel@vger.kernel.org" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + afd@ti.com + " 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" @@ -29,7 +37,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" @@ -38,7 +46,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" @@ -47,7 +55,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" @@ -56,7 +64,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" @@ -65,7 +73,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" @@ -74,7 +82,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" @@ -83,7 +91,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" @@ -92,7 +100,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" @@ -101,7 +109,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" @@ -110,7 +118,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" @@ -119,7 +127,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" @@ -128,7 +136,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" @@ -137,7 +145,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" @@ -146,7 +154,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" @@ -155,7 +163,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" @@ -164,7 +172,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" @@ -173,7 +181,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" @@ -182,7 +190,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" @@ -191,7 +199,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" @@ -200,7 +208,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" @@ -209,7 +217,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" @@ -218,7 +226,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" @@ -227,7 +235,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" @@ -236,7 +244,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" @@ -245,7 +253,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" @@ -254,11 +262,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 -2277f5de6bf44383ed6614f14555802b7b09c43c14a43f428a4c28dbfd133402 +08c752ba2dbdcac7af2ab4bba58821de07009fe4d0c8d1599c9b6672ec4d0560
diff --git a/a/1.txt b/N2/1.txt index 2011eda..36eec16 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,7 +21,7 @@ index f23147093fd8..457515b0736a 100644 }; - chipstmxptclk: chipstmxptclk { -+ chipstmxptclk: chipstmxptclk at 2310164 { ++ chipstmxptclk: chipstmxptclk@2310164 { #clock-cells = <0>; compatible = "ti,keystone,pll-divider-clock"; clocks = <&mainmuxclk>; @@ -30,7 +30,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkmodrst0: clkmodrst0 { -+ clkmodrst0: clkmodrst0 at 2350000 { ++ clkmodrst0: clkmodrst0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -39,7 +39,7 @@ index f23147093fd8..457515b0736a 100644 - clkusb: clkusb { -+ clkusb: clkusb at 2350008 { ++ clkusb: clkusb@2350008 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -48,7 +48,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkaemifspi: clkaemifspi { -+ clkaemifspi: clkaemifspi at 235000c { ++ clkaemifspi: clkaemifspi@235000c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk16>; @@ -57,7 +57,7 @@ index f23147093fd8..457515b0736a 100644 - clkdebugsstrc: clkdebugsstrc { -+ clkdebugsstrc: clkdebugsstrc at 2350014 { ++ clkdebugsstrc: clkdebugsstrc@2350014 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -66,7 +66,7 @@ index f23147093fd8..457515b0736a 100644 }; - clktetbtrc: clktetbtrc { -+ clktetbtrc: clktetbtrc at 2350018 { ++ clktetbtrc: clktetbtrc@2350018 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk13>; @@ -75,7 +75,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkpa: clkpa { -+ clkpa: clkpa at 235001c { ++ clkpa: clkpa@235001c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&paclk13>; @@ -84,7 +84,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkcpgmac: clkcpgmac { -+ clkcpgmac: clkcpgmac at 2350020 { ++ clkcpgmac: clkcpgmac@2350020 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -93,7 +93,7 @@ index f23147093fd8..457515b0736a 100644 }; - clksa: clksa { -+ clksa: clksa at 2350024 { ++ clksa: clksa@2350024 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkpa>; @@ -102,7 +102,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkpcie: clkpcie { -+ clkpcie: clkpcie at 2350028 { ++ clkpcie: clkpcie@2350028 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -111,7 +111,7 @@ index f23147093fd8..457515b0736a 100644 }; - clksr: clksr { -+ clksr: clksr at 2350034 { ++ clksr: clksr@2350034 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1rstiso112>; @@ -120,7 +120,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkgem0: clkgem0 { -+ clkgem0: clkgem0 at 235003c { ++ clkgem0: clkgem0@235003c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk1>; @@ -129,7 +129,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkddr30: clkddr30 { -+ clkddr30: clkddr30 at 235005c { ++ clkddr30: clkddr30@235005c { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&chipclk12>; @@ -138,7 +138,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer0: clkwdtimer0 { -+ clkwdtimer0: clkwdtimer0 at 2350000 { ++ clkwdtimer0: clkwdtimer0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -147,7 +147,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer1: clkwdtimer1 { -+ clkwdtimer1: clkwdtimer1 at 2350000 { ++ clkwdtimer1: clkwdtimer1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -156,7 +156,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer2: clkwdtimer2 { -+ clkwdtimer2: clkwdtimer2 at 2350000 { ++ clkwdtimer2: clkwdtimer2@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -165,7 +165,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkwdtimer3: clkwdtimer3 { -+ clkwdtimer3: clkwdtimer3 at 2350000 { ++ clkwdtimer3: clkwdtimer3@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -174,7 +174,7 @@ index f23147093fd8..457515b0736a 100644 }; - clktimer15: clktimer15 { -+ clktimer15: clktimer15 at 2350000 { ++ clktimer15: clktimer15@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -183,7 +183,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkuart0: clkuart0 { -+ clkuart0: clkuart0 at 2350000 { ++ clkuart0: clkuart0@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -192,7 +192,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkuart1: clkuart1 { -+ clkuart1: clkuart1 at 2350000 { ++ clkuart1: clkuart1@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -201,7 +201,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkaemif: clkaemif { -+ clkaemif: clkaemif at 2350000 { ++ clkaemif: clkaemif@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -210,7 +210,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkusim: clkusim { -+ clkusim: clkusim at 2350000 { ++ clkusim: clkusim@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -219,7 +219,7 @@ index f23147093fd8..457515b0736a 100644 }; - clki2c: clki2c { -+ clki2c: clki2c at 2350000 { ++ clki2c: clki2c@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -228,7 +228,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkspi: clkspi { -+ clkspi: clkspi at 2350000 { ++ clkspi: clkspi@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkaemifspi>; @@ -237,7 +237,7 @@ index f23147093fd8..457515b0736a 100644 }; - clkgpio: clkgpio { -+ clkgpio: clkgpio at 2350000 { ++ clkgpio: clkgpio@2350000 { #clock-cells = <0>; compatible = "ti,keystone,psc-clock"; clocks = <&clkmodrst0>; @@ -246,7 +246,7 @@ index f23147093fd8..457515b0736a 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 8c74417..e03987b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,17 @@ "ref\020171215132102.435-1-nm@ti.com\0" "ref\020171216204040.18017-1-nm@ti.com\0" - "From\0nm@ti.com (Nishanth Menon)\0" + "From\0Nishanth Menon <nm@ti.com>\0" "Subject\0[PATCH V2 5/8] ARM: dts: keystone-clocks: Add missing unit name to clock nodes that have regs\0" "Date\0Sat, 16 Dec 2017 14:40:37 -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> + <afd@ti.com> + " 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" @@ -29,7 +37,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" @@ -38,7 +46,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" @@ -47,7 +55,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" @@ -56,7 +64,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" @@ -65,7 +73,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" @@ -74,7 +82,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" @@ -83,7 +91,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" @@ -92,7 +100,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" @@ -101,7 +109,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" @@ -110,7 +118,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" @@ -119,7 +127,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" @@ -128,7 +136,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" @@ -137,7 +145,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" @@ -146,7 +154,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" @@ -155,7 +163,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" @@ -164,7 +172,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" @@ -173,7 +181,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" @@ -182,7 +190,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" @@ -191,7 +199,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" @@ -200,7 +208,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" @@ -209,7 +217,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" @@ -218,7 +226,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" @@ -227,7 +235,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" @@ -236,7 +244,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" @@ -245,7 +253,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" @@ -254,11 +262,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 -2277f5de6bf44383ed6614f14555802b7b09c43c14a43f428a4c28dbfd133402 +8877f133adc5b3c027c33ea2b8fb68ab7f804bebe8017b84c1eea99ded878124
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.