Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1483289 > unrolled thread
| Started by | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| First post | 2016-09-14 15:30 +0200 |
| Last post | 2016-09-14 15:40 +0200 |
| Articles | 20 on this page of 27 — 7 participants |
Back to article view | Back to linux.kernel
[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 1 of 2 [1] 2 Next page →
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:30 +0200 |
| Subject | [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support |
| Message-ID | <shiqd-1oQ-3@gated-at.bofh.it> |
Resending due to incorrect Cc tags.
ST have sent patches which remove clock support for these SoCs [1]
which once applied mean the platform will no longer boot.
This series cleans up various STi platform drivers which have
support for these SoC's, by removing code, and updating the DT
documentation accordingly. Some drivers such as miphy365 and
stih41x-usb can be removed completely because the IP is only
found on these legacy SoC's.
Once this series is applied, drm display driver, and ALSA SoC
are the main two remaining references to the legacy SoCs, other
than clocks which already have patches on the ML.
regards,
Peter.
[1] https://patchwork.kernel.org/patch/9157571/
Peter Griffin (19):
phy: phy-miphy365x: Remove miphy365 driver and dt binding
documentation.
phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
MAINTAINERS: Remove phy-miphy365x.c entry from STi arch
MAINTAINERS: Remove phy-stih41x-usb.c entry from STi arch
ARM: multi_v7_defconfig: Remove miphy365 phy.
ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol.
ahci: st: Remove STiH416 dt example
thermal: sti: Remove obsolete platforms from the DT doc.
thermal: sti: Remove obsolete STiH416 platform support.
watchdog: bindings: Remove obsolete platforms from dt doc.
watchdog: st_wdt: Remove support for obsolete platforms
reset: sti: Remove obsolete platforms from dt binding doc.
pinctrl: st: Remove STiH415/6 SoC pinctrl driver support.
pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc
reset: sti: Remove STiH415/6 reset support
power: reset: st-poweroff: Remove obsolete platforms.
power: reset: st: Remove obsolete platforms from dt doc
stmmac: dwmac-sti: Remove obsolete STi platforms
reset: sti: softreset: Remove obsolete platforms from dt binding doc.
Documentation/devicetree/bindings/ata/ahci-st.txt | 15 -
.../devicetree/bindings/net/sti-dwmac.txt | 3 +-
.../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
.../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 -
.../devicetree/bindings/pinctrl/pinctrl-st.txt | 33 +-
.../devicetree/bindings/power/reset/st-reset.txt | 7 +-
.../devicetree/bindings/reset/st,sti-powerdown.txt | 12 +-
.../devicetree/bindings/reset/st,sti-softreset.txt | 8 +-
.../devicetree/bindings/thermal/st-thermal.txt | 28 +-
.../devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +-
MAINTAINERS | 2 -
arch/arm/configs/multi_v7_defconfig | 2 -
arch/arm/mach-sti/Kconfig | 2 -
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 --
drivers/phy/Kconfig | 18 -
drivers/phy/Makefile | 2 -
drivers/phy/phy-miphy365x.c | 625 ---------------------
drivers/phy/phy-stih41x-usb.c | 188 -------
drivers/pinctrl/pinctrl-st.c | 76 +--
drivers/power/reset/st-poweroff.c | 41 --
drivers/reset/sti/Kconfig | 8 -
drivers/reset/sti/Makefile | 2 -
drivers/reset/sti/reset-stih415.c | 112 ----
drivers/reset/sti/reset-stih416.c | 143 -----
drivers/thermal/st/st_thermal_memmap.c | 34 +-
drivers/watchdog/st_lpc_wdt.c | 33 --
26 files changed, 65 insertions(+), 1470 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
delete mode 100644 drivers/phy/phy-miphy365x.c
delete mode 100644 drivers/phy/phy-stih41x-usb.c
delete mode 100644 drivers/reset/sti/reset-stih415.c
delete mode 100644 drivers/reset/sti/reset-stih416.c
--
1.9.1
[toc] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc. |
| Message-ID | <shizT-1s7-1@gated-at.bofh.it> |
| In reply to | #1483289 |
STiH415/6 SoC support is being removed from the kernel so update the dt bding document to reflect this. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Cc: <wim@iguana.be> Cc: <linux@roeck-us.net> Cc: <robh+dt@kernel.org> Cc: <linux-watchdog@vger.kernel.org> --- Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt b/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt index 039c5ca..b949039 100644 --- a/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt @@ -9,8 +9,7 @@ functionality. Required properties -- compatible : Must be one of: "st,stih407-lpc" "st,stih416-lpc" - "st,stih415-lpc" "st,stid127-lpc" +- compatible : Should be: "st,stih407-lpc" - reg : LPC registers base address + size - interrupts : LPC interrupt line number and associated flags - clocks : Clock used by LPC device (See: ../clock/clock-bindings.txt) -- 1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2016-09-15 00:20 +0200 |
| Subject | Re: [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc. |
| Message-ID | <shqH7-6Kt-17@gated-at.bofh.it> |
| In reply to | #1483290 |
On Wed, Sep 14, 2016 at 02:27:48PM +0100, Peter Griffin wrote: > STiH415/6 SoC support is being removed from the kernel > so update the dt bding document to reflect this. > > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > Cc: <wim@iguana.be> > Cc: <linux@roeck-us.net> > Cc: <robh+dt@kernel.org> > Cc: <linux-watchdog@vger.kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt b/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt > index 039c5ca..b949039 100644 > --- a/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt > +++ b/Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt > @@ -9,8 +9,7 @@ functionality. > > Required properties > > -- compatible : Must be one of: "st,stih407-lpc" "st,stih416-lpc" > - "st,stih415-lpc" "st,stid127-lpc" > +- compatible : Should be: "st,stih407-lpc" > - reg : LPC registers base address + size > - interrupts : LPC interrupt line number and associated flags > - clocks : Clock used by LPC device (See: ../clock/clock-bindings.txt) > -- > 1.9.1 >
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 15/19] reset: sti: Remove STiH415/6 reset support |
| Message-ID | <shizU-1s7-9@gated-at.bofh.it> |
| In reply to | #1483289 |
Support for STiH415/6 SoCs is being removed from the
kernel because the platforms are obsolete. This patch removes
the reset drivers for these SoC's.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <p.zabel@pengutronix.de>
---
arch/arm/mach-sti/Kconfig | 2 -
drivers/reset/sti/Kconfig | 8 ---
drivers/reset/sti/Makefile | 2 -
drivers/reset/sti/reset-stih415.c | 112 -----------------------------
drivers/reset/sti/reset-stih416.c | 143 --------------------------------------
5 files changed, 267 deletions(-)
delete mode 100644 drivers/reset/sti/reset-stih415.c
delete mode 100644 drivers/reset/sti/reset-stih416.c
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 119e110..f8eeeff 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -28,7 +28,6 @@ if ARCH_STI
config SOC_STIH415
bool "STiH415 STMicroelectronics Consumer Electronics family"
default y
- select STIH415_RESET
help
This enables support for STMicroelectronics Digital Consumer
Electronics family StiH415 parts, primarily targeted at set-top-box
@@ -38,7 +37,6 @@ config SOC_STIH415
config SOC_STIH416
bool "STiH416 STMicroelectronics Consumer Electronics family"
default y
- select STIH416_RESET
help
This enables support for STMicroelectronics Digital Consumer
Electronics family StiH416 parts, primarily targeted at set-top-box
diff --git a/drivers/reset/sti/Kconfig b/drivers/reset/sti/Kconfig
index 6131785..71592b5 100644
--- a/drivers/reset/sti/Kconfig
+++ b/drivers/reset/sti/Kconfig
@@ -3,14 +3,6 @@ if ARCH_STI
config STI_RESET_SYSCFG
bool
-config STIH415_RESET
- bool
- select STI_RESET_SYSCFG
-
-config STIH416_RESET
- bool
- select STI_RESET_SYSCFG
-
config STIH407_RESET
bool
select STI_RESET_SYSCFG
diff --git a/drivers/reset/sti/Makefile b/drivers/reset/sti/Makefile
index dc85dfb..f9d8241 100644
--- a/drivers/reset/sti/Makefile
+++ b/drivers/reset/sti/Makefile
@@ -1,5 +1,3 @@
obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o
-obj-$(CONFIG_STIH415_RESET) += reset-stih415.o
-obj-$(CONFIG_STIH416_RESET) += reset-stih416.o
obj-$(CONFIG_STIH407_RESET) += reset-stih407.o
diff --git a/drivers/reset/sti/reset-stih415.c b/drivers/reset/sti/reset-stih415.c
deleted file mode 100644
index 6f220cd..0000000
--- a/drivers/reset/sti/reset-stih415.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2013 STMicroelectronics (R&D) Limited
- * Author: Stephen Gallimore <stephen.gallimore@st.com>
- * Author: Srinivas Kandagatla <srinivas.kandagatla@st.com>
- *
- * This program 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.
- */
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/platform_device.h>
-
-#include <dt-bindings/reset/stih415-resets.h>
-
-#include "reset-syscfg.h"
-
-/*
- * STiH415 Peripheral powerdown definitions.
- */
-static const char stih415_front[] = "st,stih415-front-syscfg";
-static const char stih415_rear[] = "st,stih415-rear-syscfg";
-static const char stih415_sbc[] = "st,stih415-sbc-syscfg";
-static const char stih415_lpm[] = "st,stih415-lpm-syscfg";
-
-#define STIH415_PDN_FRONT(_bit) \
- _SYSCFG_RST_CH(stih415_front, SYSCFG_114, _bit, SYSSTAT_187, _bit)
-
-#define STIH415_PDN_REAR(_cntl, _stat) \
- _SYSCFG_RST_CH(stih415_rear, SYSCFG_336, _cntl, SYSSTAT_384, _stat)
-
-#define STIH415_SRST_REAR(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih415_rear, _reg, _bit)
-
-#define STIH415_SRST_SBC(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih415_sbc, _reg, _bit)
-
-#define STIH415_SRST_FRONT(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih415_front, _reg, _bit)
-
-#define STIH415_SRST_LPM(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih415_lpm, _reg, _bit)
-
-#define SYSCFG_114 0x38 /* Powerdown request EMI/NAND/Keyscan */
-#define SYSSTAT_187 0x15c /* Powerdown status EMI/NAND/Keyscan */
-
-#define SYSCFG_336 0x90 /* Powerdown request USB/SATA/PCIe */
-#define SYSSTAT_384 0x150 /* Powerdown status USB/SATA/PCIe */
-
-#define SYSCFG_376 0x130 /* Reset generator 0 control 0 */
-#define SYSCFG_166 0x108 /* Softreset Ethernet 0 */
-#define SYSCFG_31 0x7c /* Softreset Ethernet 1 */
-#define LPM_SYSCFG_1 0x4 /* Softreset IRB */
-
-static const struct syscfg_reset_channel_data stih415_powerdowns[] = {
- [STIH415_EMISS_POWERDOWN] = STIH415_PDN_FRONT(0),
- [STIH415_NAND_POWERDOWN] = STIH415_PDN_FRONT(1),
- [STIH415_KEYSCAN_POWERDOWN] = STIH415_PDN_FRONT(2),
- [STIH415_USB0_POWERDOWN] = STIH415_PDN_REAR(0, 0),
- [STIH415_USB1_POWERDOWN] = STIH415_PDN_REAR(1, 1),
- [STIH415_USB2_POWERDOWN] = STIH415_PDN_REAR(2, 2),
- [STIH415_SATA0_POWERDOWN] = STIH415_PDN_REAR(3, 3),
- [STIH415_SATA1_POWERDOWN] = STIH415_PDN_REAR(4, 4),
- [STIH415_PCIE_POWERDOWN] = STIH415_PDN_REAR(5, 8),
-};
-
-static const struct syscfg_reset_channel_data stih415_softresets[] = {
- [STIH415_ETH0_SOFTRESET] = STIH415_SRST_FRONT(SYSCFG_166, 0),
- [STIH415_ETH1_SOFTRESET] = STIH415_SRST_SBC(SYSCFG_31, 0),
- [STIH415_IRB_SOFTRESET] = STIH415_SRST_LPM(LPM_SYSCFG_1, 6),
- [STIH415_USB0_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 9),
- [STIH415_USB1_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 10),
- [STIH415_USB2_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 11),
- [STIH415_KEYSCAN_SOFTRESET] = STIH415_SRST_LPM(LPM_SYSCFG_1, 8),
-};
-
-static struct syscfg_reset_controller_data stih415_powerdown_controller = {
- .wait_for_ack = true,
- .nr_channels = ARRAY_SIZE(stih415_powerdowns),
- .channels = stih415_powerdowns,
-};
-
-static struct syscfg_reset_controller_data stih415_softreset_controller = {
- .wait_for_ack = false,
- .active_low = true,
- .nr_channels = ARRAY_SIZE(stih415_softresets),
- .channels = stih415_softresets,
-};
-
-static const struct of_device_id stih415_reset_match[] = {
- { .compatible = "st,stih415-powerdown",
- .data = &stih415_powerdown_controller, },
- { .compatible = "st,stih415-softreset",
- .data = &stih415_softreset_controller, },
- {},
-};
-
-static struct platform_driver stih415_reset_driver = {
- .probe = syscfg_reset_probe,
- .driver = {
- .name = "reset-stih415",
- .of_match_table = stih415_reset_match,
- },
-};
-
-static int __init stih415_reset_init(void)
-{
- return platform_driver_register(&stih415_reset_driver);
-}
-arch_initcall(stih415_reset_init);
diff --git a/drivers/reset/sti/reset-stih416.c b/drivers/reset/sti/reset-stih416.c
deleted file mode 100644
index c581d606e..0000000
--- a/drivers/reset/sti/reset-stih416.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2013 STMicroelectronics (R&D) Limited
- * Author: Stephen Gallimore <stephen.gallimore@st.com>
- * Author: Srinivas Kandagatla <srinivas.kandagatla@st.com>
- *
- * This program 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.
- */
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/platform_device.h>
-
-#include <dt-bindings/reset/stih416-resets.h>
-
-#include "reset-syscfg.h"
-
-/*
- * STiH416 Peripheral powerdown definitions.
- */
-static const char stih416_front[] = "st,stih416-front-syscfg";
-static const char stih416_rear[] = "st,stih416-rear-syscfg";
-static const char stih416_sbc[] = "st,stih416-sbc-syscfg";
-static const char stih416_lpm[] = "st,stih416-lpm-syscfg";
-static const char stih416_cpu[] = "st,stih416-cpu-syscfg";
-
-#define STIH416_PDN_FRONT(_bit) \
- _SYSCFG_RST_CH(stih416_front, SYSCFG_1500, _bit, SYSSTAT_1578, _bit)
-
-#define STIH416_PDN_REAR(_cntl, _stat) \
- _SYSCFG_RST_CH(stih416_rear, SYSCFG_2525, _cntl, SYSSTAT_2583, _stat)
-
-#define SYSCFG_1500 0x7d0 /* Powerdown request EMI/NAND/Keyscan */
-#define SYSSTAT_1578 0x908 /* Powerdown status EMI/NAND/Keyscan */
-
-#define SYSCFG_2525 0x834 /* Powerdown request USB/SATA/PCIe */
-#define SYSSTAT_2583 0x91c /* Powerdown status USB/SATA/PCIe */
-
-#define SYSCFG_2552 0x8A0 /* Reset Generator control 0 */
-#define SYSCFG_1539 0x86c /* Softreset Ethernet 0 */
-#define SYSCFG_510 0x7f8 /* Softreset Ethernet 1 */
-#define LPM_SYSCFG_1 0x4 /* Softreset IRB */
-#define SYSCFG_2553 0x8a4 /* Softreset SATA0/1, PCIE0/1 */
-#define SYSCFG_7563 0x8cc /* MPE softresets 0 */
-#define SYSCFG_7564 0x8d0 /* MPE softresets 1 */
-
-#define STIH416_SRST_CPU(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih416_cpu, _reg, _bit)
-
-#define STIH416_SRST_FRONT(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih416_front, _reg, _bit)
-
-#define STIH416_SRST_REAR(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih416_rear, _reg, _bit)
-
-#define STIH416_SRST_LPM(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih416_lpm, _reg, _bit)
-
-#define STIH416_SRST_SBC(_reg, _bit) \
- _SYSCFG_RST_CH_NO_ACK(stih416_sbc, _reg, _bit)
-
-static const struct syscfg_reset_channel_data stih416_powerdowns[] = {
- [STIH416_EMISS_POWERDOWN] = STIH416_PDN_FRONT(0),
- [STIH416_NAND_POWERDOWN] = STIH416_PDN_FRONT(1),
- [STIH416_KEYSCAN_POWERDOWN] = STIH416_PDN_FRONT(2),
- [STIH416_USB0_POWERDOWN] = STIH416_PDN_REAR(0, 0),
- [STIH416_USB1_POWERDOWN] = STIH416_PDN_REAR(1, 1),
- [STIH416_USB2_POWERDOWN] = STIH416_PDN_REAR(2, 2),
- [STIH416_USB3_POWERDOWN] = STIH416_PDN_REAR(6, 5),
- [STIH416_SATA0_POWERDOWN] = STIH416_PDN_REAR(3, 3),
- [STIH416_SATA1_POWERDOWN] = STIH416_PDN_REAR(4, 4),
- [STIH416_PCIE0_POWERDOWN] = STIH416_PDN_REAR(7, 9),
- [STIH416_PCIE1_POWERDOWN] = STIH416_PDN_REAR(5, 8),
-};
-
-static const struct syscfg_reset_channel_data stih416_softresets[] = {
- [STIH416_ETH0_SOFTRESET] = STIH416_SRST_FRONT(SYSCFG_1539, 0),
- [STIH416_ETH1_SOFTRESET] = STIH416_SRST_SBC(SYSCFG_510, 0),
- [STIH416_IRB_SOFTRESET] = STIH416_SRST_LPM(LPM_SYSCFG_1, 6),
- [STIH416_USB0_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 9),
- [STIH416_USB1_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 10),
- [STIH416_USB2_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 11),
- [STIH416_USB3_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 28),
- [STIH416_SATA0_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 7),
- [STIH416_SATA1_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 3),
- [STIH416_PCIE0_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 15),
- [STIH416_PCIE1_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 2),
- [STIH416_AUD_DAC_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 14),
- [STIH416_HDTVOUT_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 5),
- [STIH416_VTAC_M_RX_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 25),
- [STIH416_VTAC_A_RX_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2552, 26),
- [STIH416_SYNC_HD_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 5),
- [STIH416_SYNC_SD_SOFTRESET] = STIH416_SRST_REAR(SYSCFG_2553, 6),
- [STIH416_BLITTER_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 10),
- [STIH416_GPU_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 11),
- [STIH416_VTAC_M_TX_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 18),
- [STIH416_VTAC_A_TX_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 19),
- [STIH416_VTG_AUX_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 21),
- [STIH416_JPEG_DEC_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7563, 23),
- [STIH416_HVA_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 2),
- [STIH416_COMPO_M_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 3),
- [STIH416_COMPO_A_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 4),
- [STIH416_VP8_DEC_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 10),
- [STIH416_VTG_MAIN_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 16),
- [STIH416_KEYSCAN_SOFTRESET] = STIH416_SRST_LPM(LPM_SYSCFG_1, 8),
-};
-
-static struct syscfg_reset_controller_data stih416_powerdown_controller = {
- .wait_for_ack = true,
- .nr_channels = ARRAY_SIZE(stih416_powerdowns),
- .channels = stih416_powerdowns,
-};
-
-static struct syscfg_reset_controller_data stih416_softreset_controller = {
- .wait_for_ack = false,
- .active_low = true,
- .nr_channels = ARRAY_SIZE(stih416_softresets),
- .channels = stih416_softresets,
-};
-
-static const struct of_device_id stih416_reset_match[] = {
- { .compatible = "st,stih416-powerdown",
- .data = &stih416_powerdown_controller, },
- { .compatible = "st,stih416-softreset",
- .data = &stih416_softreset_controller, },
- {},
-};
-
-static struct platform_driver stih416_reset_driver = {
- .probe = syscfg_reset_probe,
- .driver = {
- .name = "reset-stih416",
- .of_match_table = stih416_reset_match,
- },
-};
-
-static int __init stih416_reset_init(void)
-{
- return platform_driver_register(&stih416_reset_driver);
-}
-arch_initcall(stih416_reset_init);
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms. |
| Message-ID | <shizU-1s7-13@gated-at.bofh.it> |
| In reply to | #1483289 |
This patch removes support for STiH415/6 SoC's from the
st-poweroff driver, as support for these platforms is
being removed from the kernel.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <dwmw2@infradead.org>
Cc: <dbaryshkov@gmail.com>
Cc: <sre@kernel.org>
Cc: <linux-pm@vger.kernel.org>
---
drivers/power/reset/st-poweroff.c | 41 ---------------------------------------
1 file changed, 41 deletions(-)
diff --git a/drivers/power/reset/st-poweroff.c b/drivers/power/reset/st-poweroff.c
index a488877..2046b31 100644
--- a/drivers/power/reset/st-poweroff.c
+++ b/drivers/power/reset/st-poweroff.c
@@ -28,28 +28,6 @@ struct reset_syscfg {
unsigned int mask_rst_msk;
};
-/* STiH415 */
-#define STIH415_SYSCFG_11 0x2c
-#define STIH415_SYSCFG_15 0x3c
-
-static struct reset_syscfg stih415_reset = {
- .offset_rst = STIH415_SYSCFG_11,
- .mask_rst = BIT(0),
- .offset_rst_msk = STIH415_SYSCFG_15,
- .mask_rst_msk = BIT(0)
-};
-
-/* STiH416 */
-#define STIH416_SYSCFG_500 0x7d0
-#define STIH416_SYSCFG_504 0x7e0
-
-static struct reset_syscfg stih416_reset = {
- .offset_rst = STIH416_SYSCFG_500,
- .mask_rst = BIT(0),
- .offset_rst_msk = STIH416_SYSCFG_504,
- .mask_rst_msk = BIT(0)
-};
-
/* STiH407 */
#define STIH407_SYSCFG_4000 0x0
#define STIH407_SYSCFG_4008 0x20
@@ -61,16 +39,6 @@ static struct reset_syscfg stih407_reset = {
.mask_rst_msk = BIT(0)
};
-/* STiD127 */
-#define STID127_SYSCFG_700 0x0
-#define STID127_SYSCFG_773 0x124
-
-static struct reset_syscfg stid127_reset = {
- .offset_rst = STID127_SYSCFG_773,
- .mask_rst = BIT(0),
- .offset_rst_msk = STID127_SYSCFG_700,
- .mask_rst_msk = BIT(8)
-};
static struct reset_syscfg *st_restart_syscfg;
@@ -99,17 +67,8 @@ static struct notifier_block st_restart_nb = {
static const struct of_device_id st_reset_of_match[] = {
{
- .compatible = "st,stih415-restart",
- .data = (void *)&stih415_reset,
- }, {
- .compatible = "st,stih416-restart",
- .data = (void *)&stih416_reset,
- }, {
.compatible = "st,stih407-restart",
.data = (void *)&stih407_reset,
- }, {
- .compatible = "st,stid127-restart",
- .data = (void *)&stid127_reset,
},
{}
};
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Sebastian Reichel <sre@kernel.org> |
|---|---|
| Date | 2016-09-19 21:40 +0200 |
| Subject | Re: [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms. |
| Message-ID | <sjcA2-17g-33@gated-at.bofh.it> |
| In reply to | #1483297 |
[Multipart message — attachments visible in raw view] — view raw
Hi, On Wed, Sep 14, 2016 at 02:27:54PM +0100, Peter Griffin wrote: > This patch removes support for STiH415/6 SoC's from the > st-poweroff driver, as support for these platforms is > being removed from the kernel. I queued this to power-supply's for-next branch. Please cc me to full thread next time, so that I can see what is goin on. -- Sebastian
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc |
| Message-ID | <shizU-1s7-23@gated-at.bofh.it> |
| In reply to | #1483289 |
STiH415/6 SoC support is being removed from the kernel.
This patch updates the ST pinctrl dt doc and removes
references to these obsolete platforms. It also updates
the dt example to the currently supported STiH407
platform.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <linus.walleij@linaro.org>
Cc: <robh+dt@kernel.org>
Cc: <linux-gpio@vger.kernel.org>
---
.../devicetree/bindings/pinctrl/pinctrl-st.txt | 33 +++++++++++-----------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt
index 26bcb18..78160cc 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt
@@ -30,8 +30,7 @@ Second type has a dedicated interrupt per gpio bank.
Pin controller node:
Required properties:
-- compatible : should be "st,<SOC>-<pio-block>-pinctrl"
- like st,stih415-sbc-pinctrl, st,stih415-front-pinctrl and so on.
+- compatible : should be "st,stih407-<pio-block>-pinctrl"
- st,syscfg : Should be a phandle of the syscfg node.
- st,retime-pin-mask : Should be mask to specify which pins can be retimed.
If the property is not present, it is assumed that all the pins in the
@@ -76,23 +75,23 @@ include/dt-bindings/interrupt-controller/irq.h
Example:
pin-controller-sbc {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "st,stih415-sbc-pinctrl";
- st,syscfg = <&syscfg_sbc>;
- reg = <0xfe61f080 0x4>;
- reg-names = "irqmux";
- interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "irqmux";
- ranges = <0 0xfe610000 0x5000>;
-
- PIO0: gpio@fe610000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "st,stih407-sbc-pinctrl";
+ st,syscfg = <&syscfg_sbc>;
+ reg = <0x0961f080 0x4>;
+ reg-names = "irqmux";
+ interrupts = <GIC_SPI 188 IRQ_TYPE_NONE>;
+ interrupt-names = "irqmux";
+ ranges = <0 0x09610000 0x6000>;
+
+ pio0: gpio@09610000 {
gpio-controller;
- #gpio-cells = <1>;
+ #gpio-cells = <1>;
interrupt-controller;
#interrupt-cells = <2>;
- reg = <0 0x100>;
- st,bank-name = "PIO0";
+ reg = <0x0 0x100>;
+ st,bank-name = "PIO0";
};
...
pin-functions nodes follow...
@@ -162,7 +161,7 @@ pin-controller {
sdhci0:sdhci@fe810000{
...
- interrupt-parent = <&PIO3>;
+ interrupt-parent = <&pio3>;
#interrupt-cells = <2>;
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; /* Interrupt line via PIO3-3 */
interrupt-names = "card-detect";
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Linus Walleij <linus.walleij@linaro.org> |
|---|---|
| Date | 2016-09-15 14:40 +0200 |
| Subject | Re: [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc |
| Message-ID | <shE7n-72q-25@gated-at.bofh.it> |
| In reply to | #1483298 |
On Wed, Sep 14, 2016 at 3:27 PM, Peter Griffin <peter.griffin@linaro.org> wrote: > STiH415/6 SoC support is being removed from the kernel. > This patch updates the ST pinctrl dt doc and removes > references to these obsolete platforms. It also updates > the dt example to the currently supported STiH407 > platform. > > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > Cc: <linus.walleij@linaro.org> > Cc: <robh+dt@kernel.org> > Cc: <linux-gpio@vger.kernel.org> Patch applied, had to do some rebasing so check the result. Yours, Linus Walleij
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol. |
| Message-ID | <shizU-1s7-15@gated-at.bofh.it> |
| In reply to | #1483289 |
This IP is only found on STiH415/6 silicon and support for these SoCs is being removed from the kernel. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Cc: <kishon@ti.com> --- arch/arm/configs/multi_v7_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 949ab7f..b26a541 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -855,7 +855,6 @@ CONFIG_PHY_ROCKCHIP_USB=m CONFIG_PHY_QCOM_APQ8064_SATA=m CONFIG_PHY_MIPHY28LP=y CONFIG_PHY_RCAR_GEN2=m -CONFIG_PHY_STIH41X_USB=y CONFIG_PHY_STIH407_USB=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_SUN9I_USB=y -- 1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Message-ID | <shizU-1s7-27@gated-at.bofh.it> |
| In reply to | #1483289 |
On Wednesday, September 14, 2016 2:27:38 PM CEST Peter Griffin wrote: > Resending due to incorrect Cc tags. > > ST have sent patches which remove clock support for these SoCs [1] > which once applied mean the platform will no longer boot. > > This series cleans up various STi platform drivers which have > support for these SoC's, by removing code, and updating the DT > documentation accordingly. Some drivers such as miphy365 and > stih41x-usb can be removed completely because the IP is only > found on these legacy SoC's. > > Once this series is applied, drm display driver, and ALSA SoC > are the main two remaining references to the legacy SoCs, other > than clocks which already have patches on the ML. It would be good to have a better explanation that "it's already broken by some other commit". Is this a platform that never shipped to end-users, or is it possible that someone out there actually has a machine with one of these SoCs? Arnd
[toc] | [prev] | [next] | [standalone]
| From | Patrice Chotard <patrice.chotard@st.com> |
|---|---|
| Date | 2016-09-14 16:10 +0200 |
| Subject | Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support |
| Message-ID | <shj2V-1R7-1@gated-at.bofh.it> |
| In reply to | #1483300 |
Hi Peter, Arnd On 09/14/2016 03:38 PM, Arnd Bergmann wrote: > On Wednesday, September 14, 2016 2:27:38 PM CEST Peter Griffin wrote: >> Resending due to incorrect Cc tags. >> >> ST have sent patches which remove clock support for these SoCs [1] >> which once applied mean the platform will no longer boot. >> >> This series cleans up various STi platform drivers which have >> support for these SoC's, by removing code, and updating the DT >> documentation accordingly. Some drivers such as miphy365 and >> stih41x-usb can be removed completely because the IP is only >> found on these legacy SoC's. >> >> Once this series is applied, drm display driver, and ALSA SoC >> are the main two remaining references to the legacy SoCs, other >> than clocks which already have patches on the ML. > > It would be good to have a better explanation that "it's already > broken by some other commit". Is this a platform that never shipped > to end-users, or is it possible that someone out there actually > has a machine with one of these SoCs? This series is prematured as today STiH415/416 is not broken by any commit. This series is depending on the merge of a ST's clock series not yet upstreamed. (see https://patchwork.kernel.org/patch/9157571/) STMicroelectronics expect to remove STiH415/416 in a near future from upstream kernel. Patrice > > Arnd >
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-15 09:10 +0200 |
| Subject | Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support |
| Message-ID | <shyY1-3SK-11@gated-at.bofh.it> |
| In reply to | #1483300 |
Hi Arnd, On Wed, 14 Sep 2016, Arnd Bergmann wrote: > On Wednesday, September 14, 2016 2:27:38 PM CEST Peter Griffin wrote: > > Resending due to incorrect Cc tags. > > > > ST have sent patches which remove clock support for these SoCs [1] > > which once applied mean the platform will no longer boot. > > > > This series cleans up various STi platform drivers which have > > support for these SoC's, by removing code, and updating the DT > > documentation accordingly. Some drivers such as miphy365 and > > stih41x-usb can be removed completely because the IP is only > > found on these legacy SoC's. > > > > Once this series is applied, drm display driver, and ALSA SoC > > are the main two remaining references to the legacy SoCs, other > > than clocks which already have patches on the ML. > > It would be good to have a better explanation that "it's already > broken by some other commit". Is this a platform that never shipped > to end-users, or is it possible that someone out there actually > has a machine with one of these SoCs? STiH415 I'm sure never shipped. I'm reasonably sure STiH416 didn't either. These SoCs were considered legacy even when I was at ST ~3 years ago. Also remember these are STB SoC's, so JTAG fuses are blown in production boxes, and also full security is enabled. This means the primary bootloader will only boot a signed kernel. So if a end user did happen to have a box they would be unable to upgrade their kernel. From the landing team perspective they were interesting in that they shared many IPs with the STiH407 family on which future chipsets were based, and were available to us when that silicon was harder to get hold of. So we used it as a vehicle for upstreaming so that upstream support was already quite good when STiH407 silicon did land on our desk. regards, Peter.
[toc] | [prev] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-09-15 14:10 +0200 |
| Message-ID | <shDEm-6P5-53@gated-at.bofh.it> |
| In reply to | #1483887 |
On Thursday, September 15, 2016 8:01:39 AM CEST Peter Griffin wrote: > > STiH415 I'm sure never shipped. I'm reasonably sure STiH416 didn't > either. These SoCs were considered legacy even when I was at ST > ~3 years ago. > > Also remember these are STB SoC's, so JTAG fuses are blown in > production boxes, and also full security is enabled. This means the > primary bootloader will only boot a signed kernel. So if a end user > did happen to have a box they would be unable to upgrade their kernel. > > From the landing team perspective they were interesting in that they > shared many IPs with the STiH407 family on which future chipsets were > based, and were available to us when that silicon was harder to get > hold of. So we used it as a vehicle for upstreaming so that upstream > support was already quite good when STiH407 silicon did land on our > desk. Ok, makes sense. I did stumble over one machine basedon STiH412 the other day [1], but there probably isn't much shared with that one. Since this a NAS server rather than an STB box, it's probably less locked-down and potentially a target for OpenWRT or similar. Arnd [1] http://www.heise.de/preisvergleich/synology-diskstation-ds216play-16tb-a1400885.html
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-19 11:00 +0200 |
| Subject | Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support |
| Message-ID | <sj2AF-3cw-1@gated-at.bofh.it> |
| In reply to | #1484069 |
Hi Arnd, On Thu, 15 Sep 2016, Arnd Bergmann wrote: > On Thursday, September 15, 2016 8:01:39 AM CEST Peter Griffin wrote: > > > > STiH415 I'm sure never shipped. I'm reasonably sure STiH416 didn't > > either. These SoCs were considered legacy even when I was at ST > > ~3 years ago. > > > > Also remember these are STB SoC's, so JTAG fuses are blown in > > production boxes, and also full security is enabled. This means the > > primary bootloader will only boot a signed kernel. So if a end user > > did happen to have a box they would be unable to upgrade their kernel. > > > > From the landing team perspective they were interesting in that they > > shared many IPs with the STiH407 family on which future chipsets were > > based, and were available to us when that silicon was harder to get > > hold of. So we used it as a vehicle for upstreaming so that upstream > > support was already quite good when STiH407 silicon did land on our > > desk. > > Ok, makes sense. I did stumble over one machine basedon STiH412 > the other day [1], but there probably isn't much shared with that > one. Since this a NAS server rather than an STB box, it's probably > less locked-down and potentially a target for OpenWRT or similar. I just double checked with ST and STiH412 is a STiH407 family based SoC so support still exists for this upstream. No idea what if any security is enabled on this product though. Most probably the A/V stack on it will be SDK2, although native upstream multimedia drivers for this chipset are looking pretty good now. Peter. > [1] http://www.heise.de/preisvergleich/synology-diskstation-ds216play-16tb-a1400885.html
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support. |
| Message-ID | <shizU-1s7-19@gated-at.bofh.it> |
| In reply to | #1483289 |
STiH415/6 SoC support is being removed from the kernel.
This patch updates the ST pinctrl driver and removes
references to these obsolete platforms. As some structures
referenced by STiH407 based configuration were shared with
STiH416 we update these names to match the remaining
supported platform.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <linus.walleij@linaro.org>
Cc: <linux-gpio@vger.kernel.org>
---
drivers/pinctrl/pinctrl-st.c | 76 ++++++++------------------------------------
1 file changed, 14 insertions(+), 62 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
index 0de1c67..e110441 100644
--- a/drivers/pinctrl/pinctrl-st.c
+++ b/drivers/pinctrl/pinctrl-st.c
@@ -335,61 +335,25 @@ struct st_pinctrl {
};
/* SOC specific data */
-/* STiH415 data */
-static const unsigned int stih415_input_delays[] = {0, 500, 1000, 1500};
-static const unsigned int stih415_output_delays[] = {0, 1000, 2000, 3000};
-
-#define STIH415_PCTRL_COMMON_DATA \
- .rt_style = st_retime_style_packed, \
- .input_delays = stih415_input_delays, \
- .ninput_delays = ARRAY_SIZE(stih415_input_delays), \
- .output_delays = stih415_output_delays, \
- .noutput_delays = ARRAY_SIZE(stih415_output_delays)
-
-static const struct st_pctl_data stih415_sbc_data = {
- STIH415_PCTRL_COMMON_DATA,
- .alt = 0, .oe = 5, .pu = 7, .od = 9, .rt = 16,
-};
-
-static const struct st_pctl_data stih415_front_data = {
- STIH415_PCTRL_COMMON_DATA,
- .alt = 0, .oe = 8, .pu = 10, .od = 12, .rt = 16,
-};
-
-static const struct st_pctl_data stih415_rear_data = {
- STIH415_PCTRL_COMMON_DATA,
- .alt = 0, .oe = 6, .pu = 8, .od = 10, .rt = 38,
-};
-
-static const struct st_pctl_data stih415_left_data = {
- STIH415_PCTRL_COMMON_DATA,
- .alt = 0, .oe = 3, .pu = 4, .od = 5, .rt = 6,
-};
-
-static const struct st_pctl_data stih415_right_data = {
- STIH415_PCTRL_COMMON_DATA,
- .alt = 0, .oe = 5, .pu = 7, .od = 9, .rt = 11,
-};
-/* STiH416 data */
-static const unsigned int stih416_delays[] = {0, 300, 500, 750, 1000, 1250,
+static const unsigned int stih407_delays[] = {0, 300, 500, 750, 1000, 1250,
1500, 1750, 2000, 2250, 2500, 2750, 3000, 3250 };
-static const struct st_pctl_data stih416_data = {
- .rt_style = st_retime_style_dedicated,
- .input_delays = stih416_delays,
- .ninput_delays = ARRAY_SIZE(stih416_delays),
- .output_delays = stih416_delays,
- .noutput_delays = ARRAY_SIZE(stih416_delays),
+static const struct st_pctl_data stih407_data = {
+ .rt_style = st_retime_style_dedicated,
+ .input_delays = stih407_delays,
+ .ninput_delays = ARRAY_SIZE(stih407_delays),
+ .output_delays = stih407_delays,
+ .noutput_delays = ARRAY_SIZE(stih407_delays),
.alt = 0, .oe = 40, .pu = 50, .od = 60, .rt = 100,
};
static const struct st_pctl_data stih407_flashdata = {
.rt_style = st_retime_style_none,
- .input_delays = stih416_delays,
- .ninput_delays = ARRAY_SIZE(stih416_delays),
- .output_delays = stih416_delays,
- .noutput_delays = ARRAY_SIZE(stih416_delays),
+ .input_delays = stih407_delays,
+ .ninput_delays = ARRAY_SIZE(stih407_delays),
+ .output_delays = stih407_delays,
+ .noutput_delays = ARRAY_SIZE(stih407_delays),
.alt = 0,
.oe = -1, /* Not Available */
.pu = -1, /* Not Available */
@@ -1579,21 +1543,9 @@ static int st_gpiolib_register_bank(struct st_pinctrl *info,
}
static const struct of_device_id st_pctl_of_match[] = {
- { .compatible = "st,stih415-sbc-pinctrl", .data = &stih415_sbc_data },
- { .compatible = "st,stih415-rear-pinctrl", .data = &stih415_rear_data },
- { .compatible = "st,stih415-left-pinctrl", .data = &stih415_left_data },
- { .compatible = "st,stih415-right-pinctrl",
- .data = &stih415_right_data },
- { .compatible = "st,stih415-front-pinctrl",
- .data = &stih415_front_data },
- { .compatible = "st,stih416-sbc-pinctrl", .data = &stih416_data},
- { .compatible = "st,stih416-front-pinctrl", .data = &stih416_data},
- { .compatible = "st,stih416-rear-pinctrl", .data = &stih416_data},
- { .compatible = "st,stih416-fvdp-fe-pinctrl", .data = &stih416_data},
- { .compatible = "st,stih416-fvdp-lite-pinctrl", .data = &stih416_data},
- { .compatible = "st,stih407-sbc-pinctrl", .data = &stih416_data},
- { .compatible = "st,stih407-front-pinctrl", .data = &stih416_data},
- { .compatible = "st,stih407-rear-pinctrl", .data = &stih416_data},
+ { .compatible = "st,stih407-sbc-pinctrl", .data = &stih407_data},
+ { .compatible = "st,stih407-front-pinctrl", .data = &stih407_data},
+ { .compatible = "st,stih407-rear-pinctrl", .data = &stih407_data},
{ .compatible = "st,stih407-flash-pinctrl", .data = &stih407_flashdata},
{ /* sentinel */ }
};
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Linus Walleij <linus.walleij@linaro.org> |
|---|---|
| Date | 2016-09-15 14:40 +0200 |
| Subject | Re: [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support. |
| Message-ID | <shE7o-72q-27@gated-at.bofh.it> |
| In reply to | #1483301 |
On Wed, Sep 14, 2016 at 3:27 PM, Peter Griffin <peter.griffin@linaro.org> wrote: > STiH415/6 SoC support is being removed from the kernel. > This patch updates the ST pinctrl driver and removes > references to these obsolete platforms. As some structures > referenced by STiH407 based configuration were shared with > STiH416 we update these names to match the remaining > supported platform. > > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > Cc: <linus.walleij@linaro.org> > Cc: <linux-gpio@vger.kernel.org> Patch applied. Yours, Linus Walleij
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy. |
| Message-ID | <shizU-1s7-31@gated-at.bofh.it> |
| In reply to | #1483289 |
This IP is only found on STiH415/6 silicon and support for these SoCs is being removed from the kernel. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Cc: <kishon@ti.com> --- arch/arm/configs/multi_v7_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 2c8665c..949ab7f 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -854,7 +854,6 @@ CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_USB=m CONFIG_PHY_QCOM_APQ8064_SATA=m CONFIG_PHY_MIPHY28LP=y -CONFIG_PHY_MIPHY365X=y CONFIG_PHY_RCAR_GEN2=m CONFIG_PHY_STIH41X_USB=y CONFIG_PHY_STIH407_USB=y -- 1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch |
| Message-ID | <shizV-1s7-51@gated-at.bofh.it> |
| In reply to | #1483289 |
Remove this driver as the IP is only found on STiH415/6 silicon, and support for these SoC's is being removed from the kernel. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Cc: <kishon@ti.com> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index db814a8..12c271c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1754,7 +1754,6 @@ F: drivers/media/rc/st_rc.c F: drivers/media/platform/sti/c8sectpfe/ F: drivers/mmc/host/sdhci-st.c F: drivers/phy/phy-miphy28lp.c -F: drivers/phy/phy-miphy365x.c F: drivers/phy/phy-stih407-usb.c F: drivers/phy/phy-stih41x-usb.c F: drivers/pinctrl/pinctrl-st.c -- 1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Peter Griffin <peter.griffin@linaro.org> |
|---|---|
| Date | 2016-09-14 15:40 +0200 |
| Subject | [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms |
| Message-ID | <shizU-1s7-39@gated-at.bofh.it> |
| In reply to | #1483289 |
STiH415/6 SoC support is being removed from the kernel.
This patch updates the watchdog driver to remove references
to these obsolete platforms.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <wim@iguana.be>
Cc: <linux@roeck-us.net>
Cc: <linux-watchdog@vger.kernel.org>
---
drivers/watchdog/st_lpc_wdt.c | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
index 14e9bad..e6100e4 100644
--- a/drivers/watchdog/st_lpc_wdt.c
+++ b/drivers/watchdog/st_lpc_wdt.c
@@ -52,27 +52,6 @@ struct st_wdog {
bool warm_reset;
};
-static struct st_wdog_syscfg stid127_syscfg = {
- .reset_type_reg = 0x004,
- .reset_type_mask = BIT(2),
- .enable_reg = 0x000,
- .enable_mask = BIT(2),
-};
-
-static struct st_wdog_syscfg stih415_syscfg = {
- .reset_type_reg = 0x0B8,
- .reset_type_mask = BIT(6),
- .enable_reg = 0x0B4,
- .enable_mask = BIT(7),
-};
-
-static struct st_wdog_syscfg stih416_syscfg = {
- .reset_type_reg = 0x88C,
- .reset_type_mask = BIT(6),
- .enable_reg = 0x888,
- .enable_mask = BIT(7),
-};
-
static struct st_wdog_syscfg stih407_syscfg = {
.enable_reg = 0x204,
.enable_mask = BIT(19),
@@ -83,18 +62,6 @@ static const struct of_device_id st_wdog_match[] = {
.compatible = "st,stih407-lpc",
.data = &stih407_syscfg,
},
- {
- .compatible = "st,stih416-lpc",
- .data = &stih416_syscfg,
- },
- {
- .compatible = "st,stih415-lpc",
- .data = &stih415_syscfg,
- },
- {
- .compatible = "st,stid127-lpc",
- .data = &stid127_syscfg,
- },
{},
};
MODULE_DEVICE_TABLE(of, st_wdog_match);
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2016-09-15 00:20 +0200 |
| Subject | Re: [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms |
| Message-ID | <shqH7-6Kt-1@gated-at.bofh.it> |
| In reply to | #1483305 |
On Wed, Sep 14, 2016 at 02:27:49PM +0100, Peter Griffin wrote:
> STiH415/6 SoC support is being removed from the kernel.
> This patch updates the watchdog driver to remove references
> to these obsolete platforms.
>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Cc: <wim@iguana.be>
> Cc: <linux@roeck-us.net>
> Cc: <linux-watchdog@vger.kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/st_lpc_wdt.c | 33 ---------------------------------
> 1 file changed, 33 deletions(-)
>
> diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c
> index 14e9bad..e6100e4 100644
> --- a/drivers/watchdog/st_lpc_wdt.c
> +++ b/drivers/watchdog/st_lpc_wdt.c
> @@ -52,27 +52,6 @@ struct st_wdog {
> bool warm_reset;
> };
>
> -static struct st_wdog_syscfg stid127_syscfg = {
> - .reset_type_reg = 0x004,
> - .reset_type_mask = BIT(2),
> - .enable_reg = 0x000,
> - .enable_mask = BIT(2),
> -};
> -
> -static struct st_wdog_syscfg stih415_syscfg = {
> - .reset_type_reg = 0x0B8,
> - .reset_type_mask = BIT(6),
> - .enable_reg = 0x0B4,
> - .enable_mask = BIT(7),
> -};
> -
> -static struct st_wdog_syscfg stih416_syscfg = {
> - .reset_type_reg = 0x88C,
> - .reset_type_mask = BIT(6),
> - .enable_reg = 0x888,
> - .enable_mask = BIT(7),
> -};
> -
> static struct st_wdog_syscfg stih407_syscfg = {
> .enable_reg = 0x204,
> .enable_mask = BIT(19),
> @@ -83,18 +62,6 @@ static const struct of_device_id st_wdog_match[] = {
> .compatible = "st,stih407-lpc",
> .data = &stih407_syscfg,
> },
> - {
> - .compatible = "st,stih416-lpc",
> - .data = &stih416_syscfg,
> - },
> - {
> - .compatible = "st,stih415-lpc",
> - .data = &stih415_syscfg,
> - },
> - {
> - .compatible = "st,stid127-lpc",
> - .data = &stid127_syscfg,
> - },
> {},
> };
> MODULE_DEVICE_TABLE(of, st_wdog_match);
> --
> 1.9.1
>
[toc] | [prev] | [next] | [standalone]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web