]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground...
authorTony Lindgren <tony@atomide.com>
Thu, 8 May 2014 15:02:57 +0000 (08:02 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 8 May 2014 15:02:57 +0000 (08:02 -0700)
1  2 
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/dra7.dtsi

index 36d523a268314d3e1948dd894ae6b07141ac946e,032ba8777e85828eeb8b46df4d1f370bcdbcfb84..ef2903741f54b8ac0246b485f91e5940087f467e
@@@ -8,7 -8,6 +8,7 @@@
   * kind, whether express or implied.
   */
  
 +#include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/interrupt-controller/arm-gic.h>
  
  #include "skeleton.dtsi"
                        compatible = "arm,cortex-a9";
                        device_type = "cpu";
                        reg = <0>;
 +
 +                      clocks = <&dpll_mpu_ck>;
 +                      clock-names = "cpu";
 +
 +                      clock-latency = <300000>; /* From omap-cpufreq driver */
                };
        };
  
        };
  
        ocp {
-               compatible = "simple-bus";
+               compatible = "ti,am4372-l3-noc", "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges;
                ti,hwmods = "l3_main";
+               reg = <0x44000000 0x400000
+                      0x44800000 0x400000>;
+               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
  
                prcm: prcm@44df0000 {
                        compatible = "ti,am4-prcm";
                        status = "disabled";
                };
  
 +              hwspinlock: spinlock@480ca000 {
 +                      compatible = "ti,omap4-hwspinlock";
 +                      reg = <0x480ca000 0x1000>;
 +                      ti,hwmods = "spinlock";
 +                      #hwlock-cells = <1>;
 +              };
 +
                i2c0: i2c@44e0b000 {
                        compatible = "ti,am4372-i2c","ti,omap4-i2c";
                        reg = <0x44e0b000 0x1000>;
  
                        ecap0: ecap@48300100 {
                                compatible = "ti,am4372-ecap","ti,am33xx-ecap";
 +                              #pwm-cells = <3>;
                                reg = <0x48300100 0x80>;
                                ti,hwmods = "ecap0";
                                status = "disabled";
  
                        ehrpwm0: ehrpwm@48300200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
 +                              #pwm-cells = <3>;
                                reg = <0x48300200 0x80>;
                                ti,hwmods = "ehrpwm0";
                                status = "disabled";
  
                        ecap1: ecap@48302100 {
                                compatible = "ti,am4372-ecap","ti,am33xx-ecap";
 +                              #pwm-cells = <3>;
                                reg = <0x48302100 0x80>;
                                ti,hwmods = "ecap1";
                                status = "disabled";
  
                        ehrpwm1: ehrpwm@48302200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
 +                              #pwm-cells = <3>;
                                reg = <0x48302200 0x80>;
                                ti,hwmods = "ehrpwm1";
                                status = "disabled";
  
                        ecap2: ecap@48304100 {
                                compatible = "ti,am4372-ecap","ti,am33xx-ecap";
 +                              #pwm-cells = <3>;
                                reg = <0x48304100 0x80>;
                                ti,hwmods = "ecap2";
                                status = "disabled";
  
                        ehrpwm2: ehrpwm@48304200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
 +                              #pwm-cells = <3>;
                                reg = <0x48304200 0x80>;
                                ti,hwmods = "ehrpwm2";
                                status = "disabled";
  
                        ehrpwm3: ehrpwm@48306200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
 +                              #pwm-cells = <3>;
                                reg = <0x48306200 0x80>;
                                ti,hwmods = "ehrpwm3";
                                status = "disabled";
  
                        ehrpwm4: ehrpwm@48308200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
 +                              #pwm-cells = <3>;
                                reg = <0x48308200 0x80>;
                                ti,hwmods = "ehrpwm4";
                                status = "disabled";
  
                        ehrpwm5: ehrpwm@4830a200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
 +                              #pwm-cells = <3>;
                                reg = <0x4830a200 0x80>;
                                ti,hwmods = "ehrpwm5";
                                status = "disabled";
                               <&edma 11>;
                        dma-names = "tx", "rx";
                };
 +
 +              elm: elm@48080000 {
 +                      compatible = "ti,am3352-elm";
 +                      reg = <0x48080000 0x2000>;
 +                      interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
 +                      ti,hwmods = "elm";
 +                      clocks = <&l4ls_gclk>;
 +                      clock-names = "fck";
 +                      status = "disabled";
 +              };
 +
 +              gpmc: gpmc@50000000 {
 +                      compatible = "ti,am3352-gpmc";
 +                      ti,hwmods = "gpmc";
 +                      clocks = <&l3s_gclk>;
 +                      clock-names = "fck";
 +                      reg = <0x50000000 0x2000>;
 +                      interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
 +                      gpmc,num-cs = <7>;
 +                      gpmc,num-waitpins = <2>;
 +                      #address-cells = <2>;
 +                      #size-cells = <1>;
 +                      status = "disabled";
 +              };
        };
  };
  
index 149b5509993588aa17971d6fbc7a56f314c658e5,8c62664149f00b50134a84b628cea67ff6775e1f..ab01f2d0e590c429c1f78ac26b39b271641fadae
                                1000000 1060000
                                1176000 1160000
                                >;
 +
 +                      clocks = <&dpll_mpu_ck>;
 +                      clock-names = "cpu";
 +
 +                      clock-latency = <300000>; /* From omap-cpufreq driver */
                };
                cpu@1 {
                        device_type = "cpu";
@@@ -80,7 -75,7 +80,7 @@@
        };
  
        /*
 -       * The soc node represents the soc top level view. It is uses for IPs
 +       * The soc node represents the soc top level view. It is used for IPs
         * that are not memory mapped in the MPU view or for the MPU itself.
         */
        soc {
        /*
         * XXX: Use a flat representation of the SOC interconnect.
         * The real OMAP interconnect network is quite complex.
 -       * Since that will not bring real advantage to represent that in DT for
 +       * Since it will not bring real advantage to represent that in DT for
         * the moment, just use a fake OCP bus entry to represent the whole bus
         * hierarchy.
         */
        ocp {
-               compatible = "ti,omap4-l3-noc", "simple-bus";
+               compatible = "ti,dra7-l3-noc", "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges;
                ti,hwmods = "l3_main_1", "l3_main_2";
-               reg = <0x44000000 0x2000>,
-                     <0x44800000 0x3000>;
+               reg = <0x44000000 0x1000000>,
+                     <0x45000000 0x1000>;
                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
  
                        ti,hwmods = "counter_32k";
                };
  
 +              dra7_ctrl_general: tisyscon@4a002e00 {
 +                      compatible = "syscon";
 +                      reg = <0x4a002e00 0x7c>;
 +              };
 +
 +              pbias_regulator: pbias_regulator {
 +                      compatible = "ti,pbias-omap";
 +                      reg = <0 0x4>;
 +                      syscon = <&dra7_ctrl_general>;
 +                      pbias_mmc_reg: pbias_mmc_omap5 {
 +                              regulator-name = "pbias_mmc_omap5";
 +                              regulator-min-microvolt = <1800000>;
 +                              regulator-max-microvolt = <3000000>;
 +                      };
 +              };
 +
                dra7_pmx_core: pinmux@4a003400 {
                        compatible = "pinctrl-single";
                        reg = <0x4a003400 0x0464>;
                        ti,hwmods = "wd_timer2";
                };
  
 +              hwspinlock: spinlock@4a0f6000 {
 +                      compatible = "ti,omap4-hwspinlock";
 +                      reg = <0x4a0f6000 0x1000>;
 +                      ti,hwmods = "spinlock";
 +                      #hwlock-cells = <1>;
 +              };
 +
 +              dmm@4e000000 {
 +                      compatible = "ti,omap5-dmm";
 +                      reg = <0x4e000000 0x800>;
 +                      interrupts = <0 113 0x4>;
 +                      ti,hwmods = "dmm";
 +              };
 +
                i2c1: i2c@48070000 {
                        compatible = "ti,omap4-i2c";
                        reg = <0x48070000 0x100>;
                        dmas = <&sdma 61>, <&sdma 62>;
                        dma-names = "tx", "rx";
                        status = "disabled";
 +                      pbias-supply = <&pbias_mmc_reg>;
                };
  
                mmc2: mmc@480b4000 {
                        status = "disabled";
                };
  
 +              abb_mpu: regulator-abb-mpu {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_mpu";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07ddc 0x4>, <0x4ae07de0 0x4>,
 +                            <0x4ae06014 0x4>, <0x4a003b20 0x8>,
 +                            <0x4ae0c158 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x80>;
 +                      /* LDOVBBMPU_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBMPU_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1060000         0       0x0     0 0x02000000 0x01F00000
 +                      1160000         0       0x4     0 0x02000000 0x01F00000
 +                      1210000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
 +              abb_ivahd: regulator-abb-ivahd {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_ivahd";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07e34 0x4>, <0x4ae07e24 0x4>,
 +                            <0x4ae06010 0x4>, <0x4a0025cc 0x8>,
 +                            <0x4a002470 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x40000000>;
 +                      /* LDOVBBIVA_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBIVA_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1055000         0       0x0     0 0x02000000 0x01F00000
 +                      1150000         0       0x4     0 0x02000000 0x01F00000
 +                      1250000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
 +              abb_dspeve: regulator-abb-dspeve {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_dspeve";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07e30 0x4>, <0x4ae07e20 0x4>,
 +                            <0x4ae06010 0x4>, <0x4a0025e0 0x8>,
 +                            <0x4a00246c 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x20000000>;
 +                      /* LDOVBBDSPEVE_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBDSPEVE_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1055000         0       0x0     0 0x02000000 0x01F00000
 +                      1150000         0       0x4     0 0x02000000 0x01F00000
 +                      1250000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
 +              abb_gpu: regulator-abb-gpu {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_gpu";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07de4 0x4>, <0x4ae07de8 0x4>,
 +                            <0x4ae06010 0x4>, <0x4a003b08 0x8>,
 +                            <0x4ae0c154 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x10000000>;
 +                      /* LDOVBBGPU_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBGPU_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1090000         0       0x0     0 0x02000000 0x01F00000
 +                      1210000         0       0x4     0 0x02000000 0x01F00000
 +                      1280000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
                mcspi1: spi@48098000 {
                        compatible = "ti,omap4-mcspi";
                        reg = <0x48098000 0x200>;