ARM: sunxi: Support cpufreq on sun[457]i

On sun[45678]i, we have one cluster of identical cores sharing a clock, which is ideal for using cpufreq-dt. Register a platform device for cpufreq-dt.

Signed-off-by Chen-Yu Tsai <[email protected]>

Hi,

Quoted 4 lines · Chen-Yu Tsai

On sun[45678]i, we have one cluster of identical cores sharing a clock, which is ideal for using cpufreq-dt. Register a platform device for cpufreq-dt.

Quoted 1 line

Signed-off-by Chen-Yu Tsai <[email protected]>

While I don't have anything against this patch, I seem to recall that it was not necessary anymore, or that there was some work in the direction of removing that kind of code, have you looked into that?

I believe you are referring to the work done by Viresh Kumar (CCed), specifically the 2 series "[RFC V1 0/8] CPUFreq: create platform-dev for DT based cpufreq drivers" and "[RFC] OPP: Redefine bindings to overcome shortcomings". So far the new code has not appeared in linux-next. If it does, I will happily use it.

On sun[45678]i, we have one cluster of identical cores sharing a clock, which is ideal for using cpufreq-dt. Register a platform device for cpufreq-dt.

Signed-off-by Chen-Yu Tsai <[email protected]>

The cpu clock on sunxi machines is just a mux clock, which is normally fed by the main PLL, but can be muxed to the main or low power oscillator.

Make the mux clock propagate rate changes to its parent, so we can change the clock rate of the PLL, and thus actually implement rate changing on the cpu clock.

This patch also removes the no reparenting limit.

Signed-off-by Chen-Yu Tsai <[email protected]>

The touchscreen controller has a temperature sensor embedded in the SoC, which already has hwmon support in the driver.

Add DT thermal zone support so we can use it with cpufreq for thermal throttling.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 .../bindings/input/touchscreen/sun4i.txt           |  1 +
 drivers/input/touchscreen/sun4i-ts.c               | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

index aef57791f40b..7f1110adbd24 100644

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

 Optional properties:
  - allwinner,ts-attached: boolean indicating that an actual touchscreen is

drivers/input/touchscreen/sun4i-ts.c +2 -0

index 28a06749ae42..b6e9043446d6 100644
@@ -34,6 +34,7 @@
 
 #include <linux/err.h>
 #include <linux/hwmon.h>
+#include <linux/thermal.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>

@@ -107,6 +108,7 @@
 struct sun4i_ts_data {
 	struct device *dev;
 	struct input_dev *input;
+	struct thermal_zone_device *tz;
 	void __iomem *base;
 	unsigned int irq;
 	bool ignore_fifo_data;

@@ -180,6 +182,23 @@ static void sun4i_ts_close(struct input_dev *dev)
 	writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 }
 

drivers/input/touchscreen/sun4i-ts.c +7 -0

