diff for duplicates of <20141125181829.GC25249@lukather> diff --git a/a/1.txt b/N1/1.txt index c3bd20c..60f4b34 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ Creating a sun6i.dtsi and including that from both the A31 and A31s seems more like an appropriate solution. > -> Signed-off-by: Hans de Goede <hdegoede@redhat.com> +> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > --- > arch/arm/boot/dts/sun6i-a31s.dtsi | 925 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 925 insertions(+) @@ -32,7 +32,7 @@ seems more like an appropriate solution. > +/* > + * Copyright 2013 Maxime Ripard > + * -> + * Maxime Ripard <maxime.ripard@free-electrons.com> +> + * Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> It should be your copyright here. @@ -104,7 +104,7 @@ There was an issue with the wording of the license, s/library/file/ > + #size-cells = <1>; > + ranges; > + -> + framebuffer at 0 { +> + framebuffer@0 { > + compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; > + allwinner,pipeline = "de_be0-lcd0-hdmi"; > + clocks = <&pll6>; @@ -123,25 +123,25 @@ allwinner,sun6i-a31s I guess? > + #address-cells = <1>; > + #size-cells = <0>; > + -> + cpu at 0 { +> + cpu@0 { > + compatible = "arm,cortex-a7"; > + device_type = "cpu"; > + reg = <0>; > + }; > + -> + cpu at 1 { +> + cpu@1 { > + compatible = "arm,cortex-a7"; > + device_type = "cpu"; > + reg = <1>; > + }; > + -> + cpu at 2 { +> + cpu@2 { > + compatible = "arm,cortex-a7"; > + device_type = "cpu"; > + reg = <2>; > + }; > + -> + cpu at 3 { +> + cpu@3 { > + compatible = "arm,cortex-a7"; > + device_type = "cpu"; > + reg = <3>; @@ -171,14 +171,14 @@ allwinner,sun6i-a31s I guess? > + clock-frequency = <24000000>; > + }; > + -> + osc32k: clk at 0 { +> + osc32k: clk@0 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <32768>; > + clock-output-names = "osc32k"; > + }; > + -> + pll1: clk at 01c20000 { +> + pll1: clk@01c20000 { > + #clock-cells = <0>; > + compatible = "allwinner,sun6i-a31-pll1-clk"; > + reg = <0x01c20000 0x4>; @@ -186,7 +186,7 @@ allwinner,sun6i-a31s I guess? > + clock-output-names = "pll1"; > + }; > + -> + pll6: clk at 01c20028 { +> + pll6: clk@01c20028 { > + #clock-cells = <0>; > + compatible = "allwinner,sun6i-a31-pll6-clk"; > + reg = <0x01c20028 0x4>; @@ -194,7 +194,7 @@ allwinner,sun6i-a31s I guess? > + clock-output-names = "pll6"; > + }; > + -> + cpu: cpu at 01c20050 { +> + cpu: cpu@01c20050 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-cpu-clk"; > + reg = <0x01c20050 0x4>; @@ -209,7 +209,7 @@ allwinner,sun6i-a31s I guess? > + clock-output-names = "cpu"; > + }; > + -> + axi: axi at 01c20050 { +> + axi: axi@01c20050 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-axi-clk"; > + reg = <0x01c20050 0x4>; @@ -217,7 +217,7 @@ allwinner,sun6i-a31s I guess? > + clock-output-names = "axi"; > + }; > + -> + ahb1_mux: ahb1_mux at 01c20054 { +> + ahb1_mux: ahb1_mux@01c20054 { > + #clock-cells = <0>; > + compatible = "allwinner,sun6i-a31-ahb1-mux-clk"; > + reg = <0x01c20054 0x4>; @@ -225,7 +225,7 @@ allwinner,sun6i-a31s I guess? > + clock-output-names = "ahb1_mux"; > + }; > + -> + ahb1: ahb1 at 01c20054 { +> + ahb1: ahb1@01c20054 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-ahb-clk"; > + reg = <0x01c20054 0x4>; @@ -233,7 +233,7 @@ allwinner,sun6i-a31s I guess? > + clock-output-names = "ahb1"; > + }; > + -> + ahb1_gates: clk at 01c20060 { +> + ahb1_gates: clk@01c20060 { > + #clock-cells = <1>; > + compatible = "allwinner,sun6i-a31-ahb1-gates-clk"; > + reg = <0x01c20060 0x8>; @@ -258,7 +258,7 @@ Are the gates really identical? As in not even stripped down? -> + apb1: apb1 at 01c20054 { +> + apb1: apb1@01c20054 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-apb0-clk"; > + reg = <0x01c20054 0x4>; @@ -266,7 +266,7 @@ As in not even stripped down? > + clock-output-names = "apb1"; > + }; > + -> + apb1_gates: clk at 01c20068 { +> + apb1_gates: clk@01c20068 { > + #clock-cells = <1>; > + compatible = "allwinner,sun6i-a31-apb1-gates-clk"; > + reg = <0x01c20068 0x4>; @@ -276,7 +276,7 @@ As in not even stripped down? > + "apb1_daudio1"; > + }; > + -> + apb2_mux: apb2_mux at 01c20058 { +> + apb2_mux: apb2_mux@01c20058 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-apb1-mux-clk"; > + reg = <0x01c20058 0x4>; @@ -284,7 +284,7 @@ As in not even stripped down? > + clock-output-names = "apb2_mux"; > + }; > + -> + apb2: apb2 at 01c20058 { +> + apb2: apb2@01c20058 { > + #clock-cells = <0>; > + compatible = "allwinner,sun6i-a31-apb2-div-clk"; > + reg = <0x01c20058 0x4>; @@ -292,7 +292,7 @@ As in not even stripped down? > + clock-output-names = "apb2"; > + }; > + -> + apb2_gates: clk at 01c2006c { +> + apb2_gates: clk@01c2006c { > + #clock-cells = <1>; > + compatible = "allwinner,sun6i-a31-apb2-gates-clk"; > + reg = <0x01c2006c 0x4>; @@ -303,7 +303,7 @@ As in not even stripped down? > + "apb2_uart4", "apb2_uart5"; > + }; > + -> + mmc0_clk: clk at 01c20088 { +> + mmc0_clk: clk@01c20088 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c20088 0x4>; @@ -311,7 +311,7 @@ As in not even stripped down? > + clock-output-names = "mmc0"; > + }; > + -> + mmc1_clk: clk at 01c2008c { +> + mmc1_clk: clk@01c2008c { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c2008c 0x4>; @@ -319,7 +319,7 @@ As in not even stripped down? > + clock-output-names = "mmc1"; > + }; > + -> + mmc2_clk: clk at 01c20090 { +> + mmc2_clk: clk@01c20090 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c20090 0x4>; @@ -327,7 +327,7 @@ As in not even stripped down? > + clock-output-names = "mmc2"; > + }; > + -> + mmc3_clk: clk at 01c20094 { +> + mmc3_clk: clk@01c20094 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c20094 0x4>; @@ -335,7 +335,7 @@ As in not even stripped down? > + clock-output-names = "mmc3"; > + }; > + -> + spi0_clk: clk at 01c200a0 { +> + spi0_clk: clk@01c200a0 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c200a0 0x4>; @@ -343,7 +343,7 @@ As in not even stripped down? > + clock-output-names = "spi0"; > + }; > + -> + spi1_clk: clk at 01c200a4 { +> + spi1_clk: clk@01c200a4 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c200a4 0x4>; @@ -351,7 +351,7 @@ As in not even stripped down? > + clock-output-names = "spi1"; > + }; > + -> + spi2_clk: clk at 01c200a8 { +> + spi2_clk: clk@01c200a8 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c200a8 0x4>; @@ -359,7 +359,7 @@ As in not even stripped down? > + clock-output-names = "spi2"; > + }; > + -> + spi3_clk: clk at 01c200ac { +> + spi3_clk: clk@01c200ac { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-mod0-clk"; > + reg = <0x01c200ac 0x4>; @@ -367,7 +367,7 @@ As in not even stripped down? > + clock-output-names = "spi3"; > + }; > + -> + usb_clk: clk at 01c200cc { +> + usb_clk: clk@01c200cc { > + #clock-cells = <1>; > + #reset-cells = <1>; > + compatible = "allwinner,sun6i-a31-usb-clk"; @@ -384,21 +384,21 @@ As in not even stripped down? > + * interface mode, using clk_set_rate auto-reparenting. > + * The actual TX clock rate is not controlled by the gmac_tx clock. > + */ -> + mii_phy_tx_clk: clk at 1 { +> + mii_phy_tx_clk: clk@1 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <25000000>; > + clock-output-names = "mii_phy_tx"; > + }; > + -> + gmac_int_tx_clk: clk at 2 { +> + gmac_int_tx_clk: clk@2 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <125000000>; > + clock-output-names = "gmac_int_tx"; > + }; > + -> + gmac_tx_clk: clk at 01c200d0 { +> + gmac_tx_clk: clk@01c200d0 { > + #clock-cells = <0>; > + compatible = "allwinner,sun7i-a20-gmac-clk"; > + reg = <0x01c200d0 0x4>; @@ -407,13 +407,13 @@ As in not even stripped down? > + }; > + }; > + -> + soc at 01c00000 { +> + soc@01c00000 { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + -> + dma: dma-controller at 01c02000 { +> + dma: dma-controller@01c02000 { > + compatible = "allwinner,sun6i-a31-dma"; > + reg = <0x01c02000 0x1000>; > + interrupts = <0 50 4>; @@ -422,7 +422,7 @@ As in not even stripped down? > + #dma-cells = <1>; > + }; > + -> + mmc0: mmc at 01c0f000 { +> + mmc0: mmc@01c0f000 { > + compatible = "allwinner,sun5i-a13-mmc"; > + reg = <0x01c0f000 0x1000>; > + clocks = <&ahb1_gates 8>, <&mmc0_clk>; @@ -433,7 +433,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + mmc1: mmc at 01c10000 { +> + mmc1: mmc@01c10000 { > + compatible = "allwinner,sun5i-a13-mmc"; > + reg = <0x01c10000 0x1000>; > + clocks = <&ahb1_gates 9>, <&mmc1_clk>; @@ -444,7 +444,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + mmc2: mmc at 01c11000 { +> + mmc2: mmc@01c11000 { > + compatible = "allwinner,sun5i-a13-mmc"; > + reg = <0x01c11000 0x1000>; > + clocks = <&ahb1_gates 10>, <&mmc2_clk>; @@ -455,7 +455,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + mmc3: mmc at 01c12000 { +> + mmc3: mmc@01c12000 { > + compatible = "allwinner,sun5i-a13-mmc"; > + reg = <0x01c12000 0x1000>; > + clocks = <&ahb1_gates 11>, <&mmc3_clk>; @@ -466,7 +466,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + usbphy: phy at 01c19400 { +> + usbphy: phy@01c19400 { > + compatible = "allwinner,sun6i-a31-usb-phy"; > + reg = <0x01c19400 0x10>, > + <0x01c1a800 0x4>, @@ -490,7 +490,7 @@ As in not even stripped down? > + #phy-cells = <1>; > + }; > + -> + ehci0: usb at 01c1a000 { +> + ehci0: usb@01c1a000 { > + compatible = "allwinner,sun6i-a31-ehci", "generic-ehci"; > + reg = <0x01c1a000 0x100>; > + interrupts = <0 72 4>; @@ -501,7 +501,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + ohci0: usb at 01c1a400 { +> + ohci0: usb@01c1a400 { > + compatible = "allwinner,sun6i-a31-ohci", "generic-ohci"; > + reg = <0x01c1a400 0x100>; > + interrupts = <0 73 4>; @@ -512,7 +512,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + ehci1: usb at 01c1b000 { +> + ehci1: usb@01c1b000 { > + compatible = "allwinner,sun6i-a31-ehci", "generic-ehci"; > + reg = <0x01c1b000 0x100>; > + interrupts = <0 74 4>; @@ -523,7 +523,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + ohci1: usb at 01c1b400 { +> + ohci1: usb@01c1b400 { > + compatible = "allwinner,sun6i-a31-ohci", "generic-ohci"; > + reg = <0x01c1b400 0x100>; > + interrupts = <0 75 4>; @@ -534,7 +534,7 @@ As in not even stripped down? > + status = "disabled"; > + }; > + -> + pio: pinctrl at 01c20800 { +> + pio: pinctrl@01c20800 { > + compatible = "allwinner,sun6i-a31s-pinctrl"; > + reg = <0x01c20800 0x400>; > + interrupts = <0 11 4>, @@ -548,35 +548,35 @@ As in not even stripped down? > + #size-cells = <0>; > + #gpio-cells = <3>; > + -> + uart0_pins_a: uart0 at 0 { +> + uart0_pins_a: uart0@0 { > + allwinner,pins = "PH20", "PH21"; > + allwinner,function = "uart0"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; > + -> + i2c0_pins_a: i2c0 at 0 { +> + i2c0_pins_a: i2c0@0 { > + allwinner,pins = "PH14", "PH15"; > + allwinner,function = "i2c0"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; > + -> + i2c1_pins_a: i2c1 at 0 { +> + i2c1_pins_a: i2c1@0 { > + allwinner,pins = "PH16", "PH17"; > + allwinner,function = "i2c1"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; > + -> + i2c2_pins_a: i2c2 at 0 { +> + i2c2_pins_a: i2c2@0 { > + allwinner,pins = "PH18", "PH19"; > + allwinner,function = "i2c2"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; > + -> + mmc0_pins_a: mmc0 at 0 { +> + mmc0_pins_a: mmc0@0 { > + allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; Spaces after the comma, and I guess that would be better on two lines. @@ -586,7 +586,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + allwinner,pull = <0>; > + }; > + -> + gmac_pins_mii_a: gmac_mii at 0 { +> + gmac_pins_mii_a: gmac_mii@0 { > + allwinner,pins = "PA0", "PA1", "PA2", "PA3", > + "PA8", "PA9", "PA11", > + "PA12", "PA13", "PA14", "PA19", @@ -597,7 +597,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + allwinner,pull = <0>; > + }; > + -> + gmac_pins_gmii_a: gmac_gmii at 0 { +> + gmac_pins_gmii_a: gmac_gmii@0 { > + allwinner,pins = "PA0", "PA1", "PA2", "PA3", > + "PA4", "PA5", "PA6", "PA7", > + "PA8", "PA9", "PA10", "PA11", @@ -614,7 +614,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + allwinner,pull = <0>; > + }; > + -> + gmac_pins_rgmii_a: gmac_rgmii at 0 { +> + gmac_pins_rgmii_a: gmac_rgmii@0 { > + allwinner,pins = "PA0", "PA1", "PA2", "PA3", > + "PA9", "PA10", "PA11", > + "PA12", "PA13", "PA14", "PA19", @@ -629,25 +629,25 @@ Spaces after the comma, and I guess that would be better on two lines. > + }; > + }; > + -> + ahb1_rst: reset at 01c202c0 { +> + ahb1_rst: reset@01c202c0 { > + #reset-cells = <1>; > + compatible = "allwinner,sun6i-a31-ahb1-reset"; > + reg = <0x01c202c0 0xc>; > + }; > + -> + apb1_rst: reset at 01c202d0 { +> + apb1_rst: reset@01c202d0 { > + #reset-cells = <1>; > + compatible = "allwinner,sun6i-a31-clock-reset"; > + reg = <0x01c202d0 0x4>; > + }; > + -> + apb2_rst: reset at 01c202d8 { +> + apb2_rst: reset@01c202d8 { > + #reset-cells = <1>; > + compatible = "allwinner,sun6i-a31-clock-reset"; > + reg = <0x01c202d8 0x4>; > + }; > + -> + timer at 01c20c00 { +> + timer@01c20c00 { > + compatible = "allwinner,sun4i-a10-timer"; > + reg = <0x01c20c00 0xa0>; > + interrupts = <0 18 4>, @@ -658,12 +658,12 @@ Spaces after the comma, and I guess that would be better on two lines. > + clocks = <&osc24M>; > + }; > + -> + wdt1: watchdog at 01c20ca0 { +> + wdt1: watchdog@01c20ca0 { > + compatible = "allwinner,sun6i-a31-wdt"; > + reg = <0x01c20ca0 0x20>; > + }; > + -> + uart0: serial at 01c28000 { +> + uart0: serial@01c28000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x01c28000 0x400>; > + interrupts = <0 0 4>; @@ -676,7 +676,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + uart1: serial at 01c28400 { +> + uart1: serial@01c28400 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x01c28400 0x400>; > + interrupts = <0 1 4>; @@ -689,7 +689,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + uart2: serial at 01c28800 { +> + uart2: serial@01c28800 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x01c28800 0x400>; > + interrupts = <0 2 4>; @@ -702,7 +702,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + uart3: serial at 01c28c00 { +> + uart3: serial@01c28c00 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x01c28c00 0x400>; > + interrupts = <0 3 4>; @@ -715,7 +715,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + uart4: serial at 01c29000 { +> + uart4: serial@01c29000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x01c29000 0x400>; > + interrupts = <0 4 4>; @@ -728,7 +728,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + uart5: serial at 01c29400 { +> + uart5: serial@01c29400 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x01c29400 0x400>; > + interrupts = <0 5 4>; @@ -741,7 +741,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + i2c0: i2c at 01c2ac00 { +> + i2c0: i2c@01c2ac00 { > + compatible = "allwinner,sun6i-a31-i2c"; > + reg = <0x01c2ac00 0x400>; > + interrupts = <0 6 4>; @@ -752,7 +752,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + #size-cells = <0>; > + }; > + -> + i2c1: i2c at 01c2b000 { +> + i2c1: i2c@01c2b000 { > + compatible = "allwinner,sun6i-a31-i2c"; > + reg = <0x01c2b000 0x400>; > + interrupts = <0 7 4>; @@ -763,7 +763,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + #size-cells = <0>; > + }; > + -> + i2c2: i2c at 01c2b400 { +> + i2c2: i2c@01c2b400 { > + compatible = "allwinner,sun6i-a31-i2c"; > + reg = <0x01c2b400 0x400>; > + interrupts = <0 8 4>; @@ -774,7 +774,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + #size-cells = <0>; > + }; > + -> + i2c3: i2c at 01c2b800 { +> + i2c3: i2c@01c2b800 { > + compatible = "allwinner,sun6i-a31-i2c"; > + reg = <0x01c2b800 0x400>; > + interrupts = <0 9 4>; @@ -785,7 +785,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + #size-cells = <0>; > + }; > + -> + gmac: ethernet at 01c30000 { +> + gmac: ethernet@01c30000 { > + compatible = "allwinner,sun7i-a20-gmac"; > + reg = <0x01c30000 0x1054>; > + interrupts = <0 82 4>; @@ -802,7 +802,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + #size-cells = <0>; > + }; > + -> + timer at 01c60000 { +> + timer@01c60000 { > + compatible = "allwinner,sun6i-a31-hstimer", "allwinner,sun7i-a20-hstimer"; > + reg = <0x01c60000 0x1000>; > + interrupts = <0 51 4>, @@ -813,7 +813,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + resets = <&ahb1_rst 19>; > + }; > + -> + spi0: spi at 01c68000 { +> + spi0: spi@01c68000 { > + compatible = "allwinner,sun6i-a31-spi"; > + reg = <0x01c68000 0x1000>; > + interrupts = <0 65 4>; @@ -825,7 +825,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + spi1: spi at 01c69000 { +> + spi1: spi@01c69000 { > + compatible = "allwinner,sun6i-a31-spi"; > + reg = <0x01c69000 0x1000>; > + interrupts = <0 66 4>; @@ -837,7 +837,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + spi2: spi at 01c6a000 { +> + spi2: spi@01c6a000 { > + compatible = "allwinner,sun6i-a31-spi"; > + reg = <0x01c6a000 0x1000>; > + interrupts = <0 67 4>; @@ -849,7 +849,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + spi3: spi at 01c6b000 { +> + spi3: spi@01c6b000 { > + compatible = "allwinner,sun6i-a31-spi"; > + reg = <0x01c6b000 0x1000>; > + interrupts = <0 68 4>; @@ -861,7 +861,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + status = "disabled"; > + }; > + -> + gic: interrupt-controller at 01c81000 { +> + gic: interrupt-controller@01c81000 { > + compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic"; > + reg = <0x01c81000 0x1000>, > + <0x01c82000 0x1000>, @@ -872,13 +872,13 @@ Spaces after the comma, and I guess that would be better on two lines. > + interrupts = <1 9 0xf04>; > + }; > + -> + rtc: rtc at 01f00000 { +> + rtc: rtc@01f00000 { > + compatible = "allwinner,sun6i-a31-rtc"; > + reg = <0x01f00000 0x54>; > + interrupts = <0 40 4>, <0 41 4>; > + }; > + -> + nmi_intc: interrupt-controller at 01f00c0c { +> + nmi_intc: interrupt-controller@01f00c0c { > + compatible = "allwinner,sun6i-a31-sc-nmi"; > + interrupt-controller; > + #interrupt-cells = <2>; @@ -886,7 +886,7 @@ Spaces after the comma, and I guess that would be better on two lines. > + interrupts = <0 32 4>; > + }; > + -> + prcm at 01f01400 { +> + prcm@01f01400 { > + compatible = "allwinner,sun6i-a31-prcm"; > + reg = <0x01f01400 0x200>; > + @@ -939,12 +939,12 @@ This is yet to be agreed on.... > + }; > + }; > + -> + cpucfg at 01f01c00 { +> + cpucfg@01f01c00 { > + compatible = "allwinner,sun6i-a31-cpuconfig"; > + reg = <0x01f01c00 0x300>; > + }; > + -> + ir at 01f02000 { +> + ir@01f02000 { > + compatible = "allwinner,sun5i-a13-ir"; > + clocks = <&apb0_gates 1>, <&ir_clk>; > + clock-names = "apb", "ir"; @@ -954,7 +954,7 @@ This is yet to be agreed on.... > + status = "disabled"; > + }; > + -> + r_pio: pinctrl at 01f02c00 { +> + r_pio: pinctrl@01f02c00 { > + compatible = "allwinner,sun6i-a31-r-pinctrl"; > + reg = <0x01f02c00 0x400>; > + interrupts = <0 45 4>, @@ -967,7 +967,7 @@ This is yet to be agreed on.... > + #size-cells = <0>; > + #gpio-cells = <3>; > + -> + ir_pins_a: ir at 0 { +> + ir_pins_a: ir@0 { > + allwinner,pins = "PL4"; > + allwinner,function = "s_ir"; > + allwinner,drive = <0>; @@ -984,10 +984,3 @@ This is yet to be agreed on.... Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --------------- next part -------------- -A non-text attachment was scrubbed... -Name: signature.asc -Type: application/pgp-signature -Size: 819 bytes -Desc: Digital signature -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141125/51037df9/attachment-0001.sig> diff --git a/a/content_digest b/N1/content_digest index d8d316f..98cc65e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,16 @@ "ref\01416747283-13489-1-git-send-email-hdegoede@redhat.com\0" "ref\01416747283-13489-5-git-send-email-hdegoede@redhat.com\0" - "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" - "Subject\0[PATCH 4/5] ARM: dts: sun6i: Add sun6i-a31s.dtsi\0" + "ref\01416747283-13489-5-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org\0" + "From\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH 4/5] ARM: dts: sun6i: Add sun6i-a31s.dtsi\0" "Date\0Tue, 25 Nov 2014 19:18:29 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Cc\0Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" + "\01:1\0" "b\0" "Hi,\n" "\n" @@ -25,7 +31,7 @@ "seems more like an appropriate solution.\n" "\n" "> \n" - "> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" + "> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/sun6i-a31s.dtsi | 925 ++++++++++++++++++++++++++++++++++++++\n" "> 1 file changed, 925 insertions(+)\n" @@ -40,7 +46,7 @@ "> +/*\n" "> + * Copyright 2013 Maxime Ripard\n" "> + *\n" - "> + * Maxime Ripard <maxime.ripard@free-electrons.com>\n" + "> + * Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "\n" "It should be your copyright here.\n" "\n" @@ -112,7 +118,7 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tframebuffer at 0 {\n" + "> +\t\tframebuffer@0 {\n" "> +\t\t\tcompatible = \"allwinner,simple-framebuffer\", \"simple-framebuffer\";\n" "> +\t\t\tallwinner,pipeline = \"de_be0-lcd0-hdmi\";\n" "> +\t\t\tclocks = <&pll6>;\n" @@ -131,25 +137,25 @@ "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\tcpu at 0 {\n" + "> +\t\tcpu@0 {\n" "> +\t\t\tcompatible = \"arm,cortex-a7\";\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\treg = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tcpu at 1 {\n" + "> +\t\tcpu@1 {\n" "> +\t\t\tcompatible = \"arm,cortex-a7\";\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\treg = <1>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tcpu at 2 {\n" + "> +\t\tcpu@2 {\n" "> +\t\t\tcompatible = \"arm,cortex-a7\";\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\treg = <2>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tcpu at 3 {\n" + "> +\t\tcpu@3 {\n" "> +\t\t\tcompatible = \"arm,cortex-a7\";\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\treg = <3>;\n" @@ -179,14 +185,14 @@ "> +\t\t\tclock-frequency = <24000000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tosc32k: clk at 0 {\n" + "> +\t\tosc32k: clk@0 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"fixed-clock\";\n" "> +\t\t\tclock-frequency = <32768>;\n" "> +\t\t\tclock-output-names = \"osc32k\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tpll1: clk at 01c20000 {\n" + "> +\t\tpll1: clk@01c20000 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-pll1-clk\";\n" "> +\t\t\treg = <0x01c20000 0x4>;\n" @@ -194,7 +200,7 @@ "> +\t\t\tclock-output-names = \"pll1\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tpll6: clk at 01c20028 {\n" + "> +\t\tpll6: clk@01c20028 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-pll6-clk\";\n" "> +\t\t\treg = <0x01c20028 0x4>;\n" @@ -202,7 +208,7 @@ "> +\t\t\tclock-output-names = \"pll6\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tcpu: cpu at 01c20050 {\n" + "> +\t\tcpu: cpu@01c20050 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-cpu-clk\";\n" "> +\t\t\treg = <0x01c20050 0x4>;\n" @@ -217,7 +223,7 @@ "> +\t\t\tclock-output-names = \"cpu\";\n" "> +\t\t};\n" "> +\n" - "> +\t\taxi: axi at 01c20050 {\n" + "> +\t\taxi: axi@01c20050 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-axi-clk\";\n" "> +\t\t\treg = <0x01c20050 0x4>;\n" @@ -225,7 +231,7 @@ "> +\t\t\tclock-output-names = \"axi\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tahb1_mux: ahb1_mux at 01c20054 {\n" + "> +\t\tahb1_mux: ahb1_mux@01c20054 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-ahb1-mux-clk\";\n" "> +\t\t\treg = <0x01c20054 0x4>;\n" @@ -233,7 +239,7 @@ "> +\t\t\tclock-output-names = \"ahb1_mux\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tahb1: ahb1 at 01c20054 {\n" + "> +\t\tahb1: ahb1@01c20054 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-ahb-clk\";\n" "> +\t\t\treg = <0x01c20054 0x4>;\n" @@ -241,7 +247,7 @@ "> +\t\t\tclock-output-names = \"ahb1\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tahb1_gates: clk at 01c20060 {\n" + "> +\t\tahb1_gates: clk@01c20060 {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-ahb1-gates-clk\";\n" "> +\t\t\treg = <0x01c20060 0x8>;\n" @@ -266,7 +272,7 @@ "\n" "As in not even stripped down?\n" "\n" - "> +\t\tapb1: apb1 at 01c20054 {\n" + "> +\t\tapb1: apb1@01c20054 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-apb0-clk\";\n" "> +\t\t\treg = <0x01c20054 0x4>;\n" @@ -274,7 +280,7 @@ "> +\t\t\tclock-output-names = \"apb1\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tapb1_gates: clk at 01c20068 {\n" + "> +\t\tapb1_gates: clk@01c20068 {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-apb1-gates-clk\";\n" "> +\t\t\treg = <0x01c20068 0x4>;\n" @@ -284,7 +290,7 @@ "> +\t\t\t\t\t\"apb1_daudio1\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tapb2_mux: apb2_mux at 01c20058 {\n" + "> +\t\tapb2_mux: apb2_mux@01c20058 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-apb1-mux-clk\";\n" "> +\t\t\treg = <0x01c20058 0x4>;\n" @@ -292,7 +298,7 @@ "> +\t\t\tclock-output-names = \"apb2_mux\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tapb2: apb2 at 01c20058 {\n" + "> +\t\tapb2: apb2@01c20058 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-apb2-div-clk\";\n" "> +\t\t\treg = <0x01c20058 0x4>;\n" @@ -300,7 +306,7 @@ "> +\t\t\tclock-output-names = \"apb2\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tapb2_gates: clk at 01c2006c {\n" + "> +\t\tapb2_gates: clk@01c2006c {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-apb2-gates-clk\";\n" "> +\t\t\treg = <0x01c2006c 0x4>;\n" @@ -311,7 +317,7 @@ "> +\t\t\t\t\t\"apb2_uart4\", \"apb2_uart5\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc0_clk: clk at 01c20088 {\n" + "> +\t\tmmc0_clk: clk@01c20088 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c20088 0x4>;\n" @@ -319,7 +325,7 @@ "> +\t\t\tclock-output-names = \"mmc0\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc1_clk: clk at 01c2008c {\n" + "> +\t\tmmc1_clk: clk@01c2008c {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c2008c 0x4>;\n" @@ -327,7 +333,7 @@ "> +\t\t\tclock-output-names = \"mmc1\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc2_clk: clk at 01c20090 {\n" + "> +\t\tmmc2_clk: clk@01c20090 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c20090 0x4>;\n" @@ -335,7 +341,7 @@ "> +\t\t\tclock-output-names = \"mmc2\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc3_clk: clk at 01c20094 {\n" + "> +\t\tmmc3_clk: clk@01c20094 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c20094 0x4>;\n" @@ -343,7 +349,7 @@ "> +\t\t\tclock-output-names = \"mmc3\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi0_clk: clk at 01c200a0 {\n" + "> +\t\tspi0_clk: clk@01c200a0 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c200a0 0x4>;\n" @@ -351,7 +357,7 @@ "> +\t\t\tclock-output-names = \"spi0\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi1_clk: clk at 01c200a4 {\n" + "> +\t\tspi1_clk: clk@01c200a4 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c200a4 0x4>;\n" @@ -359,7 +365,7 @@ "> +\t\t\tclock-output-names = \"spi1\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi2_clk: clk at 01c200a8 {\n" + "> +\t\tspi2_clk: clk@01c200a8 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c200a8 0x4>;\n" @@ -367,7 +373,7 @@ "> +\t\t\tclock-output-names = \"spi2\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi3_clk: clk at 01c200ac {\n" + "> +\t\tspi3_clk: clk@01c200ac {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-mod0-clk\";\n" "> +\t\t\treg = <0x01c200ac 0x4>;\n" @@ -375,7 +381,7 @@ "> +\t\t\tclock-output-names = \"spi3\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb_clk: clk at 01c200cc {\n" + "> +\t\tusb_clk: clk@01c200cc {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t #reset-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-usb-clk\";\n" @@ -392,21 +398,21 @@ "> +\t\t * interface mode, using clk_set_rate auto-reparenting.\n" "> +\t\t * The actual TX clock rate is not controlled by the gmac_tx clock.\n" "> +\t\t */\n" - "> +\t\tmii_phy_tx_clk: clk at 1 {\n" + "> +\t\tmii_phy_tx_clk: clk@1 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"fixed-clock\";\n" "> +\t\t\tclock-frequency = <25000000>;\n" "> +\t\t\tclock-output-names = \"mii_phy_tx\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tgmac_int_tx_clk: clk at 2 {\n" + "> +\t\tgmac_int_tx_clk: clk@2 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"fixed-clock\";\n" "> +\t\t\tclock-frequency = <125000000>;\n" "> +\t\t\tclock-output-names = \"gmac_int_tx\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tgmac_tx_clk: clk at 01c200d0 {\n" + "> +\t\tgmac_tx_clk: clk@01c200d0 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun7i-a20-gmac-clk\";\n" "> +\t\t\treg = <0x01c200d0 0x4>;\n" @@ -415,13 +421,13 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tsoc at 01c00000 {\n" + "> +\tsoc@01c00000 {\n" "> +\t\tcompatible = \"simple-bus\";\n" "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <1>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tdma: dma-controller at 01c02000 {\n" + "> +\t\tdma: dma-controller@01c02000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-dma\";\n" "> +\t\t\treg = <0x01c02000 0x1000>;\n" "> +\t\t\tinterrupts = <0 50 4>;\n" @@ -430,7 +436,7 @@ "> +\t\t\t#dma-cells = <1>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc0: mmc at 01c0f000 {\n" + "> +\t\tmmc0: mmc@01c0f000 {\n" "> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" "> +\t\t\treg = <0x01c0f000 0x1000>;\n" "> +\t\t\tclocks = <&ahb1_gates 8>, <&mmc0_clk>;\n" @@ -441,7 +447,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc1: mmc at 01c10000 {\n" + "> +\t\tmmc1: mmc@01c10000 {\n" "> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" "> +\t\t\treg = <0x01c10000 0x1000>;\n" "> +\t\t\tclocks = <&ahb1_gates 9>, <&mmc1_clk>;\n" @@ -452,7 +458,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc2: mmc at 01c11000 {\n" + "> +\t\tmmc2: mmc@01c11000 {\n" "> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" "> +\t\t\treg = <0x01c11000 0x1000>;\n" "> +\t\t\tclocks = <&ahb1_gates 10>, <&mmc2_clk>;\n" @@ -463,7 +469,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmmc3: mmc at 01c12000 {\n" + "> +\t\tmmc3: mmc@01c12000 {\n" "> +\t\t\tcompatible = \"allwinner,sun5i-a13-mmc\";\n" "> +\t\t\treg = <0x01c12000 0x1000>;\n" "> +\t\t\tclocks = <&ahb1_gates 11>, <&mmc3_clk>;\n" @@ -474,7 +480,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tusbphy: phy at 01c19400 {\n" + "> +\t\tusbphy: phy@01c19400 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-usb-phy\";\n" "> +\t\t\treg = <0x01c19400 0x10>,\n" "> +\t\t\t <0x01c1a800 0x4>,\n" @@ -498,7 +504,7 @@ "> +\t\t\t#phy-cells = <1>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci0: usb at 01c1a000 {\n" + "> +\t\tehci0: usb@01c1a000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-ehci\", \"generic-ehci\";\n" "> +\t\t\treg = <0x01c1a000 0x100>;\n" "> +\t\t\tinterrupts = <0 72 4>;\n" @@ -509,7 +515,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci0: usb at 01c1a400 {\n" + "> +\t\tohci0: usb@01c1a400 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-ohci\", \"generic-ohci\";\n" "> +\t\t\treg = <0x01c1a400 0x100>;\n" "> +\t\t\tinterrupts = <0 73 4>;\n" @@ -520,7 +526,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tehci1: usb at 01c1b000 {\n" + "> +\t\tehci1: usb@01c1b000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-ehci\", \"generic-ehci\";\n" "> +\t\t\treg = <0x01c1b000 0x100>;\n" "> +\t\t\tinterrupts = <0 74 4>;\n" @@ -531,7 +537,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tohci1: usb at 01c1b400 {\n" + "> +\t\tohci1: usb@01c1b400 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-ohci\", \"generic-ohci\";\n" "> +\t\t\treg = <0x01c1b400 0x100>;\n" "> +\t\t\tinterrupts = <0 75 4>;\n" @@ -542,7 +548,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tpio: pinctrl at 01c20800 {\n" + "> +\t\tpio: pinctrl@01c20800 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31s-pinctrl\";\n" "> +\t\t\treg = <0x01c20800 0x400>;\n" "> +\t\t\tinterrupts = <0 11 4>,\n" @@ -556,35 +562,35 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t\t#gpio-cells = <3>;\n" "> +\n" - "> +\t\t\tuart0_pins_a: uart0 at 0 {\n" + "> +\t\t\tuart0_pins_a: uart0@0 {\n" "> +\t\t\t\tallwinner,pins = \"PH20\", \"PH21\";\n" "> +\t\t\t\tallwinner,function = \"uart0\";\n" "> +\t\t\t\tallwinner,drive = <0>;\n" "> +\t\t\t\tallwinner,pull = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c0_pins_a: i2c0 at 0 {\n" + "> +\t\t\ti2c0_pins_a: i2c0@0 {\n" "> +\t\t\t\tallwinner,pins = \"PH14\", \"PH15\";\n" "> +\t\t\t\tallwinner,function = \"i2c0\";\n" "> +\t\t\t\tallwinner,drive = <0>;\n" "> +\t\t\t\tallwinner,pull = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1_pins_a: i2c1 at 0 {\n" + "> +\t\t\ti2c1_pins_a: i2c1@0 {\n" "> +\t\t\t\tallwinner,pins = \"PH16\", \"PH17\";\n" "> +\t\t\t\tallwinner,function = \"i2c1\";\n" "> +\t\t\t\tallwinner,drive = <0>;\n" "> +\t\t\t\tallwinner,pull = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c2_pins_a: i2c2 at 0 {\n" + "> +\t\t\ti2c2_pins_a: i2c2@0 {\n" "> +\t\t\t\tallwinner,pins = \"PH18\", \"PH19\";\n" "> +\t\t\t\tallwinner,function = \"i2c2\";\n" "> +\t\t\t\tallwinner,drive = <0>;\n" "> +\t\t\t\tallwinner,pull = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmc0_pins_a: mmc0 at 0 {\n" + "> +\t\t\tmmc0_pins_a: mmc0@0 {\n" "> +\t\t\t\tallwinner,pins = \"PF0\",\"PF1\",\"PF2\",\"PF3\",\"PF4\",\"PF5\";\n" "\n" "Spaces after the comma, and I guess that would be better on two lines.\n" @@ -594,7 +600,7 @@ "> +\t\t\t\tallwinner,pull = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tgmac_pins_mii_a: gmac_mii at 0 {\n" + "> +\t\t\tgmac_pins_mii_a: gmac_mii@0 {\n" "> +\t\t\t\tallwinner,pins = \"PA0\", \"PA1\", \"PA2\", \"PA3\",\n" "> +\t\t\t\t\t\t\"PA8\", \"PA9\", \"PA11\",\n" "> +\t\t\t\t\t\t\"PA12\", \"PA13\", \"PA14\", \"PA19\",\n" @@ -605,7 +611,7 @@ "> +\t\t\t\tallwinner,pull = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tgmac_pins_gmii_a: gmac_gmii at 0 {\n" + "> +\t\t\tgmac_pins_gmii_a: gmac_gmii@0 {\n" "> +\t\t\t\tallwinner,pins = \"PA0\", \"PA1\", \"PA2\", \"PA3\",\n" "> +\t\t\t\t\t\t\"PA4\", \"PA5\", \"PA6\", \"PA7\",\n" "> +\t\t\t\t\t\t\"PA8\", \"PA9\", \"PA10\", \"PA11\",\n" @@ -622,7 +628,7 @@ "> +\t\t\t\tallwinner,pull = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tgmac_pins_rgmii_a: gmac_rgmii at 0 {\n" + "> +\t\t\tgmac_pins_rgmii_a: gmac_rgmii@0 {\n" "> +\t\t\t\tallwinner,pins = \"PA0\", \"PA1\", \"PA2\", \"PA3\",\n" "> +\t\t\t\t\t\t\"PA9\", \"PA10\", \"PA11\",\n" "> +\t\t\t\t\t\t\"PA12\", \"PA13\", \"PA14\", \"PA19\",\n" @@ -637,25 +643,25 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tahb1_rst: reset at 01c202c0 {\n" + "> +\t\tahb1_rst: reset@01c202c0 {\n" "> +\t\t\t#reset-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-ahb1-reset\";\n" "> +\t\t\treg = <0x01c202c0 0xc>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tapb1_rst: reset at 01c202d0 {\n" + "> +\t\tapb1_rst: reset@01c202d0 {\n" "> +\t\t\t#reset-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-clock-reset\";\n" "> +\t\t\treg = <0x01c202d0 0x4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tapb2_rst: reset at 01c202d8 {\n" + "> +\t\tapb2_rst: reset@01c202d8 {\n" "> +\t\t\t#reset-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-clock-reset\";\n" "> +\t\t\treg = <0x01c202d8 0x4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ttimer at 01c20c00 {\n" + "> +\t\ttimer@01c20c00 {\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-timer\";\n" "> +\t\t\treg = <0x01c20c00 0xa0>;\n" "> +\t\t\tinterrupts = <0 18 4>,\n" @@ -666,12 +672,12 @@ "> +\t\t\tclocks = <&osc24M>;\n" "> +\t\t};\n" "> +\n" - "> +\t\twdt1: watchdog at 01c20ca0 {\n" + "> +\t\twdt1: watchdog@01c20ca0 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-wdt\";\n" "> +\t\t\treg = <0x01c20ca0 0x20>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart0: serial at 01c28000 {\n" + "> +\t\tuart0: serial@01c28000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x01c28000 0x400>;\n" "> +\t\t\tinterrupts = <0 0 4>;\n" @@ -684,7 +690,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart1: serial at 01c28400 {\n" + "> +\t\tuart1: serial@01c28400 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x01c28400 0x400>;\n" "> +\t\t\tinterrupts = <0 1 4>;\n" @@ -697,7 +703,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart2: serial at 01c28800 {\n" + "> +\t\tuart2: serial@01c28800 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x01c28800 0x400>;\n" "> +\t\t\tinterrupts = <0 2 4>;\n" @@ -710,7 +716,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart3: serial at 01c28c00 {\n" + "> +\t\tuart3: serial@01c28c00 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x01c28c00 0x400>;\n" "> +\t\t\tinterrupts = <0 3 4>;\n" @@ -723,7 +729,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart4: serial at 01c29000 {\n" + "> +\t\tuart4: serial@01c29000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x01c29000 0x400>;\n" "> +\t\t\tinterrupts = <0 4 4>;\n" @@ -736,7 +742,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart5: serial at 01c29400 {\n" + "> +\t\tuart5: serial@01c29400 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x01c29400 0x400>;\n" "> +\t\t\tinterrupts = <0 5 4>;\n" @@ -749,7 +755,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c0: i2c at 01c2ac00 {\n" + "> +\t\ti2c0: i2c@01c2ac00 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-i2c\";\n" "> +\t\t\treg = <0x01c2ac00 0x400>;\n" "> +\t\t\tinterrupts = <0 6 4>;\n" @@ -760,7 +766,7 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c1: i2c at 01c2b000 {\n" + "> +\t\ti2c1: i2c@01c2b000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-i2c\";\n" "> +\t\t\treg = <0x01c2b000 0x400>;\n" "> +\t\t\tinterrupts = <0 7 4>;\n" @@ -771,7 +777,7 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c2: i2c at 01c2b400 {\n" + "> +\t\ti2c2: i2c@01c2b400 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-i2c\";\n" "> +\t\t\treg = <0x01c2b400 0x400>;\n" "> +\t\t\tinterrupts = <0 8 4>;\n" @@ -782,7 +788,7 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ti2c3: i2c at 01c2b800 {\n" + "> +\t\ti2c3: i2c@01c2b800 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-i2c\";\n" "> +\t\t\treg = <0x01c2b800 0x400>;\n" "> +\t\t\tinterrupts = <0 9 4>;\n" @@ -793,7 +799,7 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tgmac: ethernet at 01c30000 {\n" + "> +\t\tgmac: ethernet@01c30000 {\n" "> +\t\t\tcompatible = \"allwinner,sun7i-a20-gmac\";\n" "> +\t\t\treg = <0x01c30000 0x1054>;\n" "> +\t\t\tinterrupts = <0 82 4>;\n" @@ -810,7 +816,7 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\ttimer at 01c60000 {\n" + "> +\t\ttimer@01c60000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-hstimer\", \"allwinner,sun7i-a20-hstimer\";\n" "> +\t\t\treg = <0x01c60000 0x1000>;\n" "> +\t\t\tinterrupts = <0 51 4>,\n" @@ -821,7 +827,7 @@ "> +\t\t\tresets = <&ahb1_rst 19>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi0: spi at 01c68000 {\n" + "> +\t\tspi0: spi@01c68000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-spi\";\n" "> +\t\t\treg = <0x01c68000 0x1000>;\n" "> +\t\t\tinterrupts = <0 65 4>;\n" @@ -833,7 +839,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi1: spi at 01c69000 {\n" + "> +\t\tspi1: spi@01c69000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-spi\";\n" "> +\t\t\treg = <0x01c69000 0x1000>;\n" "> +\t\t\tinterrupts = <0 66 4>;\n" @@ -845,7 +851,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi2: spi at 01c6a000 {\n" + "> +\t\tspi2: spi@01c6a000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-spi\";\n" "> +\t\t\treg = <0x01c6a000 0x1000>;\n" "> +\t\t\tinterrupts = <0 67 4>;\n" @@ -857,7 +863,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tspi3: spi at 01c6b000 {\n" + "> +\t\tspi3: spi@01c6b000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-spi\";\n" "> +\t\t\treg = <0x01c6b000 0x1000>;\n" "> +\t\t\tinterrupts = <0 68 4>;\n" @@ -869,7 +875,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tgic: interrupt-controller at 01c81000 {\n" + "> +\t\tgic: interrupt-controller@01c81000 {\n" "> +\t\t\tcompatible = \"arm,cortex-a7-gic\", \"arm,cortex-a15-gic\";\n" "> +\t\t\treg = <0x01c81000 0x1000>,\n" "> +\t\t\t <0x01c82000 0x1000>,\n" @@ -880,13 +886,13 @@ "> +\t\t\tinterrupts = <1 9 0xf04>;\n" "> +\t\t};\n" "> +\n" - "> +\t\trtc: rtc at 01f00000 {\n" + "> +\t\trtc: rtc@01f00000 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-rtc\";\n" "> +\t\t\treg = <0x01f00000 0x54>;\n" "> +\t\t\tinterrupts = <0 40 4>, <0 41 4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tnmi_intc: interrupt-controller at 01f00c0c {\n" + "> +\t\tnmi_intc: interrupt-controller@01f00c0c {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-sc-nmi\";\n" "> +\t\t\tinterrupt-controller;\n" "> +\t\t\t#interrupt-cells = <2>;\n" @@ -894,7 +900,7 @@ "> +\t\t\tinterrupts = <0 32 4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tprcm at 01f01400 {\n" + "> +\t\tprcm@01f01400 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-prcm\";\n" "> +\t\t\treg = <0x01f01400 0x200>;\n" "> +\n" @@ -947,12 +953,12 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tcpucfg at 01f01c00 {\n" + "> +\t\tcpucfg@01f01c00 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-cpuconfig\";\n" "> +\t\t\treg = <0x01f01c00 0x300>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tir at 01f02000 {\n" + "> +\t\tir@01f02000 {\n" "> +\t\t\tcompatible = \"allwinner,sun5i-a13-ir\";\n" "> +\t\t\tclocks = <&apb0_gates 1>, <&ir_clk>;\n" "> +\t\t\tclock-names = \"apb\", \"ir\";\n" @@ -962,7 +968,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tr_pio: pinctrl at 01f02c00 {\n" + "> +\t\tr_pio: pinctrl@01f02c00 {\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-r-pinctrl\";\n" "> +\t\t\treg = <0x01f02c00 0x400>;\n" "> +\t\t\tinterrupts = <0 45 4>,\n" @@ -975,7 +981,7 @@ "> +\t\t\t#size-cells = <0>;\n" "> +\t\t\t#gpio-cells = <3>;\n" "> +\n" - "> +\t\t\tir_pins_a: ir at 0 {\n" + "> +\t\t\tir_pins_a: ir@0 {\n" "> +\t\t\t\tallwinner,pins = \"PL4\";\n" "> +\t\t\t\tallwinner,function = \"s_ir\";\n" "> +\t\t\t\tallwinner,drive = <0>;\n" @@ -991,13 +997,6 @@ "-- \n" "Maxime Ripard, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" - "http://free-electrons.com\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: signature.asc\n" - "Type: application/pgp-signature\n" - "Size: 819 bytes\n" - "Desc: Digital signature\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141125/51037df9/attachment-0001.sig> + http://free-electrons.com -d48f520ef888b44faccd8978f64190213f305f30994e37941ff18068eefa576f +90ac4eeebac41ba789e0022f4d8752048851b76c7145f7646855128d10f8799a
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.