Merge tag 'sunxi-dt-for-3.11-2' of git://github.com/mripard/linux into next/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:23:41 +0000 (15:23 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:23:41 +0000 (15:23 +0200)
From Maxime Ripard:

Allwinner SoCs DT additions for 3.11, part 2

Mostly adds support for the i2c controllers and the Allwinner A10S SoC.

* tag 'sunxi-dt-for-3.11-2' of git://github.com/mripard/linux:
  ARM: sunxi: Add Olimex A10s-Olinuxino-micro device tree
  ARM: sunxi: dt: Add Allwinner A10s DTSI
  ARM: sun4i: cubieboard: Enable the i2c controllers
  ARM: sun5i: olinuxino: Enable the i2c controllers
  ARM: sun5i: dt: Add i2c muxing options
  ARM: sun4i: dt: Add i2c muxing options
  ARM: sunxi: dt: Add i2c controller nodes to the DTSI

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/boot/dts/sun5i-a13.dtsi

index a778bc013ce8b13a9c9bec8bf26929eacf4673d0,9d6e5a4e8a1c1692c587c79f8795d3d8f7faa43b..242a4937fe6f7347ef8c93f453988878e09eec74
@@@ -16,13 -16,11 +16,13 @@@ dtb-$(CONFIG_ARCH_AT91) += at91sam9263e
  dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb
  dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb
  # sam9g20
 +dtb-$(CONFIG_ARCH_AT91) += at91-foxg20.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb
  dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb
  dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
  dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
 +dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb
  # sam9g45
  dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb
@@@ -86,8 -84,6 +86,8 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-ns2max.dtb \
        kirkwood-ns2mini.dtb \
        kirkwood-nsa310.dtb \
 +      kirkwood-sheevaplug.dtb \
 +      kirkwood-sheevaplug-esata.dtb \
        kirkwood-topkick.dtb \
        kirkwood-ts219-6281.dtb \
        kirkwood-ts219-6282.dtb \
@@@ -107,15 -103,13 +107,15 @@@ dtb-$(CONFIG_ARCH_MXC) += 
        imx27-apf27.dtb \
        imx27-apf27dev.dtb \
        imx27-pdk.dtb \
 -      imx27-phytec-phycore.dtb \
 +      imx27-phytec-phycore-som.dtb \
 +      imx27-phytec-phycore-rdk.dtb \
        imx31-bug.dtb \
        imx51-apf51.dtb \
        imx51-apf51dev.dtb \
        imx51-babbage.dtb \
        imx53-ard.dtb \
        imx53-evk.dtb \
 +      imx53-m53evk.dtb \
        imx53-mba53.dtb \
        imx53-qsb.dtb \
        imx53-smd.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-wandboard.dtb \
        imx6q-arm2.dtb \
 +      imx6q-phytec-pbab01.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
 -      imx6q-sbc6x.dtb
 +      imx6q-sbc6x.dtb \
 +      imx6sl-evk.dtb \
 +      vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
        imx23-olinuxino.dtb \
        imx23-stmp378x_devb.dtb \
        imx28-cfa10036.dtb \
        imx28-cfa10037.dtb \
        imx28-cfa10049.dtb \
 +      imx28-cfa10055.dtb \
 +      imx28-cfa10057.dtb \
        imx28-evk.dtb \
        imx28-m28evk.dtb \
        imx28-sps1.dtb \
@@@ -169,13 -158,10 +169,13 @@@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb
  dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
        hrefprev60.dtb \
        hrefv60plus.dtb \
 +      ccu8540.dtb \
        ccu9540.dtb
 +dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
 +      r8a7740-armadillo800eva-reference.dtb \
        r8a7779-marzen-reference.dtb \
        r8a7790-lager.dtb \
        sh73a0-kzm9g.dtb \
@@@ -191,10 -177,9 +191,11 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-evb.dtb \
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 -dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
 +dtb-$(CONFIG_ARCH_SUNXI) += \
 +      sun4i-a10-cubieboard.dtb \
 +      sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