+	return 0;
+}
+
+static struct thermal_zone_of_device_ops sun4i_ts_tz_ops = {
+	.get_temp = get_temp,
+};
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
 			 char *buf)
 {

@@ -288,6 +307,11 @@ static int sun4i_ts_probe(struct platform_device *pdev)
 	if (IS_ERR(hwmon))

drivers/input/touchscreen/sun4i-ts.c +3 -0

@@ -310,6 +334,9 @@ static int sun4i_ts_remove(struct platform_device *pdev)
 	if (ts->input)
 		input_unregister_device(ts->input);
 
+	if (ts->tz)
+		thermal_zone_of_sensor_unregister(ts->dev, ts->tz);
+
 	/* Deactivate all IRQs */
 	writel(0, ts->base + TP_INT_FIFOC);
 

Signature · 1 line

2.1.4

Hello Chen-Yu,

Quoted 17 lines · Chen-Yu Tsai

The touchscreen controller has a temperature sensor embedded in the SoC, which already has hwmon support in the driver.

Add DT thermal zone support so we can use it with cpufreq for thermal throttling.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 .../bindings/input/touchscreen/sun4i.txt           |  1 +
 drivers/input/touchscreen/sun4i-ts.c               | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

index aef57791f40b..7f1110adbd24 100644

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt Required properties: · line 9

Quoted 5 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +1 -0

@@ -5,6 +5,7 @@ Required properties:
  - compatible: "allwinner,sun4i-a10-ts"
  - reg: mmio address range of the chip
  - interrupts: interrupt to which the chip is connected
+ - #thermal-sensor-cells: shall be 0
 

You may want to update your Example section too, below. Example:

        rtp: rtp at 01c25000 {
                compatible = "allwinner,sun4i-a10-ts";
                reg = <0x01c25000 0x100>;
                interrupts = <29>;
                allwinner,ts-attached;
                #thermal-sensor-cells = <0>;
        };

Quoted 28 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

 Optional properties:
  - allwinner,ts-attached: boolean indicating that an actual touchscreen is

drivers/input/touchscreen/sun4i-ts.c +2 -0

index 28a06749ae42..b6e9043446d6 100644
@@ -34,6 +34,7 @@
 
 #include <linux/err.h>
 #include <linux/hwmon.h>
+#include <linux/thermal.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>

@@ -107,6 +108,7 @@
 struct sun4i_ts_data {
      struct device *dev;
      struct input_dev *input;
+     struct thermal_zone_device *tz;
      void __iomem *base;
      unsigned int irq;
      bool ignore_fifo_data;

@@ -180,6 +182,23 @@ static void sun4i_ts_close(struct input_dev *dev)
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 }
 

drivers/input/touchscreen/sun4i-ts.c static void sun4i_ts_close(struct input_dev *dev) · line 194

Quoted 10 lines

drivers/input/touchscreen/sun4i-ts.c +10 -0

+static int get_temp(void *data, long *temp)
+{
+     struct sun4i_ts_data *ts = data;
+
+     /* No temp_data until the first irq */
+     if (ts->temp_data == -1)
+             return -EAGAIN;
+
+     *temp = (ts->temp_data - 1447) * 100;
+

Care to explain the formula in a simple comment?

Quoted 21 lines

drivers/input/touchscreen/sun4i-ts.c +12 -0

+     return 0;
+}
+
+static struct thermal_zone_of_device_ops sun4i_ts_tz_ops = {
+     .get_temp = get_temp,
+};
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                       char *buf)
 {

@@ -288,6 +307,11 @@ static int sun4i_ts_probe(struct platform_device *pdev)
      if (IS_ERR(hwmon))
              return PTR_ERR(hwmon);
 
+     ts->tz = thermal_zone_of_sensor_register(ts->dev, 0, ts,
+                                              &sun4i_ts_tz_ops);
+     if (IS_ERR(ts->tz))
+             ts->tz = NULL;
+
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 

drivers/input/touchscreen/sun4i-ts.c static int sun4i_ts_probe(struct platform_device *pdev) · line 317

Quoted 1 line

drivers/input/touchscreen/sun4i-ts.c +0 -0

      if (ts_attached) {

here.. if input_register_device fails, you will keep an orphan thermal zone registered in your system:

                error = input_register_device(ts->input);
                if (error) {
                        writel(0, ts->base + TP_INT_FIFOC);

                        return error;
                }
                ...

Quoted 13 lines

drivers/input/touchscreen/sun4i-ts.c +3 -1

@@ -310,6 +334,9 @@ static int sun4i_ts_remove(struct platform_device *pdev)
      if (ts->input)
              input_unregister_device(ts->input);
 
+     if (ts->tz)
+             thermal_zone_of_sensor_unregister(ts->dev, ts->tz);
+
      /* Deactivate all IRQs */
      writel(0, ts->base + TP_INT_FIFOC);
 
--

2.1.4

Hi,

Quoted 30 lines · Eduardo Valentin

Hello Chen-Yu,

Quoted 17 lines · Chen-Yu Tsai

The touchscreen controller has a temperature sensor embedded in the SoC, which already has hwmon support in the driver.

Add DT thermal zone support so we can use it with cpufreq for thermal throttling.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 .../bindings/input/touchscreen/sun4i.txt           |  1 +
 drivers/input/touchscreen/sun4i-ts.c               | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

index aef57791f40b..7f1110adbd24 100644

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt Required properties: · line 9

Quoted 5 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +1 -0

@@ -5,6 +5,7 @@ Required properties:
  - compatible: "allwinner,sun4i-a10-ts"
  - reg: mmio address range of the chip
  - interrupts: interrupt to which the chip is connected
+ - #thermal-sensor-cells: shall be 0
 

You may want to update your Example section too, below. Example:

Quoted 7 lines

        rtp: rtp at 01c25000 {
                compatible = "allwinner,sun4i-a10-ts";
                reg = <0x01c25000 0x100>;
                interrupts = <29>;
                allwinner,ts-attached;
                #thermal-sensor-cells = <0>;
        };

Ok.

Quoted 28 lines

Quoted 28 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

 Optional properties:
  - allwinner,ts-attached: boolean indicating that an actual touchscreen is

drivers/input/touchscreen/sun4i-ts.c +2 -0

index 28a06749ae42..b6e9043446d6 100644
@@ -34,6 +34,7 @@
 
 #include <linux/err.h>
 #include <linux/hwmon.h>
+#include <linux/thermal.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>

@@ -107,6 +108,7 @@
 struct sun4i_ts_data {
      struct device *dev;
      struct input_dev *input;
+     struct thermal_zone_device *tz;
      void __iomem *base;
      unsigned int irq;
      bool ignore_fifo_data;

@@ -180,6 +182,23 @@ static void sun4i_ts_close(struct input_dev *dev)
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 }
 

Quoted 12 lines

drivers/input/touchscreen/sun4i-ts.c static void sun4i_ts_close(struct input_dev *dev) · line 194

Quoted 10 lines

drivers/input/touchscreen/sun4i-ts.c +10 -0

+static int get_temp(void *data, long *temp)
+{
+     struct sun4i_ts_data *ts = data;
+
+     /* No temp_data until the first irq */
+     if (ts->temp_data == -1)
+             return -EAGAIN;
+
+     *temp = (ts->temp_data - 1447) * 100;
+

Care to explain the formula in a simple comment?

This was just copied from the hwmon section. AFAIK there is no documentation for the formula. It was probably copied from Allwinner's SDK code.

Hans? Do you remember where you got this?

Quoted 21 lines

Quoted 21 lines

drivers/input/touchscreen/sun4i-ts.c +12 -0

+     return 0;
+}
+
+static struct thermal_zone_of_device_ops sun4i_ts_tz_ops = {
+     .get_temp = get_temp,
+};
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                       char *buf)
 {

@@ -288,6 +307,11 @@ static int sun4i_ts_probe(struct platform_device *pdev)
      if (IS_ERR(hwmon))
              return PTR_ERR(hwmon);
 
+     ts->tz = thermal_zone_of_sensor_register(ts->dev, 0, ts,
+                                              &sun4i_ts_tz_ops);
+     if (IS_ERR(ts->tz))
+             ts->tz = NULL;
+
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 

Quoted 8 lines

drivers/input/touchscreen/sun4i-ts.c static int sun4i_ts_probe(struct platform_device *pdev) · line 317

Quoted 1 line

drivers/input/touchscreen/sun4i-ts.c +0 -0

      if (ts_attached) {

here.. if input_register_device fails, you will keep an orphan thermal zone registered in your system:

                error = input_register_device(ts->input);
                if (error) {
                        writel(0, ts->base + TP_INT_FIFOC);

Will add an unregister call here.

Thanks for the review.

ChenYu

Quoted 18 lines

                        return error;
                }
                ...

Quoted 13 lines

drivers/input/touchscreen/sun4i-ts.c +3 -1

@@ -310,6 +334,9 @@ static int sun4i_ts_remove(struct platform_device *pdev)
      if (ts->input)
              input_unregister_device(ts->input);
 
+     if (ts->tz)
+             thermal_zone_of_sensor_unregister(ts->dev, ts->tz);
+
      /* Deactivate all IRQs */
      writel(0, ts->base + TP_INT_FIFOC);
 
--

2.1.4

Quoted 87 lines · Chen-Yu Tsai

Hi,

Quoted 30 lines · Eduardo Valentin

Hello Chen-Yu,

Quoted 17 lines · Chen-Yu Tsai

The touchscreen controller has a temperature sensor embedded in the SoC, which already has hwmon support in the driver.

Add DT thermal zone support so we can use it with cpufreq for thermal throttling.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 .../bindings/input/touchscreen/sun4i.txt           |  1 +
 drivers/input/touchscreen/sun4i-ts.c               | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

index aef57791f40b..7f1110adbd24 100644

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt Required properties: · line 9

Quoted 5 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +1 -0

@@ -5,6 +5,7 @@ Required properties:
  - compatible: "allwinner,sun4i-a10-ts"
  - reg: mmio address range of the chip
  - interrupts: interrupt to which the chip is connected
+ - #thermal-sensor-cells: shall be 0
 

You may want to update your Example section too, below. Example:

Quoted 7 lines

        rtp: rtp at 01c25000 {
                compatible = "allwinner,sun4i-a10-ts";
                reg = <0x01c25000 0x100>;
                interrupts = <29>;
                allwinner,ts-attached;
                #thermal-sensor-cells = <0>;
        };

Ok.

Quoted 28 lines

Quoted 28 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

 Optional properties:
  - allwinner,ts-attached: boolean indicating that an actual touchscreen is

drivers/input/touchscreen/sun4i-ts.c +2 -0

index 28a06749ae42..b6e9043446d6 100644
@@ -34,6 +34,7 @@
 
 #include <linux/err.h>
 #include <linux/hwmon.h>
+#include <linux/thermal.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>

@@ -107,6 +108,7 @@
 struct sun4i_ts_data {
      struct device *dev;
      struct input_dev *input;
+     struct thermal_zone_device *tz;
      void __iomem *base;
      unsigned int irq;
      bool ignore_fifo_data;

@@ -180,6 +182,23 @@ static void sun4i_ts_close(struct input_dev *dev)
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 }
 

Quoted 12 lines

drivers/input/touchscreen/sun4i-ts.c static void sun4i_ts_close(struct input_dev *dev) · line 194

Quoted 10 lines

drivers/input/touchscreen/sun4i-ts.c +10 -0

+static int get_temp(void *data, long *temp)
+{
+     struct sun4i_ts_data *ts = data;
+
+     /* No temp_data until the first irq */
+     if (ts->temp_data == -1)
+             return -EAGAIN;
+
+     *temp = (ts->temp_data - 1447) * 100;
+

Care to explain the formula in a simple comment?

This was just copied from the hwmon section. AFAIK there is no documentation for the formula. It was probably copied from Allwinner's SDK code.

Quoted 1 line

Hans? Do you remember where you got this?

So this is from the AXP209 datasheet. The Allwinner SoC datasheets don't mention the formula to calculate the temperature. But since Allwinner and X-powers are affiliated, it's possible they use the same formula.

http://comments.gmane.org/gmane.comp.hardware.netbook.arm.sunxi/3838

Quoted 53 lines

Quoted 22 lines

Quoted 22 lines

drivers/input/touchscreen/sun4i-ts.c +12 -0

+     return 0;
+}
+
+static struct thermal_zone_of_device_ops sun4i_ts_tz_ops = {
+     .get_temp = get_temp,
+};
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                       char *buf)
 {

@@ -288,6 +307,11 @@ static int sun4i_ts_probe(struct platform_device *pdev)
      if (IS_ERR(hwmon))
              return PTR_ERR(hwmon);
 
+     ts->tz = thermal_zone_of_sensor_register(ts->dev, 0, ts,
+                                              &sun4i_ts_tz_ops);
+     if (IS_ERR(ts->tz))
+             ts->tz = NULL;
+
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 

Quoted 8 lines

drivers/input/touchscreen/sun4i-ts.c static int sun4i_ts_probe(struct platform_device *pdev) · line 317

Quoted 1 line

drivers/input/touchscreen/sun4i-ts.c +0 -0

      if (ts_attached) {

here.. if input_register_device fails, you will keep an orphan thermal zone registered in your system:

                error = input_register_device(ts->input);
                if (error) {
                        writel(0, ts->base + TP_INT_FIFOC);

Will add an unregister call here.

Thanks for the review.

ChenYu

Quoted 15 lines

                        return error;
                }
                ...

Quoted 10 lines

drivers/input/touchscreen/sun4i-ts.c +3 -0

@@ -310,6 +334,9 @@ static int sun4i_ts_remove(struct platform_device *pdev)
      if (ts->input)
              input_unregister_device(ts->input);
 
+     if (ts->tz)
+             thermal_zone_of_sensor_unregister(ts->dev, ts->tz);
+
      /* Deactivate all IRQs */
      writel(0, ts->base + TP_INT_FIFOC);
 

Quoted 3 lines

Quoted 3 lines

Quoted 3 lines

--
2.1.4

Quoted 90 lines · Chen-Yu Tsai

Quoted 88 lines · Chen-Yu Tsai

Hi,

Quoted 30 lines · Eduardo Valentin

Hello Chen-Yu,

Quoted 17 lines · Chen-Yu Tsai

The touchscreen controller has a temperature sensor embedded in the SoC, which already has hwmon support in the driver.

Add DT thermal zone support so we can use it with cpufreq for thermal throttling.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 .../bindings/input/touchscreen/sun4i.txt           |  1 +
 drivers/input/touchscreen/sun4i-ts.c               | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

index aef57791f40b..7f1110adbd24 100644

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt Required properties: · line 9

Quoted 5 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +1 -0

@@ -5,6 +5,7 @@ Required properties:
  - compatible: "allwinner,sun4i-a10-ts"
  - reg: mmio address range of the chip
  - interrupts: interrupt to which the chip is connected
+ - #thermal-sensor-cells: shall be 0
 

You may want to update your Example section too, below. Example:

Quoted 7 lines

        rtp: rtp at 01c25000 {
                compatible = "allwinner,sun4i-a10-ts";
                reg = <0x01c25000 0x100>;
                interrupts = <29>;
                allwinner,ts-attached;
                #thermal-sensor-cells = <0>;
        };

Ok.

Quoted 28 lines

Quoted 28 lines

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt +0 -0

 Optional properties:
  - allwinner,ts-attached: boolean indicating that an actual touchscreen is

drivers/input/touchscreen/sun4i-ts.c +2 -0

index 28a06749ae42..b6e9043446d6 100644
@@ -34,6 +34,7 @@
 
 #include <linux/err.h>
 #include <linux/hwmon.h>
+#include <linux/thermal.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>

@@ -107,6 +108,7 @@
 struct sun4i_ts_data {
      struct device *dev;
      struct input_dev *input;
+     struct thermal_zone_device *tz;
      void __iomem *base;
      unsigned int irq;
      bool ignore_fifo_data;

@@ -180,6 +182,23 @@ static void sun4i_ts_close(struct input_dev *dev)
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 }
 

Quoted 12 lines

drivers/input/touchscreen/sun4i-ts.c static void sun4i_ts_close(struct input_dev *dev) · line 194

Quoted 10 lines

drivers/input/touchscreen/sun4i-ts.c +10 -0

+static int get_temp(void *data, long *temp)
+{
+     struct sun4i_ts_data *ts = data;
+
+     /* No temp_data until the first irq */
+     if (ts->temp_data == -1)
+             return -EAGAIN;
+
+     *temp = (ts->temp_data - 1447) * 100;
+

Care to explain the formula in a simple comment?

This was just copied from the hwmon section. AFAIK there is no documentation for the formula. It was probably copied from Allwinner's SDK code.

Hans? Do you remember where you got this?

Quoted 5 lines

So this is from the AXP209 datasheet. The Allwinner SoC datasheets don't mention the formula to calculate the temperature. But since Allwinner and X-powers are affiliated, it's possible they use the same formula.

http://comments.gmane.org/gmane.comp.hardware.netbook.arm.sunxi/3838

Ok. We use in the thermal framework miliCelsius as the temperature unit. Can you make sure the resulting temperature is in miliCelsius?

Quoted 56 lines

Quoted 56 lines

Quoted 22 lines

Quoted 22 lines

drivers/input/touchscreen/sun4i-ts.c +12 -0

+     return 0;
+}
+
+static struct thermal_zone_of_device_ops sun4i_ts_tz_ops = {
+     .get_temp = get_temp,
+};
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
                       char *buf)
 {

@@ -288,6 +307,11 @@ static int sun4i_ts_probe(struct platform_device *pdev)
      if (IS_ERR(hwmon))
              return PTR_ERR(hwmon);
 
+     ts->tz = thermal_zone_of_sensor_register(ts->dev, 0, ts,
+                                              &sun4i_ts_tz_ops);
+     if (IS_ERR(ts->tz))
+             ts->tz = NULL;
+
      writel(TEMP_IRQ_EN(1), ts->base + TP_INT_FIFOC);
 

Quoted 8 lines

drivers/input/touchscreen/sun4i-ts.c static int sun4i_ts_probe(struct platform_device *pdev) · line 317

Quoted 1 line

drivers/input/touchscreen/sun4i-ts.c +0 -0

      if (ts_attached) {

here.. if input_register_device fails, you will keep an orphan thermal zone registered in your system:

                error = input_register_device(ts->input);
                if (error) {
                        writel(0, ts->base + TP_INT_FIFOC);

Will add an unregister call here.

Thanks for the review.

ChenYu

Quoted 18 lines

                        return error;
                }
                ...

Quoted 13 lines

drivers/input/touchscreen/sun4i-ts.c +3 -1

@@ -310,6 +334,9 @@ static int sun4i_ts_remove(struct platform_device *pdev)
      if (ts->input)
              input_unregister_device(ts->input);
 
+     if (ts->tz)
+             thermal_zone_of_sensor_unregister(ts->dev, ts->tz);
+
      /* Deactivate all IRQs */
      writel(0, ts->base + TP_INT_FIFOC);
 
--

2.1.4

The AXP209 PMIC is used with some Allwinner SoCs. This patch adds a dtsi file listing all the regulator nodes. The regulators are initialized based on their device node names.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/boot/dts/axp209.dtsi | 87 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 arch/arm/boot/dts/axp209.dtsi

arch/arm/boot/dts/axp209.dtsi new file +51 -0

new file mode 100644
index 000000000000..3c38cbafe285
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015 Chen-Yu Tsai
+ *
+ * Chen-Yu Tsai <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this file; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * AXP202/209 Integrated Power Management Chip

arch/arm/boot/dts/axp209.dtsi new file +14 -0

+		reg_dcdc2: dcdc2 {
+		};
+
+		reg_dcdc3: dcdc3 {
+		};
+
+		reg_ldo1: ldo1 {
+			/* LDO1 is a fixed output regulator */
+			regulator-always-on;
+			regulator-min-microvolt = <1300000>;
+			regulator-max-microvolt = <1300000>;
+		};
+
+		reg_ldo2: ldo2 {

Hi,

Quoted 67 lines · Chen-Yu Tsai

The AXP209 PMIC is used with some Allwinner SoCs. This patch adds a dtsi file listing all the regulator nodes. The regulators are initialized based on their device node names.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/boot/dts/axp209.dtsi | 87 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 arch/arm/boot/dts/axp209.dtsi

arch/arm/boot/dts/axp209.dtsi new file +51 -0

new file mode 100644
index 000000000000..3c38cbafe285
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2015 Chen-Yu Tsai
+ *
+ * Chen-Yu Tsai <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this file; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * AXP202/209 Integrated Power Management Chip

arch/arm/boot/dts/axp209.dtsi line 61

Quoted 10 lines

arch/arm/boot/dts/axp209.dtsi new file +10 -0

+ * http://www.x-powers.com/product/AXP20X.php
+ * http://dl.linux-sunxi.org/AXP/AXP209%20Datasheet%20v1.0_cn.pdf
+ */
+
+&axp209 {
+     regulators {
+             /* Default work frequency for buck regulators */
+             x-powers,dcdc-freq = <1500>;
+
+             /* This section lists all the regulators */

I don't think this comment is necessary.

Quoted 18 lines

arch/arm/boot/dts/axp209.dtsi new file +18 -0

+             reg_dcdc2: dcdc2 {
+             };
+
+             reg_dcdc3: dcdc3 {
+             };
+
+             reg_ldo1: ldo1 {
+                     /* LDO1 is a fixed output regulator */
+                     regulator-always-on;
+                     regulator-min-microvolt = <1300000>;
+                     regulator-max-microvolt = <1300000>;
+             };
+
+             reg_ldo2: ldo2 {
+             };
+
+             reg_ldo3: ldo3 {
+             };

arch/arm/boot/dts/axp209.dtsi line 85

Quoted 6 lines

arch/arm/boot/dts/axp209.dtsi new file +6 -0

+
+             reg_ldo4: ldo4 {
+             };
+
+             reg_ldo5: ldo5 {
+             };

Some default names for the regulator would be great!

Now that the resistive touchpanel driver supports thermal sensors, add the "#thermal-sensor-cells" property as required by the thermal framework.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/boot/dts/sun4i-a10.dtsi  | 1 +
 arch/arm/boot/dts/sun5i-a10s.dtsi | 1 +
 arch/arm/boot/dts/sun5i-a13.dtsi  | 1 +
 arch/arm/boot/dts/sun7i-a20.dtsi  | 1 +
 4 files changed, 4 insertions(+)

arch/arm/boot/dts/sun4i-a10.dtsi +1 -0

index 847d5e09fcfb..f92635ecb937 100644
@@ -712,6 +712,7 @@
 			compatible = "allwinner,sun4i-a10-ts";
 			reg = <0x01c25000 0x100>;
 			interrupts = <29>;
+			#thermal-sensor-cells = <0>;
 		};
 
 		uart0: serial at 01c28000 {

arch/arm/boot/dts/sun5i-a10s.dtsi +1 -0

index 3c3c1920788a..8d324ef7e46e 100644
@@ -535,6 +535,7 @@
 			compatible = "allwinner,sun4i-a10-ts";
 			reg = <0x01c25000 0x100>;
 			interrupts = <29>;
+			#thermal-sensor-cells = <0>;
 		};
 
 		uart0: serial at 01c28000 {

arch/arm/boot/dts/sun5i-a13.dtsi +1 -0

index 2448d7f38d6b..4fe0bd192e29 100644
@@ -469,6 +469,7 @@
 			compatible = "allwinner,sun4i-a10-ts";
 			reg = <0x01c25000 0x100>;
 			interrupts = <29>;
+			#thermal-sensor-cells = <0>;
 		};
 
 		uart1: serial at 01c28400 {

arch/arm/boot/dts/sun7i-a20.dtsi +1 -0

index e21ce5992d56..01c7133e699c 100644
@@ -926,6 +926,7 @@
 			compatible = "allwinner,sun4i-a10-ts";
 			reg = <0x01c25000 0x100>;
 			interrupts = <0 29 4>;
+			#thermal-sensor-cells = <0>;
 		};
 
 		uart0: serial at 01c28000 {

Signature · 1 line

2.1.4

Now that the resistive touchpanel driver supports thermal sensors, add the "#thermal-sensor-cells" property as required by the thermal framework.

Signed-off-by Chen-Yu Tsai <[email protected]>

The cpu core is clocked from the "cpu" clock. Add a reference to it in the first cpu node. Also add "cpu0" label to the node.

The operating points were taken from the A20 FEX files in the sunxi-boards repository. Not all boards have the same settings. The settings in this patch are the most generic ones.

Signed-off-by Chen-Yu Tsai <[email protected]>

The core temperature sensor now supports thermal zones. Add a thermal zone mapping for the cpus with passive cooling (cpufreq throttling).

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/boot/dts/sun7i-a20.dtsi | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

arch/arm/boot/dts/sun7i-a20.dtsi +1 -0

index 887b0521bbfb..951e99ed3aa9 100644
@@ -111,6 +111,38 @@
 		};
 	};
 
+	thermal-zones {

arch/arm/boot/dts/sun7i-a20.dtsi +21 -0

+				};
+			};
+
+			trips {
+				cpu_alert0: cpu_alert0 {
+					/* milliCelsius */
+					temperature = <75000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu_crit: cpu_crit {
+					/* milliCelsius */
+					temperature = <100000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	memory {
 		reg = <0x40000000 0x80000000>;
 	};

Signature · 1 line

2.1.4

This patch adds the regulator nodes for the axp209 by including the axp209 dtsi. As the inputs of these regulators are from the axp209's PS output, which is basically just a mux over the 2 inputs, it is considered to be unregulated. Thus we do not provide input supply properties for them.

The regulator names and constraints are based on the board schematics and the SoC datasheet.

DCDC2 is used as the cpu power supply. This patch also references it from the cpu node.

Also get rid of axp209 properties already set in axp209.dtsi.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/boot/dts/axp209.dtsi               |  4 ++++
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 35 +++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)

arch/arm/boot/dts/axp209.dtsi +0 -0

index 3c38cbafe285..fec3364b2110 100644

arch/arm/boot/dts/axp209.dtsi +0 -0

 	regulators {
 		/* Default work frequency for buck regulators */
 		x-powers,dcdc-freq = <1500>;

arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +0 -4

index 53680983461a..61e61c0eb829 100644
@@ -84,13 +84,9 @@
 			status = "okay";
 
 			axp209: pmic at 34 {
-				compatible = "x-powers,axp209";
 				reg = <0x34>;
 				interrupt-parent = <&nmi_intc>;
 				interrupts = <0 8>;
-
-				interrupt-controller;
-				#interrupt-cells = <1>;
 			};
 		};
 

The core temperature sensor now supports thermal zones. Add a thermal zone mapping for the cpus with passive cooling (cpufreq throttling).

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/boot/dts/sun5i-a13.dtsi | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

arch/arm/boot/dts/sun5i-a13.dtsi +1 -0

index dd93d227865e..9140cc7c8944 100644
@@ -47,6 +47,38 @@
 		};
 	};
 
+	thermal-zones {

arch/arm/boot/dts/sun5i-a13.dtsi +21 -0

+				};
+			};
+
+			trips {
+				cpu_alert0: cpu_alert0 {
+					/* milliCelsius */
+					temperature = <850000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu_crit: cpu_crit {
+					/* milliCelsius */
+					temperature = <100000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	memory {
 		reg = <0x40000000 0x20000000>;
 	};

Signature · 1 line

2.1.4

The core temperature sensor now supports thermal zones. Add a thermal zone mapping for the cpus with passive cooling (cpufreq throttling).

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/boot/dts/sun4i-a10.dtsi | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

arch/arm/boot/dts/sun4i-a10.dtsi +1 -0

index ce3af83dd80b..eb626833ac86 100644
@@ -64,6 +64,38 @@
 		};
 	};
 
+	thermal-zones {

arch/arm/boot/dts/sun4i-a10.dtsi +21 -0

+				};
+			};
+
+			trips {
+				cpu_alert0: cpu_alert0 {
+					/* milliCelsius */
+					temperature = <850000>;
+					hysteresis = <2000>;
+					type = "passive";
+				};
+
+				cpu_crit: cpu_crit {
+					/* milliCelsius */
+					temperature = <100000>;
+					hysteresis = <2000>;
+					type = "critical";
+				};
+			};
+		};
+	};
+
 	memory {
 		reg = <0x40000000 0x80000000>;
 	};

Signature · 1 line

2.1.4

This patch enables TOUCHSCREEN_SUN4I, CPUFREQ_DT, and CPU_THERMAL to enable cpufreq support with passive cpu cooling (thermal throttling) by default.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/configs/sunxi_defconfig | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

arch/arm/configs/sunxi_defconfig +6 -1

index 7a342d2780a8..46a8688bd49a 100644
@@ -9,6 +9,8 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPUFREQ_DT=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_PM=y

@@ -54,6 +56,8 @@ CONFIG_STMMAC_ETH=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_SUN4I=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=8

@@ -71,7 +75,8 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_SUN6I=y
-# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_CPU_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MFD_AXP20X=y

Signature · 1 line

2.1.4

This patch enables TOUCHSCREEN_SUN4I, CPUFREQ_DT, and CPU_THERMAL to enable cpufreq support with passive cpu cooling (thermal throttling) by default.

Signed-off-by Chen-Yu Tsai <[email protected]>

This patch enables TOUCHSCREEN_SUN4I and CPU_THERMAL to enable cpufreq support with passive cpu cooling (thermal throttling) on sunxi by default.

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm/configs/multi_v7_defconfig | 2 ++
 1 file changed, 2 insertions(+)

arch/arm/configs/multi_v7_defconfig +2 -0

index 2328fe752e9c..0e7159ad269b 100644
@@ -189,6 +189,7 @@ CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 CONFIG_TOUCHSCREEN_STMPE=y
+CONFIG_TOUCHSCREEN_SUN4I=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MPU3050=y
 CONFIG_SERIO_AMBAKMI=y

@@ -267,6 +268,7 @@ CONFIG_POWER_RESET_SUN6I=y
 CONFIG_SENSORS_LM90=y
 CONFIG_SENSORS_LM95245=y
 CONFIG_THERMAL=y
+CONFIG_CPU_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
 CONFIG_ST_THERMAL_SYSCFG=y
 CONFIG_ST_THERMAL_MEMMAP=y

Signature · 1 line

2.1.4

This patch enables TOUCHSCREEN_SUN4I and CPU_THERMAL to enable cpufreq support with passive cpu cooling (thermal throttling) on sunxi by default.

Signed-off-by Chen-Yu Tsai <[email protected]>