Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1483289 > unrolled thread

[PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support

Back to article view | Back to linux.kernel

Contents

  [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:30 +0200
    [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
      Re: [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from  dt doc. Guenter Roeck <linux@roeck-us.net> - 2016-09-15 00:20 +0200
    [PATCH 15/19] reset: sti: Remove STiH415/6 reset support Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
    [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
      Re: [PATCH 16/19] power: reset: st-poweroff: Remove obsolete  platforms. Sebastian Reichel <sre@kernel.org> - 2016-09-19 21:40 +0200
    [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
      Re: [PATCH 14/19] pinctrl: st: Remove obsolete platforms from  pinctrl-st dt doc Linus Walleij <linus.walleij@linaro.org> - 2016-09-15 14:40 +0200
    [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
    Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support Arnd Bergmann <arnd@arndb.de> - 2016-09-14 15:40 +0200
      Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform  support Patrice Chotard <patrice.chotard@st.com> - 2016-09-14 16:10 +0200
      Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform  support Peter Griffin <peter.griffin@linaro.org> - 2016-09-15 09:10 +0200
        Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support Arnd Bergmann <arnd@arndb.de> - 2016-09-15 14:10 +0200
          Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform  support Peter Griffin <peter.griffin@linaro.org> - 2016-09-19 11:00 +0200
    [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
      Re: [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support. Linus Walleij <linus.walleij@linaro.org> - 2016-09-15 14:40 +0200
    [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
    [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
    [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
      Re: [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete  platforms Guenter Roeck <linux@roeck-us.net> - 2016-09-15 00:20 +0200
    [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
    [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
    [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
    [PATCH 07/19] ahci: st: Remove STiH416 dt example Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200
      Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example Tejun Heo <tj@kernel.org> - 2016-09-16 18:00 +0200
        Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example Patrice Chotard <patrice.chotard@st.com> - 2016-09-19 09:30 +0200
    [PATCH 09/19] thermal: sti: Remove obsolete STiH416 platform support. Peter Griffin <peter.griffin@linaro.org> - 2016-09-14 15:40 +0200

Page 2 of 2 — ← Prev page 1 [2]

#1483308 — [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms

This patch removes support for STiH415/6 SoC's from the
dwmac-sti driver and dt binding doc, as support for these
platforms is being removed from the kernel. It also removes
STiD127 related code, which has never actually been supported
upstream.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <peppe.cavallaro@st.com>
Cc: <alexandre.torgue@st.com>
Cc: <netdev@vger.kernel.org>
---
 .../devicetree/bindings/net/sti-dwmac.txt          |  3 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c    | 37 ----------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/sti-dwmac.txt b/Documentation/devicetree/bindings/net/sti-dwmac.txt
index d05c1e1..2031786 100644
--- a/Documentation/devicetree/bindings/net/sti-dwmac.txt
+++ b/Documentation/devicetree/bindings/net/sti-dwmac.txt
@@ -7,8 +7,7 @@ and what is needed on STi platforms to program the stmmac glue logic.
 The device node has following properties.
 
 Required properties:
- - compatible	: Can be "st,stih415-dwmac", "st,stih416-dwmac",
-   "st,stih407-dwmac", "st,stid127-dwmac".
+ - compatible	: Should be "st,stih407-dwmac".
  - st,syscon : Should be phandle/offset pair. The phandle to the syscon node which
    encompases the glue register, and the offset of the control register.
  - st,gmac_en: this is to enable the gmac into a dedicated sysctl control
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
index 58c05ac..fcbe374 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
@@ -198,36 +198,6 @@ static void stih4xx_fix_retime_src(void *priv, u32 spd)
 			   stih4xx_tx_retime_val[src]);
 }
 
-static void stid127_fix_retime_src(void *priv, u32 spd)
-{
-	struct sti_dwmac *dwmac = priv;
-	u32 reg = dwmac->ctrl_reg;
-	u32 freq = 0;
-	u32 val = 0;
-
-	if (dwmac->interface == PHY_INTERFACE_MODE_MII) {
-		val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK;
-	} else if (dwmac->interface == PHY_INTERFACE_MODE_RMII) {
-		if (!dwmac->ext_phyclk) {
-			val = STID127_ETH_SEL_INTERNAL_NOTEXT_PHYCLK;
-			freq = DWMAC_50MHZ;
-		}
-	} else if (IS_PHY_IF_MODE_RGMII(dwmac->interface)) {
-		val = STID127_ETH_SEL_INTERNAL_NOTEXT_TXCLK;
-		if (spd == SPEED_1000)
-			freq = DWMAC_125MHZ;
-		else if (spd == SPEED_100)
-			freq = DWMAC_25MHZ;
-		else if (spd == SPEED_10)
-			freq = DWMAC_2_5MHZ;
-	}
-
-	if (dwmac->clk && freq)
-		clk_set_rate(dwmac->clk, freq);
-
-	regmap_update_bits(dwmac->regmap, reg, STID127_RETIME_SRC_MASK, val);
-}
-
 static int sti_dwmac_init(struct platform_device *pdev, void *priv)
 {
 	struct sti_dwmac *dwmac = priv;
@@ -372,14 +342,7 @@ static const struct sti_dwmac_of_data stih4xx_dwmac_data = {
 	.fix_retime_src = stih4xx_fix_retime_src,
 };
 
-static const struct sti_dwmac_of_data stid127_dwmac_data = {
-	.fix_retime_src = stid127_fix_retime_src,
-};
-
 static const struct of_device_id sti_dwmac_match[] = {
-	{ .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},
-	{ .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},
-	{ .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},
 	{ .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},
 	{ }
 };
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1483309 — [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc.

STiH415/6 SoC support is being removed from the kernel.
This patch updates the sti dt softreset bindings and
removes references to these obsolete platforms.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <p.zabel@pengutronix.de>
---
 Documentation/devicetree/bindings/reset/st,sti-softreset.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
index 891a2fd..a21658f 100644
--- a/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-softreset.txt
@@ -15,15 +15,14 @@ Please refer to reset.txt in this directory for common reset
 controller binding usage.
 
 Required properties:
-- compatible: Should be "st,<chip>-softreset" example:
-	"st,stih415-softreset" or "st,stih416-softreset";
+- compatible: Should be st,stih407-softreset";
 - #reset-cells: 1, see below
 
 example:
 
 	softreset: softreset-controller {
 		#reset-cells = <1>;
-		compatible = "st,stih415-softreset";
+		compatible = "st,stih407-softreset";
 	};
 
 
@@ -42,5 +41,4 @@ example:
 
 Macro definitions for the supported reset channels can be found in:
 
-include/dt-bindings/reset/stih415-resets.h
-include/dt-bindings/reset/stih416-resets.h
+include/dt-bindings/reset/stih407-resets.h
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1483310 — [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.

STiH415/6 SoC's are being removed from the kernel. This
patch removes the compatibles from the dt doc and also
updates the example to a supported platform.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <rui.zhang@intel.com>
Cc: <edubezval@gmail.com>
Cc: <robh+dt@kernel.org>
---
 .../devicetree/bindings/thermal/st-thermal.txt     | 28 +++++++---------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/Documentation/devicetree/bindings/thermal/st-thermal.txt b/Documentation/devicetree/bindings/thermal/st-thermal.txt
index 3b9251b..a2f9391 100644
--- a/Documentation/devicetree/bindings/thermal/st-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/st-thermal.txt
@@ -3,17 +3,8 @@ Binding for Thermal Sensor driver for STMicroelectronics STi series of SoCs.
 Required parameters:
 -------------------
 
-compatible : 	st,<SoC>-<module>-thermal; should be one of:
-		  "st,stih415-sas-thermal",
-		  "st,stih415-mpe-thermal",
-		  "st,stih416-sas-thermal"
-		  "st,stih416-mpe-thermal"
-		  "st,stid127-thermal" or
-		  "st,stih407-thermal"
-		according to the SoC type (stih415, stih416, stid127, stih407)
-		and module type (sas or mpe). On stid127 & stih407 there is only
-		one die/module, so there is no module type in the compatible
-		string.
+compatible : 	Should be "st,stih407-thermal"
+
 clock-names : 	Should be "thermal".
 		  See: Documentation/devicetree/bindings/resource-names.txt
 clocks : 	Phandle of the clock used by the thermal sensor.
@@ -25,18 +16,17 @@ Optional parameters:
 reg : 		For non-sysconf based sensors, this should be the physical base
 		address and length of the sensor's registers.
 interrupts :	Standard way to define interrupt number.
-		Interrupt is mandatory to be defined when compatible is
-		"stih416-mpe-thermal".
 		  NB: For thermal sensor's for which no interrupt has been
 		  defined, a polling delay of 1000ms will be used to read the
 		  temperature from device.
 
 Example:
 
-	temp1@fdfe8000 {
-		compatible	= "st,stih416-mpe-thermal";
-		reg		= <0xfdfe8000 0x10>;
-		clock-names	= "thermal";
-		clocks		= <&clk_m_mpethsens>;
-		interrupts	= <GIC_SPI 23 IRQ_TYPE_NONE>;
+	temp0@91a0000 {
+		compatible = "st,stih407-thermal";
+		reg = <0x91a0000 0x28>;
+		clock-names = "thermal";
+		clocks = <&CLK_SYSIN>;
+		interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
+		st,passive_cooling_temp = <110>;
 	};
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1483312 — [PATCH 07/19] ahci: st: Remove STiH416 dt example

This platform is being removed from the kernel so remove
the dt example.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <tj@kernel.org>
Cc: <robh+dt@kernel.org>
Cc: <linux-ide@vger.kernel.org>
---
 Documentation/devicetree/bindings/ata/ahci-st.txt | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/Documentation/devicetree/bindings/ata/ahci-st.txt b/Documentation/devicetree/bindings/ata/ahci-st.txt
index e1d01df..909c993 100644
--- a/Documentation/devicetree/bindings/ata/ahci-st.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-st.txt
@@ -18,21 +18,6 @@ Optional properties:
 
 Example:
 
-	/* Example for stih416 */
-	sata0: sata@fe380000 {
-		compatible	= "st,ahci";
-		reg		= <0xfe380000 0x1000>;
-		interrupts	= <GIC_SPI 157 IRQ_TYPE_NONE>;
-		interrupt-names	= "hostc";
-		phys		= <&phy_port0 PHY_TYPE_SATA>;
-		phy-names	= "ahci_phy";
-		resets		= <&powerdown STIH416_SATA0_POWERDOWN>,
-				  <&softreset STIH416_SATA0_SOFTRESET>;
-		reset-names	= "pwr-dwn", "sw-rst";
-		clocks		= <&clk_s_a0_ls CLK_ICN_REG>;
-		clock-names	= "ahci_clk";
-	};
-
 	/* Example for stih407 family silicon */
 	sata0: sata@9b20000 {
 		compatible	= "st,ahci";
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1485138 — Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example

On Wed, Sep 14, 2016 at 02:27:45PM +0100, Peter Griffin wrote:
> This platform is being removed from the kernel so remove
> the dt example.
> 
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Cc: <tj@kernel.org>
> Cc: <robh+dt@kernel.org>
> Cc: <linux-ide@vger.kernel.org>

This is gonna go through dt tree, right?  If it should go through
libata, please let me know.

Thanks.

-- 
tejun

[toc] | [prev] | [next] | [standalone]

#1486201 — Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example

On 09/16/2016 05:54 PM, Tejun Heo wrote:
> On Wed, Sep 14, 2016 at 02:27:45PM +0100, Peter Griffin wrote:
>> This platform is being removed from the kernel so remove
>> the dt example.
>>
>> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
>> Cc: <tj@kernel.org>
>> Cc: <robh+dt@kernel.org>
>> Cc: <linux-ide@vger.kernel.org>
> 
> This is gonna go through dt tree, right?  If it should go through
> libata, please let me know.

Hi Tejun

I will take care of this patch and include it in the next STi DT pull request.

Thanks

> 
> Thanks.
> 

[toc] | [prev] | [next] | [standalone]

#1483314 — [PATCH 09/19] thermal: sti: Remove obsolete STiH416 platform support.

STiH415/6 SoC support is being removed from the kernel.
This patch removes support from the thermal driver.
Also it updates the register defines and removes
the SoC and die prefix as neither of these are relevant
in the context of STiH407 based silicon (STiH415/6 were
dual die SoCs with an MPE die and SAS die).

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <rui.zhang@intel.com>
Cc: <edubezval@gmail.com>
---
 drivers/thermal/st/st_thermal_memmap.c | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/drivers/thermal/st/st_thermal_memmap.c b/drivers/thermal/st/st_thermal_memmap.c
index fc0c9e1..d53965d 100644
--- a/drivers/thermal/st/st_thermal_memmap.c
+++ b/drivers/thermal/st/st_thermal_memmap.c
@@ -15,10 +15,10 @@
 
 #include "st_thermal.h"
 
-#define STIH416_MPE_CONF			0x0
-#define STIH416_MPE_STATUS			0x4
-#define STIH416_MPE_INT_THRESH			0x8
-#define STIH416_MPE_INT_EN			0xC
+#define CONF                       0x0
+#define STATUS                     0x4
+#define INT_THRESH                 0x8
+#define INT_EN                     0xC
 
 /* Power control bits for the memory mapped thermal sensor */
 #define THERMAL_PDN				BIT(4)
@@ -31,11 +31,11 @@ static const struct reg_field st_mmap_thermal_regfields[MAX_REGFIELDS] = {
 	 * written simultaneously for powering on and off the temperature
 	 * sensor. regmap_update_bits() will be used to update the register.
 	 */
-	[INT_THRESH_HI]	= REG_FIELD(STIH416_MPE_INT_THRESH, 	0,  7),
-	[DCORRECT]	= REG_FIELD(STIH416_MPE_CONF,		5,  9),
-	[OVERFLOW]	= REG_FIELD(STIH416_MPE_STATUS,		9,  9),
-	[DATA]		= REG_FIELD(STIH416_MPE_STATUS,		11, 18),
-	[INT_ENABLE]	= REG_FIELD(STIH416_MPE_INT_EN,		0,  0),
+	[INT_THRESH_HI]	= REG_FIELD(INT_THRESH,		0,  7),
+	[DCORRECT]	= REG_FIELD(CONF,		5,  9),
+	[OVERFLOW]	= REG_FIELD(STATUS,		9,  9),
+	[DATA]		= REG_FIELD(STATUS,		11, 18),
+	[INT_ENABLE]	= REG_FIELD(INT_EN,		0,  0),
 };
 
 static irqreturn_t st_mmap_thermal_trip_handler(int irq, void *sdata)
@@ -54,7 +54,7 @@ static int st_mmap_power_ctrl(struct st_thermal_sensor *sensor,
 	const unsigned int mask = (THERMAL_PDN | THERMAL_SRSTN);
 	const unsigned int val = power_state ? mask : 0;
 
-	return regmap_update_bits(sensor->regmap, STIH416_MPE_CONF, mask, val);
+	return regmap_update_bits(sensor->regmap, CONF, mask, val);
 }
 
 static int st_mmap_alloc_regfields(struct st_thermal_sensor *sensor)
@@ -114,7 +114,7 @@ static int st_mmap_register_enable_irq(struct st_thermal_sensor *sensor)
 	return st_mmap_enable_irq(sensor);
 }
 
-static const struct regmap_config st_416mpe_regmap_config = {
+static const struct regmap_config st_thermal_regmap_config = {
 	.reg_bits = 32,
 	.val_bits = 32,
 	.reg_stride = 4,
@@ -139,7 +139,7 @@ static int st_mmap_regmap_init(struct st_thermal_sensor *sensor)
 	}
 
 	sensor->regmap = devm_regmap_init_mmio(dev, sensor->mmio_base,
-				&st_416mpe_regmap_config);
+				&st_thermal_regmap_config);
 	if (IS_ERR(sensor->regmap)) {
 		dev_err(dev, "failed to initialise regmap\n");
 		return PTR_ERR(sensor->regmap);
@@ -156,15 +156,6 @@ static const struct st_thermal_sensor_ops st_mmap_sensor_ops = {
 	.enable_irq		= st_mmap_enable_irq,
 };
 
-/* Compatible device data stih416 mpe thermal sensor */
-static const struct st_thermal_compat_data st_416mpe_cdata = {
-	.reg_fields		= st_mmap_thermal_regfields,
-	.ops			= &st_mmap_sensor_ops,
-	.calibration_val	= 14,
-	.temp_adjust_val	= -95,
-	.crit_temp		= 120,
-};
-
 /* Compatible device data stih407 thermal sensor */
 static const struct st_thermal_compat_data st_407_cdata = {
 	.reg_fields		= st_mmap_thermal_regfields,
@@ -175,7 +166,6 @@ static const struct st_thermal_compat_data st_407_cdata = {
 };
 
 static const struct of_device_id st_mmap_thermal_of_match[] = {
-	{ .compatible = "st,stih416-mpe-thermal", .data = &st_416mpe_cdata },
 	{ .compatible = "st,stih407-thermal",     .data = &st_407_cdata },
 	{ /* sentinel */ }
 };
-- 
1.9.1

[toc] | [prev] | [standalone]

Page 2 of 2 — ← Prev page 1 [2]

Back to top | Article view | linux.kernel

csiph-web