+       sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a13-olinuxino.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
@@@ -221,11 -206,8 +222,11 @@@ dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dt
  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
        wm8505-ref.dtb \
        wm8650-mid.dtb \
 +      wm8750-apc8750.dtb \
        wm8850-w70v2.dtb
 -dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
 +dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
 +      zynq-zc706.dtb \
 +      zynq-zed.dtb
  
  targets += dtbs
  targets += $(dtb-y)
index 9bf5ea51e70fc8fbe5de92b662c08820f4582b66,7dde32f2170d383ee34651961d3e81e690c168d3..82e03d22f9139e9768cab8b8540aaa58145a8926
        interrupt-parent = <&intc>;
  
        cpus {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                cpu@0 {
 +                      device_type = "cpu";
                        compatible = "arm,cortex-a8";
 +                      reg = <0x0>;
                };
        };
  
                                allwinner,drive = <0>;
                                allwinner,pull = <0>;
                        };
+                       i2c0_pins_a: i2c0@0 {
+                               allwinner,pins = "PB0", "PB1";
+                               allwinner,function = "i2c0";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
+                       i2c1_pins_a: i2c1@0 {
+                               allwinner,pins = "PB18", "PB19";
+                               allwinner,function = "i2c1";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
+                       i2c2_pins_a: i2c2@0 {
+                               allwinner,pins = "PB20", "PB21";
+                               allwinner,function = "i2c2";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
                };
  
                timer@01c20c00 {
                        clocks = <&apb1_gates 23>;
                        status = "disabled";
                };
+               i2c0: i2c@01c2ac00 {
+                       compatible = "allwinner,sun4i-i2c";
+                       reg = <0x01c2ac00 0x400>;
+                       interrupts = <7>;
+                       clocks = <&apb1_gates 0>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+               i2c1: i2c@01c2b000 {
+                       compatible = "allwinner,sun4i-i2c";
+                       reg = <0x01c2b000 0x400>;
+                       interrupts = <8>;
+                       clocks = <&apb1_gates 1>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+               i2c2: i2c@01c2b400 {
+                       compatible = "allwinner,sun4i-i2c";
+                       reg = <0x01c2b400 0x400>;
+                       interrupts = <9>;
+                       clocks = <&apb1_gates 2>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
        };
  };
index 027cb24438f8b8e0e30a39decce5f66e09010708,df96c545e0b33e916b19676f6e2ca46a1af67622..7363211daf8446754a20074a9ffd2cf99803c535
        interrupt-parent = <&intc>;
  
        cpus {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                cpu@0 {
 +                      device_type = "cpu";
                        compatible = "arm,cortex-a8";
 +                      reg = <0x0>;
                };
        };
  
                                allwinner,drive = <0>;
                                allwinner,pull = <0>;
                        };
+                       i2c0_pins_a: i2c0@0 {
+                               allwinner,pins = "PB0", "PB1";
+                               allwinner,function = "i2c0";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
+                       i2c1_pins_a: i2c1@0 {
+                               allwinner,pins = "PB15", "PB16";
+                               allwinner,function = "i2c1";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
+                       i2c2_pins_a: i2c2@0 {
+                               allwinner,pins = "PB17", "PB18";
+                               allwinner,function = "i2c2";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
                };
  
                timer@01c20c00 {
                        clocks = <&apb1_gates 19>;
                        status = "disabled";
                };
+               i2c0: i2c@01c2ac00 {
+                       compatible = "allwinner,sun4i-i2c";
+                       reg = <0x01c2ac00 0x400>;
+                       interrupts = <7>;
+                       clocks = <&apb1_gates 0>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+               i2c1: i2c@01c2b000 {
+                       compatible = "allwinner,sun4i-i2c";
+                       reg = <0x01c2b000 0x400>;
+                       interrupts = <8>;
+                       clocks = <&apb1_gates 1>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+               i2c2: i2c@01c2b400 {
+                       compatible = "allwinner,sun4i-i2c";
+                       reg = <0x01c2b400 0x400>;
+                       interrupts = <9>;
+                       clocks = <&apb1_gates 2>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
        };
  };