]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel...
authorZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
13 files changed:
Documentation/devicetree/bindings/thermal/armada-thermal.txt
Documentation/devicetree/bindings/thermal/exynos-thermal.txt
drivers/thermal/Kconfig
drivers/thermal/armada_thermal.c
drivers/thermal/int3403_thermal.c
drivers/thermal/intel_powerclamp.c
drivers/thermal/rcar_thermal.c
drivers/thermal/samsung/exynos_tmu.c
drivers/thermal/samsung/exynos_tmu.h
drivers/thermal/samsung/exynos_tmu_data.c
drivers/thermal/samsung/exynos_tmu_data.h
drivers/thermal/spear_thermal.c
drivers/thermal/ti-soc-thermal/ti-bandgap.c

index fff93d5f92dea1096b97226f1ba51a3d84b62b8b..4cf024929a3f4bc900524278cec2b863aff4d714 100644 (file)
@@ -1,11 +1,21 @@
-* Marvell Armada 370/XP thermal management
+* Marvell Armada 370/375/380/XP thermal management
 
 Required properties:
 
 - compatible:  Should be set to one of the following:
                marvell,armada370-thermal
+               marvell,armada375-thermal
+               marvell,armada375-z1-thermal
+               marvell,armada380-thermal
                marvell,armadaxp-thermal
 
+               Note: As the name suggests, "marvell,armada375-z1-thermal"
+               applies for the SoC Z1 stepping only. On such stepping
+               some quirks need to be done and the register offset differs
+               from the one in the A0 stepping.
+               The operating system may auto-detect the SoC stepping and
+               update the compatible and register offsets at runtime.
+
 - reg:         Device's register space.
                Two entries are expected, see the examples below.
                The first one is required for the sensor register;
index 284f5300fd8bbed4400e54b29f14d653e978da3f..c94909215c0785691395840de27ec80b2de0c42b 100644 (file)
@@ -6,16 +6,35 @@
               "samsung,exynos4412-tmu"
               "samsung,exynos4210-tmu"
               "samsung,exynos5250-tmu"
+              "samsung,exynos5260-tmu"
+              "samsung,exynos5420-tmu" for TMU channel 0, 1 on Exynos5420
+              "samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4
+                       Exynos5420 (Must pass triminfo base and triminfo clock)
               "samsung,exynos5440-tmu"
 - interrupt-parent : The phandle for the interrupt controller
 - reg : Address range of the thermal registers. For soc's which has multiple
        instances of TMU and some registers are shared across all TMU's like
        interrupt related then 2 set of register has to supplied. First set
-       belongs to each instance of TMU and second set belongs to common TMU
-       registers.
+       belongs to register set of TMU instance and second set belongs to
+       registers shared with the TMU instance.
+
+  NOTE: On Exynos5420, the TRIMINFO register is misplaced for TMU
+       channels 2, 3 and 4
+       Use "samsung,exynos5420-tmu-ext-triminfo" in cases, there is a misplaced
+       register, also provide clock to access that base.
+
+       TRIMINFO at 0x1006c000 contains data for TMU channel 3
+       TRIMINFO at 0x100a0000 contains data for TMU channel 4
+       TRIMINFO at 0x10068000 contains data for TMU channel 2
+
 - interrupts : Should contain interrupt for thermal system
-- clocks : The main clock for TMU device
+- clocks : The main clocks for TMU device
+       -- 1. operational clock for TMU channel
+       -- 2. optional clock to access the shared registers of TMU channel
 - clock-names : Thermal system clock name
+       -- "tmu_apbif" operational clock for current TMU channel
+       -- "tmu_triminfo_apbif" clock to access the shared triminfo register
+               for current TMU channel
 - vtmu-supply: This entry is optional and provides the regulator node supplying
                voltage to TMU. If needed this entry can be placed inside
                board/platform specific dts file.
@@ -43,6 +62,31 @@ Example 2):
                clock-names = "tmu_apbif";
        };
 
+Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
+       tmu_cpu2: tmu@10068000 {
+               compatible = "samsung,exynos5420-tmu-ext-triminfo";
+               reg = <0x10068000 0x100>, <0x1006c000 0x4>;
+               interrupts = <0 184 0>;
+               clocks = <&clock 318>, <&clock 318>;
+               clock-names = "tmu_apbif", "tmu_triminfo_apbif";
+       };
+
+       tmu_cpu3: tmu@1006c000 {
+               compatible = "samsung,exynos5420-tmu-ext-triminfo";
+               reg = <0x1006c000 0x100>, <0x100a0000 0x4>;
+               interrupts = <0 185 0>;
+               clocks = <&clock 318>, <&clock 319>;
+               clock-names = "tmu_apbif", "tmu_triminfo_apbif";
+       };
+
+       tmu_gpu: tmu@100a0000 {
+               compatible = "samsung,exynos5420-tmu-ext-triminfo";
+               reg = <0x100a0000 0x100>, <0x10068000 0x4>;
+               interrupts = <0 215 0>;
+               clocks = <&clock 319>, <&clock 318>;
+               clock-names = "tmu_apbif", "tmu_triminfo_apbif";
+       };
+
 Note: For multi-instance tmu each instance should have an alias correctly
 numbered in "aliases" node.
 
index 74323d5e342542fa2d3516b1ce02dc4ee0516a1e..f9a13867cb70df87fa58aa48a86645eddbefd9c8 100644 (file)
@@ -239,7 +239,7 @@ source "drivers/thermal/ti-soc-thermal/Kconfig"
 endmenu
 
 menu "Samsung thermal drivers"
-depends on PLAT_SAMSUNG
+depends on ARCH_EXYNOS
 source "drivers/thermal/samsung/Kconfig"
 endmenu
 
index 5e53212b984fd183f329a0fb7f7b48e778199f12..9d1420acb391b0967ddb60db3c6daae940d908df 100644 (file)
 #include <linux/of_device.h>
 #include <linux/thermal.h>
 
-#define THERMAL_VALID_OFFSET           9
 #define THERMAL_VALID_MASK             0x1
-#define THERMAL_TEMP_OFFSET            10
-#define THERMAL_TEMP_MASK              0x1ff
 
 /* Thermal Manager Control and Status Register */
 #define PMU_TDC0_SW_RST_MASK           (0x1 << 1)
 #define PMU_TDC0_OTF_CAL_MASK          (0x1 << 30)
 #define PMU_TDC0_START_CAL_MASK                (0x1 << 25)
 
