diff for duplicates of <20131215034029.23538.70910@quantum> diff --git a/a/1.txt b/N1/1.txt index 9fbfdd6..b9129a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> omap4_pmx_core: pinmux@4a100040 { +> omap4_pmx_core: pinmux at 4a100040 { > @@ -172,6 +174,8 @@ > #dma-cells = <1>; > #dma-channels = <32>; @@ -34,7 +34,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> gpio1: gpio@4a310000 { +> gpio1: gpio at 4a310000 { > @@ -184,6 +188,8 @@ > #gpio-cells = <2>; > interrupt-controller; @@ -43,7 +43,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "dbclk"; > }; > -> gpio2: gpio@48055000 { +> gpio2: gpio at 48055000 { > @@ -195,6 +201,8 @@ > #gpio-cells = <2>; > interrupt-controller; @@ -52,7 +52,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "dbclk"; > }; > -> gpio3: gpio@48057000 { +> gpio3: gpio at 48057000 { > @@ -206,6 +214,8 @@ > #gpio-cells = <2>; > interrupt-controller; @@ -61,7 +61,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "dbclk"; > }; > -> gpio4: gpio@48059000 { +> gpio4: gpio at 48059000 { > @@ -217,6 +227,8 @@ > #gpio-cells = <2>; > interrupt-controller; @@ -70,7 +70,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "dbclk"; > }; > -> gpio5: gpio@4805b000 { +> gpio5: gpio at 4805b000 { > @@ -228,6 +240,8 @@ > #gpio-cells = <2>; > interrupt-controller; @@ -79,7 +79,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "dbclk"; > }; > -> gpio6: gpio@4805d000 { +> gpio6: gpio at 4805d000 { > @@ -239,6 +253,8 @@ > #gpio-cells = <2>; > interrupt-controller; @@ -88,7 +88,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "dbclk"; > }; > -> gpmc: gpmc@50000000 { +> gpmc: gpmc at 50000000 { > @@ -259,6 +275,8 @@ > interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "uart1"; @@ -97,7 +97,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> uart2: serial@4806c000 { +> uart2: serial at 4806c000 { > @@ -267,6 +285,8 @@ > interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "uart2"; @@ -106,7 +106,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> uart3: serial@48020000 { +> uart3: serial at 48020000 { > @@ -275,6 +295,8 @@ > interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "uart3"; @@ -115,7 +115,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> uart4: serial@4806e000 { +> uart4: serial at 4806e000 { > @@ -283,6 +305,8 @@ > interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "uart4"; @@ -124,7 +124,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> hwspinlock: spinlock@4a0f6000 { +> hwspinlock: spinlock at 4a0f6000 { > @@ -298,6 +322,8 @@ > #address-cells = <1>; > #size-cells = <0>; @@ -133,7 +133,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> i2c2: i2c@48072000 { +> i2c2: i2c at 48072000 { > @@ -307,6 +333,8 @@ > #address-cells = <1>; > #size-cells = <0>; @@ -142,7 +142,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> i2c3: i2c@48060000 { +> i2c3: i2c at 48060000 { > @@ -316,6 +344,8 @@ > #address-cells = <1>; > #size-cells = <0>; @@ -151,7 +151,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> i2c4: i2c@48350000 { +> i2c4: i2c at 48350000 { > @@ -325,6 +355,8 @@ > #address-cells = <1>; > #size-cells = <0>; @@ -160,7 +160,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mcspi1: spi@48098000 { +> mcspi1: spi at 48098000 { > @@ -345,6 +377,8 @@ > <&sdma 42>; > dma-names = "tx0", "rx0", "tx1", "rx1", @@ -169,7 +169,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mcspi2: spi@4809a000 { +> mcspi2: spi at 4809a000 { > @@ -360,6 +394,8 @@ > <&sdma 45>, > <&sdma 46>; @@ -178,7 +178,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mcspi3: spi@480b8000 { +> mcspi3: spi at 480b8000 { > @@ -372,6 +408,8 @@ > ti,spi-num-cs = <2>; > dmas = <&sdma 15>, <&sdma 16>; @@ -187,7 +187,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mcspi4: spi@480ba000 { +> mcspi4: spi at 480ba000 { > @@ -384,6 +422,8 @@ > ti,spi-num-cs = <1>; > dmas = <&sdma 70>, <&sdma 71>; @@ -196,7 +196,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mmc1: mmc@4809c000 { +> mmc1: mmc at 4809c000 { > @@ -395,6 +435,8 @@ > ti,needs-special-reset; > dmas = <&sdma 61>, <&sdma 62>; @@ -205,7 +205,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mmc2: mmc@480b4000 { +> mmc2: mmc at 480b4000 { > @@ -405,6 +447,8 @@ > ti,needs-special-reset; > dmas = <&sdma 47>, <&sdma 48>; @@ -214,7 +214,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mmc3: mmc@480ad000 { +> mmc3: mmc at 480ad000 { > @@ -415,6 +459,8 @@ > ti,needs-special-reset; > dmas = <&sdma 77>, <&sdma 78>; @@ -223,7 +223,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mmc4: mmc@480d1000 { +> mmc4: mmc at 480d1000 { > @@ -425,6 +471,8 @@ > ti,needs-special-reset; > dmas = <&sdma 57>, <&sdma 58>; @@ -232,7 +232,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mmc5: mmc@480d5000 { +> mmc5: mmc at 480d5000 { > @@ -435,6 +483,8 @@ > ti,needs-special-reset; > dmas = <&sdma 59>, <&sdma 60>; @@ -241,7 +241,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> wdt2: wdt@4a314000 { +> wdt2: wdt at 4a314000 { > @@ -442,6 +492,8 @@ > reg = <0x4a314000 0x80>; > interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; @@ -250,7 +250,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mcpdm: mcpdm@40132000 { +> mcpdm: mcpdm at 40132000 { > @@ -454,6 +506,8 @@ > dmas = <&sdma 65>, > <&sdma 66>; @@ -259,7 +259,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> dmic: dmic@4012e000 { +> dmic: dmic at 4012e000 { > @@ -465,6 +519,8 @@ > ti,hwmods = "dmic"; > dmas = <&sdma 67>; @@ -268,7 +268,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> mcbsp1: mcbsp@40122000 { +> mcbsp1: mcbsp at 40122000 { > @@ -479,6 +535,8 @@ > dmas = <&sdma 33>, > <&sdma 34>; @@ -277,7 +277,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "pad_fck", "prcm_fck"; > }; > -> mcbsp2: mcbsp@40124000 { +> mcbsp2: mcbsp at 40124000 { > @@ -493,6 +551,8 @@ > dmas = <&sdma 17>, > <&sdma 18>; @@ -286,7 +286,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "pad_fck", "prcm_fck"; > }; > -> mcbsp3: mcbsp@40126000 { +> mcbsp3: mcbsp at 40126000 { > @@ -507,6 +567,8 @@ > dmas = <&sdma 19>, > <&sdma 20>; @@ -295,7 +295,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "pad_fck", "prcm_fck"; > }; > -> mcbsp4: mcbsp@48096000 { +> mcbsp4: mcbsp at 48096000 { > @@ -520,6 +582,8 @@ > dmas = <&sdma 31>, > <&sdma 32>; @@ -304,7 +304,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck", "pad_fck", "prcm_fck"; > }; > -> keypad: keypad@4a31c000 { +> keypad: keypad at 4a31c000 { > @@ -528,6 +592,8 @@ > interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; > reg-names = "mpu"; @@ -313,7 +313,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> emif1: emif@4c000000 { +> emif1: emif at 4c000000 { > @@ -540,6 +606,8 @@ > hw-caps-read-idle-ctrl; > hw-caps-ll-interface; @@ -322,7 +322,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> emif2: emif@4d000000 { +> emif2: emif at 4d000000 { > @@ -552,6 +620,8 @@ > hw-caps-read-idle-ctrl; > hw-caps-ll-interface; @@ -331,14 +331,14 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> ocp2scp@4a0ad000 { +> ocp2scp at 4a0ad000 { > @@ -561,6 +631,8 @@ > #size-cells = <1>; > ranges; > ti,hwmods = "ocp2scp_usb_phy"; > + clocks = <&ocp2scp_usb_phy_phy_48m>; > + clock-names = "fck"; -> usb2_phy: usb2phy@4a0ad080 { +> usb2_phy: usb2phy at 4a0ad080 { > compatible = "ti,omap-usb2"; > reg = <0x4a0ad080 0x58>; > @@ -575,6 +647,8 @@ @@ -349,7 +349,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer2: timer@48032000 { +> timer2: timer at 48032000 { > @@ -582,6 +656,8 @@ > reg = <0x48032000 0x80>; > interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; @@ -358,7 +358,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer3: timer@48034000 { +> timer3: timer at 48034000 { > @@ -589,6 +665,8 @@ > reg = <0x48034000 0x80>; > interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; @@ -367,7 +367,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer4: timer@48036000 { +> timer4: timer at 48036000 { > @@ -596,6 +674,8 @@ > reg = <0x48036000 0x80>; > interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; @@ -376,7 +376,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer5: timer@40138000 { +> timer5: timer at 40138000 { > @@ -605,6 +685,8 @@ > interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "timer5"; @@ -385,7 +385,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer6: timer@4013a000 { +> timer6: timer at 4013a000 { > @@ -614,6 +696,8 @@ > interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "timer6"; @@ -394,7 +394,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer7: timer@4013c000 { +> timer7: timer at 4013c000 { > @@ -623,6 +707,8 @@ > interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "timer7"; @@ -403,7 +403,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer8: timer@4013e000 { +> timer8: timer at 4013e000 { > @@ -633,6 +719,8 @@ > ti,hwmods = "timer8"; > ti,timer-pwm; @@ -412,7 +412,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer9: timer@4803e000 { +> timer9: timer at 4803e000 { > @@ -641,6 +729,8 @@ > interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "timer9"; @@ -421,7 +421,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer10: timer@48086000 { +> timer10: timer at 48086000 { > @@ -649,6 +739,8 @@ > interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "timer10"; @@ -430,7 +430,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> timer11: timer@48088000 { +> timer11: timer at 48088000 { > @@ -657,6 +749,8 @@ > interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; > ti,hwmods = "timer11"; @@ -439,7 +439,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> usbhstll: usbhstll@4a062000 { +> usbhstll: usbhstll at 4a062000 { > @@ -664,6 +758,8 @@ > reg = <0x4a062000 0x1000>; > interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>; @@ -448,7 +448,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> usbhshost: usbhshost@4a064000 { +> usbhshost: usbhshost at 4a064000 { > @@ -673,6 +769,8 @@ > #address-cells = <1>; > #size-cells = <1>; @@ -456,7 +456,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clocks = <&usb_host_hs_fck>; > + clock-names = "fck"; > -> usbhsohci: ohci@4a064800 { +> usbhsohci: ohci at 4a064800 { > compatible = "ti,ohci-omap3", "usb-ohci"; > @@ -714,6 +812,8 @@ > num-eps = <16>; @@ -466,7 +466,7 @@ Reviewed-by: Mike Turquette <mturquette@linaro.org> > + clock-names = "fck"; > }; > -> aes: aes@4b501000 { +> aes: aes at 4b501000 { > diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > index 1e5b12c..aeda9e6 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c diff --git a/a/content_digest b/N1/content_digest index f9894ce..bbfd087 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\01386848309-14076-1-git-send-email-rnayak@ti.com\0" "ref\01386848309-14076-4-git-send-email-rnayak@ti.com\0" - "From\0Mike Turquette <mturquette@linaro.org>\0" - "Subject\0Re: [PATCH v2 3/3] ARM: OMAP4: dts: Add main and optional clock data into DT\0" + "From\0mturquette@linaro.org (Mike Turquette)\0" + "Subject\0[PATCH v2 3/3] ARM: OMAP4: dts: Add main and optional clock data into DT\0" "Date\0Sat, 14 Dec 2013 19:40:29 -0800\0" - "To\0linux-omap@vger.kernel.org" - tony@atomide.com - paul@pwsan.com - " nm@ti.com\0" - "Cc\0mark.rutland@arm.com" - bcousson@baylibre.com - linux-arm-kernel@lists.infradead.org - " Rajendra Nayak <rnayak@ti.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Quoting Rajendra Nayak (2013-12-12 03:38:29)\n" @@ -40,7 +33,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> omap4_pmx_core: pinmux@4a100040 {\n" + "> omap4_pmx_core: pinmux at 4a100040 {\n" "> @@ -172,6 +174,8 @@\n" "> #dma-cells = <1>;\n" "> #dma-channels = <32>;\n" @@ -49,7 +42,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> gpio1: gpio@4a310000 {\n" + "> gpio1: gpio at 4a310000 {\n" "> @@ -184,6 +188,8 @@\n" "> #gpio-cells = <2>;\n" "> interrupt-controller;\n" @@ -58,7 +51,7 @@ "> + clock-names = \"fck\", \"dbclk\";\n" "> };\n" "> \n" - "> gpio2: gpio@48055000 {\n" + "> gpio2: gpio at 48055000 {\n" "> @@ -195,6 +201,8 @@\n" "> #gpio-cells = <2>;\n" "> interrupt-controller;\n" @@ -67,7 +60,7 @@ "> + clock-names = \"fck\", \"dbclk\";\n" "> };\n" "> \n" - "> gpio3: gpio@48057000 {\n" + "> gpio3: gpio at 48057000 {\n" "> @@ -206,6 +214,8 @@\n" "> #gpio-cells = <2>;\n" "> interrupt-controller;\n" @@ -76,7 +69,7 @@ "> + clock-names = \"fck\", \"dbclk\";\n" "> };\n" "> \n" - "> gpio4: gpio@48059000 {\n" + "> gpio4: gpio at 48059000 {\n" "> @@ -217,6 +227,8 @@\n" "> #gpio-cells = <2>;\n" "> interrupt-controller;\n" @@ -85,7 +78,7 @@ "> + clock-names = \"fck\", \"dbclk\";\n" "> };\n" "> \n" - "> gpio5: gpio@4805b000 {\n" + "> gpio5: gpio at 4805b000 {\n" "> @@ -228,6 +240,8 @@\n" "> #gpio-cells = <2>;\n" "> interrupt-controller;\n" @@ -94,7 +87,7 @@ "> + clock-names = \"fck\", \"dbclk\";\n" "> };\n" "> \n" - "> gpio6: gpio@4805d000 {\n" + "> gpio6: gpio at 4805d000 {\n" "> @@ -239,6 +253,8 @@\n" "> #gpio-cells = <2>;\n" "> interrupt-controller;\n" @@ -103,7 +96,7 @@ "> + clock-names = \"fck\", \"dbclk\";\n" "> };\n" "> \n" - "> gpmc: gpmc@50000000 {\n" + "> gpmc: gpmc at 50000000 {\n" "> @@ -259,6 +275,8 @@\n" "> interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"uart1\";\n" @@ -112,7 +105,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> uart2: serial@4806c000 {\n" + "> uart2: serial at 4806c000 {\n" "> @@ -267,6 +285,8 @@\n" "> interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"uart2\";\n" @@ -121,7 +114,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> uart3: serial@48020000 {\n" + "> uart3: serial at 48020000 {\n" "> @@ -275,6 +295,8 @@\n" "> interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"uart3\";\n" @@ -130,7 +123,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> uart4: serial@4806e000 {\n" + "> uart4: serial at 4806e000 {\n" "> @@ -283,6 +305,8 @@\n" "> interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"uart4\";\n" @@ -139,7 +132,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> hwspinlock: spinlock@4a0f6000 {\n" + "> hwspinlock: spinlock at 4a0f6000 {\n" "> @@ -298,6 +322,8 @@\n" "> #address-cells = <1>;\n" "> #size-cells = <0>;\n" @@ -148,7 +141,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> i2c2: i2c@48072000 {\n" + "> i2c2: i2c at 48072000 {\n" "> @@ -307,6 +333,8 @@\n" "> #address-cells = <1>;\n" "> #size-cells = <0>;\n" @@ -157,7 +150,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> i2c3: i2c@48060000 {\n" + "> i2c3: i2c at 48060000 {\n" "> @@ -316,6 +344,8 @@\n" "> #address-cells = <1>;\n" "> #size-cells = <0>;\n" @@ -166,7 +159,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> i2c4: i2c@48350000 {\n" + "> i2c4: i2c at 48350000 {\n" "> @@ -325,6 +355,8 @@\n" "> #address-cells = <1>;\n" "> #size-cells = <0>;\n" @@ -175,7 +168,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mcspi1: spi@48098000 {\n" + "> mcspi1: spi at 48098000 {\n" "> @@ -345,6 +377,8 @@\n" "> <&sdma 42>;\n" "> dma-names = \"tx0\", \"rx0\", \"tx1\", \"rx1\",\n" @@ -184,7 +177,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mcspi2: spi@4809a000 {\n" + "> mcspi2: spi at 4809a000 {\n" "> @@ -360,6 +394,8 @@\n" "> <&sdma 45>,\n" "> <&sdma 46>;\n" @@ -193,7 +186,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mcspi3: spi@480b8000 {\n" + "> mcspi3: spi at 480b8000 {\n" "> @@ -372,6 +408,8 @@\n" "> ti,spi-num-cs = <2>;\n" "> dmas = <&sdma 15>, <&sdma 16>;\n" @@ -202,7 +195,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mcspi4: spi@480ba000 {\n" + "> mcspi4: spi at 480ba000 {\n" "> @@ -384,6 +422,8 @@\n" "> ti,spi-num-cs = <1>;\n" "> dmas = <&sdma 70>, <&sdma 71>;\n" @@ -211,7 +204,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mmc1: mmc@4809c000 {\n" + "> mmc1: mmc at 4809c000 {\n" "> @@ -395,6 +435,8 @@\n" "> ti,needs-special-reset;\n" "> dmas = <&sdma 61>, <&sdma 62>;\n" @@ -220,7 +213,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mmc2: mmc@480b4000 {\n" + "> mmc2: mmc at 480b4000 {\n" "> @@ -405,6 +447,8 @@\n" "> ti,needs-special-reset;\n" "> dmas = <&sdma 47>, <&sdma 48>;\n" @@ -229,7 +222,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mmc3: mmc@480ad000 {\n" + "> mmc3: mmc at 480ad000 {\n" "> @@ -415,6 +459,8 @@\n" "> ti,needs-special-reset;\n" "> dmas = <&sdma 77>, <&sdma 78>;\n" @@ -238,7 +231,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mmc4: mmc@480d1000 {\n" + "> mmc4: mmc at 480d1000 {\n" "> @@ -425,6 +471,8 @@\n" "> ti,needs-special-reset;\n" "> dmas = <&sdma 57>, <&sdma 58>;\n" @@ -247,7 +240,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mmc5: mmc@480d5000 {\n" + "> mmc5: mmc at 480d5000 {\n" "> @@ -435,6 +483,8 @@\n" "> ti,needs-special-reset;\n" "> dmas = <&sdma 59>, <&sdma 60>;\n" @@ -256,7 +249,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> wdt2: wdt@4a314000 {\n" + "> wdt2: wdt at 4a314000 {\n" "> @@ -442,6 +492,8 @@\n" "> reg = <0x4a314000 0x80>;\n" "> interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -265,7 +258,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mcpdm: mcpdm@40132000 {\n" + "> mcpdm: mcpdm at 40132000 {\n" "> @@ -454,6 +506,8 @@\n" "> dmas = <&sdma 65>,\n" "> <&sdma 66>;\n" @@ -274,7 +267,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> dmic: dmic@4012e000 {\n" + "> dmic: dmic at 4012e000 {\n" "> @@ -465,6 +519,8 @@\n" "> ti,hwmods = \"dmic\";\n" "> dmas = <&sdma 67>;\n" @@ -283,7 +276,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> mcbsp1: mcbsp@40122000 {\n" + "> mcbsp1: mcbsp at 40122000 {\n" "> @@ -479,6 +535,8 @@\n" "> dmas = <&sdma 33>,\n" "> <&sdma 34>;\n" @@ -292,7 +285,7 @@ "> + clock-names = \"fck\", \"pad_fck\", \"prcm_fck\";\n" "> };\n" "> \n" - "> mcbsp2: mcbsp@40124000 {\n" + "> mcbsp2: mcbsp at 40124000 {\n" "> @@ -493,6 +551,8 @@\n" "> dmas = <&sdma 17>,\n" "> <&sdma 18>;\n" @@ -301,7 +294,7 @@ "> + clock-names = \"fck\", \"pad_fck\", \"prcm_fck\";\n" "> };\n" "> \n" - "> mcbsp3: mcbsp@40126000 {\n" + "> mcbsp3: mcbsp at 40126000 {\n" "> @@ -507,6 +567,8 @@\n" "> dmas = <&sdma 19>,\n" "> <&sdma 20>;\n" @@ -310,7 +303,7 @@ "> + clock-names = \"fck\", \"pad_fck\", \"prcm_fck\";\n" "> };\n" "> \n" - "> mcbsp4: mcbsp@48096000 {\n" + "> mcbsp4: mcbsp at 48096000 {\n" "> @@ -520,6 +582,8 @@\n" "> dmas = <&sdma 31>,\n" "> <&sdma 32>;\n" @@ -319,7 +312,7 @@ "> + clock-names = \"fck\", \"pad_fck\", \"prcm_fck\";\n" "> };\n" "> \n" - "> keypad: keypad@4a31c000 {\n" + "> keypad: keypad at 4a31c000 {\n" "> @@ -528,6 +592,8 @@\n" "> interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;\n" "> reg-names = \"mpu\";\n" @@ -328,7 +321,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> emif1: emif@4c000000 {\n" + "> emif1: emif at 4c000000 {\n" "> @@ -540,6 +606,8 @@\n" "> hw-caps-read-idle-ctrl;\n" "> hw-caps-ll-interface;\n" @@ -337,7 +330,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> emif2: emif@4d000000 {\n" + "> emif2: emif at 4d000000 {\n" "> @@ -552,6 +620,8 @@\n" "> hw-caps-read-idle-ctrl;\n" "> hw-caps-ll-interface;\n" @@ -346,14 +339,14 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> ocp2scp@4a0ad000 {\n" + "> ocp2scp at 4a0ad000 {\n" "> @@ -561,6 +631,8 @@\n" "> #size-cells = <1>;\n" "> ranges;\n" "> ti,hwmods = \"ocp2scp_usb_phy\";\n" "> + clocks = <&ocp2scp_usb_phy_phy_48m>;\n" "> + clock-names = \"fck\";\n" - "> usb2_phy: usb2phy@4a0ad080 {\n" + "> usb2_phy: usb2phy at 4a0ad080 {\n" "> compatible = \"ti,omap-usb2\";\n" "> reg = <0x4a0ad080 0x58>;\n" "> @@ -575,6 +647,8 @@\n" @@ -364,7 +357,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer2: timer@48032000 {\n" + "> timer2: timer at 48032000 {\n" "> @@ -582,6 +656,8 @@\n" "> reg = <0x48032000 0x80>;\n" "> interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -373,7 +366,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer3: timer@48034000 {\n" + "> timer3: timer at 48034000 {\n" "> @@ -589,6 +665,8 @@\n" "> reg = <0x48034000 0x80>;\n" "> interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -382,7 +375,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer4: timer@48036000 {\n" + "> timer4: timer at 48036000 {\n" "> @@ -596,6 +674,8 @@\n" "> reg = <0x48036000 0x80>;\n" "> interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -391,7 +384,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer5: timer@40138000 {\n" + "> timer5: timer at 40138000 {\n" "> @@ -605,6 +685,8 @@\n" "> interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"timer5\";\n" @@ -400,7 +393,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer6: timer@4013a000 {\n" + "> timer6: timer at 4013a000 {\n" "> @@ -614,6 +696,8 @@\n" "> interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"timer6\";\n" @@ -409,7 +402,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer7: timer@4013c000 {\n" + "> timer7: timer at 4013c000 {\n" "> @@ -623,6 +707,8 @@\n" "> interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"timer7\";\n" @@ -418,7 +411,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer8: timer@4013e000 {\n" + "> timer8: timer at 4013e000 {\n" "> @@ -633,6 +719,8 @@\n" "> ti,hwmods = \"timer8\";\n" "> ti,timer-pwm;\n" @@ -427,7 +420,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer9: timer@4803e000 {\n" + "> timer9: timer at 4803e000 {\n" "> @@ -641,6 +729,8 @@\n" "> interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"timer9\";\n" @@ -436,7 +429,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer10: timer@48086000 {\n" + "> timer10: timer at 48086000 {\n" "> @@ -649,6 +739,8 @@\n" "> interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"timer10\";\n" @@ -445,7 +438,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> timer11: timer@48088000 {\n" + "> timer11: timer at 48088000 {\n" "> @@ -657,6 +749,8 @@\n" "> interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;\n" "> ti,hwmods = \"timer11\";\n" @@ -454,7 +447,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> usbhstll: usbhstll@4a062000 {\n" + "> usbhstll: usbhstll at 4a062000 {\n" "> @@ -664,6 +758,8 @@\n" "> reg = <0x4a062000 0x1000>;\n" "> interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -463,7 +456,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> usbhshost: usbhshost@4a064000 {\n" + "> usbhshost: usbhshost at 4a064000 {\n" "> @@ -673,6 +769,8 @@\n" "> #address-cells = <1>;\n" "> #size-cells = <1>;\n" @@ -471,7 +464,7 @@ "> + clocks = <&usb_host_hs_fck>;\n" "> + clock-names = \"fck\";\n" "> \n" - "> usbhsohci: ohci@4a064800 {\n" + "> usbhsohci: ohci at 4a064800 {\n" "> compatible = \"ti,ohci-omap3\", \"usb-ohci\";\n" "> @@ -714,6 +812,8 @@\n" "> num-eps = <16>;\n" @@ -481,7 +474,7 @@ "> + clock-names = \"fck\";\n" "> };\n" "> \n" - "> aes: aes@4b501000 {\n" + "> aes: aes at 4b501000 {\n" "> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" "> index 1e5b12c..aeda9e6 100644\n" "> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c\n" @@ -1028,4 +1021,4 @@ "> 1.7.9.5\n" > -c520c55638bff68e75d28547d0f36109a8b9ae7d47185c2ff8d8128bd3bf01ed +be698560e426e0096945564d39b129f45646c1dec4edc17001ce9b79e7f7331d
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.