-struct armada_thermal_ops;
+#define A375_Z1_CAL_RESET_LSB          0x8011e214
+#define A375_Z1_CAL_RESET_MSB          0x30a88019
+#define A375_Z1_WORKAROUND_BIT         BIT(9)
+
+#define A375_UNIT_CONTROL_SHIFT                27
+#define A375_UNIT_CONTROL_MASK         0x7
+#define A375_READOUT_INVERT            BIT(15)
+#define A375_HW_RESETn                 BIT(8)
+#define A380_HW_RESET                  BIT(8)
+
+struct armada_thermal_data;
 
 /* Marvell EBU Thermal Sensor Dev Structure */
 struct armada_thermal_priv {
        void __iomem *sensor;
        void __iomem *control;
-       struct armada_thermal_ops *ops;
+       struct armada_thermal_data *data;
 };
 
-struct armada_thermal_ops {
+struct armada_thermal_data {
        /* Initialize the sensor */
-       void (*init_sensor)(struct armada_thermal_priv *);
+       void (*init_sensor)(struct platform_device *pdev,
+                           struct armada_thermal_priv *);
 
        /* Test for a valid sensor value (optional) */
        bool (*is_valid)(struct armada_thermal_priv *);
+
+       /* Formula coeficients: temp = (b + m * reg) / div */
+       unsigned long coef_b;
+       unsigned long coef_m;
+       unsigned long coef_div;
+       bool inverted;
+
+       /* Register shift and mask to access the sensor temperature */
+       unsigned int temp_shift;
+       unsigned int temp_mask;
+       unsigned int is_valid_shift;
 };
 
-static void armadaxp_init_sensor(struct armada_thermal_priv *priv)
+static void armadaxp_init_sensor(struct platform_device *pdev,
+                                struct armada_thermal_priv *priv)
 {
        unsigned long reg;
 
@@ -80,7 +100,8 @@ static void armadaxp_init_sensor(struct armada_thermal_priv *priv)
        writel(reg, priv->sensor);
 }
 
-static void armada370_init_sensor(struct armada_thermal_priv *priv)
+static void armada370_init_sensor(struct platform_device *pdev,
+                                 struct armada_thermal_priv *priv)
 {
        unsigned long reg;
 
@@ -99,11 +120,54 @@ static void armada370_init_sensor(struct armada_thermal_priv *priv)
        mdelay(10);
 }
 
+static void armada375_init_sensor(struct platform_device *pdev,
+                                 struct armada_thermal_priv *priv)
+{
+       unsigned long reg;
+       bool quirk_needed =
+               !!of_device_is_compatible(pdev->dev.of_node,
+                                         "marvell,armada375-z1-thermal");
+
+       if (quirk_needed) {
+               /* Ensure these registers have the default (reset) values */
+               writel(A375_Z1_CAL_RESET_LSB, priv->control);
+               writel(A375_Z1_CAL_RESET_MSB, priv->control + 0x4);
+       }
+
+       reg = readl(priv->control + 4);
+       reg &= ~(A375_UNIT_CONTROL_MASK << A375_UNIT_CONTROL_SHIFT);
+       reg &= ~A375_READOUT_INVERT;
+       reg &= ~A375_HW_RESETn;
+
+       if (quirk_needed)
+               reg |= A375_Z1_WORKAROUND_BIT;
+
+       writel(reg, priv->control + 4);
+       mdelay(20);
+
+       reg |= A375_HW_RESETn;
+       writel(reg, priv->control + 4);
+       mdelay(50);
+}
+
+static void armada380_init_sensor(struct platform_device *pdev,
+                                 struct armada_thermal_priv *priv)
+{
+       unsigned long reg = readl_relaxed(priv->control);
+
+       /* Reset hardware once */
+       if (!(reg & A380_HW_RESET)) {
+               reg |= A380_HW_RESET;
+               writel(reg, priv->control);
+               mdelay(10);
+       }
+}
+
 static bool armada_is_valid(struct armada_thermal_priv *priv)
 {
        unsigned long reg = readl_relaxed(priv->sensor);
 
-       return (reg >> THERMAL_VALID_OFFSET) & THERMAL_VALID_MASK;
+       return (reg >> priv->data->is_valid_shift) & THERMAL_VALID_MASK;
 }
 
 static int armada_get_temp(struct thermal_zone_device *thermal,
@@ -111,17 +175,27 @@ static int armada_get_temp(struct thermal_zone_device *thermal,
 {
        struct armada_thermal_priv *priv = thermal->devdata;
        unsigned long reg;
+       unsigned long m, b, div;
 
        /* Valid check */
-       if (priv->ops->is_valid && !priv->ops->is_valid(priv)) {
+       if (priv->data->is_valid && !priv->data->is_valid(priv)) {
                dev_err(&thermal->device,
                        "Temperature sensor reading not valid\n");
                return -EIO;
        }
 
        reg = readl_relaxed(priv->sensor);
-       reg = (reg >> THERMAL_TEMP_OFFSET) & THERMAL_TEMP_MASK;
-       *temp = (3153000000UL - (10000000UL*reg)) / 13825;
+       reg = (reg >> priv->data->temp_shift) & priv->data->temp_mask;
+
+       /* Get formula coeficients */
+       b = priv->data->coef_b;
+       m = priv->data->coef_m;
+       div = priv->data->coef_div;
+
+       if (priv->data->inverted)
+               *temp = ((m * reg) - b) / div;
+       else
+               *temp = (b - (m * reg)) / div;
        return 0;
 }
 
@@ -129,23 +203,69 @@ static struct thermal_zone_device_ops ops = {
        .get_temp = armada_get_temp,
 };
 
-static const struct armada_thermal_ops armadaxp_ops = {
+static const struct armada_thermal_data armadaxp_data = {
        .init_sensor = armadaxp_init_sensor,
+       .temp_shift = 10,
+       .temp_mask = 0x1ff,
+       .coef_b = 3153000000UL,
+       .coef_m = 10000000UL,
+       .coef_div = 13825,
 };
 
-static const struct armada_thermal_ops armada370_ops = {
+static const struct armada_thermal_data armada370_data = {
        .is_valid = armada_is_valid,
        .init_sensor = armada370_init_sensor,
+       .is_valid_shift = 9,
+       .temp_shift = 10,
+       .temp_mask = 0x1ff,
+       .coef_b = 3153000000UL,
+       .coef_m = 10000000UL,
+       .coef_div = 13825,
+};
+
+static const struct armada_thermal_data armada375_data = {
+       .is_valid = armada_is_valid,
+       .init_sensor = armada375_init_sensor,
+       .is_valid_shift = 10,
+       .temp_shift = 0,
+       .temp_mask = 0x1ff,
+       .coef_b = 3171900000UL,
+       .coef_m = 10000000UL,
+       .coef_div = 13616,
+};
+
+static const struct armada_thermal_data armada380_data = {
+       .is_valid = armada_is_valid,
+       .init_sensor = armada380_init_sensor,
+       .is_valid_shift = 10,
+       .temp_shift = 0,
+       .temp_mask = 0x3ff,
+       .coef_b = 1169498786UL,
+       .coef_m = 2000000UL,
+       .coef_div = 4289,
+       .inverted = true,
 };
 
 static const struct of_device_id armada_thermal_id_table[] = {
        {
                .compatible = "marvell,armadaxp-thermal",
-               .data       = &armadaxp_ops,
+               .data       = &armadaxp_data,
        },
        {
                .compatible = "marvell,armada370-thermal",
-               .data       = &armada370_ops,
+               .data       = &armada370_data,
+       },
+       {
+               .compatible = "marvell,armada375-thermal",
+               .data       = &armada375_data,
+       },
+       {
+               .compatible = "marvell,armada375-z1-thermal",
+               .data       = &armada375_data,
+       },
+       {
+               .compatible = "marvell,armada380-thermal",
+               .data       = &armada380_data,
        },
        {
                /* sentinel */
@@ -178,8 +298,8 @@ static int armada_thermal_probe(struct platform_device *pdev)
        if (IS_ERR(priv->control))
                return PTR_ERR(priv->control);
 
-       priv->ops = (struct armada_thermal_ops *)match->data;
-       priv->ops->init_sensor(priv);
+       priv->data = (struct armada_thermal_data *)match->data;
+       priv->data->init_sensor(pdev, priv);
 
        thermal = thermal_zone_device_register("armada_thermal", 0, 0,
                                               priv, &ops, NULL, 0, 0);
index 1301681d9a7792904324167300cdaca6a7b948b0..e93f0253f6ed2070c934570cbe5c62f400bdfcc1 100644 (file)
@@ -62,7 +62,13 @@ static int sys_get_trip_hyst(struct thermal_zone_device *tzone,
        if (ACPI_FAILURE(status))
                return -EIO;
 
-       *temp = DECI_KELVIN_TO_MILLI_CELSIUS(hyst, KELVIN_OFFSET);
+       /*
+        * Thermal hysteresis represents a temperature difference.
+        * Kelvin and Celsius have same degree size. So the
+        * conversion here between tenths of degree Kelvin unit
+        * and Milli-Celsius unit is just to multiply 100.
+        */
+       *temp = hyst * 100;
 
        return 0;
 }
index a084325f13861cc12de7824d9a251ccb58cdb282..95cb7fc20e1780582efededf6dc1d88fe95aad37 100644 (file)
@@ -681,8 +681,10 @@ static const struct x86_cpu_id intel_powerclamp_ids[] = {
        { X86_VENDOR_INTEL, 6, 0x2d},
        { X86_VENDOR_INTEL, 6, 0x2e},
        { X86_VENDOR_INTEL, 6, 0x2f},
+       { X86_VENDOR_INTEL, 6, 0x37},
        { X86_VENDOR_INTEL, 6, 0x3a},
        { X86_VENDOR_INTEL, 6, 0x3c},
+       { X86_VENDOR_INTEL, 6, 0x3d},
        { X86_VENDOR_INTEL, 6, 0x3e},
        { X86_VENDOR_INTEL, 6, 0x3f},
        { X86_VENDOR_INTEL, 6, 0x45},
index 5a37940b02c99df447a0fc024177edccabd96635..8803e693fe6868a620b76abda347e0e27645d6d3 100644 (file)
@@ -374,10 +374,8 @@ static int rcar_thermal_probe(struct platform_device *pdev)
        int idle = IDLE_INTERVAL;
 
        common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL);
-       if (!common) {
-               dev_err(dev, "Could not allocate common\n");
+       if (!common)
                return -ENOMEM;
-       }
 
        INIT_LIST_HEAD(&common->head);
        spin_lock_init(&common->lock);
@@ -423,7 +421,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 
                priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
                if (!priv) {
-                       dev_err(dev, "Could not allocate priv\n");
                        ret = -ENOMEM;
                        goto error_unregister;
                }
@@ -470,7 +467,7 @@ error_unregister:
                        rcar_thermal_irq_disable(priv);
        }
 
-       pm_runtime_put_sync(dev);
+       pm_runtime_put(dev);
        pm_runtime_disable(dev);
 
        return ret;
@@ -488,7 +485,7 @@ static int rcar_thermal_remove(struct platform_device *pdev)
                        rcar_thermal_irq_disable(priv);
        }
 
-       pm_runtime_put_sync(dev);
+       pm_runtime_put(dev);
        pm_runtime_disable(dev);
 
        return 0;
index 0d96a510389f412c0287f4f67484a23ae71356f1..d7ca9f49c9cb2201d41f55c4fe98f0fb04595173 100644 (file)
  * @id: identifier of the one instance of the TMU controller.
  * @pdata: pointer to the tmu platform/configuration data
  * @base: base address of the single instance of the TMU controller.
- * @base_common: base address of the common registers of the TMU controller.
+ * @base_second: base address of the common registers of the TMU controller.
  * @irq: irq number of the TMU controller.
  * @soc: id of the SOC type.
  * @irq_work: pointer to the irq work structure.
  * @lock: lock to implement synchronization.
  * @clk: pointer to the clock structure.
+ * @clk_sec: pointer to the clock structure for accessing the base_second.
  * @temp_error1: fused value of the first point trim.
  * @temp_error2: fused value of the second point trim.
  * @regulator: pointer to the TMU regulator structure.
@@ -56,12 +57,12 @@ struct exynos_tmu_data {
        int id;
        struct exynos_tmu_platform_data *pdata;
        void __iomem *base;
-       void __iomem *base_common;
+       void __iomem *base_second;
        int irq;
        enum soc_type soc;
        struct work_struct irq_work;
        struct mutex lock;
-       struct clk *clk;
+       struct clk *clk, *clk_sec;
        u8 temp_error1, temp_error2;
        struct regulator *regulator;
        struct thermal_sensor_conf *reg_conf;
@@ -152,6 +153,8 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
 
        mutex_lock(&data->lock);
        clk_enable(data->clk);
+       if (!IS_ERR(data->clk_sec))
+               clk_enable(data->clk_sec);
 
        if (TMU_SUPPORTS(pdata, READY_STATUS)) {
                status = readb(data->base + reg->tmu_status);
@@ -186,7 +189,12 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
                        EXYNOS5440_EFUSE_SWAP_OFFSET + reg->triminfo_data);
                }
        } else {
-               trim_info = readl(data->base + reg->triminfo_data);
+               /* On exynos5420 the triminfo register is in the shared space */
+               if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO)
+                       trim_info = readl(data->base_second +
+                                                       reg->triminfo_data);
+               else
+                       trim_info = readl(data->base + reg->triminfo_data);
        }
        data->temp_error1 = trim_info & EXYNOS_TMU_TEMP_MASK;
        data->temp_error2 = ((trim_info >> reg->triminfo_85_shift) &
@@ -225,6 +233,8 @@ skip_calib_data:
                        trigger_levs++;
        }
 
+       rising_threshold = readl(data->base + reg->threshold_th0);
+
        if (data->soc == SOC_ARCH_EXYNOS4210) {
                /* Write temperature code for threshold */
                threshold_code = temp_to_code(data, pdata->threshold);
@@ -238,7 +248,7 @@ skip_calib_data:
                        writeb(pdata->trigger_levels[i], data->base +
                        reg->threshold_th0 + i * sizeof(reg->threshold_th0));
 
-               writel(reg->inten_rise_mask, data->base + reg->tmu_intclear);
+               writel(reg->intclr_rise_mask, data->base + reg->tmu_intclear);
        } else {
                /* Write temperature code for rising and falling threshold */
                for (i = 0;
@@ -249,6 +259,7 @@ skip_calib_data:
                                ret = threshold_code;
                                goto out;
                        }
+                       rising_threshold &= ~(0xff << 8 * i);
                        rising_threshold |= threshold_code << 8 * i;
                        if (pdata->threshold_falling) {
                                threshold_code = temp_to_code(data,
@@ -265,8 +276,8 @@ skip_calib_data:
                writel(falling_threshold,
                                data->base + reg->threshold_th1);
 
-               writel((reg->inten_rise_mask << reg->inten_rise_shift) |
-                       (reg->inten_fall_mask << reg->inten_fall_shift),
+               writel((reg->intclr_rise_mask << reg->intclr_rise_shift) |
+                       (reg->intclr_fall_mask << reg->intclr_fall_shift),
                                data->base + reg->tmu_intclear);
 
                /* if last threshold limit is also present */
@@ -281,6 +292,7 @@ skip_calib_data:
                        }
                        if (i == EXYNOS_MAX_TRIGGER_PER_REG - 1) {
                                /* 1-4 level to be assigned in th0 reg */
+                               rising_threshold &= ~(0xff << 8 * i);
                                rising_threshold |= threshold_code << 8 * i;
                                writel(rising_threshold,
                                        data->base + reg->threshold_th0);
@@ -298,10 +310,12 @@ skip_calib_data:
        }
        /*Clear the PMIN in the common TMU register*/
        if (reg->tmu_pmin && !data->id)
-               writel(0, data->base_common + reg->tmu_pmin);
+               writel(0, data->base_second + reg->tmu_pmin);
 out:
        clk_disable(data->clk);
        mutex_unlock(&data->lock);
+       if (!IS_ERR(data->clk_sec))
+               clk_disable(data->clk_sec);
 
        return ret;
 }
@@ -453,12 +467,16 @@ static void exynos_tmu_work(struct work_struct *work)
        const struct exynos_tmu_registers *reg = pdata->registers;
        unsigned int val_irq, val_type;
 
+       if (!IS_ERR(data->clk_sec))
+               clk_enable(data->clk_sec);
        /* Find which sensor generated this interrupt */
        if (reg->tmu_irqstatus) {
-               val_type = readl(data->base_common + reg->tmu_irqstatus);
+               val_type = readl(data->base_second + reg->tmu_irqstatus);
                if (!((val_type >> data->id) & 0x1))
                        goto out;
        }
+       if (!IS_ERR(data->clk_sec))
+               clk_disable(data->clk_sec);
 
        exynos_report_trigger(data->reg_conf);
        mutex_lock(&data->lock);
@@ -498,6 +516,18 @@ static const struct of_device_id exynos_tmu_match[] = {
                .compatible = "samsung,exynos5250-tmu",
                .data = (void *)EXYNOS5250_TMU_DRV_DATA,
        },
+       {
+               .compatible = "samsung,exynos5260-tmu",
+               .data = (void *)EXYNOS5260_TMU_DRV_DATA,
+       },
+       {
+               .compatible = "samsung,exynos5420-tmu",
+               .data = (void *)EXYNOS5420_TMU_DRV_DATA,
+       },
+       {
+               .compatible = "samsung,exynos5420-tmu-ext-triminfo",
+               .data = (void *)EXYNOS5420_TMU_DRV_DATA,
+       },
        {
                .compatible = "samsung,exynos5440-tmu",
                .data = (void *)EXYNOS5440_TMU_DRV_DATA,
@@ -580,7 +610,7 @@ static int exynos_map_dt_data(struct platform_device *pdev)
         * Check if the TMU shares some registers and then try to map the
         * memory of common registers.
         */
-       if (!TMU_SUPPORTS(pdata, SHARED_MEMORY))
+       if (!TMU_SUPPORTS(pdata, ADDRESS_MULTIPLE))
                return 0;
 
        if (of_address_to_resource(pdev->dev.of_node, 1, &res)) {
@@ -588,9 +618,9 @@ static int exynos_map_dt_data(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       data->base_common = devm_ioremap(&pdev->dev, res.start,
+       data->base_second = devm_ioremap(&pdev->dev, res.start,
                                        resource_size(&res));
-       if (!data->base_common) {
+       if (!data->base_second) {
                dev_err(&pdev->dev, "Failed to ioremap memory\n");
                return -ENOMEM;
        }
@@ -607,10 +637,8 @@ static int exynos_tmu_probe(struct platform_device *pdev)
 
        data = devm_kzalloc(&pdev->dev, sizeof(struct exynos_tmu_data),
                                        GFP_KERNEL);
-       if (!data) {
-               dev_err(&pdev->dev, "Failed to allocate driver structure\n");
+       if (!data)
                return -ENOMEM;
-       }
 
        platform_set_drvdata(pdev, data);
        mutex_init(&data->lock);
@@ -629,13 +657,31 @@ static int exynos_tmu_probe(struct platform_device *pdev)
                return  PTR_ERR(data->clk);
        }
 
+       data->clk_sec = devm_clk_get(&pdev->dev, "tmu_triminfo_apbif");
+       if (IS_ERR(data->clk_sec)) {
+               if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) {
+                       dev_err(&pdev->dev, "Failed to get triminfo clock\n");
+                       return PTR_ERR(data->clk_sec);
+               }
+       } else {
+               ret = clk_prepare(data->clk_sec);
+               if (ret) {
+                       dev_err(&pdev->dev, "Failed to get clock\n");
+                       return ret;
+               }
+       }
+
        ret = clk_prepare(data->clk);
-       if (ret)
-               return ret;
+       if (ret) {
+               dev_err(&pdev->dev, "Failed to get clock\n");
+               goto err_clk_sec;
+       }
 
        if (pdata->type == SOC_ARCH_EXYNOS4210 ||
            pdata->type == SOC_ARCH_EXYNOS4412 ||
            pdata->type == SOC_ARCH_EXYNOS5250 ||
+           pdata->type == SOC_ARCH_EXYNOS5260 ||
+           pdata->type == SOC_ARCH_EXYNOS5420_TRIMINFO ||
            pdata->type == SOC_ARCH_EXYNOS5440)
                data->soc = pdata->type;
        else {
@@ -656,7 +702,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
        sensor_conf = devm_kzalloc(&pdev->dev,
                                sizeof(struct thermal_sensor_conf), GFP_KERNEL);
        if (!sensor_conf) {
-               dev_err(&pdev->dev, "Failed to allocate registration struct\n");
                ret = -ENOMEM;
                goto err_clk;
        }
@@ -704,6 +749,9 @@ static int exynos_tmu_probe(struct platform_device *pdev)
        return 0;
 err_clk:
        clk_unprepare(data->clk);
+err_clk_sec:
+       if (!IS_ERR(data->clk_sec))
+               clk_unprepare(data->clk_sec);
        return ret;
 }
 
@@ -716,6 +764,8 @@ static int exynos_tmu_remove(struct platform_device *pdev)
        exynos_unregister_thermal(data->reg_conf);
 
        clk_unprepare(data->clk);
+       if (!IS_ERR(data->clk_sec))
+               clk_unprepare(data->clk_sec);
 
        if (!IS_ERR(data->regulator))
                regulator_disable(data->regulator);
index 3fb65547e64c9d9e3d3410f1c0ea729fb5a9332e..edd08cf7672921bffd56f6986e125cb1684b0081 100644 (file)
@@ -43,6 +43,8 @@ enum soc_type {
        SOC_ARCH_EXYNOS4210 = 1,
        SOC_ARCH_EXYNOS4412,
        SOC_ARCH_EXYNOS5250,
+       SOC_ARCH_EXYNOS5260,
+       SOC_ARCH_EXYNOS5420_TRIMINFO,
        SOC_ARCH_EXYNOS5440,
 };
 
@@ -60,7 +62,7 @@ enum soc_type {
  *                     state(active/idle) can be checked.
  * TMU_SUPPORT_EMUL_TIME - This features allows to set next temp emulation
  *                     sample time.
- * TMU_SUPPORT_SHARED_MEMORY - This feature tells that the different TMU
+ * TMU_SUPPORT_ADDRESS_MULTIPLE - This feature tells that the different TMU
  *                     sensors shares some common registers.
  * TMU_SUPPORT - macro to compare the above features with the supplied.
  */
@@ -70,7 +72,7 @@ enum soc_type {
 #define TMU_SUPPORT_FALLING_TRIP               BIT(3)
 #define TMU_SUPPORT_READY_STATUS               BIT(4)
 #define TMU_SUPPORT_EMUL_TIME                  BIT(5)
-#define TMU_SUPPORT_SHARED_MEMORY              BIT(6)
+#define TMU_SUPPORT_ADDRESS_MULTIPLE           BIT(6)
 
 #define TMU_SUPPORTS(a, b)     (a->features & TMU_SUPPORT_ ## b)
 
@@ -122,10 +124,6 @@ enum soc_type {
  * @threshold_th3_l0_shift: shift bits of level0 threshold temperature.
  * @tmu_inten: register containing the different threshold interrupt
        enable bits.
- * @inten_rise_shift: shift bits of all rising interrupt bits.
- * @inten_rise_mask: mask bits of all rising interrupt bits.
- * @inten_fall_shift: shift bits of all rising interrupt bits.
- * @inten_fall_mask: mask bits of all rising interrupt bits.
  * @inten_rise0_shift: shift bits of rising 0 interrupt bits.
  * @inten_rise1_shift: shift bits of rising 1 interrupt bits.
  * @inten_rise2_shift: shift bits of rising 2 interrupt bits.
@@ -136,6 +134,10 @@ enum soc_type {
  * @inten_fall3_shift: shift bits of falling 3 interrupt bits.
  * @tmu_intstat: Register containing the interrupt status values.
  * @tmu_intclear: Register for clearing the raised interrupt status.
+ * @intclr_fall_shift: shift bits for interrupt clear fall 0
+ * @intclr_rise_shift: shift bits of all rising interrupt bits.
+ * @intclr_rise_mask: mask bits of all rising interrupt bits.
+ * @intclr_fall_mask: mask bits of all rising interrupt bits.
  * @emul_con: TMU emulation controller register.
  * @emul_temp_shift: shift bits of emulation temperature.
  * @emul_time_shift: shift bits of emulation time.
@@ -149,6 +151,7 @@ struct exynos_tmu_registers {
        u32     triminfo_85_shift;
 
        u32     triminfo_ctrl;
+       u32     triminfo_ctrl1;
        u32     triminfo_reload_shift;
 
        u32     tmu_ctrl;
@@ -191,10 +194,6 @@ struct exynos_tmu_registers {
        u32     threshold_th3_l0_shift;
 
        u32     tmu_inten;
-       u32     inten_rise_shift;
-       u32     inten_rise_mask;
-       u32     inten_fall_shift;
-       u32     inten_fall_mask;
        u32     inten_rise0_shift;
        u32     inten_rise1_shift;
        u32     inten_rise2_shift;
@@ -207,6 +206,10 @@ struct exynos_tmu_registers {
        u32     tmu_intstat;
 
        u32     tmu_intclear;
+       u32     intclr_fall_shift;
+       u32     intclr_rise_shift;
+       u32     intclr_fall_mask;
+       u32     intclr_rise_mask;
 
        u32     emul_con;
        u32     emul_temp_shift;
index 476b768c633e93f115943e143e07eedf11c7ab46..c1d81dcd781993858f2e6e17ab845c85c169fc42 100644 (file)
@@ -40,13 +40,13 @@ static const struct exynos_tmu_registers exynos4210_tmu_registers = {
        .threshold_temp = EXYNOS4210_TMU_REG_THRESHOLD_TEMP,
        .threshold_th0 = EXYNOS4210_TMU_REG_TRIG_LEVEL0,
        .tmu_inten = EXYNOS_TMU_REG_INTEN,
-       .inten_rise_mask = EXYNOS4210_TMU_TRIG_LEVEL_MASK,
        .inten_rise0_shift = EXYNOS_TMU_INTEN_RISE0_SHIFT,
        .inten_rise1_shift = EXYNOS_TMU_INTEN_RISE1_SHIFT,
        .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
        .inten_rise3_shift = EXYNOS_TMU_INTEN_RISE3_SHIFT,
        .tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
        .tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
+       .intclr_rise_mask = EXYNOS4210_TMU_TRIG_LEVEL_MASK,
 };
 
 struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
@@ -112,10 +112,6 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
        .threshold_th0 = EXYNOS_THD_TEMP_RISE,
        .threshold_th1 = EXYNOS_THD_TEMP_FALL,
        .tmu_inten = EXYNOS_TMU_REG_INTEN,
-       .inten_rise_mask = EXYNOS_TMU_RISE_INT_MASK,
-       .inten_rise_shift = EXYNOS_TMU_RISE_INT_SHIFT,
-       .inten_fall_mask = EXYNOS_TMU_FALL_INT_MASK,
-       .inten_fall_shift = EXYNOS_TMU_FALL_INT_SHIFT,
        .inten_rise0_shift = EXYNOS_TMU_INTEN_RISE0_SHIFT,
        .inten_rise1_shift = EXYNOS_TMU_INTEN_RISE1_SHIFT,
        .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
@@ -123,6 +119,10 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
        .inten_fall0_shift = EXYNOS_TMU_INTEN_FALL0_SHIFT,
        .tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
        .tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
+       .intclr_fall_shift = EXYNOS_TMU_CLEAR_FALL_INT_SHIFT,
+       .intclr_rise_shift = EXYNOS_TMU_RISE_INT_SHIFT,
+       .intclr_rise_mask = EXYNOS_TMU_RISE_INT_MASK,
+       .intclr_fall_mask = EXYNOS_TMU_FALL_INT_MASK,
        .emul_con = EXYNOS_EMUL_CON,
        .emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
        .emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
@@ -194,6 +194,197 @@ struct exynos_tmu_init_data const exynos5250_default_tmu_data = {
 };
 #endif
 
+#if defined(CONFIG_SOC_EXYNOS5260)
+static const struct exynos_tmu_registers exynos5260_tmu_registers = {
+       .triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
+       .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
+       .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
+       .tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
+       .tmu_ctrl = EXYNOS_TMU_REG_CONTROL1,
+       .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
+       .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
+       .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
+       .therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
+       .therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
+       .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
+       .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
+       .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
+       .tmu_status = EXYNOS_TMU_REG_STATUS,
+       .tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
+       .threshold_th0 = EXYNOS_THD_TEMP_RISE,
+       .threshold_th1 = EXYNOS_THD_TEMP_FALL,
+       .tmu_inten = EXYNOS5260_TMU_REG_INTEN,
+       .inten_rise0_shift = EXYNOS_TMU_INTEN_RISE0_SHIFT,
+       .inten_rise1_shift = EXYNOS_TMU_INTEN_RISE1_SHIFT,
+       .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
+       .inten_rise3_shift = EXYNOS_TMU_INTEN_RISE3_SHIFT,
+       .inten_fall0_shift = EXYNOS_TMU_INTEN_FALL0_SHIFT,
+       .tmu_intstat = EXYNOS5260_TMU_REG_INTSTAT,
+       .tmu_intclear = EXYNOS5260_TMU_REG_INTCLEAR,
+       .intclr_fall_shift = EXYNOS5420_TMU_CLEAR_FALL_INT_SHIFT,
+       .intclr_rise_shift = EXYNOS_TMU_RISE_INT_SHIFT,
+       .intclr_rise_mask = EXYNOS5260_TMU_RISE_INT_MASK,
+       .intclr_fall_mask = EXYNOS5260_TMU_FALL_INT_MASK,
+       .emul_con = EXYNOS5260_EMUL_CON,
+       .emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
+       .emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
+       .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
+};
+
+#define __EXYNOS5260_TMU_DATA  \
+       .threshold_falling = 10, \
+       .trigger_levels[0] = 85, \
+       .trigger_levels[1] = 103, \
+       .trigger_levels[2] = 110, \
+       .trigger_levels[3] = 120, \
+       .trigger_enable[0] = true, \
+       .trigger_enable[1] = true, \
+       .trigger_enable[2] = true, \
+       .trigger_enable[3] = false, \
+       .trigger_type[0] = THROTTLE_ACTIVE, \
+       .trigger_type[1] = THROTTLE_ACTIVE, \
+       .trigger_type[2] = SW_TRIP, \
+       .trigger_type[3] = HW_TRIP, \
+       .max_trigger_level = 4, \
+       .gain = 8, \
+       .reference_voltage = 16, \
+       .noise_cancel_mode = 4, \
+       .cal_type = TYPE_ONE_POINT_TRIMMING, \
+       .efuse_value = 55, \
+       .min_efuse_value = 40, \
+       .max_efuse_value = 100, \
+       .first_point_trim = 25, \
+       .second_point_trim = 85, \
+       .default_temp_offset = 50, \
+       .freq_tab[0] = { \
+               .freq_clip_max = 800 * 1000, \
+               .temp_level = 85, \
+       }, \
+       .freq_tab[1] = { \
+               .freq_clip_max = 200 * 1000, \
+               .temp_level = 103, \
+       }, \
+       .freq_tab_count = 2, \
+       .registers = &exynos5260_tmu_registers, \
+
+#define EXYNOS5260_TMU_DATA \
+       __EXYNOS5260_TMU_DATA \
+       .type = SOC_ARCH_EXYNOS5260, \
+       .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
+                       TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \
+                       TMU_SUPPORT_EMUL_TIME)
+
+struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
+       .tmu_data = {
+               { EXYNOS5260_TMU_DATA },
+               { EXYNOS5260_TMU_DATA },
+               { EXYNOS5260_TMU_DATA },
+               { EXYNOS5260_TMU_DATA },
+               { EXYNOS5260_TMU_DATA },
+       },
+       .tmu_count = 5,
+};
+#endif
+
+#if defined(CONFIG_SOC_EXYNOS5420)
+static const struct exynos_tmu_registers exynos5420_tmu_registers = {
+       .triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
+       .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
+       .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
+       .tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
+       .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
+       .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
+       .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
+       .therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
+       .therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
+       .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
+       .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
+       .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
+       .tmu_status = EXYNOS_TMU_REG_STATUS,
+       .tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
+       .threshold_th0 = EXYNOS_THD_TEMP_RISE,
+       .threshold_th1 = EXYNOS_THD_TEMP_FALL,
+       .tmu_inten = EXYNOS_TMU_REG_INTEN,
+       .inten_rise0_shift = EXYNOS_TMU_INTEN_RISE0_SHIFT,
+       .inten_rise1_shift = EXYNOS_TMU_INTEN_RISE1_SHIFT,
+       .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
+       /* INTEN_RISE3 Not availble in exynos5420 */
+       .inten_rise3_shift = EXYNOS_TMU_INTEN_RISE3_SHIFT,
+       .inten_fall0_shift = EXYNOS_TMU_INTEN_FALL0_SHIFT,
+       .tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
+       .tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
+       .intclr_fall_shift = EXYNOS5420_TMU_CLEAR_FALL_INT_SHIFT,
+       .intclr_rise_shift = EXYNOS_TMU_RISE_INT_SHIFT,
+       .intclr_rise_mask = EXYNOS_TMU_RISE_INT_MASK,
+       .intclr_fall_mask = EXYNOS_TMU_FALL_INT_MASK,
+       .emul_con = EXYNOS_EMUL_CON,
+       .emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
+       .emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
+       .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
+};
+
+#define __EXYNOS5420_TMU_DATA  \
+       .threshold_falling = 10, \
+       .trigger_levels[0] = 85, \
+       .trigger_levels[1] = 103, \
+       .trigger_levels[2] = 110, \
+       .trigger_levels[3] = 120, \
+       .trigger_enable[0] = true, \
+       .trigger_enable[1] = true, \
+       .trigger_enable[2] = true, \
+       .trigger_enable[3] = false, \
+       .trigger_type[0] = THROTTLE_ACTIVE, \
+       .trigger_type[1] = THROTTLE_ACTIVE, \
+       .trigger_type[2] = SW_TRIP, \
+       .trigger_type[3] = HW_TRIP, \
+       .max_trigger_level = 4, \
+       .gain = 8, \
+       .reference_voltage = 16, \
+       .noise_cancel_mode = 4, \
+       .cal_type = TYPE_ONE_POINT_TRIMMING, \
+       .efuse_value = 55, \
+       .min_efuse_value = 40, \
+       .max_efuse_value = 100, \
+       .first_point_trim = 25, \
+       .second_point_trim = 85, \
+       .default_temp_offset = 50, \
+       .freq_tab[0] = { \
+               .freq_clip_max = 800 * 1000, \
+               .temp_level = 85, \
+       }, \
+       .freq_tab[1] = { \
+               .freq_clip_max = 200 * 1000, \
+               .temp_level = 103, \
+       }, \
+       .freq_tab_count = 2, \
+       .registers = &exynos5420_tmu_registers, \
+
+#define EXYNOS5420_TMU_DATA \
+       __EXYNOS5420_TMU_DATA \
+       .type = SOC_ARCH_EXYNOS5250, \
+       .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
+                       TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \
+                       TMU_SUPPORT_EMUL_TIME)
+
+#define EXYNOS5420_TMU_DATA_SHARED \
+       __EXYNOS5420_TMU_DATA \
+       .type = SOC_ARCH_EXYNOS5420_TRIMINFO, \
+       .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
+                       TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \
+                       TMU_SUPPORT_EMUL_TIME | TMU_SUPPORT_ADDRESS_MULTIPLE)
+
+struct exynos_tmu_init_data const exynos5420_default_tmu_data = {
+       .tmu_data = {
+               { EXYNOS5420_TMU_DATA },
+               { EXYNOS5420_TMU_DATA },
+               { EXYNOS5420_TMU_DATA_SHARED },
+               { EXYNOS5420_TMU_DATA_SHARED },
+               { EXYNOS5420_TMU_DATA_SHARED },
+       },
+       .tmu_count = 5,
+};
+#endif
+
 #if defined(CONFIG_SOC_EXYNOS5440)
 static const struct exynos_tmu_registers exynos5440_tmu_registers = {
        .triminfo_data = EXYNOS5440_TMU_S0_7_TRIM,
@@ -217,10 +408,6 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
        .threshold_th2 = EXYNOS5440_TMU_S0_7_TH2,
        .threshold_th3_l0_shift = EXYNOS5440_TMU_TH_RISE4_SHIFT,
        .tmu_inten = EXYNOS5440_TMU_S0_7_IRQEN,
-       .inten_rise_mask = EXYNOS5440_TMU_RISE_INT_MASK,
-       .inten_rise_shift = EXYNOS5440_TMU_RISE_INT_SHIFT,
-       .inten_fall_mask = EXYNOS5440_TMU_FALL_INT_MASK,
-       .inten_fall_shift = EXYNOS5440_TMU_FALL_INT_SHIFT,
        .inten_rise0_shift = EXYNOS5440_TMU_INTEN_RISE0_SHIFT,
        .inten_rise1_shift = EXYNOS5440_TMU_INTEN_RISE1_SHIFT,
        .inten_rise2_shift = EXYNOS5440_TMU_INTEN_RISE2_SHIFT,
@@ -228,6 +415,10 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
        .inten_fall0_shift = EXYNOS5440_TMU_INTEN_FALL0_SHIFT,
        .tmu_intstat = EXYNOS5440_TMU_S0_7_IRQ,
        .tmu_intclear = EXYNOS5440_TMU_S0_7_IRQ,
+       .intclr_fall_shift = EXYNOS5440_TMU_CLEAR_FALL_INT_SHIFT,
+       .intclr_rise_shift = EXYNOS5440_TMU_RISE_INT_SHIFT,
+       .intclr_rise_mask = EXYNOS5440_TMU_RISE_INT_MASK,
+       .intclr_fall_mask = EXYNOS5440_TMU_FALL_INT_MASK,
        .tmu_irqstatus = EXYNOS5440_TMU_IRQ_STATUS,
        .emul_con = EXYNOS5440_TMU_S0_7_DEBUG,
        .emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
@@ -255,7 +446,7 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
        .type = SOC_ARCH_EXYNOS5440, \
        .registers = &exynos5440_tmu_registers, \
        .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_FALLING_TRIP | \
-                       TMU_SUPPORT_MULTI_INST | TMU_SUPPORT_SHARED_MEMORY),
+                       TMU_SUPPORT_MULTI_INST | TMU_SUPPORT_ADDRESS_MULTIPLE),
 
 struct exynos_tmu_init_data const exynos5440_default_tmu_data = {
        .tmu_data = {
index a1ea19d9e0a6e6bfee1a80f173dcdf4786dcc284..d268981b65e5f122ddc56baf0202e81d1334bc5c 100644 (file)
 #define EXYNOS_TMU_RISE_INT_MASK       0x111
 #define EXYNOS_TMU_RISE_INT_SHIFT      0
 #define EXYNOS_TMU_FALL_INT_MASK       0x111
-#define EXYNOS_TMU_FALL_INT_SHIFT      12
 #define EXYNOS_TMU_CLEAR_RISE_INT      0x111
 #define EXYNOS_TMU_CLEAR_FALL_INT      (0x111 << 12)
+#define EXYNOS_TMU_CLEAR_FALL_INT_SHIFT        12
+#define EXYNOS5420_TMU_CLEAR_FALL_INT_SHIFT    16
+#define EXYNOS5440_TMU_CLEAR_FALL_INT_SHIFT    4
 #define EXYNOS_TMU_TRIP_MODE_SHIFT     13
 #define EXYNOS_TMU_TRIP_MODE_MASK      0x7
 #define EXYNOS_TMU_THERM_TRIP_EN_SHIFT 12
@@ -85,6 +87,7 @@
 #define EXYNOS_TMU_INTEN_FALL0_SHIFT   16
 #define EXYNOS_TMU_INTEN_FALL1_SHIFT   20
 #define EXYNOS_TMU_INTEN_FALL2_SHIFT   24
+#define EXYNOS_TMU_INTEN_FALL3_SHIFT   28
 
 #define EXYNOS_EMUL_TIME       0x57F0
 #define EXYNOS_EMUL_TIME_MASK  0xffff
 
 #define EXYNOS_MAX_TRIGGER_PER_REG     4
 
+/* Exynos5260 specific */
+#define EXYNOS_TMU_REG_CONTROL1                        0x24
+#define EXYNOS5260_TMU_REG_INTEN               0xC0
+#define EXYNOS5260_TMU_REG_INTSTAT             0xC4
+#define EXYNOS5260_TMU_REG_INTCLEAR            0xC8
+#define EXYNOS5260_TMU_CLEAR_RISE_INT          0x1111
+#define EXYNOS5260_TMU_CLEAR_FALL_INT          (0x1111 << 16)
+#define EXYNOS5260_TMU_RISE_INT_MASK           0x1111
+#define EXYNOS5260_TMU_FALL_INT_MASK           0x1111
+#define EXYNOS5260_EMUL_CON                    0x100
+
 /* Exynos4412 specific */
 #define EXYNOS4412_MUX_ADDR_VALUE          6
 #define EXYNOS4412_MUX_ADDR_SHIFT          20
 #define EXYNOS5440_TMU_RISE_INT_MASK           0xf
 #define EXYNOS5440_TMU_RISE_INT_SHIFT          0
 #define EXYNOS5440_TMU_FALL_INT_MASK           0xf
-#define EXYNOS5440_TMU_FALL_INT_SHIFT          4
 #define EXYNOS5440_TMU_INTEN_RISE0_SHIFT       0
 #define EXYNOS5440_TMU_INTEN_RISE1_SHIFT       1
 #define EXYNOS5440_TMU_INTEN_RISE2_SHIFT       2
@@ -156,6 +169,20 @@ extern struct exynos_tmu_init_data const exynos5250_default_tmu_data;
 #define EXYNOS5250_TMU_DRV_DATA (NULL)
 #endif
 
+#if defined(CONFIG_SOC_EXYNOS5260)
+extern struct exynos_tmu_init_data const exynos5260_default_tmu_data;
+#define EXYNOS5260_TMU_DRV_DATA (&exynos5260_default_tmu_data)
+#else
+#define EXYNOS5260_TMU_DRV_DATA (NULL)
+#endif
+
+#if defined(CONFIG_SOC_EXYNOS5420)
+extern struct exynos_tmu_init_data const exynos5420_default_tmu_data;
+#define EXYNOS5420_TMU_DRV_DATA (&exynos5420_default_tmu_data)
+#else
+#define EXYNOS5420_TMU_DRV_DATA (NULL)
+#endif
+
 #if defined(CONFIG_SOC_EXYNOS5440)
 extern struct exynos_tmu_init_data const exynos5440_default_tmu_data;
 #define EXYNOS5440_TMU_DRV_DATA (&exynos5440_default_tmu_data)
index ab79ea4701d9f88df85b693c41f96a7d80faaea8..1e2193fc3241f857d1965d80f70b6c1e06b530cf 100644 (file)
@@ -113,10 +113,8 @@ static int spear_thermal_probe(struct platform_device *pdev)
        }
 
        stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL);
-       if (!stdev) {
-               dev_err(&pdev->dev, "kzalloc fail\n");
+       if (!stdev)
                return -ENOMEM;
-       }
 
        /* Enable thermal sensor */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
index 3ab12ee359b79325751d6d1671dda2850ec8b019..a1271b55103aceaa8fe80663e41e3447a070d9dc 100644 (file)
@@ -1248,7 +1248,7 @@ int ti_bandgap_probe(struct platform_device *pdev)
        clk_rate = clk_round_rate(bgp->div_clk,
                                  bgp->conf->sensors[0].ts_data->max_freq);
        if (clk_rate < bgp->conf->sensors[0].ts_data->min_freq ||
-           clk_rate == 0xffffffff) {
+           clk_rate <= 0) {
                ret = -ENODEV;
                dev_err(&pdev->dev, "wrong clock rate (%d)\n", clk_rate);
                goto put_clks;