* [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A, lee.jones-QSEj5FYQhm4dnm+yROfE0A
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
This phy is only used on STiH415/6 based 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>
---
.../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
drivers/phy/Kconfig | 10 -
drivers/phy/Makefile | 1 -
drivers/phy/phy-miphy365x.c | 625 ---------------------
4 files changed, 713 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
delete mode 100644 drivers/phy/phy-miphy365x.c
diff --git a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
deleted file mode 100644
index 8772900..0000000
--- a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-STMicroelectronics STi MIPHY365x PHY binding
-============================================
-
-This binding describes a miphy device that is used to control PHY hardware
-for SATA and PCIe.
-
-Required properties (controller (parent) node):
-- compatible : Should be "st,miphy365x-phy"
-- st,syscfg : Phandle / integer array property. Phandle of sysconfig group
- containing the miphy registers and integer array should contain
- an entry for each port sub-node, specifying the control
- register offset inside the sysconfig group.
-
-Required nodes : A sub-node is required for each channel the controller
- provides. Address range information including the usual
- 'reg' and 'reg-names' properties are used inside these
- nodes to describe the controller's topology. These nodes
- are translated by the driver's .xlate() function.
-
-Required properties (port (child) node):
-- #phy-cells : Should be 1 (See second example)
- Cell after port phandle is device type from:
- - PHY_TYPE_SATA
- - PHY_TYPE_PCI
-- reg : Address and length of register sets for each device in
- "reg-names"
-- reg-names : The names of the register addresses corresponding to the
- registers filled in "reg":
- - sata: For SATA devices
- - pcie: For PCIe devices
-
-Optional properties (port (child) node):
-- st,sata-gen : Generation of locally attached SATA IP. Expected values
- are {1,2,3). If not supplied generation 1 hardware will
- be expected
-- st,pcie-tx-pol-inv : Bool property to invert the polarity PCIe Tx (Txn/Txp)
-- st,sata-tx-pol-inv : Bool property to invert the polarity SATA Tx (Txn/Txp)
-
-Example:
-
- miphy365x_phy: miphy365x@fe382000 {
- compatible = "st,miphy365x-phy";
- st,syscfg = <&syscfg_rear 0x824 0x828>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges;
-
- phy_port0: port@fe382000 {
- reg = <0xfe382000 0x100>, <0xfe394000 0x100>;
- reg-names = "sata", "pcie";
- #phy-cells = <1>;
- st,sata-gen = <3>;
- };
-
- phy_port1: port@fe38a000 {
- reg = <0xfe38a000 0x100>, <0xfe804000 0x100>;;
- reg-names = "sata", "pcie", "syscfg";
- #phy-cells = <1>;
- st,pcie-tx-pol-inv;
- };
- };
-
-Specifying phy control of devices
-=================================
-
-Device nodes should specify the configuration required in their "phys"
-property, containing a phandle to the phy port node and a device type.
-
-Example:
-
-#include <dt-bindings/phy/phy.h>
-
- sata0: sata@fe380000 {
- ...
- phys = <&phy_port0 PHY_TYPE_SATA>;
- ...
- };
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 19bff3a..d1f22ac 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -120,16 +120,6 @@ config PHY_MIPHY28LP
Enable this to support the miphy transceiver (for SATA/PCIE/USB3)
that is part of STMicroelectronics STiH407 SoC.
-config PHY_MIPHY365X
- tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series"
- depends on ARCH_STI
- depends on HAS_IOMEM
- depends on OF
- select GENERIC_PHY
- help
- Enable this to support the miphy transceiver (for SATA/PCIE)
- that is part of STMicroelectronics STiH41x SoC series.
-
config PHY_RCAR_GEN2
tristate "Renesas R-Car generation 2 USB PHY driver"
depends on ARCH_RENESAS
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 90ae198..d169d80 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -17,7 +17,6 @@ obj-$(CONFIG_PHY_PXA_28NM_USB2) += phy-pxa-28nm-usb2.o
obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o
obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o
obj-$(CONFIG_PHY_MIPHY28LP) += phy-miphy28lp.o
-obj-$(CONFIG_PHY_MIPHY365X) += phy-miphy365x.o
obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
obj-$(CONFIG_PHY_RCAR_GEN3_USB2) += phy-rcar-gen3-usb2.o
obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o
diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
deleted file mode 100644
index e661f3b..0000000
--- a/drivers/phy/phy-miphy365x.c
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics – All Rights Reserved
- *
- * STMicroelectronics PHY driver MiPHY365 (for SoC STiH416).
- *
- * Authors: Alexandre Torgue <alexandre.torgue@st.com>
- * Lee Jones <lee.jones@linaro.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/of_address.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/delay.h>
-#include <linux/mfd/syscon.h>
-#include <linux/regmap.h>
-
-#include <dt-bindings/phy/phy.h>
-
-#define HFC_TIMEOUT 100
-
-#define SYSCFG_SELECT_SATA_MASK BIT(1)
-#define SYSCFG_SELECT_SATA_POS 1
-
-/* MiPHY365x register definitions */
-#define RESET_REG 0x00
-#define RST_PLL BIT(1)
-#define RST_PLL_CAL BIT(2)
-#define RST_RX BIT(4)
-#define RST_MACRO BIT(7)
-
-#define STATUS_REG 0x01
-#define IDLL_RDY BIT(0)
-#define PLL_RDY BIT(1)
-#define DES_BIT_LOCK BIT(2)
-#define DES_SYMBOL_LOCK BIT(3)
-
-#define CTRL_REG 0x02
-#define TERM_EN BIT(0)
-#define PCI_EN BIT(2)
-#define DES_BIT_LOCK_EN BIT(3)
-#define TX_POL BIT(5)
-
-#define INT_CTRL_REG 0x03
-
-#define BOUNDARY1_REG 0x10
-#define SPDSEL_SEL BIT(0)
-
-#define BOUNDARY3_REG 0x12
-#define TX_SPDSEL_GEN1_VAL 0
-#define TX_SPDSEL_GEN2_VAL 0x01
-#define TX_SPDSEL_GEN3_VAL 0x02
-#define RX_SPDSEL_GEN1_VAL 0
-#define RX_SPDSEL_GEN2_VAL (0x01 << 3)
-#define RX_SPDSEL_GEN3_VAL (0x02 << 3)
-
-#define PCIE_REG 0x16
-
-#define BUF_SEL_REG 0x20
-#define CONF_GEN_SEL_GEN3 0x02
-#define CONF_GEN_SEL_GEN2 0x01
-#define PD_VDDTFILTER BIT(4)
-
-#define TXBUF1_REG 0x21
-#define SWING_VAL 0x04
-#define SWING_VAL_GEN1 0x03
-#define PREEMPH_VAL (0x3 << 5)
-
-#define TXBUF2_REG 0x22
-#define TXSLEW_VAL 0x2
-#define TXSLEW_VAL_GEN1 0x4
-
-#define RXBUF_OFFSET_CTRL_REG 0x23
-
-#define RXBUF_REG 0x25
-#define SDTHRES_VAL 0x01
-#define EQ_ON3 (0x03 << 4)
-#define EQ_ON1 (0x01 << 4)
-
-#define COMP_CTRL1_REG 0x40
-#define START_COMSR BIT(0)
-#define START_COMZC BIT(1)
-#define COMSR_DONE BIT(2)
-#define COMZC_DONE BIT(3)
-#define COMP_AUTO_LOAD BIT(4)
-
-#define COMP_CTRL2_REG 0x41
-#define COMP_2MHZ_RAT_GEN1 0x1e
-#define COMP_2MHZ_RAT 0xf
-
-#define COMP_CTRL3_REG 0x42
-#define COMSR_COMP_REF 0x33
-
-#define COMP_IDLL_REG 0x47
-#define COMZC_IDLL 0x2a
-
-#define PLL_CTRL1_REG 0x50
-#define PLL_START_CAL BIT(0)
-#define BUF_EN BIT(2)
-#define SYNCHRO_TX BIT(3)
-#define SSC_EN BIT(6)
-#define CONFIG_PLL BIT(7)
-
-#define PLL_CTRL2_REG 0x51
-#define BYPASS_PLL_CAL BIT(1)
-
-#define PLL_RAT_REG 0x52
-
-#define PLL_SSC_STEP_MSB_REG 0x56
-#define PLL_SSC_STEP_MSB_VAL 0x03
-
-#define PLL_SSC_STEP_LSB_REG 0x57
-#define PLL_SSC_STEP_LSB_VAL 0x63
-
-#define PLL_SSC_PER_MSB_REG 0x58
-#define PLL_SSC_PER_MSB_VAL 0
-
-#define PLL_SSC_PER_LSB_REG 0x59
-#define PLL_SSC_PER_LSB_VAL 0xf1
-
-#define IDLL_TEST_REG 0x72
-#define START_CLK_HF BIT(6)
-
-#define DES_BITLOCK_REG 0x86
-#define BIT_LOCK_LEVEL 0x01
-#define BIT_LOCK_CNT_512 (0x03 << 5)
-
-struct miphy365x_phy {
- struct phy *phy;
- void __iomem *base;
- bool pcie_tx_pol_inv;
- bool sata_tx_pol_inv;
- u32 sata_gen;
- u32 ctrlreg;
- u8 type;
-};
-
-struct miphy365x_dev {
- struct device *dev;
- struct regmap *regmap;
- struct mutex miphy_mutex;
- struct miphy365x_phy **phys;
- int nphys;
-};
-
-/*
- * These values are represented in Device tree. They are considered to be ABI
- * and although they can be extended any existing values must not change.
- */
-enum miphy_sata_gen {
- SATA_GEN1 = 1,
- SATA_GEN2,
- SATA_GEN3
-};
-
-static u8 rx_tx_spd[] = {
- 0, /* GEN0 doesn't exist. */
- TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,
- TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,
- TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL
-};
-
-/*
- * This function selects the system configuration,
- * either two SATA, one SATA and one PCIe, or two PCIe lanes.
- */
-static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- bool sata = (miphy_phy->type == PHY_TYPE_SATA);
-
- return regmap_update_bits(miphy_dev->regmap,
- miphy_phy->ctrlreg,
- SYSCFG_SELECT_SATA_MASK,
- sata << SYSCFG_SELECT_SATA_POS);
-}
-
-static int miphy365x_init_pcie_port(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val;
-
- if (miphy_phy->pcie_tx_pol_inv) {
- /* Invert Tx polarity and clear pci_txdetect_pol bit */
- val = TERM_EN | PCI_EN | DES_BIT_LOCK_EN | TX_POL;
- writeb_relaxed(val, miphy_phy->base + CTRL_REG);
- writeb_relaxed(0x00, miphy_phy->base + PCIE_REG);
- }
-
- return 0;
-}
-
-static inline int miphy365x_hfc_not_rdy(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
- u8 mask = IDLL_RDY | PLL_RDY;
- u8 regval;
-
- do {
- regval = readb_relaxed(miphy_phy->base + STATUS_REG);
- if (!(regval & mask))
- return 0;
-
- usleep_range(2000, 2500);
- } while (time_before(jiffies, timeout));
-
- dev_err(miphy_dev->dev, "HFC ready timeout!\n");
- return -EBUSY;
-}
-
-static inline int miphy365x_rdy(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
- u8 mask = IDLL_RDY | PLL_RDY;
- u8 regval;
-
- do {
- regval = readb_relaxed(miphy_phy->base + STATUS_REG);
- if ((regval & mask) == mask)
- return 0;
-
- usleep_range(2000, 2500);
- } while (time_before(jiffies, timeout));
-
- dev_err(miphy_dev->dev, "PHY not ready timeout!\n");
- return -EBUSY;
-}
-
-static inline void miphy365x_set_comp(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val, mask;
-
- if (miphy_phy->sata_gen == SATA_GEN1)
- writeb_relaxed(COMP_2MHZ_RAT_GEN1,
- miphy_phy->base + COMP_CTRL2_REG);
- else
- writeb_relaxed(COMP_2MHZ_RAT,
- miphy_phy->base + COMP_CTRL2_REG);
-
- if (miphy_phy->sata_gen != SATA_GEN3) {
- writeb_relaxed(COMSR_COMP_REF,
- miphy_phy->base + COMP_CTRL3_REG);
- /*
- * Force VCO current to value defined by address 0x5A
- * and disable PCIe100Mref bit
- * Enable auto load compensation for pll_i_bias
- */
- writeb_relaxed(BYPASS_PLL_CAL, miphy_phy->base + PLL_CTRL2_REG);
- writeb_relaxed(COMZC_IDLL, miphy_phy->base + COMP_IDLL_REG);
- }
-
- /*
- * Force restart compensation and enable auto load
- * for Comzc_Tx, Comzc_Rx and Comsr on macro
- */
- val = START_COMSR | START_COMZC | COMP_AUTO_LOAD;
- writeb_relaxed(val, miphy_phy->base + COMP_CTRL1_REG);
-
- mask = COMSR_DONE | COMZC_DONE;
- while ((readb_relaxed(miphy_phy->base + COMP_CTRL1_REG) & mask) != mask)
- cpu_relax();
-}
-
-static inline void miphy365x_set_ssc(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val;
-
- /*
- * SSC Settings. SSC will be enabled through Link
- * SSC Ampl. = 0.4%
- * SSC Freq = 31KHz
- */
- writeb_relaxed(PLL_SSC_STEP_MSB_VAL,
- miphy_phy->base + PLL_SSC_STEP_MSB_REG);
- writeb_relaxed(PLL_SSC_STEP_LSB_VAL,
- miphy_phy->base + PLL_SSC_STEP_LSB_REG);
- writeb_relaxed(PLL_SSC_PER_MSB_VAL,
- miphy_phy->base + PLL_SSC_PER_MSB_REG);
- writeb_relaxed(PLL_SSC_PER_LSB_VAL,
- miphy_phy->base + PLL_SSC_PER_LSB_REG);
-
- /* SSC Settings complete */
- if (miphy_phy->sata_gen == SATA_GEN1) {
- val = PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
- writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
- } else {
- val = SSC_EN | PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
- writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
- }
-}
-
-static int miphy365x_init_sata_port(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- int ret;
- u8 val;
-
- /*
- * Force PHY macro reset, PLL calibration reset, PLL reset
- * and assert Deserializer Reset
- */
- val = RST_PLL | RST_PLL_CAL | RST_RX | RST_MACRO;
- writeb_relaxed(val, miphy_phy->base + RESET_REG);
-
- if (miphy_phy->sata_tx_pol_inv)
- writeb_relaxed(TX_POL, miphy_phy->base + CTRL_REG);
-
- /*
- * Force macro1 to use rx_lspd, tx_lspd
- * Force Rx_Clock on first I-DLL phase
- * Force Des in HP mode on macro, rx_lspd, tx_lspd for Gen2/3
- */
- writeb_relaxed(SPDSEL_SEL, miphy_phy->base + BOUNDARY1_REG);
- writeb_relaxed(START_CLK_HF, miphy_phy->base + IDLL_TEST_REG);
- val = rx_tx_spd[miphy_phy->sata_gen];
- writeb_relaxed(val, miphy_phy->base + BOUNDARY3_REG);
-
- /* Wait for HFC_READY = 0 */
- ret = miphy365x_hfc_not_rdy(miphy_phy, miphy_dev);
- if (ret)
- return ret;
-
- /* Compensation Recalibration */
- miphy365x_set_comp(miphy_phy, miphy_dev);
-
- switch (miphy_phy->sata_gen) {
- case SATA_GEN3:
- /*
- * TX Swing target 550-600mv peak to peak diff
- * Tx Slew target 90-110ps rising/falling time
- * Rx Eq ON3, Sigdet threshold SDTH1
- */
- val = PD_VDDTFILTER | CONF_GEN_SEL_GEN3;
- writeb_relaxed(val, miphy_phy->base + BUF_SEL_REG);
- val = SWING_VAL | PREEMPH_VAL;
- writeb_relaxed(val, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
- writeb_relaxed(0x00, miphy_phy->base + RXBUF_OFFSET_CTRL_REG);
- val = SDTHRES_VAL | EQ_ON3;
- writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
- break;
- case SATA_GEN2:
- /*
- * conf gen sel=0x1 to program Gen2 banked registers
- * VDDT filter ON
- * Tx Swing target 550-600mV peak-to-peak diff
- * Tx Slew target 90-110 ps rising/falling time
- * RX Equalization ON1, Sigdet threshold SDTH1
- */
- writeb_relaxed(CONF_GEN_SEL_GEN2,
- miphy_phy->base + BUF_SEL_REG);
- writeb_relaxed(SWING_VAL, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
- val = SDTHRES_VAL | EQ_ON1;
- writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
- break;
- case SATA_GEN1:
- /*
- * conf gen sel = 00b to program Gen1 banked registers
- * VDDT filter ON
- * Tx Swing target 500-550mV peak-to-peak diff
- * Tx Slew target120-140 ps rising/falling time
- */
- writeb_relaxed(PD_VDDTFILTER, miphy_phy->base + BUF_SEL_REG);
- writeb_relaxed(SWING_VAL_GEN1, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL_GEN1, miphy_phy->base + TXBUF2_REG);
- break;
- default:
- break;
- }
-
- /* Force Macro1 in partial mode & release pll cal reset */
- writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
- usleep_range(100, 150);
-
- miphy365x_set_ssc(miphy_phy, miphy_dev);
-
- /* Wait for phy_ready */
- ret = miphy365x_rdy(miphy_phy, miphy_dev);
- if (ret)
- return ret;
-
- /*
- * Enable macro1 to use rx_lspd & tx_lspd
- * Release Rx_Clock on first I-DLL phase on macro1
- * Assert deserializer reset
- * des_bit_lock_en is set
- * bit lock detection strength
- * Deassert deserializer reset
- */
- writeb_relaxed(0x00, miphy_phy->base + BOUNDARY1_REG);
- writeb_relaxed(0x00, miphy_phy->base + IDLL_TEST_REG);
- writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
- val = miphy_phy->sata_tx_pol_inv ?
- (TX_POL | DES_BIT_LOCK_EN) : DES_BIT_LOCK_EN;
- writeb_relaxed(val, miphy_phy->base + CTRL_REG);
-
- val = BIT_LOCK_CNT_512 | BIT_LOCK_LEVEL;
- writeb_relaxed(val, miphy_phy->base + DES_BITLOCK_REG);
- writeb_relaxed(0x00, miphy_phy->base + RESET_REG);
-
- return 0;
-}
-
-static int miphy365x_init(struct phy *phy)
-{
- struct miphy365x_phy *miphy_phy = phy_get_drvdata(phy);
- struct miphy365x_dev *miphy_dev = dev_get_drvdata(phy->dev.parent);
- int ret = 0;
-
- mutex_lock(&miphy_dev->miphy_mutex);
-
- ret = miphy365x_set_path(miphy_phy, miphy_dev);
- if (ret) {
- mutex_unlock(&miphy_dev->miphy_mutex);
- return ret;
- }
-
- /* Initialise Miphy for PCIe or SATA */
- if (miphy_phy->type == PHY_TYPE_PCIE)
- ret = miphy365x_init_pcie_port(miphy_phy, miphy_dev);
- else
- ret = miphy365x_init_sata_port(miphy_phy, miphy_dev);
-
- mutex_unlock(&miphy_dev->miphy_mutex);
-
- return ret;
-}
-
-static int miphy365x_get_addr(struct device *dev,
- struct miphy365x_phy *miphy_phy, int index)
-{
- struct device_node *phynode = miphy_phy->phy->dev.of_node;
- const char *name;
- int type = miphy_phy->type;
- int ret;
-
- ret = of_property_read_string_index(phynode, "reg-names", index, &name);
- if (ret) {
- dev_err(dev, "no reg-names property not found\n");
- return ret;
- }
-
- if (!((!strncmp(name, "sata", 4) && type == PHY_TYPE_SATA) ||
- (!strncmp(name, "pcie", 4) && type == PHY_TYPE_PCIE)))
- return 0;
-
- miphy_phy->base = of_iomap(phynode, index);
- if (!miphy_phy->base) {
- dev_err(dev, "Failed to map %s\n", phynode->full_name);
- return -EINVAL;
- }
-
- return 0;
-}
-
-static struct phy *miphy365x_xlate(struct device *dev,
- struct of_phandle_args *args)
-{
- struct miphy365x_dev *miphy_dev = dev_get_drvdata(dev);
- struct miphy365x_phy *miphy_phy = NULL;
- struct device_node *phynode = args->np;
- int ret, index;
-
- if (args->args_count != 1) {
- dev_err(dev, "Invalid number of cells in 'phy' property\n");
- return ERR_PTR(-EINVAL);
- }
-
- for (index = 0; index < miphy_dev->nphys; index++)
- if (phynode == miphy_dev->phys[index]->phy->dev.of_node) {
- miphy_phy = miphy_dev->phys[index];
- break;
- }
-
- if (!miphy_phy) {
- dev_err(dev, "Failed to find appropriate phy\n");
- return ERR_PTR(-EINVAL);
- }
-
- miphy_phy->type = args->args[0];
-
- if (!(miphy_phy->type == PHY_TYPE_SATA ||
- miphy_phy->type == PHY_TYPE_PCIE)) {
- dev_err(dev, "Unsupported device type: %d\n", miphy_phy->type);
- return ERR_PTR(-EINVAL);
- }
-
- /* Each port handles SATA and PCIE - third entry is always sysconf. */
- for (index = 0; index < 3; index++) {
- ret = miphy365x_get_addr(dev, miphy_phy, index);
- if (ret < 0)
- return ERR_PTR(ret);
- }
-
- return miphy_phy->phy;
-}
-
-static const struct phy_ops miphy365x_ops = {
- .init = miphy365x_init,
- .owner = THIS_MODULE,
-};
-
-static int miphy365x_of_probe(struct device_node *phynode,
- struct miphy365x_phy *miphy_phy)
-{
- of_property_read_u32(phynode, "st,sata-gen", &miphy_phy->sata_gen);
- if (!miphy_phy->sata_gen)
- miphy_phy->sata_gen = SATA_GEN1;
-
- miphy_phy->pcie_tx_pol_inv =
- of_property_read_bool(phynode, "st,pcie-tx-pol-inv");
-
- miphy_phy->sata_tx_pol_inv =
- of_property_read_bool(phynode, "st,sata-tx-pol-inv");
-
- return 0;
-}
-
-static int miphy365x_probe(struct platform_device *pdev)
-{
- struct device_node *child, *np = pdev->dev.of_node;
- struct miphy365x_dev *miphy_dev;
- struct phy_provider *provider;
- struct phy *phy;
- int ret, port = 0;
-
- miphy_dev = devm_kzalloc(&pdev->dev, sizeof(*miphy_dev), GFP_KERNEL);
- if (!miphy_dev)
- return -ENOMEM;
-
- miphy_dev->nphys = of_get_child_count(np);
- miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
- sizeof(*miphy_dev->phys), GFP_KERNEL);
- if (!miphy_dev->phys)
- return -ENOMEM;
-
- miphy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
- if (IS_ERR(miphy_dev->regmap)) {
- dev_err(miphy_dev->dev, "No syscfg phandle specified\n");
- return PTR_ERR(miphy_dev->regmap);
- }
-
- miphy_dev->dev = &pdev->dev;
-
- dev_set_drvdata(&pdev->dev, miphy_dev);
-
- mutex_init(&miphy_dev->miphy_mutex);
-
- for_each_child_of_node(np, child) {
- struct miphy365x_phy *miphy_phy;
-
- miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy),
- GFP_KERNEL);
- if (!miphy_phy) {
- ret = -ENOMEM;
- goto put_child;
- }
-
- miphy_dev->phys[port] = miphy_phy;
-
- phy = devm_phy_create(&pdev->dev, child, &miphy365x_ops);
- if (IS_ERR(phy)) {
- dev_err(&pdev->dev, "failed to create PHY\n");
- ret = PTR_ERR(phy);
- goto put_child;
- }
-
- miphy_dev->phys[port]->phy = phy;
-
- ret = miphy365x_of_probe(child, miphy_phy);
- if (ret)
- goto put_child;
-
- phy_set_drvdata(phy, miphy_dev->phys[port]);
-
- port++;
- /* sysconfig offsets are indexed from 1 */
- ret = of_property_read_u32_index(np, "st,syscfg", port,
- &miphy_phy->ctrlreg);
- if (ret) {
- dev_err(&pdev->dev, "No sysconfig offset found\n");
- goto put_child;
- }
- }
-
- provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate);
- return PTR_ERR_OR_ZERO(provider);
-put_child:
- of_node_put(child);
- return ret;
-}
-
-static const struct of_device_id miphy365x_of_match[] = {
- { .compatible = "st,miphy365x-phy", },
- { },
-};
-MODULE_DEVICE_TABLE(of, miphy365x_of_match);
-
-static struct platform_driver miphy365x_driver = {
- .probe = miphy365x_probe,
- .driver = {
- .name = "miphy365x-phy",
- .of_match_table = miphy365x_of_match,
- }
-};
-module_platform_driver(miphy365x_driver);
-
-MODULE_AUTHOR("Alexandre Torgue <alexandre.torgue@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics miphy365x driver");
-MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This phy is only used on STiH415/6 based 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>
---
.../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
drivers/phy/Kconfig | 10 -
drivers/phy/Makefile | 1 -
drivers/phy/phy-miphy365x.c | 625 ---------------------
4 files changed, 713 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
delete mode 100644 drivers/phy/phy-miphy365x.c
diff --git a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
deleted file mode 100644
index 8772900..0000000
--- a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-STMicroelectronics STi MIPHY365x PHY binding
-============================================
-
-This binding describes a miphy device that is used to control PHY hardware
-for SATA and PCIe.
-
-Required properties (controller (parent) node):
-- compatible : Should be "st,miphy365x-phy"
-- st,syscfg : Phandle / integer array property. Phandle of sysconfig group
- containing the miphy registers and integer array should contain
- an entry for each port sub-node, specifying the control
- register offset inside the sysconfig group.
-
-Required nodes : A sub-node is required for each channel the controller
- provides. Address range information including the usual
- 'reg' and 'reg-names' properties are used inside these
- nodes to describe the controller's topology. These nodes
- are translated by the driver's .xlate() function.
-
-Required properties (port (child) node):
-- #phy-cells : Should be 1 (See second example)
- Cell after port phandle is device type from:
- - PHY_TYPE_SATA
- - PHY_TYPE_PCI
-- reg : Address and length of register sets for each device in
- "reg-names"
-- reg-names : The names of the register addresses corresponding to the
- registers filled in "reg":
- - sata: For SATA devices
- - pcie: For PCIe devices
-
-Optional properties (port (child) node):
-- st,sata-gen : Generation of locally attached SATA IP. Expected values
- are {1,2,3). If not supplied generation 1 hardware will
- be expected
-- st,pcie-tx-pol-inv : Bool property to invert the polarity PCIe Tx (Txn/Txp)
-- st,sata-tx-pol-inv : Bool property to invert the polarity SATA Tx (Txn/Txp)
-
-Example:
-
- miphy365x_phy: miphy365x at fe382000 {
- compatible = "st,miphy365x-phy";
- st,syscfg = <&syscfg_rear 0x824 0x828>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges;
-
- phy_port0: port at fe382000 {
- reg = <0xfe382000 0x100>, <0xfe394000 0x100>;
- reg-names = "sata", "pcie";
- #phy-cells = <1>;
- st,sata-gen = <3>;
- };
-
- phy_port1: port at fe38a000 {
- reg = <0xfe38a000 0x100>, <0xfe804000 0x100>;;
- reg-names = "sata", "pcie", "syscfg";
- #phy-cells = <1>;
- st,pcie-tx-pol-inv;
- };
- };
-
-Specifying phy control of devices
-=================================
-
-Device nodes should specify the configuration required in their "phys"
-property, containing a phandle to the phy port node and a device type.
-
-Example:
-
-#include <dt-bindings/phy/phy.h>
-
- sata0: sata at fe380000 {
- ...
- phys = <&phy_port0 PHY_TYPE_SATA>;
- ...
- };
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 19bff3a..d1f22ac 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -120,16 +120,6 @@ config PHY_MIPHY28LP
Enable this to support the miphy transceiver (for SATA/PCIE/USB3)
that is part of STMicroelectronics STiH407 SoC.
-config PHY_MIPHY365X
- tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series"
- depends on ARCH_STI
- depends on HAS_IOMEM
- depends on OF
- select GENERIC_PHY
- help
- Enable this to support the miphy transceiver (for SATA/PCIE)
- that is part of STMicroelectronics STiH41x SoC series.
-
config PHY_RCAR_GEN2
tristate "Renesas R-Car generation 2 USB PHY driver"
depends on ARCH_RENESAS
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 90ae198..d169d80 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -17,7 +17,6 @@ obj-$(CONFIG_PHY_PXA_28NM_USB2) += phy-pxa-28nm-usb2.o
obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o
obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o
obj-$(CONFIG_PHY_MIPHY28LP) += phy-miphy28lp.o
-obj-$(CONFIG_PHY_MIPHY365X) += phy-miphy365x.o
obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
obj-$(CONFIG_PHY_RCAR_GEN3_USB2) += phy-rcar-gen3-usb2.o
obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o
diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
deleted file mode 100644
index e661f3b..0000000
--- a/drivers/phy/phy-miphy365x.c
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics ? All Rights Reserved
- *
- * STMicroelectronics PHY driver MiPHY365 (for SoC STiH416).
- *
- * Authors: Alexandre Torgue <alexandre.torgue@st.com>
- * Lee Jones <lee.jones@linaro.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/of_address.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/delay.h>
-#include <linux/mfd/syscon.h>
-#include <linux/regmap.h>
-
-#include <dt-bindings/phy/phy.h>
-
-#define HFC_TIMEOUT 100
-
-#define SYSCFG_SELECT_SATA_MASK BIT(1)
-#define SYSCFG_SELECT_SATA_POS 1
-
-/* MiPHY365x register definitions */
-#define RESET_REG 0x00
-#define RST_PLL BIT(1)
-#define RST_PLL_CAL BIT(2)
-#define RST_RX BIT(4)
-#define RST_MACRO BIT(7)
-
-#define STATUS_REG 0x01
-#define IDLL_RDY BIT(0)
-#define PLL_RDY BIT(1)
-#define DES_BIT_LOCK BIT(2)
-#define DES_SYMBOL_LOCK BIT(3)
-
-#define CTRL_REG 0x02
-#define TERM_EN BIT(0)
-#define PCI_EN BIT(2)
-#define DES_BIT_LOCK_EN BIT(3)
-#define TX_POL BIT(5)
-
-#define INT_CTRL_REG 0x03
-
-#define BOUNDARY1_REG 0x10
-#define SPDSEL_SEL BIT(0)
-
-#define BOUNDARY3_REG 0x12
-#define TX_SPDSEL_GEN1_VAL 0
-#define TX_SPDSEL_GEN2_VAL 0x01
-#define TX_SPDSEL_GEN3_VAL 0x02
-#define RX_SPDSEL_GEN1_VAL 0
-#define RX_SPDSEL_GEN2_VAL (0x01 << 3)
-#define RX_SPDSEL_GEN3_VAL (0x02 << 3)
-
-#define PCIE_REG 0x16
-
-#define BUF_SEL_REG 0x20
-#define CONF_GEN_SEL_GEN3 0x02
-#define CONF_GEN_SEL_GEN2 0x01
-#define PD_VDDTFILTER BIT(4)
-
-#define TXBUF1_REG 0x21
-#define SWING_VAL 0x04
-#define SWING_VAL_GEN1 0x03
-#define PREEMPH_VAL (0x3 << 5)
-
-#define TXBUF2_REG 0x22
-#define TXSLEW_VAL 0x2
-#define TXSLEW_VAL_GEN1 0x4
-
-#define RXBUF_OFFSET_CTRL_REG 0x23
-
-#define RXBUF_REG 0x25
-#define SDTHRES_VAL 0x01
-#define EQ_ON3 (0x03 << 4)
-#define EQ_ON1 (0x01 << 4)
-
-#define COMP_CTRL1_REG 0x40
-#define START_COMSR BIT(0)
-#define START_COMZC BIT(1)
-#define COMSR_DONE BIT(2)
-#define COMZC_DONE BIT(3)
-#define COMP_AUTO_LOAD BIT(4)
-
-#define COMP_CTRL2_REG 0x41
-#define COMP_2MHZ_RAT_GEN1 0x1e
-#define COMP_2MHZ_RAT 0xf
-
-#define COMP_CTRL3_REG 0x42
-#define COMSR_COMP_REF 0x33
-
-#define COMP_IDLL_REG 0x47
-#define COMZC_IDLL 0x2a
-
-#define PLL_CTRL1_REG 0x50
-#define PLL_START_CAL BIT(0)
-#define BUF_EN BIT(2)
-#define SYNCHRO_TX BIT(3)
-#define SSC_EN BIT(6)
-#define CONFIG_PLL BIT(7)
-
-#define PLL_CTRL2_REG 0x51
-#define BYPASS_PLL_CAL BIT(1)
-
-#define PLL_RAT_REG 0x52
-
-#define PLL_SSC_STEP_MSB_REG 0x56
-#define PLL_SSC_STEP_MSB_VAL 0x03
-
-#define PLL_SSC_STEP_LSB_REG 0x57
-#define PLL_SSC_STEP_LSB_VAL 0x63
-
-#define PLL_SSC_PER_MSB_REG 0x58
-#define PLL_SSC_PER_MSB_VAL 0
-
-#define PLL_SSC_PER_LSB_REG 0x59
-#define PLL_SSC_PER_LSB_VAL 0xf1
-
-#define IDLL_TEST_REG 0x72
-#define START_CLK_HF BIT(6)
-
-#define DES_BITLOCK_REG 0x86
-#define BIT_LOCK_LEVEL 0x01
-#define BIT_LOCK_CNT_512 (0x03 << 5)
-
-struct miphy365x_phy {
- struct phy *phy;
- void __iomem *base;
- bool pcie_tx_pol_inv;
- bool sata_tx_pol_inv;
- u32 sata_gen;
- u32 ctrlreg;
- u8 type;
-};
-
-struct miphy365x_dev {
- struct device *dev;
- struct regmap *regmap;
- struct mutex miphy_mutex;
- struct miphy365x_phy **phys;
- int nphys;
-};
-
-/*
- * These values are represented in Device tree. They are considered to be ABI
- * and although they can be extended any existing values must not change.
- */
-enum miphy_sata_gen {
- SATA_GEN1 = 1,
- SATA_GEN2,
- SATA_GEN3
-};
-
-static u8 rx_tx_spd[] = {
- 0, /* GEN0 doesn't exist. */
- TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,
- TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,
- TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL
-};
-
-/*
- * This function selects the system configuration,
- * either two SATA, one SATA and one PCIe, or two PCIe lanes.
- */
-static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- bool sata = (miphy_phy->type == PHY_TYPE_SATA);
-
- return regmap_update_bits(miphy_dev->regmap,
- miphy_phy->ctrlreg,
- SYSCFG_SELECT_SATA_MASK,
- sata << SYSCFG_SELECT_SATA_POS);
-}
-
-static int miphy365x_init_pcie_port(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val;
-
- if (miphy_phy->pcie_tx_pol_inv) {
- /* Invert Tx polarity and clear pci_txdetect_pol bit */
- val = TERM_EN | PCI_EN | DES_BIT_LOCK_EN | TX_POL;
- writeb_relaxed(val, miphy_phy->base + CTRL_REG);
- writeb_relaxed(0x00, miphy_phy->base + PCIE_REG);
- }
-
- return 0;
-}
-
-static inline int miphy365x_hfc_not_rdy(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
- u8 mask = IDLL_RDY | PLL_RDY;
- u8 regval;
-
- do {
- regval = readb_relaxed(miphy_phy->base + STATUS_REG);
- if (!(regval & mask))
- return 0;
-
- usleep_range(2000, 2500);
- } while (time_before(jiffies, timeout));
-
- dev_err(miphy_dev->dev, "HFC ready timeout!\n");
- return -EBUSY;
-}
-
-static inline int miphy365x_rdy(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
- u8 mask = IDLL_RDY | PLL_RDY;
- u8 regval;
-
- do {
- regval = readb_relaxed(miphy_phy->base + STATUS_REG);
- if ((regval & mask) == mask)
- return 0;
-
- usleep_range(2000, 2500);
- } while (time_before(jiffies, timeout));
-
- dev_err(miphy_dev->dev, "PHY not ready timeout!\n");
- return -EBUSY;
-}
-
-static inline void miphy365x_set_comp(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val, mask;
-
- if (miphy_phy->sata_gen == SATA_GEN1)
- writeb_relaxed(COMP_2MHZ_RAT_GEN1,
- miphy_phy->base + COMP_CTRL2_REG);
- else
- writeb_relaxed(COMP_2MHZ_RAT,
- miphy_phy->base + COMP_CTRL2_REG);
-
- if (miphy_phy->sata_gen != SATA_GEN3) {
- writeb_relaxed(COMSR_COMP_REF,
- miphy_phy->base + COMP_CTRL3_REG);
- /*
- * Force VCO current to value defined by address 0x5A
- * and disable PCIe100Mref bit
- * Enable auto load compensation for pll_i_bias
- */
- writeb_relaxed(BYPASS_PLL_CAL, miphy_phy->base + PLL_CTRL2_REG);
- writeb_relaxed(COMZC_IDLL, miphy_phy->base + COMP_IDLL_REG);
- }
-
- /*
- * Force restart compensation and enable auto load
- * for Comzc_Tx, Comzc_Rx and Comsr on macro
- */
- val = START_COMSR | START_COMZC | COMP_AUTO_LOAD;
- writeb_relaxed(val, miphy_phy->base + COMP_CTRL1_REG);
-
- mask = COMSR_DONE | COMZC_DONE;
- while ((readb_relaxed(miphy_phy->base + COMP_CTRL1_REG) & mask) != mask)
- cpu_relax();
-}
-
-static inline void miphy365x_set_ssc(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val;
-
- /*
- * SSC Settings. SSC will be enabled through Link
- * SSC Ampl. = 0.4%
- * SSC Freq = 31KHz
- */
- writeb_relaxed(PLL_SSC_STEP_MSB_VAL,
- miphy_phy->base + PLL_SSC_STEP_MSB_REG);
- writeb_relaxed(PLL_SSC_STEP_LSB_VAL,
- miphy_phy->base + PLL_SSC_STEP_LSB_REG);
- writeb_relaxed(PLL_SSC_PER_MSB_VAL,
- miphy_phy->base + PLL_SSC_PER_MSB_REG);
- writeb_relaxed(PLL_SSC_PER_LSB_VAL,
- miphy_phy->base + PLL_SSC_PER_LSB_REG);
-
- /* SSC Settings complete */
- if (miphy_phy->sata_gen == SATA_GEN1) {
- val = PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
- writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
- } else {
- val = SSC_EN | PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
- writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
- }
-}
-
-static int miphy365x_init_sata_port(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- int ret;
- u8 val;
-
- /*
- * Force PHY macro reset, PLL calibration reset, PLL reset
- * and assert Deserializer Reset
- */
- val = RST_PLL | RST_PLL_CAL | RST_RX | RST_MACRO;
- writeb_relaxed(val, miphy_phy->base + RESET_REG);
-
- if (miphy_phy->sata_tx_pol_inv)
- writeb_relaxed(TX_POL, miphy_phy->base + CTRL_REG);
-
- /*
- * Force macro1 to use rx_lspd, tx_lspd
- * Force Rx_Clock on first I-DLL phase
- * Force Des in HP mode on macro, rx_lspd, tx_lspd for Gen2/3
- */
- writeb_relaxed(SPDSEL_SEL, miphy_phy->base + BOUNDARY1_REG);
- writeb_relaxed(START_CLK_HF, miphy_phy->base + IDLL_TEST_REG);
- val = rx_tx_spd[miphy_phy->sata_gen];
- writeb_relaxed(val, miphy_phy->base + BOUNDARY3_REG);
-
- /* Wait for HFC_READY = 0 */
- ret = miphy365x_hfc_not_rdy(miphy_phy, miphy_dev);
- if (ret)
- return ret;
-
- /* Compensation Recalibration */
- miphy365x_set_comp(miphy_phy, miphy_dev);
-
- switch (miphy_phy->sata_gen) {
- case SATA_GEN3:
- /*
- * TX Swing target 550-600mv peak to peak diff
- * Tx Slew target 90-110ps rising/falling time
- * Rx Eq ON3, Sigdet threshold SDTH1
- */
- val = PD_VDDTFILTER | CONF_GEN_SEL_GEN3;
- writeb_relaxed(val, miphy_phy->base + BUF_SEL_REG);
- val = SWING_VAL | PREEMPH_VAL;
- writeb_relaxed(val, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
- writeb_relaxed(0x00, miphy_phy->base + RXBUF_OFFSET_CTRL_REG);
- val = SDTHRES_VAL | EQ_ON3;
- writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
- break;
- case SATA_GEN2:
- /*
- * conf gen sel=0x1 to program Gen2 banked registers
- * VDDT filter ON
- * Tx Swing target 550-600mV peak-to-peak diff
- * Tx Slew target 90-110 ps rising/falling time
- * RX Equalization ON1, Sigdet threshold SDTH1
- */
- writeb_relaxed(CONF_GEN_SEL_GEN2,
- miphy_phy->base + BUF_SEL_REG);
- writeb_relaxed(SWING_VAL, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
- val = SDTHRES_VAL | EQ_ON1;
- writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
- break;
- case SATA_GEN1:
- /*
- * conf gen sel = 00b to program Gen1 banked registers
- * VDDT filter ON
- * Tx Swing target 500-550mV peak-to-peak diff
- * Tx Slew target120-140 ps rising/falling time
- */
- writeb_relaxed(PD_VDDTFILTER, miphy_phy->base + BUF_SEL_REG);
- writeb_relaxed(SWING_VAL_GEN1, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL_GEN1, miphy_phy->base + TXBUF2_REG);
- break;
- default:
- break;
- }
-
- /* Force Macro1 in partial mode & release pll cal reset */
- writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
- usleep_range(100, 150);
-
- miphy365x_set_ssc(miphy_phy, miphy_dev);
-
- /* Wait for phy_ready */
- ret = miphy365x_rdy(miphy_phy, miphy_dev);
- if (ret)
- return ret;
-
- /*
- * Enable macro1 to use rx_lspd & tx_lspd
- * Release Rx_Clock on first I-DLL phase on macro1
- * Assert deserializer reset
- * des_bit_lock_en is set
- * bit lock detection strength
- * Deassert deserializer reset
- */
- writeb_relaxed(0x00, miphy_phy->base + BOUNDARY1_REG);
- writeb_relaxed(0x00, miphy_phy->base + IDLL_TEST_REG);
- writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
- val = miphy_phy->sata_tx_pol_inv ?
- (TX_POL | DES_BIT_LOCK_EN) : DES_BIT_LOCK_EN;
- writeb_relaxed(val, miphy_phy->base + CTRL_REG);
-
- val = BIT_LOCK_CNT_512 | BIT_LOCK_LEVEL;
- writeb_relaxed(val, miphy_phy->base + DES_BITLOCK_REG);
- writeb_relaxed(0x00, miphy_phy->base + RESET_REG);
-
- return 0;
-}
-
-static int miphy365x_init(struct phy *phy)
-{
- struct miphy365x_phy *miphy_phy = phy_get_drvdata(phy);
- struct miphy365x_dev *miphy_dev = dev_get_drvdata(phy->dev.parent);
- int ret = 0;
-
- mutex_lock(&miphy_dev->miphy_mutex);
-
- ret = miphy365x_set_path(miphy_phy, miphy_dev);
- if (ret) {
- mutex_unlock(&miphy_dev->miphy_mutex);
- return ret;
- }
-
- /* Initialise Miphy for PCIe or SATA */
- if (miphy_phy->type == PHY_TYPE_PCIE)
- ret = miphy365x_init_pcie_port(miphy_phy, miphy_dev);
- else
- ret = miphy365x_init_sata_port(miphy_phy, miphy_dev);
-
- mutex_unlock(&miphy_dev->miphy_mutex);
-
- return ret;
-}
-
-static int miphy365x_get_addr(struct device *dev,
- struct miphy365x_phy *miphy_phy, int index)
-{
- struct device_node *phynode = miphy_phy->phy->dev.of_node;
- const char *name;
- int type = miphy_phy->type;
- int ret;
-
- ret = of_property_read_string_index(phynode, "reg-names", index, &name);
- if (ret) {
- dev_err(dev, "no reg-names property not found\n");
- return ret;
- }
-
- if (!((!strncmp(name, "sata", 4) && type == PHY_TYPE_SATA) ||
- (!strncmp(name, "pcie", 4) && type == PHY_TYPE_PCIE)))
- return 0;
-
- miphy_phy->base = of_iomap(phynode, index);
- if (!miphy_phy->base) {
- dev_err(dev, "Failed to map %s\n", phynode->full_name);
- return -EINVAL;
- }
-
- return 0;
-}
-
-static struct phy *miphy365x_xlate(struct device *dev,
- struct of_phandle_args *args)
-{
- struct miphy365x_dev *miphy_dev = dev_get_drvdata(dev);
- struct miphy365x_phy *miphy_phy = NULL;
- struct device_node *phynode = args->np;
- int ret, index;
-
- if (args->args_count != 1) {
- dev_err(dev, "Invalid number of cells in 'phy' property\n");
- return ERR_PTR(-EINVAL);
- }
-
- for (index = 0; index < miphy_dev->nphys; index++)
- if (phynode == miphy_dev->phys[index]->phy->dev.of_node) {
- miphy_phy = miphy_dev->phys[index];
- break;
- }
-
- if (!miphy_phy) {
- dev_err(dev, "Failed to find appropriate phy\n");
- return ERR_PTR(-EINVAL);
- }
-
- miphy_phy->type = args->args[0];
-
- if (!(miphy_phy->type == PHY_TYPE_SATA ||
- miphy_phy->type == PHY_TYPE_PCIE)) {
- dev_err(dev, "Unsupported device type: %d\n", miphy_phy->type);
- return ERR_PTR(-EINVAL);
- }
-
- /* Each port handles SATA and PCIE - third entry is always sysconf. */
- for (index = 0; index < 3; index++) {
- ret = miphy365x_get_addr(dev, miphy_phy, index);
- if (ret < 0)
- return ERR_PTR(ret);
- }
-
- return miphy_phy->phy;
-}
-
-static const struct phy_ops miphy365x_ops = {
- .init = miphy365x_init,
- .owner = THIS_MODULE,
-};
-
-static int miphy365x_of_probe(struct device_node *phynode,
- struct miphy365x_phy *miphy_phy)
-{
- of_property_read_u32(phynode, "st,sata-gen", &miphy_phy->sata_gen);
- if (!miphy_phy->sata_gen)
- miphy_phy->sata_gen = SATA_GEN1;
-
- miphy_phy->pcie_tx_pol_inv =
- of_property_read_bool(phynode, "st,pcie-tx-pol-inv");
-
- miphy_phy->sata_tx_pol_inv =
- of_property_read_bool(phynode, "st,sata-tx-pol-inv");
-
- return 0;
-}
-
-static int miphy365x_probe(struct platform_device *pdev)
-{
- struct device_node *child, *np = pdev->dev.of_node;
- struct miphy365x_dev *miphy_dev;
- struct phy_provider *provider;
- struct phy *phy;
- int ret, port = 0;
-
- miphy_dev = devm_kzalloc(&pdev->dev, sizeof(*miphy_dev), GFP_KERNEL);
- if (!miphy_dev)
- return -ENOMEM;
-
- miphy_dev->nphys = of_get_child_count(np);
- miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
- sizeof(*miphy_dev->phys), GFP_KERNEL);
- if (!miphy_dev->phys)
- return -ENOMEM;
-
- miphy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
- if (IS_ERR(miphy_dev->regmap)) {
- dev_err(miphy_dev->dev, "No syscfg phandle specified\n");
- return PTR_ERR(miphy_dev->regmap);
- }
-
- miphy_dev->dev = &pdev->dev;
-
- dev_set_drvdata(&pdev->dev, miphy_dev);
-
- mutex_init(&miphy_dev->miphy_mutex);
-
- for_each_child_of_node(np, child) {
- struct miphy365x_phy *miphy_phy;
-
- miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy),
- GFP_KERNEL);
- if (!miphy_phy) {
- ret = -ENOMEM;
- goto put_child;
- }
-
- miphy_dev->phys[port] = miphy_phy;
-
- phy = devm_phy_create(&pdev->dev, child, &miphy365x_ops);
- if (IS_ERR(phy)) {
- dev_err(&pdev->dev, "failed to create PHY\n");
- ret = PTR_ERR(phy);
- goto put_child;
- }
-
- miphy_dev->phys[port]->phy = phy;
-
- ret = miphy365x_of_probe(child, miphy_phy);
- if (ret)
- goto put_child;
-
- phy_set_drvdata(phy, miphy_dev->phys[port]);
-
- port++;
- /* sysconfig offsets are indexed from 1 */
- ret = of_property_read_u32_index(np, "st,syscfg", port,
- &miphy_phy->ctrlreg);
- if (ret) {
- dev_err(&pdev->dev, "No sysconfig offset found\n");
- goto put_child;
- }
- }
-
- provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate);
- return PTR_ERR_OR_ZERO(provider);
-put_child:
- of_node_put(child);
- return ret;
-}
-
-static const struct of_device_id miphy365x_of_match[] = {
- { .compatible = "st,miphy365x-phy", },
- { },
-};
-MODULE_DEVICE_TABLE(of, miphy365x_of_match);
-
-static struct platform_driver miphy365x_driver = {
- .probe = miphy365x_probe,
- .driver = {
- .name = "miphy365x-phy",
- .of_match_table = miphy365x_of_match,
- }
-};
-module_platform_driver(miphy365x_driver);
-
-MODULE_AUTHOR("Alexandre Torgue <alexandre.torgue@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics miphy365x driver");
-MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
This phy is only used on STiH415/6 based silicon, and support for
these SoC's is being removed from the kernel.
Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <kishon-l0cyMroinI0@public.gmane.org>
---
.../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
drivers/phy/Kconfig | 10 -
drivers/phy/Makefile | 1 -
drivers/phy/phy-miphy365x.c | 625 ---------------------
4 files changed, 713 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
delete mode 100644 drivers/phy/phy-miphy365x.c
diff --git a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
deleted file mode 100644
index 8772900..0000000
--- a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-STMicroelectronics STi MIPHY365x PHY binding
-============================================
-
-This binding describes a miphy device that is used to control PHY hardware
-for SATA and PCIe.
-
-Required properties (controller (parent) node):
-- compatible : Should be "st,miphy365x-phy"
-- st,syscfg : Phandle / integer array property. Phandle of sysconfig group
- containing the miphy registers and integer array should contain
- an entry for each port sub-node, specifying the control
- register offset inside the sysconfig group.
-
-Required nodes : A sub-node is required for each channel the controller
- provides. Address range information including the usual
- 'reg' and 'reg-names' properties are used inside these
- nodes to describe the controller's topology. These nodes
- are translated by the driver's .xlate() function.
-
-Required properties (port (child) node):
-- #phy-cells : Should be 1 (See second example)
- Cell after port phandle is device type from:
- - PHY_TYPE_SATA
- - PHY_TYPE_PCI
-- reg : Address and length of register sets for each device in
- "reg-names"
-- reg-names : The names of the register addresses corresponding to the
- registers filled in "reg":
- - sata: For SATA devices
- - pcie: For PCIe devices
-
-Optional properties (port (child) node):
-- st,sata-gen : Generation of locally attached SATA IP. Expected values
- are {1,2,3). If not supplied generation 1 hardware will
- be expected
-- st,pcie-tx-pol-inv : Bool property to invert the polarity PCIe Tx (Txn/Txp)
-- st,sata-tx-pol-inv : Bool property to invert the polarity SATA Tx (Txn/Txp)
-
-Example:
-
- miphy365x_phy: miphy365x@fe382000 {
- compatible = "st,miphy365x-phy";
- st,syscfg = <&syscfg_rear 0x824 0x828>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges;
-
- phy_port0: port@fe382000 {
- reg = <0xfe382000 0x100>, <0xfe394000 0x100>;
- reg-names = "sata", "pcie";
- #phy-cells = <1>;
- st,sata-gen = <3>;
- };
-
- phy_port1: port@fe38a000 {
- reg = <0xfe38a000 0x100>, <0xfe804000 0x100>;;
- reg-names = "sata", "pcie", "syscfg";
- #phy-cells = <1>;
- st,pcie-tx-pol-inv;
- };
- };
-
-Specifying phy control of devices
-=================================
-
-Device nodes should specify the configuration required in their "phys"
-property, containing a phandle to the phy port node and a device type.
-
-Example:
-
-#include <dt-bindings/phy/phy.h>
-
- sata0: sata@fe380000 {
- ...
- phys = <&phy_port0 PHY_TYPE_SATA>;
- ...
- };
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 19bff3a..d1f22ac 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -120,16 +120,6 @@ config PHY_MIPHY28LP
Enable this to support the miphy transceiver (for SATA/PCIE/USB3)
that is part of STMicroelectronics STiH407 SoC.
-config PHY_MIPHY365X
- tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series"
- depends on ARCH_STI
- depends on HAS_IOMEM
- depends on OF
- select GENERIC_PHY
- help
- Enable this to support the miphy transceiver (for SATA/PCIE)
- that is part of STMicroelectronics STiH41x SoC series.
-
config PHY_RCAR_GEN2
tristate "Renesas R-Car generation 2 USB PHY driver"
depends on ARCH_RENESAS
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 90ae198..d169d80 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -17,7 +17,6 @@ obj-$(CONFIG_PHY_PXA_28NM_USB2) += phy-pxa-28nm-usb2.o
obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o
obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o
obj-$(CONFIG_PHY_MIPHY28LP) += phy-miphy28lp.o
-obj-$(CONFIG_PHY_MIPHY365X) += phy-miphy365x.o
obj-$(CONFIG_PHY_RCAR_GEN2) += phy-rcar-gen2.o
obj-$(CONFIG_PHY_RCAR_GEN3_USB2) += phy-rcar-gen3-usb2.o
obj-$(CONFIG_OMAP_CONTROL_PHY) += phy-omap-control.o
diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
deleted file mode 100644
index e661f3b..0000000
--- a/drivers/phy/phy-miphy365x.c
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics – All Rights Reserved
- *
- * STMicroelectronics PHY driver MiPHY365 (for SoC STiH416).
- *
- * Authors: Alexandre Torgue <alexandre.torgue-qxv4g6HH51o@public.gmane.org>
- * Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/of_address.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/delay.h>
-#include <linux/mfd/syscon.h>
-#include <linux/regmap.h>
-
-#include <dt-bindings/phy/phy.h>
-
-#define HFC_TIMEOUT 100
-
-#define SYSCFG_SELECT_SATA_MASK BIT(1)
-#define SYSCFG_SELECT_SATA_POS 1
-
-/* MiPHY365x register definitions */
-#define RESET_REG 0x00
-#define RST_PLL BIT(1)
-#define RST_PLL_CAL BIT(2)
-#define RST_RX BIT(4)
-#define RST_MACRO BIT(7)
-
-#define STATUS_REG 0x01
-#define IDLL_RDY BIT(0)
-#define PLL_RDY BIT(1)
-#define DES_BIT_LOCK BIT(2)
-#define DES_SYMBOL_LOCK BIT(3)
-
-#define CTRL_REG 0x02
-#define TERM_EN BIT(0)
-#define PCI_EN BIT(2)
-#define DES_BIT_LOCK_EN BIT(3)
-#define TX_POL BIT(5)
-
-#define INT_CTRL_REG 0x03
-
-#define BOUNDARY1_REG 0x10
-#define SPDSEL_SEL BIT(0)
-
-#define BOUNDARY3_REG 0x12
-#define TX_SPDSEL_GEN1_VAL 0
-#define TX_SPDSEL_GEN2_VAL 0x01
-#define TX_SPDSEL_GEN3_VAL 0x02
-#define RX_SPDSEL_GEN1_VAL 0
-#define RX_SPDSEL_GEN2_VAL (0x01 << 3)
-#define RX_SPDSEL_GEN3_VAL (0x02 << 3)
-
-#define PCIE_REG 0x16
-
-#define BUF_SEL_REG 0x20
-#define CONF_GEN_SEL_GEN3 0x02
-#define CONF_GEN_SEL_GEN2 0x01
-#define PD_VDDTFILTER BIT(4)
-
-#define TXBUF1_REG 0x21
-#define SWING_VAL 0x04
-#define SWING_VAL_GEN1 0x03
-#define PREEMPH_VAL (0x3 << 5)
-
-#define TXBUF2_REG 0x22
-#define TXSLEW_VAL 0x2
-#define TXSLEW_VAL_GEN1 0x4
-
-#define RXBUF_OFFSET_CTRL_REG 0x23
-
-#define RXBUF_REG 0x25
-#define SDTHRES_VAL 0x01
-#define EQ_ON3 (0x03 << 4)
-#define EQ_ON1 (0x01 << 4)
-
-#define COMP_CTRL1_REG 0x40
-#define START_COMSR BIT(0)
-#define START_COMZC BIT(1)
-#define COMSR_DONE BIT(2)
-#define COMZC_DONE BIT(3)
-#define COMP_AUTO_LOAD BIT(4)
-
-#define COMP_CTRL2_REG 0x41
-#define COMP_2MHZ_RAT_GEN1 0x1e
-#define COMP_2MHZ_RAT 0xf
-
-#define COMP_CTRL3_REG 0x42
-#define COMSR_COMP_REF 0x33
-
-#define COMP_IDLL_REG 0x47
-#define COMZC_IDLL 0x2a
-
-#define PLL_CTRL1_REG 0x50
-#define PLL_START_CAL BIT(0)
-#define BUF_EN BIT(2)
-#define SYNCHRO_TX BIT(3)
-#define SSC_EN BIT(6)
-#define CONFIG_PLL BIT(7)
-
-#define PLL_CTRL2_REG 0x51
-#define BYPASS_PLL_CAL BIT(1)
-
-#define PLL_RAT_REG 0x52
-
-#define PLL_SSC_STEP_MSB_REG 0x56
-#define PLL_SSC_STEP_MSB_VAL 0x03
-
-#define PLL_SSC_STEP_LSB_REG 0x57
-#define PLL_SSC_STEP_LSB_VAL 0x63
-
-#define PLL_SSC_PER_MSB_REG 0x58
-#define PLL_SSC_PER_MSB_VAL 0
-
-#define PLL_SSC_PER_LSB_REG 0x59
-#define PLL_SSC_PER_LSB_VAL 0xf1
-
-#define IDLL_TEST_REG 0x72
-#define START_CLK_HF BIT(6)
-
-#define DES_BITLOCK_REG 0x86
-#define BIT_LOCK_LEVEL 0x01
-#define BIT_LOCK_CNT_512 (0x03 << 5)
-
-struct miphy365x_phy {
- struct phy *phy;
- void __iomem *base;
- bool pcie_tx_pol_inv;
- bool sata_tx_pol_inv;
- u32 sata_gen;
- u32 ctrlreg;
- u8 type;
-};
-
-struct miphy365x_dev {
- struct device *dev;
- struct regmap *regmap;
- struct mutex miphy_mutex;
- struct miphy365x_phy **phys;
- int nphys;
-};
-
-/*
- * These values are represented in Device tree. They are considered to be ABI
- * and although they can be extended any existing values must not change.
- */
-enum miphy_sata_gen {
- SATA_GEN1 = 1,
- SATA_GEN2,
- SATA_GEN3
-};
-
-static u8 rx_tx_spd[] = {
- 0, /* GEN0 doesn't exist. */
- TX_SPDSEL_GEN1_VAL | RX_SPDSEL_GEN1_VAL,
- TX_SPDSEL_GEN2_VAL | RX_SPDSEL_GEN2_VAL,
- TX_SPDSEL_GEN3_VAL | RX_SPDSEL_GEN3_VAL
-};
-
-/*
- * This function selects the system configuration,
- * either two SATA, one SATA and one PCIe, or two PCIe lanes.
- */
-static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- bool sata = (miphy_phy->type == PHY_TYPE_SATA);
-
- return regmap_update_bits(miphy_dev->regmap,
- miphy_phy->ctrlreg,
- SYSCFG_SELECT_SATA_MASK,
- sata << SYSCFG_SELECT_SATA_POS);
-}
-
-static int miphy365x_init_pcie_port(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val;
-
- if (miphy_phy->pcie_tx_pol_inv) {
- /* Invert Tx polarity and clear pci_txdetect_pol bit */
- val = TERM_EN | PCI_EN | DES_BIT_LOCK_EN | TX_POL;
- writeb_relaxed(val, miphy_phy->base + CTRL_REG);
- writeb_relaxed(0x00, miphy_phy->base + PCIE_REG);
- }
-
- return 0;
-}
-
-static inline int miphy365x_hfc_not_rdy(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
- u8 mask = IDLL_RDY | PLL_RDY;
- u8 regval;
-
- do {
- regval = readb_relaxed(miphy_phy->base + STATUS_REG);
- if (!(regval & mask))
- return 0;
-
- usleep_range(2000, 2500);
- } while (time_before(jiffies, timeout));
-
- dev_err(miphy_dev->dev, "HFC ready timeout!\n");
- return -EBUSY;
-}
-
-static inline int miphy365x_rdy(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(HFC_TIMEOUT);
- u8 mask = IDLL_RDY | PLL_RDY;
- u8 regval;
-
- do {
- regval = readb_relaxed(miphy_phy->base + STATUS_REG);
- if ((regval & mask) == mask)
- return 0;
-
- usleep_range(2000, 2500);
- } while (time_before(jiffies, timeout));
-
- dev_err(miphy_dev->dev, "PHY not ready timeout!\n");
- return -EBUSY;
-}
-
-static inline void miphy365x_set_comp(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val, mask;
-
- if (miphy_phy->sata_gen == SATA_GEN1)
- writeb_relaxed(COMP_2MHZ_RAT_GEN1,
- miphy_phy->base + COMP_CTRL2_REG);
- else
- writeb_relaxed(COMP_2MHZ_RAT,
- miphy_phy->base + COMP_CTRL2_REG);
-
- if (miphy_phy->sata_gen != SATA_GEN3) {
- writeb_relaxed(COMSR_COMP_REF,
- miphy_phy->base + COMP_CTRL3_REG);
- /*
- * Force VCO current to value defined by address 0x5A
- * and disable PCIe100Mref bit
- * Enable auto load compensation for pll_i_bias
- */
- writeb_relaxed(BYPASS_PLL_CAL, miphy_phy->base + PLL_CTRL2_REG);
- writeb_relaxed(COMZC_IDLL, miphy_phy->base + COMP_IDLL_REG);
- }
-
- /*
- * Force restart compensation and enable auto load
- * for Comzc_Tx, Comzc_Rx and Comsr on macro
- */
- val = START_COMSR | START_COMZC | COMP_AUTO_LOAD;
- writeb_relaxed(val, miphy_phy->base + COMP_CTRL1_REG);
-
- mask = COMSR_DONE | COMZC_DONE;
- while ((readb_relaxed(miphy_phy->base + COMP_CTRL1_REG) & mask) != mask)
- cpu_relax();
-}
-
-static inline void miphy365x_set_ssc(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- u8 val;
-
- /*
- * SSC Settings. SSC will be enabled through Link
- * SSC Ampl. = 0.4%
- * SSC Freq = 31KHz
- */
- writeb_relaxed(PLL_SSC_STEP_MSB_VAL,
- miphy_phy->base + PLL_SSC_STEP_MSB_REG);
- writeb_relaxed(PLL_SSC_STEP_LSB_VAL,
- miphy_phy->base + PLL_SSC_STEP_LSB_REG);
- writeb_relaxed(PLL_SSC_PER_MSB_VAL,
- miphy_phy->base + PLL_SSC_PER_MSB_REG);
- writeb_relaxed(PLL_SSC_PER_LSB_VAL,
- miphy_phy->base + PLL_SSC_PER_LSB_REG);
-
- /* SSC Settings complete */
- if (miphy_phy->sata_gen == SATA_GEN1) {
- val = PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
- writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
- } else {
- val = SSC_EN | PLL_START_CAL | BUF_EN | SYNCHRO_TX | CONFIG_PLL;
- writeb_relaxed(val, miphy_phy->base + PLL_CTRL1_REG);
- }
-}
-
-static int miphy365x_init_sata_port(struct miphy365x_phy *miphy_phy,
- struct miphy365x_dev *miphy_dev)
-{
- int ret;
- u8 val;
-
- /*
- * Force PHY macro reset, PLL calibration reset, PLL reset
- * and assert Deserializer Reset
- */
- val = RST_PLL | RST_PLL_CAL | RST_RX | RST_MACRO;
- writeb_relaxed(val, miphy_phy->base + RESET_REG);
-
- if (miphy_phy->sata_tx_pol_inv)
- writeb_relaxed(TX_POL, miphy_phy->base + CTRL_REG);
-
- /*
- * Force macro1 to use rx_lspd, tx_lspd
- * Force Rx_Clock on first I-DLL phase
- * Force Des in HP mode on macro, rx_lspd, tx_lspd for Gen2/3
- */
- writeb_relaxed(SPDSEL_SEL, miphy_phy->base + BOUNDARY1_REG);
- writeb_relaxed(START_CLK_HF, miphy_phy->base + IDLL_TEST_REG);
- val = rx_tx_spd[miphy_phy->sata_gen];
- writeb_relaxed(val, miphy_phy->base + BOUNDARY3_REG);
-
- /* Wait for HFC_READY = 0 */
- ret = miphy365x_hfc_not_rdy(miphy_phy, miphy_dev);
- if (ret)
- return ret;
-
- /* Compensation Recalibration */
- miphy365x_set_comp(miphy_phy, miphy_dev);
-
- switch (miphy_phy->sata_gen) {
- case SATA_GEN3:
- /*
- * TX Swing target 550-600mv peak to peak diff
- * Tx Slew target 90-110ps rising/falling time
- * Rx Eq ON3, Sigdet threshold SDTH1
- */
- val = PD_VDDTFILTER | CONF_GEN_SEL_GEN3;
- writeb_relaxed(val, miphy_phy->base + BUF_SEL_REG);
- val = SWING_VAL | PREEMPH_VAL;
- writeb_relaxed(val, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
- writeb_relaxed(0x00, miphy_phy->base + RXBUF_OFFSET_CTRL_REG);
- val = SDTHRES_VAL | EQ_ON3;
- writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
- break;
- case SATA_GEN2:
- /*
- * conf gen sel=0x1 to program Gen2 banked registers
- * VDDT filter ON
- * Tx Swing target 550-600mV peak-to-peak diff
- * Tx Slew target 90-110 ps rising/falling time
- * RX Equalization ON1, Sigdet threshold SDTH1
- */
- writeb_relaxed(CONF_GEN_SEL_GEN2,
- miphy_phy->base + BUF_SEL_REG);
- writeb_relaxed(SWING_VAL, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL, miphy_phy->base + TXBUF2_REG);
- val = SDTHRES_VAL | EQ_ON1;
- writeb_relaxed(val, miphy_phy->base + RXBUF_REG);
- break;
- case SATA_GEN1:
- /*
- * conf gen sel = 00b to program Gen1 banked registers
- * VDDT filter ON
- * Tx Swing target 500-550mV peak-to-peak diff
- * Tx Slew target120-140 ps rising/falling time
- */
- writeb_relaxed(PD_VDDTFILTER, miphy_phy->base + BUF_SEL_REG);
- writeb_relaxed(SWING_VAL_GEN1, miphy_phy->base + TXBUF1_REG);
- writeb_relaxed(TXSLEW_VAL_GEN1, miphy_phy->base + TXBUF2_REG);
- break;
- default:
- break;
- }
-
- /* Force Macro1 in partial mode & release pll cal reset */
- writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
- usleep_range(100, 150);
-
- miphy365x_set_ssc(miphy_phy, miphy_dev);
-
- /* Wait for phy_ready */
- ret = miphy365x_rdy(miphy_phy, miphy_dev);
- if (ret)
- return ret;
-
- /*
- * Enable macro1 to use rx_lspd & tx_lspd
- * Release Rx_Clock on first I-DLL phase on macro1
- * Assert deserializer reset
- * des_bit_lock_en is set
- * bit lock detection strength
- * Deassert deserializer reset
- */
- writeb_relaxed(0x00, miphy_phy->base + BOUNDARY1_REG);
- writeb_relaxed(0x00, miphy_phy->base + IDLL_TEST_REG);
- writeb_relaxed(RST_RX, miphy_phy->base + RESET_REG);
- val = miphy_phy->sata_tx_pol_inv ?
- (TX_POL | DES_BIT_LOCK_EN) : DES_BIT_LOCK_EN;
- writeb_relaxed(val, miphy_phy->base + CTRL_REG);
-
- val = BIT_LOCK_CNT_512 | BIT_LOCK_LEVEL;
- writeb_relaxed(val, miphy_phy->base + DES_BITLOCK_REG);
- writeb_relaxed(0x00, miphy_phy->base + RESET_REG);
-
- return 0;
-}
-
-static int miphy365x_init(struct phy *phy)
-{
- struct miphy365x_phy *miphy_phy = phy_get_drvdata(phy);
- struct miphy365x_dev *miphy_dev = dev_get_drvdata(phy->dev.parent);
- int ret = 0;
-
- mutex_lock(&miphy_dev->miphy_mutex);
-
- ret = miphy365x_set_path(miphy_phy, miphy_dev);
- if (ret) {
- mutex_unlock(&miphy_dev->miphy_mutex);
- return ret;
- }
-
- /* Initialise Miphy for PCIe or SATA */
- if (miphy_phy->type == PHY_TYPE_PCIE)
- ret = miphy365x_init_pcie_port(miphy_phy, miphy_dev);
- else
- ret = miphy365x_init_sata_port(miphy_phy, miphy_dev);
-
- mutex_unlock(&miphy_dev->miphy_mutex);
-
- return ret;
-}
-
-static int miphy365x_get_addr(struct device *dev,
- struct miphy365x_phy *miphy_phy, int index)
-{
- struct device_node *phynode = miphy_phy->phy->dev.of_node;
- const char *name;
- int type = miphy_phy->type;
- int ret;
-
- ret = of_property_read_string_index(phynode, "reg-names", index, &name);
- if (ret) {
- dev_err(dev, "no reg-names property not found\n");
- return ret;
- }
-
- if (!((!strncmp(name, "sata", 4) && type == PHY_TYPE_SATA) ||
- (!strncmp(name, "pcie", 4) && type == PHY_TYPE_PCIE)))
- return 0;
-
- miphy_phy->base = of_iomap(phynode, index);
- if (!miphy_phy->base) {
- dev_err(dev, "Failed to map %s\n", phynode->full_name);
- return -EINVAL;
- }
-
- return 0;
-}
-
-static struct phy *miphy365x_xlate(struct device *dev,
- struct of_phandle_args *args)
-{
- struct miphy365x_dev *miphy_dev = dev_get_drvdata(dev);
- struct miphy365x_phy *miphy_phy = NULL;
- struct device_node *phynode = args->np;
- int ret, index;
-
- if (args->args_count != 1) {
- dev_err(dev, "Invalid number of cells in 'phy' property\n");
- return ERR_PTR(-EINVAL);
- }
-
- for (index = 0; index < miphy_dev->nphys; index++)
- if (phynode == miphy_dev->phys[index]->phy->dev.of_node) {
- miphy_phy = miphy_dev->phys[index];
- break;
- }
-
- if (!miphy_phy) {
- dev_err(dev, "Failed to find appropriate phy\n");
- return ERR_PTR(-EINVAL);
- }
-
- miphy_phy->type = args->args[0];
-
- if (!(miphy_phy->type == PHY_TYPE_SATA ||
- miphy_phy->type == PHY_TYPE_PCIE)) {
- dev_err(dev, "Unsupported device type: %d\n", miphy_phy->type);
- return ERR_PTR(-EINVAL);
- }
-
- /* Each port handles SATA and PCIE - third entry is always sysconf. */
- for (index = 0; index < 3; index++) {
- ret = miphy365x_get_addr(dev, miphy_phy, index);
- if (ret < 0)
- return ERR_PTR(ret);
- }
-
- return miphy_phy->phy;
-}
-
-static const struct phy_ops miphy365x_ops = {
- .init = miphy365x_init,
- .owner = THIS_MODULE,
-};
-
-static int miphy365x_of_probe(struct device_node *phynode,
- struct miphy365x_phy *miphy_phy)
-{
- of_property_read_u32(phynode, "st,sata-gen", &miphy_phy->sata_gen);
- if (!miphy_phy->sata_gen)
- miphy_phy->sata_gen = SATA_GEN1;
-
- miphy_phy->pcie_tx_pol_inv =
- of_property_read_bool(phynode, "st,pcie-tx-pol-inv");
-
- miphy_phy->sata_tx_pol_inv =
- of_property_read_bool(phynode, "st,sata-tx-pol-inv");
-
- return 0;
-}
-
-static int miphy365x_probe(struct platform_device *pdev)
-{
- struct device_node *child, *np = pdev->dev.of_node;
- struct miphy365x_dev *miphy_dev;
- struct phy_provider *provider;
- struct phy *phy;
- int ret, port = 0;
-
- miphy_dev = devm_kzalloc(&pdev->dev, sizeof(*miphy_dev), GFP_KERNEL);
- if (!miphy_dev)
- return -ENOMEM;
-
- miphy_dev->nphys = of_get_child_count(np);
- miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
- sizeof(*miphy_dev->phys), GFP_KERNEL);
- if (!miphy_dev->phys)
- return -ENOMEM;
-
- miphy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
- if (IS_ERR(miphy_dev->regmap)) {
- dev_err(miphy_dev->dev, "No syscfg phandle specified\n");
- return PTR_ERR(miphy_dev->regmap);
- }
-
- miphy_dev->dev = &pdev->dev;
-
- dev_set_drvdata(&pdev->dev, miphy_dev);
-
- mutex_init(&miphy_dev->miphy_mutex);
-
- for_each_child_of_node(np, child) {
- struct miphy365x_phy *miphy_phy;
-
- miphy_phy = devm_kzalloc(&pdev->dev, sizeof(*miphy_phy),
- GFP_KERNEL);
- if (!miphy_phy) {
- ret = -ENOMEM;
- goto put_child;
- }
-
- miphy_dev->phys[port] = miphy_phy;
-
- phy = devm_phy_create(&pdev->dev, child, &miphy365x_ops);
- if (IS_ERR(phy)) {
- dev_err(&pdev->dev, "failed to create PHY\n");
- ret = PTR_ERR(phy);
- goto put_child;
- }
-
- miphy_dev->phys[port]->phy = phy;
-
- ret = miphy365x_of_probe(child, miphy_phy);
- if (ret)
- goto put_child;
-
- phy_set_drvdata(phy, miphy_dev->phys[port]);
-
- port++;
- /* sysconfig offsets are indexed from 1 */
- ret = of_property_read_u32_index(np, "st,syscfg", port,
- &miphy_phy->ctrlreg);
- if (ret) {
- dev_err(&pdev->dev, "No sysconfig offset found\n");
- goto put_child;
- }
- }
-
- provider = devm_of_phy_provider_register(&pdev->dev, miphy365x_xlate);
- return PTR_ERR_OR_ZERO(provider);
-put_child:
- of_node_put(child);
- return ret;
-}
-
-static const struct of_device_id miphy365x_of_match[] = {
- { .compatible = "st,miphy365x-phy", },
- { },
-};
-MODULE_DEVICE_TABLE(of, miphy365x_of_match);
-
-static struct platform_driver miphy365x_driver = {
- .probe = miphy365x_probe,
- .driver = {
- .name = "miphy365x-phy",
- .of_match_table = miphy365x_of_match,
- }
-};
-module_platform_driver(miphy365x_driver);
-
-MODULE_AUTHOR("Alexandre Torgue <alexandre.torgue-qxv4g6HH51o@public.gmane.org>");
-MODULE_DESCRIPTION("STMicroelectronics miphy365x driver");
-MODULE_LICENSE("GPL v2");
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-09-23 15:06 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:06 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, kishon
On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
> This phy is only used on STiH415/6 based 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>
> ---
> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
Acked-by: Rob Herring <robh@kernel.org>
> drivers/phy/Kconfig | 10 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-miphy365x.c | 625 ---------------------
> 4 files changed, 713 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
> delete mode 100644 drivers/phy/phy-miphy365x.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-09-23 15:06 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:06 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
> This phy is only used on STiH415/6 based 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>
> ---
> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
Acked-by: Rob Herring <robh@kernel.org>
> drivers/phy/Kconfig | 10 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-miphy365x.c | 625 ---------------------
> 4 files changed, 713 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
> delete mode 100644 drivers/phy/phy-miphy365x.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-09-23 15:06 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:06 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
> This phy is only used on STiH415/6 based silicon, and support for
> these SoC's is being removed from the kernel.
>
> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <kishon-l0cyMroinI0@public.gmane.org>
> ---
> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> drivers/phy/Kconfig | 10 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-miphy365x.c | 625 ---------------------
> 4 files changed, 713 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
> delete mode 100644 drivers/phy/phy-miphy365x.c
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
2016-09-23 15:06 ` Rob Herring
(?)
@ 2016-10-18 7:47 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:47 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones, kishon
Hi
On 09/23/2016 05:06 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>> This phy is only used on STiH415/6 based 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>
>> ---
>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/phy/Kconfig | 10 -
>> drivers/phy/Makefile | 1 -
>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>> 4 files changed, 713 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>> delete mode 100644 drivers/phy/phy-miphy365x.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 7:47 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/23/2016 05:06 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>> This phy is only used on STiH415/6 based 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>
>> ---
>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/phy/Kconfig | 10 -
>> drivers/phy/Makefile | 1 -
>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>> 4 files changed, 713 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>> delete mode 100644 drivers/phy/phy-miphy365x.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 7:47 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:47 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
Hi
On 09/23/2016 05:06 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>> This phy is only used on STiH415/6 based silicon, and support for
>> these SoC's is being removed from the kernel.
>>
>> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>> Cc: <kishon-l0cyMroinI0@public.gmane.org>
>> ---
>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/phy/Kconfig | 10 -
>> drivers/phy/Makefile | 1 -
>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>> 4 files changed, 713 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>> delete mode 100644 drivers/phy/phy-miphy365x.c
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 8:45 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:45 UTC (permalink / raw)
To: Rob Herring, Peter Griffin, kishon
Cc: devicetree, kernel, linux-kernel, linux-arm-kernel
On 10/18/2016 09:47 AM, Patrice Chotard wrote:
> Hi
>
> On 09/23/2016 05:06 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>>> This phy is only used on STiH415/6 based 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>
>>> ---
>>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in linux-phy tree.
Kishon will you take care of it ?
Thanks
>
> Thanks
>
>>
>>> drivers/phy/Kconfig | 10 -
>>> drivers/phy/Makefile | 1 -
>>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>>> 4 files changed, 713 deletions(-)
>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>>> delete mode 100644 drivers/phy/phy-miphy365x.c
>
>
> _______________________________________________
> Kernel mailing list
> Kernel@stlinux.com
> http://www.stlinux.com/mailman/listinfo/kernel
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [STLinux Kernel] [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 8:45 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:45 UTC (permalink / raw)
To: linux-arm-kernel
On 10/18/2016 09:47 AM, Patrice Chotard wrote:
> Hi
>
> On 09/23/2016 05:06 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>>> This phy is only used on STiH415/6 based 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>
>>> ---
>>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in linux-phy tree.
Kishon will you take care of it ?
Thanks
>
> Thanks
>
>>
>>> drivers/phy/Kconfig | 10 -
>>> drivers/phy/Makefile | 1 -
>>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>>> 4 files changed, 713 deletions(-)
>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>>> delete mode 100644 drivers/phy/phy-miphy365x.c
>
>
> _______________________________________________
> Kernel mailing list
> Kernel at stlinux.com
> http://www.stlinux.com/mailman/listinfo/kernel
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 8:45 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:45 UTC (permalink / raw)
To: Rob Herring, Peter Griffin, kishon-l0cyMroinI0
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, kernel-F5mvAk5X5gdBDgjK7y7TUQ,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 10/18/2016 09:47 AM, Patrice Chotard wrote:
> Hi
>
> On 09/23/2016 05:06 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>>> This phy is only used on STiH415/6 based silicon, and support for
>>> these SoC's is being removed from the kernel.
>>>
>>> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>> Cc: <kishon-l0cyMroinI0@public.gmane.org>
>>> ---
>>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>>
>> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in linux-phy tree.
Kishon will you take care of it ?
Thanks
>
> Thanks
>
>>
>>> drivers/phy/Kconfig | 10 -
>>> drivers/phy/Makefile | 1 -
>>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>>> 4 files changed, 713 deletions(-)
>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>>> delete mode 100644 drivers/phy/phy-miphy365x.c
>
>
> _______________________________________________
> Kernel mailing list
> Kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org
> http://www.stlinux.com/mailman/listinfo/kernel
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 9:18 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-10-18 9:18 UTC (permalink / raw)
To: Patrice Chotard, Rob Herring, Peter Griffin
Cc: devicetree, kernel, linux-kernel, linux-arm-kernel
On Tuesday 18 October 2016 02:15 PM, Patrice Chotard wrote:
>
>
> On 10/18/2016 09:47 AM, Patrice Chotard wrote:
>> Hi
>>
>> On 09/23/2016 05:06 PM, Rob Herring wrote:
>>> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>>>> This phy is only used on STiH415/6 based 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>
>>>> ---
>>>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>>>
>>> Acked-by: Rob Herring <robh@kernel.org>
>>
>> Applied on sti-dt-for-4.10 branch
>
>
> Sorry, i did a mistake, these patch should go in linux-phy tree.
> Kishon will you take care of it ?
yes, I will.
Thanks
Kishon
>
> Thanks
>
>>
>> Thanks
>>
>>>
>>>> drivers/phy/Kconfig | 10 -
>>>> drivers/phy/Makefile | 1 -
>>>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>>>> 4 files changed, 713 deletions(-)
>>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>>>> delete mode 100644 drivers/phy/phy-miphy365x.c
>>
>>
>> _______________________________________________
>> Kernel mailing list
>> Kernel@stlinux.com
>> http://www.stlinux.com/mailman/listinfo/kernel
>>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [STLinux Kernel] [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 9:18 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-10-18 9:18 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 18 October 2016 02:15 PM, Patrice Chotard wrote:
>
>
> On 10/18/2016 09:47 AM, Patrice Chotard wrote:
>> Hi
>>
>> On 09/23/2016 05:06 PM, Rob Herring wrote:
>>> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>>>> This phy is only used on STiH415/6 based 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>
>>>> ---
>>>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>>>
>>> Acked-by: Rob Herring <robh@kernel.org>
>>
>> Applied on sti-dt-for-4.10 branch
>
>
> Sorry, i did a mistake, these patch should go in linux-phy tree.
> Kishon will you take care of it ?
yes, I will.
Thanks
Kishon
>
> Thanks
>
>>
>> Thanks
>>
>>>
>>>> drivers/phy/Kconfig | 10 -
>>>> drivers/phy/Makefile | 1 -
>>>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>>>> 4 files changed, 713 deletions(-)
>>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>>>> delete mode 100644 drivers/phy/phy-miphy365x.c
>>
>>
>> _______________________________________________
>> Kernel mailing list
>> Kernel at stlinux.com
>> http://www.stlinux.com/mailman/listinfo/kernel
>>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 01/19] phy: phy-miphy365x: Remove miphy365 driver and dt binding documentation.
@ 2016-10-18 9:18 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-10-18 9:18 UTC (permalink / raw)
To: Patrice Chotard, Rob Herring, Peter Griffin
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, kernel-F5mvAk5X5gdBDgjK7y7TUQ,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On Tuesday 18 October 2016 02:15 PM, Patrice Chotard wrote:
>
>
> On 10/18/2016 09:47 AM, Patrice Chotard wrote:
>> Hi
>>
>> On 09/23/2016 05:06 PM, Rob Herring wrote:
>>> On Wed, Sep 14, 2016 at 02:27:39PM +0100, Peter Griffin wrote:
>>>> This phy is only used on STiH415/6 based silicon, and support for
>>>> these SoC's is being removed from the kernel.
>>>>
>>>> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>>> Cc: <kishon-l0cyMroinI0@public.gmane.org>
>>>> ---
>>>> .../devicetree/bindings/phy/phy-miphy365x.txt | 77 ---
>>>
>>> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>>
>> Applied on sti-dt-for-4.10 branch
>
>
> Sorry, i did a mistake, these patch should go in linux-phy tree.
> Kishon will you take care of it ?
yes, I will.
Thanks
Kishon
>
> Thanks
>
>>
>> Thanks
>>
>>>
>>>> drivers/phy/Kconfig | 10 -
>>>> drivers/phy/Makefile | 1 -
>>>> drivers/phy/phy-miphy365x.c | 625 ---------------------
>>>> 4 files changed, 713 deletions(-)
>>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-miphy365x.txt
>>>> delete mode 100644 drivers/phy/phy-miphy365x.c
>>
>>
>> _______________________________________________
>> Kernel mailing list
>> Kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org
>> http://www.stlinux.com/mailman/listinfo/kernel
>>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
This phy is only used on STiH415/6 based 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>
---
.../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
drivers/phy/Kconfig | 8 -
drivers/phy/Makefile | 1 -
drivers/phy/phy-stih41x-usb.c | 188 ---------------------
4 files changed, 221 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
delete mode 100644 drivers/phy/phy-stih41x-usb.c
diff --git a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt b/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
deleted file mode 100644
index 744b480..0000000
--- a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-STMicroelectronics STiH41x USB PHY binding
-------------------------------------------
-
-This file contains documentation for the usb phy found in STiH415/6 SoCs from
-STMicroelectronics.
-
-Required properties:
-- compatible : should be "st,stih416-usb-phy" or "st,stih415-usb-phy"
-- st,syscfg : should be a phandle of the syscfg node
-- clock-names : must contain "osc_phy"
-- clocks : must contain an entry for each name in clock-names.
-See: Documentation/devicetree/bindings/clock/clock-bindings.txt
-- #phy-cells : must be 0 for this phy
-See: Documentation/devicetree/bindings/phy/phy-bindings.txt
-
-Example:
-
-usb2_phy: usb2phy@0 {
- compatible = "st,stih416-usb-phy";
- #phy-cells = <0>;
- st,syscfg = <&syscfg_rear>;
- clocks = <&clk_sysin>;
- clock-names = "osc_phy";
-};
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index d1f22ac..b4aa039 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -392,14 +392,6 @@ config PHY_STIH407_USB
Enable this support to enable the picoPHY device used by USB2
and USB3 controllers on STMicroelectronics STiH407 SoC families.
-config PHY_STIH41X_USB
- tristate "STMicroelectronics USB2 PHY driver for STiH41x series"
- depends on ARCH_STI
- select GENERIC_PHY
- help
- Enable this to support the USB transceiver that is part of
- STMicroelectronics STiH41x SoC series.
-
config PHY_QCOM_UFS
tristate "Qualcomm UFS PHY driver"
depends on OF && ARCH_QCOM
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index d169d80..5e48741 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o
-obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
deleted file mode 100644
index 0ac7463..0000000
--- a/drivers/phy/phy-stih41x-usb.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics
- *
- * STMicroelectronics PHY driver for STiH41x USB.
- *
- * Author: Maxime Coquelin <maxime.coquelin@st.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/regmap.h>
-#include <linux/mfd/syscon.h>
-
-#define SYSCFG332 0x80
-#define SYSCFG2520 0x820
-
-/**
- * struct stih41x_usb_cfg - SoC specific PHY register mapping
- * @syscfg: Offset in syscfg registers bank
- * @cfg_mask: Bits mask for PHY configuration
- * @cfg: Static configuration value for PHY
- * @oscok: Notify the PHY oscillator clock is ready
- * Setting this bit enable the PHY
- */
-struct stih41x_usb_cfg {
- u32 syscfg;
- u32 cfg_mask;
- u32 cfg;
- u32 oscok;
-};
-
-/**
- * struct stih41x_usb_phy - Private data for the PHY
- * @dev: device for this controller
- * @regmap: Syscfg registers bank in which PHY is configured
- * @cfg: SoC specific PHY register mapping
- * @clk: Oscillator used by the PHY
- */
-struct stih41x_usb_phy {
- struct device *dev;
- struct regmap *regmap;
- const struct stih41x_usb_cfg *cfg;
- struct clk *clk;
-};
-
-static struct stih41x_usb_cfg stih415_usb_phy_cfg = {
- .syscfg = SYSCFG332,
- .cfg_mask = 0x3f,
- .cfg = 0x38,
- .oscok = BIT(6),
-};
-
-static struct stih41x_usb_cfg stih416_usb_phy_cfg = {
- .syscfg = SYSCFG2520,
- .cfg_mask = 0x33f,
- .cfg = 0x238,
- .oscok = BIT(6),
-};
-
-static int stih41x_usb_phy_init(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
-
- return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->cfg_mask, phy_dev->cfg->cfg);
-}
-
-static int stih41x_usb_phy_power_on(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
- int ret;
-
- ret = clk_prepare_enable(phy_dev->clk);
- if (ret) {
- dev_err(phy_dev->dev, "Failed to enable osc_phy clock\n");
- return ret;
- }
-
- ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->oscok, phy_dev->cfg->oscok);
- if (ret)
- clk_disable_unprepare(phy_dev->clk);
-
- return ret;
-}
-
-static int stih41x_usb_phy_power_off(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
- int ret;
-
- ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->oscok, 0);
- if (ret) {
- dev_err(phy_dev->dev, "Failed to clear oscok bit\n");
- return ret;
- }
-
- clk_disable_unprepare(phy_dev->clk);
-
- return 0;
-}
-
-static const struct phy_ops stih41x_usb_phy_ops = {
- .init = stih41x_usb_phy_init,
- .power_on = stih41x_usb_phy_power_on,
- .power_off = stih41x_usb_phy_power_off,
- .owner = THIS_MODULE,
-};
-
-static const struct of_device_id stih41x_usb_phy_of_match[];
-
-static int stih41x_usb_phy_probe(struct platform_device *pdev)
-{
- struct device_node *np = pdev->dev.of_node;
- const struct of_device_id *match;
- struct stih41x_usb_phy *phy_dev;
- struct device *dev = &pdev->dev;
- struct phy_provider *phy_provider;
- struct phy *phy;
-
- phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
- if (!phy_dev)
- return -ENOMEM;
-
- match = of_match_device(stih41x_usb_phy_of_match, &pdev->dev);
- if (!match)
- return -ENODEV;
-
- phy_dev->cfg = match->data;
-
- phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
- if (IS_ERR(phy_dev->regmap)) {
- dev_err(dev, "No syscfg phandle specified\n");
- return PTR_ERR(phy_dev->regmap);
- }
-
- phy_dev->clk = devm_clk_get(dev, "osc_phy");
- if (IS_ERR(phy_dev->clk)) {
- dev_err(dev, "osc_phy clk not found\n");
- return PTR_ERR(phy_dev->clk);
- }
-
- phy = devm_phy_create(dev, NULL, &stih41x_usb_phy_ops);
-
- if (IS_ERR(phy)) {
- dev_err(dev, "failed to create phy\n");
- return PTR_ERR(phy);
- }
-
- phy_dev->dev = dev;
-
- phy_set_drvdata(phy, phy_dev);
-
- phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
- return PTR_ERR_OR_ZERO(phy_provider);
-}
-
-static const struct of_device_id stih41x_usb_phy_of_match[] = {
- { .compatible = "st,stih415-usb-phy", .data = &stih415_usb_phy_cfg },
- { .compatible = "st,stih416-usb-phy", .data = &stih416_usb_phy_cfg },
- { /* sentinel */ },
-};
-MODULE_DEVICE_TABLE(of, stih41x_usb_phy_of_match);
-
-static struct platform_driver stih41x_usb_phy_driver = {
- .probe = stih41x_usb_phy_probe,
- .driver = {
- .name = "stih41x-usb-phy",
- .of_match_table = stih41x_usb_phy_of_match,
- }
-};
-module_platform_driver(stih41x_usb_phy_driver);
-
-MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics USB PHY driver for STiH41x series");
-MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This phy is only used on STiH415/6 based 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>
---
.../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
drivers/phy/Kconfig | 8 -
drivers/phy/Makefile | 1 -
drivers/phy/phy-stih41x-usb.c | 188 ---------------------
4 files changed, 221 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
delete mode 100644 drivers/phy/phy-stih41x-usb.c
diff --git a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt b/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
deleted file mode 100644
index 744b480..0000000
--- a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-STMicroelectronics STiH41x USB PHY binding
-------------------------------------------
-
-This file contains documentation for the usb phy found in STiH415/6 SoCs from
-STMicroelectronics.
-
-Required properties:
-- compatible : should be "st,stih416-usb-phy" or "st,stih415-usb-phy"
-- st,syscfg : should be a phandle of the syscfg node
-- clock-names : must contain "osc_phy"
-- clocks : must contain an entry for each name in clock-names.
-See: Documentation/devicetree/bindings/clock/clock-bindings.txt
-- #phy-cells : must be 0 for this phy
-See: Documentation/devicetree/bindings/phy/phy-bindings.txt
-
-Example:
-
-usb2_phy: usb2phy at 0 {
- compatible = "st,stih416-usb-phy";
- #phy-cells = <0>;
- st,syscfg = <&syscfg_rear>;
- clocks = <&clk_sysin>;
- clock-names = "osc_phy";
-};
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index d1f22ac..b4aa039 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -392,14 +392,6 @@ config PHY_STIH407_USB
Enable this support to enable the picoPHY device used by USB2
and USB3 controllers on STMicroelectronics STiH407 SoC families.
-config PHY_STIH41X_USB
- tristate "STMicroelectronics USB2 PHY driver for STiH41x series"
- depends on ARCH_STI
- select GENERIC_PHY
- help
- Enable this to support the USB transceiver that is part of
- STMicroelectronics STiH41x SoC series.
-
config PHY_QCOM_UFS
tristate "Qualcomm UFS PHY driver"
depends on OF && ARCH_QCOM
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index d169d80..5e48741 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o
-obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
deleted file mode 100644
index 0ac7463..0000000
--- a/drivers/phy/phy-stih41x-usb.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics
- *
- * STMicroelectronics PHY driver for STiH41x USB.
- *
- * Author: Maxime Coquelin <maxime.coquelin@st.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/regmap.h>
-#include <linux/mfd/syscon.h>
-
-#define SYSCFG332 0x80
-#define SYSCFG2520 0x820
-
-/**
- * struct stih41x_usb_cfg - SoC specific PHY register mapping
- * @syscfg: Offset in syscfg registers bank
- * @cfg_mask: Bits mask for PHY configuration
- * @cfg: Static configuration value for PHY
- * @oscok: Notify the PHY oscillator clock is ready
- * Setting this bit enable the PHY
- */
-struct stih41x_usb_cfg {
- u32 syscfg;
- u32 cfg_mask;
- u32 cfg;
- u32 oscok;
-};
-
-/**
- * struct stih41x_usb_phy - Private data for the PHY
- * @dev: device for this controller
- * @regmap: Syscfg registers bank in which PHY is configured
- * @cfg: SoC specific PHY register mapping
- * @clk: Oscillator used by the PHY
- */
-struct stih41x_usb_phy {
- struct device *dev;
- struct regmap *regmap;
- const struct stih41x_usb_cfg *cfg;
- struct clk *clk;
-};
-
-static struct stih41x_usb_cfg stih415_usb_phy_cfg = {
- .syscfg = SYSCFG332,
- .cfg_mask = 0x3f,
- .cfg = 0x38,
- .oscok = BIT(6),
-};
-
-static struct stih41x_usb_cfg stih416_usb_phy_cfg = {
- .syscfg = SYSCFG2520,
- .cfg_mask = 0x33f,
- .cfg = 0x238,
- .oscok = BIT(6),
-};
-
-static int stih41x_usb_phy_init(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
-
- return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->cfg_mask, phy_dev->cfg->cfg);
-}
-
-static int stih41x_usb_phy_power_on(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
- int ret;
-
- ret = clk_prepare_enable(phy_dev->clk);
- if (ret) {
- dev_err(phy_dev->dev, "Failed to enable osc_phy clock\n");
- return ret;
- }
-
- ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->oscok, phy_dev->cfg->oscok);
- if (ret)
- clk_disable_unprepare(phy_dev->clk);
-
- return ret;
-}
-
-static int stih41x_usb_phy_power_off(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
- int ret;
-
- ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->oscok, 0);
- if (ret) {
- dev_err(phy_dev->dev, "Failed to clear oscok bit\n");
- return ret;
- }
-
- clk_disable_unprepare(phy_dev->clk);
-
- return 0;
-}
-
-static const struct phy_ops stih41x_usb_phy_ops = {
- .init = stih41x_usb_phy_init,
- .power_on = stih41x_usb_phy_power_on,
- .power_off = stih41x_usb_phy_power_off,
- .owner = THIS_MODULE,
-};
-
-static const struct of_device_id stih41x_usb_phy_of_match[];
-
-static int stih41x_usb_phy_probe(struct platform_device *pdev)
-{
- struct device_node *np = pdev->dev.of_node;
- const struct of_device_id *match;
- struct stih41x_usb_phy *phy_dev;
- struct device *dev = &pdev->dev;
- struct phy_provider *phy_provider;
- struct phy *phy;
-
- phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
- if (!phy_dev)
- return -ENOMEM;
-
- match = of_match_device(stih41x_usb_phy_of_match, &pdev->dev);
- if (!match)
- return -ENODEV;
-
- phy_dev->cfg = match->data;
-
- phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
- if (IS_ERR(phy_dev->regmap)) {
- dev_err(dev, "No syscfg phandle specified\n");
- return PTR_ERR(phy_dev->regmap);
- }
-
- phy_dev->clk = devm_clk_get(dev, "osc_phy");
- if (IS_ERR(phy_dev->clk)) {
- dev_err(dev, "osc_phy clk not found\n");
- return PTR_ERR(phy_dev->clk);
- }
-
- phy = devm_phy_create(dev, NULL, &stih41x_usb_phy_ops);
-
- if (IS_ERR(phy)) {
- dev_err(dev, "failed to create phy\n");
- return PTR_ERR(phy);
- }
-
- phy_dev->dev = dev;
-
- phy_set_drvdata(phy, phy_dev);
-
- phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
- return PTR_ERR_OR_ZERO(phy_provider);
-}
-
-static const struct of_device_id stih41x_usb_phy_of_match[] = {
- { .compatible = "st,stih415-usb-phy", .data = &stih415_usb_phy_cfg },
- { .compatible = "st,stih416-usb-phy", .data = &stih416_usb_phy_cfg },
- { /* sentinel */ },
-};
-MODULE_DEVICE_TABLE(of, stih41x_usb_phy_of_match);
-
-static struct platform_driver stih41x_usb_phy_driver = {
- .probe = stih41x_usb_phy_probe,
- .driver = {
- .name = "stih41x-usb-phy",
- .of_match_table = stih41x_usb_phy_of_match,
- }
-};
-module_platform_driver(stih41x_usb_phy_driver);
-
-MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics USB PHY driver for STiH41x series");
-MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
This phy is only used on STiH415/6 based 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>
---
.../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
drivers/phy/Kconfig | 8 -
drivers/phy/Makefile | 1 -
drivers/phy/phy-stih41x-usb.c | 188 ---------------------
4 files changed, 221 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
delete mode 100644 drivers/phy/phy-stih41x-usb.c
diff --git a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt b/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
deleted file mode 100644
index 744b480..0000000
--- a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-STMicroelectronics STiH41x USB PHY binding
-------------------------------------------
-
-This file contains documentation for the usb phy found in STiH415/6 SoCs from
-STMicroelectronics.
-
-Required properties:
-- compatible : should be "st,stih416-usb-phy" or "st,stih415-usb-phy"
-- st,syscfg : should be a phandle of the syscfg node
-- clock-names : must contain "osc_phy"
-- clocks : must contain an entry for each name in clock-names.
-See: Documentation/devicetree/bindings/clock/clock-bindings.txt
-- #phy-cells : must be 0 for this phy
-See: Documentation/devicetree/bindings/phy/phy-bindings.txt
-
-Example:
-
-usb2_phy: usb2phy@0 {
- compatible = "st,stih416-usb-phy";
- #phy-cells = <0>;
- st,syscfg = <&syscfg_rear>;
- clocks = <&clk_sysin>;
- clock-names = "osc_phy";
-};
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index d1f22ac..b4aa039 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -392,14 +392,6 @@ config PHY_STIH407_USB
Enable this support to enable the picoPHY device used by USB2
and USB3 controllers on STMicroelectronics STiH407 SoC families.
-config PHY_STIH41X_USB
- tristate "STMicroelectronics USB2 PHY driver for STiH41x series"
- depends on ARCH_STI
- select GENERIC_PHY
- help
- Enable this to support the USB transceiver that is part of
- STMicroelectronics STiH41x SoC series.
-
config PHY_QCOM_UFS
tristate "Qualcomm UFS PHY driver"
depends on OF && ARCH_QCOM
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index d169d80..5e48741 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o
-obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
deleted file mode 100644
index 0ac7463..0000000
--- a/drivers/phy/phy-stih41x-usb.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2014 STMicroelectronics
- *
- * STMicroelectronics PHY driver for STiH41x USB.
- *
- * Author: Maxime Coquelin <maxime.coquelin@st.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_platform.h>
-#include <linux/clk.h>
-#include <linux/phy/phy.h>
-#include <linux/regmap.h>
-#include <linux/mfd/syscon.h>
-
-#define SYSCFG332 0x80
-#define SYSCFG2520 0x820
-
-/**
- * struct stih41x_usb_cfg - SoC specific PHY register mapping
- * @syscfg: Offset in syscfg registers bank
- * @cfg_mask: Bits mask for PHY configuration
- * @cfg: Static configuration value for PHY
- * @oscok: Notify the PHY oscillator clock is ready
- * Setting this bit enable the PHY
- */
-struct stih41x_usb_cfg {
- u32 syscfg;
- u32 cfg_mask;
- u32 cfg;
- u32 oscok;
-};
-
-/**
- * struct stih41x_usb_phy - Private data for the PHY
- * @dev: device for this controller
- * @regmap: Syscfg registers bank in which PHY is configured
- * @cfg: SoC specific PHY register mapping
- * @clk: Oscillator used by the PHY
- */
-struct stih41x_usb_phy {
- struct device *dev;
- struct regmap *regmap;
- const struct stih41x_usb_cfg *cfg;
- struct clk *clk;
-};
-
-static struct stih41x_usb_cfg stih415_usb_phy_cfg = {
- .syscfg = SYSCFG332,
- .cfg_mask = 0x3f,
- .cfg = 0x38,
- .oscok = BIT(6),
-};
-
-static struct stih41x_usb_cfg stih416_usb_phy_cfg = {
- .syscfg = SYSCFG2520,
- .cfg_mask = 0x33f,
- .cfg = 0x238,
- .oscok = BIT(6),
-};
-
-static int stih41x_usb_phy_init(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
-
- return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->cfg_mask, phy_dev->cfg->cfg);
-}
-
-static int stih41x_usb_phy_power_on(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
- int ret;
-
- ret = clk_prepare_enable(phy_dev->clk);
- if (ret) {
- dev_err(phy_dev->dev, "Failed to enable osc_phy clock\n");
- return ret;
- }
-
- ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->oscok, phy_dev->cfg->oscok);
- if (ret)
- clk_disable_unprepare(phy_dev->clk);
-
- return ret;
-}
-
-static int stih41x_usb_phy_power_off(struct phy *phy)
-{
- struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
- int ret;
-
- ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
- phy_dev->cfg->oscok, 0);
- if (ret) {
- dev_err(phy_dev->dev, "Failed to clear oscok bit\n");
- return ret;
- }
-
- clk_disable_unprepare(phy_dev->clk);
-
- return 0;
-}
-
-static const struct phy_ops stih41x_usb_phy_ops = {
- .init = stih41x_usb_phy_init,
- .power_on = stih41x_usb_phy_power_on,
- .power_off = stih41x_usb_phy_power_off,
- .owner = THIS_MODULE,
-};
-
-static const struct of_device_id stih41x_usb_phy_of_match[];
-
-static int stih41x_usb_phy_probe(struct platform_device *pdev)
-{
- struct device_node *np = pdev->dev.of_node;
- const struct of_device_id *match;
- struct stih41x_usb_phy *phy_dev;
- struct device *dev = &pdev->dev;
- struct phy_provider *phy_provider;
- struct phy *phy;
-
- phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
- if (!phy_dev)
- return -ENOMEM;
-
- match = of_match_device(stih41x_usb_phy_of_match, &pdev->dev);
- if (!match)
- return -ENODEV;
-
- phy_dev->cfg = match->data;
-
- phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
- if (IS_ERR(phy_dev->regmap)) {
- dev_err(dev, "No syscfg phandle specified\n");
- return PTR_ERR(phy_dev->regmap);
- }
-
- phy_dev->clk = devm_clk_get(dev, "osc_phy");
- if (IS_ERR(phy_dev->clk)) {
- dev_err(dev, "osc_phy clk not found\n");
- return PTR_ERR(phy_dev->clk);
- }
-
- phy = devm_phy_create(dev, NULL, &stih41x_usb_phy_ops);
-
- if (IS_ERR(phy)) {
- dev_err(dev, "failed to create phy\n");
- return PTR_ERR(phy);
- }
-
- phy_dev->dev = dev;
-
- phy_set_drvdata(phy, phy_dev);
-
- phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
- return PTR_ERR_OR_ZERO(phy_provider);
-}
-
-static const struct of_device_id stih41x_usb_phy_of_match[] = {
- { .compatible = "st,stih415-usb-phy", .data = &stih415_usb_phy_cfg },
- { .compatible = "st,stih416-usb-phy", .data = &stih416_usb_phy_cfg },
- { /* sentinel */ },
-};
-MODULE_DEVICE_TABLE(of, stih41x_usb_phy_of_match);
-
-static struct platform_driver stih41x_usb_phy_driver = {
- .probe = stih41x_usb_phy_probe,
- .driver = {
- .name = "stih41x-usb-phy",
- .of_match_table = stih41x_usb_phy_of_match,
- }
-};
-module_platform_driver(stih41x_usb_phy_driver);
-
-MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics USB PHY driver for STiH41x series");
-MODULE_LICENSE("GPL v2");
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-23 15:06 ` Rob Herring
-1 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:06 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, kishon
On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
> This phy is only used on STiH415/6 based 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>
> ---
> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
Acked-by: Rob Herring <robh@kernel.org>
> drivers/phy/Kconfig | 8 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
> 4 files changed, 221 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> delete mode 100644 drivers/phy/phy-stih41x-usb.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-09-23 15:06 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:06 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
> This phy is only used on STiH415/6 based 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>
> ---
> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
Acked-by: Rob Herring <robh@kernel.org>
> drivers/phy/Kconfig | 8 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
> 4 files changed, 221 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> delete mode 100644 drivers/phy/phy-stih41x-usb.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
2016-09-23 15:06 ` Rob Herring
(?)
@ 2016-10-18 7:47 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:47 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones, kishon
Hi
On 09/23/2016 05:06 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>> This phy is only used on STiH415/6 based 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>
>> ---
>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/phy/Kconfig | 8 -
>> drivers/phy/Makefile | 1 -
>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>> 4 files changed, 221 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-10-18 7:47 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/23/2016 05:06 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>> This phy is only used on STiH415/6 based 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>
>> ---
>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/phy/Kconfig | 8 -
>> drivers/phy/Makefile | 1 -
>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>> 4 files changed, 221 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-10-18 7:47 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:47 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
Hi
On 09/23/2016 05:06 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>> This phy is only used on STiH415/6 based silicon, and support for
>> these SoC's is being removed from the kernel.
>>
>> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>> Cc: <kishon-l0cyMroinI0@public.gmane.org>
>> ---
>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/phy/Kconfig | 8 -
>> drivers/phy/Makefile | 1 -
>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>> 4 files changed, 221 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-10-18 8:52 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:52 UTC (permalink / raw)
To: Rob Herring, Peter Griffin, kishon
Cc: devicetree, kernel, linux-kernel, linux-arm-kernel
On 10/18/2016 09:47 AM, Patrice Chotard wrote:
> Hi
>
> On 09/23/2016 05:06 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>>> This phy is only used on STiH415/6 based 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>
>>> ---
>>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in linux-phy tree.
Kishon will you take care of it ?
Thanks
>
> Thanks
>
>
>>
>>> drivers/phy/Kconfig | 8 -
>>> drivers/phy/Makefile | 1 -
>>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>>> 4 files changed, 221 deletions(-)
>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>
> _______________________________________________
> Kernel mailing list
> Kernel@stlinux.com
> http://www.stlinux.com/mailman/listinfo/kernel
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [STLinux Kernel] [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-10-18 8:52 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:52 UTC (permalink / raw)
To: linux-arm-kernel
On 10/18/2016 09:47 AM, Patrice Chotard wrote:
> Hi
>
> On 09/23/2016 05:06 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>>> This phy is only used on STiH415/6 based 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>
>>> ---
>>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in linux-phy tree.
Kishon will you take care of it ?
Thanks
>
> Thanks
>
>
>>
>>> drivers/phy/Kconfig | 8 -
>>> drivers/phy/Makefile | 1 -
>>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>>> 4 files changed, 221 deletions(-)
>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>
> _______________________________________________
> Kernel mailing list
> Kernel at stlinux.com
> http://www.stlinux.com/mailman/listinfo/kernel
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-10-18 8:52 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:52 UTC (permalink / raw)
To: Rob Herring, Peter Griffin, kishon-l0cyMroinI0
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, kernel-F5mvAk5X5gdBDgjK7y7TUQ,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 10/18/2016 09:47 AM, Patrice Chotard wrote:
> Hi
>
> On 09/23/2016 05:06 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>>> This phy is only used on STiH415/6 based silicon, and support for
>>> these SoC's is being removed from the kernel.
>>>
>>> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>> Cc: <kishon-l0cyMroinI0@public.gmane.org>
>>> ---
>>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>>
>> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in linux-phy tree.
Kishon will you take care of it ?
Thanks
>
> Thanks
>
>
>>
>>> drivers/phy/Kconfig | 8 -
>>> drivers/phy/Makefile | 1 -
>>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>>> 4 files changed, 221 deletions(-)
>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>
> _______________________________________________
> Kernel mailing list
> Kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org
> http://www.stlinux.com/mailman/listinfo/kernel
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
2016-10-18 8:52 ` Patrice Chotard
(?)
@ 2016-10-18 9:06 ` Kishon Vijay Abraham I
-1 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-10-18 9:06 UTC (permalink / raw)
To: Patrice Chotard, Rob Herring, Peter Griffin
Cc: devicetree, kernel, linux-kernel, linux-arm-kernel
On Tuesday 18 October 2016 02:22 PM, Patrice Chotard wrote:
>
>
> On 10/18/2016 09:47 AM, Patrice Chotard wrote:
>> Hi
>>
>> On 09/23/2016 05:06 PM, Rob Herring wrote:
>>> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>>>> This phy is only used on STiH415/6 based 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>
>>>> ---
>>>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>>>
>>> Acked-by: Rob Herring <robh@kernel.org>
>>
>> Applied on sti-dt-for-4.10 branch
>
>
> Sorry, i did a mistake, these patch should go in linux-phy tree.
> Kishon will you take care of it ?
sure, will queue this.
Thanks
Kishon
>
> Thanks
>
>>
>> Thanks
>>
>>
>>>
>>>> drivers/phy/Kconfig | 8 -
>>>> drivers/phy/Makefile | 1 -
>>>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>>>> 4 files changed, 221 deletions(-)
>>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>>>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>>
>> _______________________________________________
>> Kernel mailing list
>> Kernel@stlinux.com
>> http://www.stlinux.com/mailman/listinfo/kernel
>>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [STLinux Kernel] [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-10-18 9:06 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-10-18 9:06 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 18 October 2016 02:22 PM, Patrice Chotard wrote:
>
>
> On 10/18/2016 09:47 AM, Patrice Chotard wrote:
>> Hi
>>
>> On 09/23/2016 05:06 PM, Rob Herring wrote:
>>> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>>>> This phy is only used on STiH415/6 based 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>
>>>> ---
>>>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>>>
>>> Acked-by: Rob Herring <robh@kernel.org>
>>
>> Applied on sti-dt-for-4.10 branch
>
>
> Sorry, i did a mistake, these patch should go in linux-phy tree.
> Kishon will you take care of it ?
sure, will queue this.
Thanks
Kishon
>
> Thanks
>
>>
>> Thanks
>>
>>
>>>
>>>> drivers/phy/Kconfig | 8 -
>>>> drivers/phy/Makefile | 1 -
>>>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>>>> 4 files changed, 221 deletions(-)
>>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>>>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>>
>> _______________________________________________
>> Kernel mailing list
>> Kernel at stlinux.com
>> http://www.stlinux.com/mailman/listinfo/kernel
>>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-10-18 9:06 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-10-18 9:06 UTC (permalink / raw)
To: Patrice Chotard, Rob Herring, Peter Griffin
Cc: devicetree, kernel, linux-kernel, linux-arm-kernel
On Tuesday 18 October 2016 02:22 PM, Patrice Chotard wrote:
>
>
> On 10/18/2016 09:47 AM, Patrice Chotard wrote:
>> Hi
>>
>> On 09/23/2016 05:06 PM, Rob Herring wrote:
>>> On Wed, Sep 14, 2016 at 02:27:40PM +0100, Peter Griffin wrote:
>>>> This phy is only used on STiH415/6 based 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>
>>>> ---
>>>> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
>>>
>>> Acked-by: Rob Herring <robh@kernel.org>
>>
>> Applied on sti-dt-for-4.10 branch
>
>
> Sorry, i did a mistake, these patch should go in linux-phy tree.
> Kishon will you take care of it ?
sure, will queue this.
Thanks
Kishon
>
> Thanks
>
>>
>> Thanks
>>
>>
>>>
>>>> drivers/phy/Kconfig | 8 -
>>>> drivers/phy/Makefile | 1 -
>>>> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
>>>> 4 files changed, 221 deletions(-)
>>>> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
>>>> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>>
>> _______________________________________________
>> Kernel mailing list
>> Kernel@stlinux.com
>> http://www.stlinux.com/mailman/listinfo/kernel
>>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-11-15 13:07 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-11-15 13:07 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel,
patrice.chotard, devicetree
Cc: lee.jones
Hi,
On Wednesday 14 September 2016 06:57 PM, Peter Griffin wrote:
> This phy is only used on STiH415/6 based 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>
I've merged the 1st 2 patches of this series. Since Patrice has already
mentioned that he's merged the MAINTAINERS patch, I'm not merging it.
Please let me know if you know of any problems.
Thanks
Kishon
> ---
> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
> drivers/phy/Kconfig | 8 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
> 4 files changed, 221 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>
> diff --git a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt b/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> deleted file mode 100644
> index 744b480..0000000
> --- a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -STMicroelectronics STiH41x USB PHY binding
> -------------------------------------------
> -
> -This file contains documentation for the usb phy found in STiH415/6 SoCs from
> -STMicroelectronics.
> -
> -Required properties:
> -- compatible : should be "st,stih416-usb-phy" or "st,stih415-usb-phy"
> -- st,syscfg : should be a phandle of the syscfg node
> -- clock-names : must contain "osc_phy"
> -- clocks : must contain an entry for each name in clock-names.
> -See: Documentation/devicetree/bindings/clock/clock-bindings.txt
> -- #phy-cells : must be 0 for this phy
> -See: Documentation/devicetree/bindings/phy/phy-bindings.txt
> -
> -Example:
> -
> -usb2_phy: usb2phy@0 {
> - compatible = "st,stih416-usb-phy";
> - #phy-cells = <0>;
> - st,syscfg = <&syscfg_rear>;
> - clocks = <&clk_sysin>;
> - clock-names = "osc_phy";
> -};
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index d1f22ac..b4aa039 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -392,14 +392,6 @@ config PHY_STIH407_USB
> Enable this support to enable the picoPHY device used by USB2
> and USB3 controllers on STMicroelectronics STiH407 SoC families.
>
> -config PHY_STIH41X_USB
> - tristate "STMicroelectronics USB2 PHY driver for STiH41x series"
> - depends on ARCH_STI
> - select GENERIC_PHY
> - help
> - Enable this to support the USB transceiver that is part of
> - STMicroelectronics STiH41x SoC series.
> -
> config PHY_QCOM_UFS
> tristate "Qualcomm UFS PHY driver"
> depends on OF && ARCH_QCOM
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index d169d80..5e48741 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -45,7 +45,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
> obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
> obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
> obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o
> -obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
> diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
> deleted file mode 100644
> index 0ac7463..0000000
> --- a/drivers/phy/phy-stih41x-usb.c
> +++ /dev/null
> @@ -1,188 +0,0 @@
> -/*
> - * Copyright (C) 2014 STMicroelectronics
> - *
> - * STMicroelectronics PHY driver for STiH41x USB.
> - *
> - * Author: Maxime Coquelin <maxime.coquelin@st.com>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2, as
> - * published by the Free Software Foundation.
> - *
> - */
> -
> -#include <linux/platform_device.h>
> -#include <linux/io.h>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/of.h>
> -#include <linux/of_platform.h>
> -#include <linux/clk.h>
> -#include <linux/phy/phy.h>
> -#include <linux/regmap.h>
> -#include <linux/mfd/syscon.h>
> -
> -#define SYSCFG332 0x80
> -#define SYSCFG2520 0x820
> -
> -/**
> - * struct stih41x_usb_cfg - SoC specific PHY register mapping
> - * @syscfg: Offset in syscfg registers bank
> - * @cfg_mask: Bits mask for PHY configuration
> - * @cfg: Static configuration value for PHY
> - * @oscok: Notify the PHY oscillator clock is ready
> - * Setting this bit enable the PHY
> - */
> -struct stih41x_usb_cfg {
> - u32 syscfg;
> - u32 cfg_mask;
> - u32 cfg;
> - u32 oscok;
> -};
> -
> -/**
> - * struct stih41x_usb_phy - Private data for the PHY
> - * @dev: device for this controller
> - * @regmap: Syscfg registers bank in which PHY is configured
> - * @cfg: SoC specific PHY register mapping
> - * @clk: Oscillator used by the PHY
> - */
> -struct stih41x_usb_phy {
> - struct device *dev;
> - struct regmap *regmap;
> - const struct stih41x_usb_cfg *cfg;
> - struct clk *clk;
> -};
> -
> -static struct stih41x_usb_cfg stih415_usb_phy_cfg = {
> - .syscfg = SYSCFG332,
> - .cfg_mask = 0x3f,
> - .cfg = 0x38,
> - .oscok = BIT(6),
> -};
> -
> -static struct stih41x_usb_cfg stih416_usb_phy_cfg = {
> - .syscfg = SYSCFG2520,
> - .cfg_mask = 0x33f,
> - .cfg = 0x238,
> - .oscok = BIT(6),
> -};
> -
> -static int stih41x_usb_phy_init(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> -
> - return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->cfg_mask, phy_dev->cfg->cfg);
> -}
> -
> -static int stih41x_usb_phy_power_on(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> - int ret;
> -
> - ret = clk_prepare_enable(phy_dev->clk);
> - if (ret) {
> - dev_err(phy_dev->dev, "Failed to enable osc_phy clock\n");
> - return ret;
> - }
> -
> - ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->oscok, phy_dev->cfg->oscok);
> - if (ret)
> - clk_disable_unprepare(phy_dev->clk);
> -
> - return ret;
> -}
> -
> -static int stih41x_usb_phy_power_off(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> - int ret;
> -
> - ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->oscok, 0);
> - if (ret) {
> - dev_err(phy_dev->dev, "Failed to clear oscok bit\n");
> - return ret;
> - }
> -
> - clk_disable_unprepare(phy_dev->clk);
> -
> - return 0;
> -}
> -
> -static const struct phy_ops stih41x_usb_phy_ops = {
> - .init = stih41x_usb_phy_init,
> - .power_on = stih41x_usb_phy_power_on,
> - .power_off = stih41x_usb_phy_power_off,
> - .owner = THIS_MODULE,
> -};
> -
> -static const struct of_device_id stih41x_usb_phy_of_match[];
> -
> -static int stih41x_usb_phy_probe(struct platform_device *pdev)
> -{
> - struct device_node *np = pdev->dev.of_node;
> - const struct of_device_id *match;
> - struct stih41x_usb_phy *phy_dev;
> - struct device *dev = &pdev->dev;
> - struct phy_provider *phy_provider;
> - struct phy *phy;
> -
> - phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
> - if (!phy_dev)
> - return -ENOMEM;
> -
> - match = of_match_device(stih41x_usb_phy_of_match, &pdev->dev);
> - if (!match)
> - return -ENODEV;
> -
> - phy_dev->cfg = match->data;
> -
> - phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
> - if (IS_ERR(phy_dev->regmap)) {
> - dev_err(dev, "No syscfg phandle specified\n");
> - return PTR_ERR(phy_dev->regmap);
> - }
> -
> - phy_dev->clk = devm_clk_get(dev, "osc_phy");
> - if (IS_ERR(phy_dev->clk)) {
> - dev_err(dev, "osc_phy clk not found\n");
> - return PTR_ERR(phy_dev->clk);
> - }
> -
> - phy = devm_phy_create(dev, NULL, &stih41x_usb_phy_ops);
> -
> - if (IS_ERR(phy)) {
> - dev_err(dev, "failed to create phy\n");
> - return PTR_ERR(phy);
> - }
> -
> - phy_dev->dev = dev;
> -
> - phy_set_drvdata(phy, phy_dev);
> -
> - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
> - return PTR_ERR_OR_ZERO(phy_provider);
> -}
> -
> -static const struct of_device_id stih41x_usb_phy_of_match[] = {
> - { .compatible = "st,stih415-usb-phy", .data = &stih415_usb_phy_cfg },
> - { .compatible = "st,stih416-usb-phy", .data = &stih416_usb_phy_cfg },
> - { /* sentinel */ },
> -};
> -MODULE_DEVICE_TABLE(of, stih41x_usb_phy_of_match);
> -
> -static struct platform_driver stih41x_usb_phy_driver = {
> - .probe = stih41x_usb_phy_probe,
> - .driver = {
> - .name = "stih41x-usb-phy",
> - .of_match_table = stih41x_usb_phy_of_match,
> - }
> -};
> -module_platform_driver(stih41x_usb_phy_driver);
> -
> -MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin@st.com>");
> -MODULE_DESCRIPTION("STMicroelectronics USB PHY driver for STiH41x series");
> -MODULE_LICENSE("GPL v2");
>
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-11-15 13:07 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-11-15 13:07 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wednesday 14 September 2016 06:57 PM, Peter Griffin wrote:
> This phy is only used on STiH415/6 based 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>
I've merged the 1st 2 patches of this series. Since Patrice has already
mentioned that he's merged the MAINTAINERS patch, I'm not merging it.
Please let me know if you know of any problems.
Thanks
Kishon
> ---
> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
> drivers/phy/Kconfig | 8 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
> 4 files changed, 221 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>
> diff --git a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt b/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> deleted file mode 100644
> index 744b480..0000000
> --- a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -STMicroelectronics STiH41x USB PHY binding
> -------------------------------------------
> -
> -This file contains documentation for the usb phy found in STiH415/6 SoCs from
> -STMicroelectronics.
> -
> -Required properties:
> -- compatible : should be "st,stih416-usb-phy" or "st,stih415-usb-phy"
> -- st,syscfg : should be a phandle of the syscfg node
> -- clock-names : must contain "osc_phy"
> -- clocks : must contain an entry for each name in clock-names.
> -See: Documentation/devicetree/bindings/clock/clock-bindings.txt
> -- #phy-cells : must be 0 for this phy
> -See: Documentation/devicetree/bindings/phy/phy-bindings.txt
> -
> -Example:
> -
> -usb2_phy: usb2phy at 0 {
> - compatible = "st,stih416-usb-phy";
> - #phy-cells = <0>;
> - st,syscfg = <&syscfg_rear>;
> - clocks = <&clk_sysin>;
> - clock-names = "osc_phy";
> -};
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index d1f22ac..b4aa039 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -392,14 +392,6 @@ config PHY_STIH407_USB
> Enable this support to enable the picoPHY device used by USB2
> and USB3 controllers on STMicroelectronics STiH407 SoC families.
>
> -config PHY_STIH41X_USB
> - tristate "STMicroelectronics USB2 PHY driver for STiH41x series"
> - depends on ARCH_STI
> - select GENERIC_PHY
> - help
> - Enable this to support the USB transceiver that is part of
> - STMicroelectronics STiH41x SoC series.
> -
> config PHY_QCOM_UFS
> tristate "Qualcomm UFS PHY driver"
> depends on OF && ARCH_QCOM
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index d169d80..5e48741 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -45,7 +45,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
> obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
> obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
> obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o
> -obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
> diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
> deleted file mode 100644
> index 0ac7463..0000000
> --- a/drivers/phy/phy-stih41x-usb.c
> +++ /dev/null
> @@ -1,188 +0,0 @@
> -/*
> - * Copyright (C) 2014 STMicroelectronics
> - *
> - * STMicroelectronics PHY driver for STiH41x USB.
> - *
> - * Author: Maxime Coquelin <maxime.coquelin@st.com>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2, as
> - * published by the Free Software Foundation.
> - *
> - */
> -
> -#include <linux/platform_device.h>
> -#include <linux/io.h>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/of.h>
> -#include <linux/of_platform.h>
> -#include <linux/clk.h>
> -#include <linux/phy/phy.h>
> -#include <linux/regmap.h>
> -#include <linux/mfd/syscon.h>
> -
> -#define SYSCFG332 0x80
> -#define SYSCFG2520 0x820
> -
> -/**
> - * struct stih41x_usb_cfg - SoC specific PHY register mapping
> - * @syscfg: Offset in syscfg registers bank
> - * @cfg_mask: Bits mask for PHY configuration
> - * @cfg: Static configuration value for PHY
> - * @oscok: Notify the PHY oscillator clock is ready
> - * Setting this bit enable the PHY
> - */
> -struct stih41x_usb_cfg {
> - u32 syscfg;
> - u32 cfg_mask;
> - u32 cfg;
> - u32 oscok;
> -};
> -
> -/**
> - * struct stih41x_usb_phy - Private data for the PHY
> - * @dev: device for this controller
> - * @regmap: Syscfg registers bank in which PHY is configured
> - * @cfg: SoC specific PHY register mapping
> - * @clk: Oscillator used by the PHY
> - */
> -struct stih41x_usb_phy {
> - struct device *dev;
> - struct regmap *regmap;
> - const struct stih41x_usb_cfg *cfg;
> - struct clk *clk;
> -};
> -
> -static struct stih41x_usb_cfg stih415_usb_phy_cfg = {
> - .syscfg = SYSCFG332,
> - .cfg_mask = 0x3f,
> - .cfg = 0x38,
> - .oscok = BIT(6),
> -};
> -
> -static struct stih41x_usb_cfg stih416_usb_phy_cfg = {
> - .syscfg = SYSCFG2520,
> - .cfg_mask = 0x33f,
> - .cfg = 0x238,
> - .oscok = BIT(6),
> -};
> -
> -static int stih41x_usb_phy_init(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> -
> - return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->cfg_mask, phy_dev->cfg->cfg);
> -}
> -
> -static int stih41x_usb_phy_power_on(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> - int ret;
> -
> - ret = clk_prepare_enable(phy_dev->clk);
> - if (ret) {
> - dev_err(phy_dev->dev, "Failed to enable osc_phy clock\n");
> - return ret;
> - }
> -
> - ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->oscok, phy_dev->cfg->oscok);
> - if (ret)
> - clk_disable_unprepare(phy_dev->clk);
> -
> - return ret;
> -}
> -
> -static int stih41x_usb_phy_power_off(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> - int ret;
> -
> - ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->oscok, 0);
> - if (ret) {
> - dev_err(phy_dev->dev, "Failed to clear oscok bit\n");
> - return ret;
> - }
> -
> - clk_disable_unprepare(phy_dev->clk);
> -
> - return 0;
> -}
> -
> -static const struct phy_ops stih41x_usb_phy_ops = {
> - .init = stih41x_usb_phy_init,
> - .power_on = stih41x_usb_phy_power_on,
> - .power_off = stih41x_usb_phy_power_off,
> - .owner = THIS_MODULE,
> -};
> -
> -static const struct of_device_id stih41x_usb_phy_of_match[];
> -
> -static int stih41x_usb_phy_probe(struct platform_device *pdev)
> -{
> - struct device_node *np = pdev->dev.of_node;
> - const struct of_device_id *match;
> - struct stih41x_usb_phy *phy_dev;
> - struct device *dev = &pdev->dev;
> - struct phy_provider *phy_provider;
> - struct phy *phy;
> -
> - phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
> - if (!phy_dev)
> - return -ENOMEM;
> -
> - match = of_match_device(stih41x_usb_phy_of_match, &pdev->dev);
> - if (!match)
> - return -ENODEV;
> -
> - phy_dev->cfg = match->data;
> -
> - phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
> - if (IS_ERR(phy_dev->regmap)) {
> - dev_err(dev, "No syscfg phandle specified\n");
> - return PTR_ERR(phy_dev->regmap);
> - }
> -
> - phy_dev->clk = devm_clk_get(dev, "osc_phy");
> - if (IS_ERR(phy_dev->clk)) {
> - dev_err(dev, "osc_phy clk not found\n");
> - return PTR_ERR(phy_dev->clk);
> - }
> -
> - phy = devm_phy_create(dev, NULL, &stih41x_usb_phy_ops);
> -
> - if (IS_ERR(phy)) {
> - dev_err(dev, "failed to create phy\n");
> - return PTR_ERR(phy);
> - }
> -
> - phy_dev->dev = dev;
> -
> - phy_set_drvdata(phy, phy_dev);
> -
> - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
> - return PTR_ERR_OR_ZERO(phy_provider);
> -}
> -
> -static const struct of_device_id stih41x_usb_phy_of_match[] = {
> - { .compatible = "st,stih415-usb-phy", .data = &stih415_usb_phy_cfg },
> - { .compatible = "st,stih416-usb-phy", .data = &stih416_usb_phy_cfg },
> - { /* sentinel */ },
> -};
> -MODULE_DEVICE_TABLE(of, stih41x_usb_phy_of_match);
> -
> -static struct platform_driver stih41x_usb_phy_driver = {
> - .probe = stih41x_usb_phy_probe,
> - .driver = {
> - .name = "stih41x-usb-phy",
> - .of_match_table = stih41x_usb_phy_of_match,
> - }
> -};
> -module_platform_driver(stih41x_usb_phy_driver);
> -
> -MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin@st.com>");
> -MODULE_DESCRIPTION("STMicroelectronics USB PHY driver for STiH41x series");
> -MODULE_LICENSE("GPL v2");
>
^ permalink raw reply [flat|nested] 174+ messages in thread* Re: [PATCH 02/19] phy: stih41x-usb: Remove usb phy driver and dt binding documentation.
@ 2016-11-15 13:07 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 174+ messages in thread
From: Kishon Vijay Abraham I @ 2016-11-15 13:07 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: lee.jones-QSEj5FYQhm4dnm+yROfE0A
Hi,
On Wednesday 14 September 2016 06:57 PM, Peter Griffin wrote:
> This phy is only used on STiH415/6 based silicon, and support for
> these SoC's is being removed from the kernel.
>
> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <kishon-l0cyMroinI0@public.gmane.org>
I've merged the 1st 2 patches of this series. Since Patrice has already
mentioned that he's merged the MAINTAINERS patch, I'm not merging it.
Please let me know if you know of any problems.
Thanks
Kishon
> ---
> .../devicetree/bindings/phy/phy-stih41x-usb.txt | 24 ---
> drivers/phy/Kconfig | 8 -
> drivers/phy/Makefile | 1 -
> drivers/phy/phy-stih41x-usb.c | 188 ---------------------
> 4 files changed, 221 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> delete mode 100644 drivers/phy/phy-stih41x-usb.c
>
> diff --git a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt b/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> deleted file mode 100644
> index 744b480..0000000
> --- a/Documentation/devicetree/bindings/phy/phy-stih41x-usb.txt
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -STMicroelectronics STiH41x USB PHY binding
> -------------------------------------------
> -
> -This file contains documentation for the usb phy found in STiH415/6 SoCs from
> -STMicroelectronics.
> -
> -Required properties:
> -- compatible : should be "st,stih416-usb-phy" or "st,stih415-usb-phy"
> -- st,syscfg : should be a phandle of the syscfg node
> -- clock-names : must contain "osc_phy"
> -- clocks : must contain an entry for each name in clock-names.
> -See: Documentation/devicetree/bindings/clock/clock-bindings.txt
> -- #phy-cells : must be 0 for this phy
> -See: Documentation/devicetree/bindings/phy/phy-bindings.txt
> -
> -Example:
> -
> -usb2_phy: usb2phy@0 {
> - compatible = "st,stih416-usb-phy";
> - #phy-cells = <0>;
> - st,syscfg = <&syscfg_rear>;
> - clocks = <&clk_sysin>;
> - clock-names = "osc_phy";
> -};
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index d1f22ac..b4aa039 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -392,14 +392,6 @@ config PHY_STIH407_USB
> Enable this support to enable the picoPHY device used by USB2
> and USB3 controllers on STMicroelectronics STiH407 SoC families.
>
> -config PHY_STIH41X_USB
> - tristate "STMicroelectronics USB2 PHY driver for STiH41x series"
> - depends on ARCH_STI
> - select GENERIC_PHY
> - help
> - Enable this to support the USB transceiver that is part of
> - STMicroelectronics STiH41x SoC series.
> -
> config PHY_QCOM_UFS
> tristate "Qualcomm UFS PHY driver"
> depends on OF && ARCH_QCOM
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index d169d80..5e48741 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -45,7 +45,6 @@ obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
> obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
> obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
> obj-$(CONFIG_PHY_STIH407_USB) += phy-stih407-usb.o
> -obj-$(CONFIG_PHY_STIH41X_USB) += phy-stih41x-usb.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-20nm.o
> obj-$(CONFIG_PHY_QCOM_UFS) += phy-qcom-ufs-qmp-14nm.o
> diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
> deleted file mode 100644
> index 0ac7463..0000000
> --- a/drivers/phy/phy-stih41x-usb.c
> +++ /dev/null
> @@ -1,188 +0,0 @@
> -/*
> - * Copyright (C) 2014 STMicroelectronics
> - *
> - * STMicroelectronics PHY driver for STiH41x USB.
> - *
> - * Author: Maxime Coquelin <maxime.coquelin-qxv4g6HH51o@public.gmane.org>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2, as
> - * published by the Free Software Foundation.
> - *
> - */
> -
> -#include <linux/platform_device.h>
> -#include <linux/io.h>
> -#include <linux/kernel.h>
> -#include <linux/module.h>
> -#include <linux/of.h>
> -#include <linux/of_platform.h>
> -#include <linux/clk.h>
> -#include <linux/phy/phy.h>
> -#include <linux/regmap.h>
> -#include <linux/mfd/syscon.h>
> -
> -#define SYSCFG332 0x80
> -#define SYSCFG2520 0x820
> -
> -/**
> - * struct stih41x_usb_cfg - SoC specific PHY register mapping
> - * @syscfg: Offset in syscfg registers bank
> - * @cfg_mask: Bits mask for PHY configuration
> - * @cfg: Static configuration value for PHY
> - * @oscok: Notify the PHY oscillator clock is ready
> - * Setting this bit enable the PHY
> - */
> -struct stih41x_usb_cfg {
> - u32 syscfg;
> - u32 cfg_mask;
> - u32 cfg;
> - u32 oscok;
> -};
> -
> -/**
> - * struct stih41x_usb_phy - Private data for the PHY
> - * @dev: device for this controller
> - * @regmap: Syscfg registers bank in which PHY is configured
> - * @cfg: SoC specific PHY register mapping
> - * @clk: Oscillator used by the PHY
> - */
> -struct stih41x_usb_phy {
> - struct device *dev;
> - struct regmap *regmap;
> - const struct stih41x_usb_cfg *cfg;
> - struct clk *clk;
> -};
> -
> -static struct stih41x_usb_cfg stih415_usb_phy_cfg = {
> - .syscfg = SYSCFG332,
> - .cfg_mask = 0x3f,
> - .cfg = 0x38,
> - .oscok = BIT(6),
> -};
> -
> -static struct stih41x_usb_cfg stih416_usb_phy_cfg = {
> - .syscfg = SYSCFG2520,
> - .cfg_mask = 0x33f,
> - .cfg = 0x238,
> - .oscok = BIT(6),
> -};
> -
> -static int stih41x_usb_phy_init(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> -
> - return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->cfg_mask, phy_dev->cfg->cfg);
> -}
> -
> -static int stih41x_usb_phy_power_on(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> - int ret;
> -
> - ret = clk_prepare_enable(phy_dev->clk);
> - if (ret) {
> - dev_err(phy_dev->dev, "Failed to enable osc_phy clock\n");
> - return ret;
> - }
> -
> - ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->oscok, phy_dev->cfg->oscok);
> - if (ret)
> - clk_disable_unprepare(phy_dev->clk);
> -
> - return ret;
> -}
> -
> -static int stih41x_usb_phy_power_off(struct phy *phy)
> -{
> - struct stih41x_usb_phy *phy_dev = phy_get_drvdata(phy);
> - int ret;
> -
> - ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->oscok, 0);
> - if (ret) {
> - dev_err(phy_dev->dev, "Failed to clear oscok bit\n");
> - return ret;
> - }
> -
> - clk_disable_unprepare(phy_dev->clk);
> -
> - return 0;
> -}
> -
> -static const struct phy_ops stih41x_usb_phy_ops = {
> - .init = stih41x_usb_phy_init,
> - .power_on = stih41x_usb_phy_power_on,
> - .power_off = stih41x_usb_phy_power_off,
> - .owner = THIS_MODULE,
> -};
> -
> -static const struct of_device_id stih41x_usb_phy_of_match[];
> -
> -static int stih41x_usb_phy_probe(struct platform_device *pdev)
> -{
> - struct device_node *np = pdev->dev.of_node;
> - const struct of_device_id *match;
> - struct stih41x_usb_phy *phy_dev;
> - struct device *dev = &pdev->dev;
> - struct phy_provider *phy_provider;
> - struct phy *phy;
> -
> - phy_dev = devm_kzalloc(dev, sizeof(*phy_dev), GFP_KERNEL);
> - if (!phy_dev)
> - return -ENOMEM;
> -
> - match = of_match_device(stih41x_usb_phy_of_match, &pdev->dev);
> - if (!match)
> - return -ENODEV;
> -
> - phy_dev->cfg = match->data;
> -
> - phy_dev->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
> - if (IS_ERR(phy_dev->regmap)) {
> - dev_err(dev, "No syscfg phandle specified\n");
> - return PTR_ERR(phy_dev->regmap);
> - }
> -
> - phy_dev->clk = devm_clk_get(dev, "osc_phy");
> - if (IS_ERR(phy_dev->clk)) {
> - dev_err(dev, "osc_phy clk not found\n");
> - return PTR_ERR(phy_dev->clk);
> - }
> -
> - phy = devm_phy_create(dev, NULL, &stih41x_usb_phy_ops);
> -
> - if (IS_ERR(phy)) {
> - dev_err(dev, "failed to create phy\n");
> - return PTR_ERR(phy);
> - }
> -
> - phy_dev->dev = dev;
> -
> - phy_set_drvdata(phy, phy_dev);
> -
> - phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
> - return PTR_ERR_OR_ZERO(phy_provider);
> -}
> -
> -static const struct of_device_id stih41x_usb_phy_of_match[] = {
> - { .compatible = "st,stih415-usb-phy", .data = &stih415_usb_phy_cfg },
> - { .compatible = "st,stih416-usb-phy", .data = &stih416_usb_phy_cfg },
> - { /* sentinel */ },
> -};
> -MODULE_DEVICE_TABLE(of, stih41x_usb_phy_of_match);
> -
> -static struct platform_driver stih41x_usb_phy_driver = {
> - .probe = stih41x_usb_phy_probe,
> - .driver = {
> - .name = "stih41x-usb-phy",
> - .of_match_table = stih41x_usb_phy_of_match,
> - }
> -};
> -module_platform_driver(stih41x_usb_phy_driver);
> -
> -MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin-qxv4g6HH51o@public.gmane.org>");
> -MODULE_DESCRIPTION("STMicroelectronics USB PHY driver for STiH41x series");
> -MODULE_LICENSE("GPL v2");
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <kishon-l0cyMroinI0@public.gmane.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread
* Re: [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-10-18 7:48 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:48 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel, devicetree
Cc: lee.jones, kishon
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-dt-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch
@ 2016-10-18 7:48 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-dt-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 03/19] MAINTAINERS: Remove phy-miphy365x.c entry from STi arch
@ 2016-10-18 7:48 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:48 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel, devicetree
Cc: lee.jones, kishon
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-dt-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 04/19] MAINTAINERS: Remove phy-stih41x-usb.c entry from STi arch
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
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 12c271c..6a278b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1755,7 +1755,6 @@ F: drivers/media/platform/sti/c8sectpfe/
F: drivers/mmc/host/sdhci-st.c
F: drivers/phy/phy-miphy28lp.c
F: drivers/phy/phy-stih407-usb.c
-F: drivers/phy/phy-stih41x-usb.c
F: drivers/pinctrl/pinctrl-st.c
F: drivers/remoteproc/st_remoteproc.c
F: drivers/reset/sti/
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 04/19] MAINTAINERS: Remove phy-stih41x-usb.c entry from STi arch
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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 12c271c..6a278b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1755,7 +1755,6 @@ F: drivers/media/platform/sti/c8sectpfe/
F: drivers/mmc/host/sdhci-st.c
F: drivers/phy/phy-miphy28lp.c
F: drivers/phy/phy-stih407-usb.c
-F: drivers/phy/phy-stih41x-usb.c
F: drivers/pinctrl/pinctrl-st.c
F: drivers/remoteproc/st_remoteproc.c
F: drivers/reset/sti/
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 04/19] MAINTAINERS: Remove phy-stih41x-usb.c entry from STi arch
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <kishon-l0cyMroinI0@public.gmane.org>
---
MAINTAINERS | 1 -
1 file changed, 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 12c271c..6a278b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1755,7 +1755,6 @@ F: drivers/media/platform/sti/c8sectpfe/
F: drivers/mmc/host/sdhci-st.c
F: drivers/phy/phy-miphy28lp.c
F: drivers/phy/phy-stih407-usb.c
-F: drivers/phy/phy-stih41x-usb.c
F: drivers/pinctrl/pinctrl-st.c
F: drivers/remoteproc/st_remoteproc.c
F: drivers/reset/sti/
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread
* Re: [PATCH 04/19] MAINTAINERS: Remove phy-stih41x-usb.c entry from STi arch
@ 2016-10-18 7:50 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:50 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel, devicetree
Cc: lee.jones, kishon
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-dt-for-4.10 branch
Thanks
> ---
> MAINTAINERS | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 12c271c..6a278b9 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1755,7 +1755,6 @@ F: drivers/media/platform/sti/c8sectpfe/
> F: drivers/mmc/host/sdhci-st.c
> F: drivers/phy/phy-miphy28lp.c
> F: drivers/phy/phy-stih407-usb.c
> -F: drivers/phy/phy-stih41x-usb.c
> F: drivers/pinctrl/pinctrl-st.c
> F: drivers/remoteproc/st_remoteproc.c
> F: drivers/reset/sti/
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 04/19] MAINTAINERS: Remove phy-stih41x-usb.c entry from STi arch
@ 2016-10-18 7:50 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-dt-for-4.10 branch
Thanks
> ---
> MAINTAINERS | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 12c271c..6a278b9 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1755,7 +1755,6 @@ F: drivers/media/platform/sti/c8sectpfe/
> F: drivers/mmc/host/sdhci-st.c
> F: drivers/phy/phy-miphy28lp.c
> F: drivers/phy/phy-stih407-usb.c
> -F: drivers/phy/phy-stih41x-usb.c
> F: drivers/pinctrl/pinctrl-st.c
> F: drivers/remoteproc/st_remoteproc.c
> F: drivers/reset/sti/
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 04/19] MAINTAINERS: Remove phy-stih41x-usb.c entry from STi arch
@ 2016-10-18 7:50 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:50 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <kishon-l0cyMroinI0@public.gmane.org>
Acked-by: Patrice Chotard <patrice.chotard-qxv4g6HH51o@public.gmane.org>
Applied on sti-dt-for-4.10 branch
Thanks
> ---
> MAINTAINERS | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 12c271c..6a278b9 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1755,7 +1755,6 @@ F: drivers/media/platform/sti/c8sectpfe/
> F: drivers/mmc/host/sdhci-st.c
> F: drivers/phy/phy-miphy28lp.c
> F: drivers/phy/phy-stih407-usb.c
> -F: drivers/phy/phy-stih41x-usb.c
> F: drivers/pinctrl/pinctrl-st.c
> F: drivers/remoteproc/st_remoteproc.c
> F: drivers/reset/sti/
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <kishon-l0cyMroinI0@public.gmane.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread
* Re: [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
@ 2016-10-18 7:53 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:53 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel, devicetree
Cc: lee.jones, kishon
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
@ 2016-10-18 7:53 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:53 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
@ 2016-10-18 7:53 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:53 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <kishon-l0cyMroinI0@public.gmane.org>
Acked-by: Patrice Chotard <patrice.chotard-qxv4g6HH51o@public.gmane.org>
Applied on sti-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-10-18 9:22 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 9:22 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel, devicetree
Cc: lee.jones, kishon
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on STi-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
@ 2016-10-18 9:22 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 9:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on STi-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 05/19] ARM: multi_v7_defconfig: Remove miphy365 phy.
@ 2016-10-18 9:22 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 9:22 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel, devicetree
Cc: lee.jones, kishon
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on STi-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, kishon
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* Re: [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol.
@ 2016-10-18 7:53 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:53 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel, linux-kernel, kernel, devicetree
Cc: lee.jones, kishon
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol.
@ 2016-10-18 7:53 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:53 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Applied on sti-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 06/19] ARM: multi_v7_defconfig: Remove stih41x phy Kconfig symbol.
@ 2016-10-18 7:53 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:53 UTC (permalink / raw)
To: Peter Griffin, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: lee.jones-QSEj5FYQhm4dnm+yROfE0A, kishon-l0cyMroinI0
Hi
On 09/14/2016 03:27 PM, Peter Griffin wrote:
> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <kishon-l0cyMroinI0@public.gmane.org>
Acked-by: Patrice Chotard <patrice.chotard-qxv4g6HH51o@public.gmane.org>
Applied on sti-defconfig-for-4.10 branch
Thanks
> ---
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 07/19] ahci: st: Remove STiH416 dt example
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, tj, robh+dt, linux-ide
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 07/19] ahci: st: Remove STiH416 dt example
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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 at 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 at 9b20000 {
compatible = "st,ahci";
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 07/19] ahci: st: Remove STiH416 dt example
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, tj, robh+dt, linux-ide
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
^ permalink raw reply related [flat|nested] 174+ messages in thread[parent not found: <1473859677-9231-8-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-16 15:54 ` Tejun Heo
-1 siblings, 0 replies; 174+ messages in thread
From: Tejun Heo @ 2016-09-16 15:54 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
linux-ide-u79uwXL29TY76Z2rM5mHXA
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: <linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
This is gonna go through dt tree, right? If it should go through
libata, please let me know.
Thanks.
--
tejun
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 07/19] ahci: st: Remove STiH416 dt example
@ 2016-09-16 15:54 ` Tejun Heo
0 siblings, 0 replies; 174+ messages in thread
From: Tejun Heo @ 2016-09-16 15:54 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example
@ 2016-09-16 15:54 ` Tejun Heo
0 siblings, 0 replies; 174+ messages in thread
From: Tejun Heo @ 2016-09-16 15:54 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, robh+dt, linux-ide
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example
2016-09-16 15:54 ` Tejun Heo
(?)
@ 2016-09-19 7:19 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-09-19 7:19 UTC (permalink / raw)
To: Tejun Heo, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones,
robh+dt, linux-ide
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.
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 07/19] ahci: st: Remove STiH416 dt example
@ 2016-09-19 7:19 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-09-19 7:19 UTC (permalink / raw)
To: linux-arm-kernel
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.
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example
@ 2016-09-19 7:19 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-09-19 7:19 UTC (permalink / raw)
To: Tejun Heo, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones,
robh+dt, linux-ide
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.
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 07/19] ahci: st: Remove STiH416 dt example
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-23 15:07 ` Rob Herring
-1 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:07 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, tj, linux-ide
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>
> ---
> Documentation/devicetree/bindings/ata/ahci-st.txt | 15 ---------------
> 1 file changed, 15 deletions(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 07/19] ahci: st: Remove STiH416 dt example
@ 2016-09-23 15:07 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:07 UTC (permalink / raw)
To: linux-arm-kernel
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>
> ---
> Documentation/devicetree/bindings/ata/ahci-st.txt | 15 ---------------
> 1 file changed, 15 deletions(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, rui.zhang, edubezval, robh+dt
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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 at fdfe8000 {
- compatible = "st,stih416-mpe-thermal";
- reg = <0xfdfe8000 0x10>;
- clock-names = "thermal";
- clocks = <&clk_m_mpethsens>;
- interrupts = <GIC_SPI 23 IRQ_TYPE_NONE>;
+ temp0 at 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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, edubezval, rui.zhang, robh+dt, lee.jones
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
@ 2016-09-23 15:08 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:08 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, rui.zhang, edubezval
On Wed, Sep 14, 2016 at 02:27:46PM +0100, Peter Griffin wrote:
> 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(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
@ 2016-09-23 15:08 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:08 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 14, 2016 at 02:27:46PM +0100, Peter Griffin wrote:
> 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(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
@ 2016-09-23 15:08 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:08 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A,
rui.zhang-ral2JQCrhuEAvxtiuMwx3w,
edubezval-Re5JQEeQqe8AvxtiuMwx3w
On Wed, Sep 14, 2016 at 02:27:46PM +0100, Peter Griffin wrote:
> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Cc: <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> ---
> .../devicetree/bindings/thermal/st-thermal.txt | 28 +++++++---------------
> 1 file changed, 9 insertions(+), 19 deletions(-)
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
2016-09-23 15:08 ` Rob Herring
(?)
@ 2016-10-18 7:56 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:56 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones,
rui.zhang, edubezval
Hi
On 09/23/2016 05:08 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:46PM +0100, Peter Griffin wrote:
>> 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(-)
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
@ 2016-10-18 7:56 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/23/2016 05:08 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:46PM +0100, Peter Griffin wrote:
>> 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(-)
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 08/19] thermal: sti: Remove obsolete platforms from the DT doc.
@ 2016-10-18 7:56 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 7:56 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A,
rui.zhang-ral2JQCrhuEAvxtiuMwx3w,
edubezval-Re5JQEeQqe8AvxtiuMwx3w
Hi
On 09/23/2016 05:08 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:46PM +0100, Peter Griffin wrote:
>> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>> Cc: <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
>> Cc: <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> Cc: <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>> ---
>> .../devicetree/bindings/thermal/st-thermal.txt | 28 +++++++---------------
>> 1 file changed, 9 insertions(+), 19 deletions(-)
>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 09/19] thermal: sti: Remove obsolete STiH416 platform support.
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, rui.zhang, edubezval
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 09/19] thermal: sti: Remove obsolete STiH416 platform support.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 09/19] thermal: sti: Remove obsolete STiH416 platform support.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A,
rui.zhang-ral2JQCrhuEAvxtiuMwx3w,
edubezval-Re5JQEeQqe8AvxtiuMwx3w
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: <edubezval-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, wim, linux, robh+dt, linux-watchdog
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, wim, linux, robh+dt, linux-watchdog
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
^ permalink raw reply related [flat|nested] 174+ messages in thread
* Re: [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 22:16 ` Guenter Roeck
-1 siblings, 0 replies; 174+ messages in thread
From: Guenter Roeck @ 2016-09-14 22:16 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, wim, robh+dt, linux-watchdog
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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-09-14 22:16 ` Guenter Roeck
0 siblings, 0 replies; 174+ messages in thread
From: Guenter Roeck @ 2016-09-14 22:16 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-09-23 15:08 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:08 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, wim, linux, linux-watchdog
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>
> ---
> Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-09-23 15:08 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:08 UTC (permalink / raw)
To: linux-arm-kernel
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>
> ---
> Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-09-23 15:08 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:08 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, wim-IQzOog9fTRqzQB+pC5nmwQ,
linux-0h96xk9xTtrk1uMJSBkQmQ,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org>
> Cc: <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
> Cc: <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: <linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
> ---
> Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-10-08 14:04 ` Wim Van Sebroeck
0 siblings, 0 replies; 174+ messages in thread
From: Wim Van Sebroeck @ 2016-10-08 14:04 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, linux, robh+dt, linux-watchdog
Hi Peter,
> 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>
> ---
This patch and your st_wdt patch has been added to linux-watchdog-next almost 2 weeks ago.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 10/19] watchdog: bindings: Remove obsolete platforms from dt doc.
@ 2016-10-08 14:04 ` Wim Van Sebroeck
0 siblings, 0 replies; 174+ messages in thread
From: Wim Van Sebroeck @ 2016-10-08 14:04 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, linux-0h96xk9xTtrk1uMJSBkQmQ,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
Hi Peter,
> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org>
> Cc: <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
> Cc: <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: <linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
> ---
This patch and your st_wdt patch has been added to linux-watchdog-next almost 2 weeks ago.
Kind regards,
Wim.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, wim, linux, linux-watchdog
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, wim-IQzOog9fTRqzQB+pC5nmwQ,
linux-0h96xk9xTtrk1uMJSBkQmQ,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org>
Cc: <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
Cc: <linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.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
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 22:16 ` Guenter Roeck
-1 siblings, 0 replies; 174+ messages in thread
From: Guenter Roeck @ 2016-09-14 22:16 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, wim, linux-watchdog
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
>
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 11/19] watchdog: st_wdt: Remove support for obsolete platforms
@ 2016-09-14 22:16 ` Guenter Roeck
0 siblings, 0 replies; 174+ messages in thread
From: Guenter Roeck @ 2016-09-14 22:16 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, p.zabel, robh+dt
STiH415/6 SoC support is being removed from the kernel.
This patch updates the sti dt powerdown bindings and
removes references to these obsolete platforms.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <p.zabel@pengutronix.de>
Cc: <robh+dt@kernel.org>
---
Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
index 1cfd21d..9252713 100644
--- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
@@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
controller binding usage.
Required properties:
-- compatible: Should be "st,<chip>-powerdown"
- ex: "st,stih415-powerdown", "st,stih416-powerdown"
+- compatible: Should be "st,stih407-powerdown"
- #reset-cells: 1, see below
example:
powerdown: powerdown-controller {
+ compatible = "st,stih407-powerdown";
#reset-cells = <1>;
- compatible = "st,stih415-powerdown";
};
@@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
example:
- usb1: usb@fe200000 {
- resets = <&powerdown STIH41X_USB1_POWERDOWN>;
+ st_dwc3: dwc3@8f94000 {
+ resets = <&powerdown STIH407_USB3_POWERDOWN>,
};
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
STiH415/6 SoC support is being removed from the kernel.
This patch updates the sti dt powerdown bindings and
removes references to these obsolete platforms.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <p.zabel@pengutronix.de>
Cc: <robh+dt@kernel.org>
---
Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
index 1cfd21d..9252713 100644
--- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
@@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
controller binding usage.
Required properties:
-- compatible: Should be "st,<chip>-powerdown"
- ex: "st,stih415-powerdown", "st,stih416-powerdown"
+- compatible: Should be "st,stih407-powerdown"
- #reset-cells: 1, see below
example:
powerdown: powerdown-controller {
+ compatible = "st,stih407-powerdown";
#reset-cells = <1>;
- compatible = "st,stih415-powerdown";
};
@@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
example:
- usb1: usb at fe200000 {
- resets = <&powerdown STIH41X_USB1_POWERDOWN>;
+ st_dwc3: dwc3 at 8f94000 {
+ resets = <&powerdown STIH407_USB3_POWERDOWN>,
};
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, p.zabel, robh+dt
STiH415/6 SoC support is being removed from the kernel.
This patch updates the sti dt powerdown bindings and
removes references to these obsolete platforms.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Cc: <p.zabel@pengutronix.de>
Cc: <robh+dt@kernel.org>
---
Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
index 1cfd21d..9252713 100644
--- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
+++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
@@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
controller binding usage.
Required properties:
-- compatible: Should be "st,<chip>-powerdown"
- ex: "st,stih415-powerdown", "st,stih416-powerdown"
+- compatible: Should be "st,stih407-powerdown"
- #reset-cells: 1, see below
example:
powerdown: powerdown-controller {
+ compatible = "st,stih407-powerdown";
#reset-cells = <1>;
- compatible = "st,stih415-powerdown";
};
@@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
example:
- usb1: usb@fe200000 {
- resets = <&powerdown STIH41X_USB1_POWERDOWN>;
+ st_dwc3: dwc3@8f94000 {
+ resets = <&powerdown STIH407_USB3_POWERDOWN>,
};
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-23 15:10 ` Rob Herring
-1 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:10 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, p.zabel
On Wed, Sep 14, 2016 at 02:27:50PM +0100, Peter Griffin wrote:
> STiH415/6 SoC support is being removed from the kernel.
> This patch updates the sti dt powerdown bindings and
> removes references to these obsolete platforms.
>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Cc: <p.zabel@pengutronix.de>
> Cc: <robh+dt@kernel.org>
> ---
> Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
> index 1cfd21d..9252713 100644
> --- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
> +++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
> @@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
> controller binding usage.
>
> Required properties:
> -- compatible: Should be "st,<chip>-powerdown"
> - ex: "st,stih415-powerdown", "st,stih416-powerdown"
> +- compatible: Should be "st,stih407-powerdown"
> - #reset-cells: 1, see below
>
> example:
>
> powerdown: powerdown-controller {
> + compatible = "st,stih407-powerdown";
> #reset-cells = <1>;
> - compatible = "st,stih415-powerdown";
> };
>
>
> @@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
>
> example:
>
> - usb1: usb@fe200000 {
> - resets = <&powerdown STIH41X_USB1_POWERDOWN>;
> + st_dwc3: dwc3@8f94000 {
usb@ was correct here. With that,
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
@ 2016-09-23 15:10 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:10 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 14, 2016 at 02:27:50PM +0100, Peter Griffin wrote:
> STiH415/6 SoC support is being removed from the kernel.
> This patch updates the sti dt powerdown bindings and
> removes references to these obsolete platforms.
>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Cc: <p.zabel@pengutronix.de>
> Cc: <robh+dt@kernel.org>
> ---
> Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
> index 1cfd21d..9252713 100644
> --- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
> +++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
> @@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
> controller binding usage.
>
> Required properties:
> -- compatible: Should be "st,<chip>-powerdown"
> - ex: "st,stih415-powerdown", "st,stih416-powerdown"
> +- compatible: Should be "st,stih407-powerdown"
> - #reset-cells: 1, see below
>
> example:
>
> powerdown: powerdown-controller {
> + compatible = "st,stih407-powerdown";
> #reset-cells = <1>;
> - compatible = "st,stih415-powerdown";
> };
>
>
> @@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
>
> example:
>
> - usb1: usb at fe200000 {
> - resets = <&powerdown STIH41X_USB1_POWERDOWN>;
> + st_dwc3: dwc3 at 8f94000 {
usb@ was correct here. With that,
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread* Re: [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
2016-09-23 15:10 ` Rob Herring
(?)
@ 2016-10-18 8:02 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:02 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones, p.zabel
Hi
On 09/23/2016 05:10 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:50PM +0100, Peter Griffin wrote:
>> STiH415/6 SoC support is being removed from the kernel.
>> This patch updates the sti dt powerdown bindings and
>> removes references to these obsolete platforms.
>>
>> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
>> Cc: <p.zabel@pengutronix.de>
>> Cc: <robh+dt@kernel.org>
>> ---
>> Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
>> 1 file changed, 5 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> index 1cfd21d..9252713 100644
>> --- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> +++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> @@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
>> controller binding usage.
>>
>> Required properties:
>> -- compatible: Should be "st,<chip>-powerdown"
>> - ex: "st,stih415-powerdown", "st,stih416-powerdown"
>> +- compatible: Should be "st,stih407-powerdown"
>> - #reset-cells: 1, see below
>>
>> example:
>>
>> powerdown: powerdown-controller {
>> + compatible = "st,stih407-powerdown";
>> #reset-cells = <1>;
>> - compatible = "st,stih415-powerdown";
>> };
>>
>>
>> @@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
>>
>> example:
>>
>> - usb1: usb@fe200000 {
>> - resets = <&powerdown STIH41X_USB1_POWERDOWN>;
>> + st_dwc3: dwc3@8f94000 {
>
> usb@ was correct here. With that,
>
> Acked-by: Rob Herring <robh@kernel.org>
>
Applied on sti-dt-for-4.10 branch
Thanks
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
@ 2016-10-18 8:02 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi
On 09/23/2016 05:10 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:50PM +0100, Peter Griffin wrote:
>> STiH415/6 SoC support is being removed from the kernel.
>> This patch updates the sti dt powerdown bindings and
>> removes references to these obsolete platforms.
>>
>> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
>> Cc: <p.zabel@pengutronix.de>
>> Cc: <robh+dt@kernel.org>
>> ---
>> Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
>> 1 file changed, 5 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> index 1cfd21d..9252713 100644
>> --- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> +++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> @@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
>> controller binding usage.
>>
>> Required properties:
>> -- compatible: Should be "st,<chip>-powerdown"
>> - ex: "st,stih415-powerdown", "st,stih416-powerdown"
>> +- compatible: Should be "st,stih407-powerdown"
>> - #reset-cells: 1, see below
>>
>> example:
>>
>> powerdown: powerdown-controller {
>> + compatible = "st,stih407-powerdown";
>> #reset-cells = <1>;
>> - compatible = "st,stih415-powerdown";
>> };
>>
>>
>> @@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
>>
>> example:
>>
>> - usb1: usb at fe200000 {
>> - resets = <&powerdown STIH41X_USB1_POWERDOWN>;
>> + st_dwc3: dwc3 at 8f94000 {
>
> usb@ was correct here. With that,
>
> Acked-by: Rob Herring <robh@kernel.org>
>
Applied on sti-dt-for-4.10 branch
Thanks
^ permalink raw reply [flat|nested] 174+ messages in thread* Re: [PATCH 12/19] reset: sti: Remove obsolete platforms from dt binding doc.
@ 2016-10-18 8:02 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:02 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ
Hi
On 09/23/2016 05:10 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:50PM +0100, Peter Griffin wrote:
>> STiH415/6 SoC support is being removed from the kernel.
>> This patch updates the sti dt powerdown bindings and
>> removes references to these obsolete platforms.
>>
>> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>> Cc: <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
>> Cc: <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>> ---
>> Documentation/devicetree/bindings/reset/st,sti-powerdown.txt | 12 +++++-------
>> 1 file changed, 5 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> index 1cfd21d..9252713 100644
>> --- a/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> +++ b/Documentation/devicetree/bindings/reset/st,sti-powerdown.txt
>> @@ -16,15 +16,14 @@ Please refer to reset.txt in this directory for common reset
>> controller binding usage.
>>
>> Required properties:
>> -- compatible: Should be "st,<chip>-powerdown"
>> - ex: "st,stih415-powerdown", "st,stih416-powerdown"
>> +- compatible: Should be "st,stih407-powerdown"
>> - #reset-cells: 1, see below
>>
>> example:
>>
>> powerdown: powerdown-controller {
>> + compatible = "st,stih407-powerdown";
>> #reset-cells = <1>;
>> - compatible = "st,stih415-powerdown";
>> };
>>
>>
>> @@ -37,11 +36,10 @@ index specifying which channel to use, as described in reset.txt
>>
>> example:
>>
>> - usb1: usb@fe200000 {
>> - resets = <&powerdown STIH41X_USB1_POWERDOWN>;
>> + st_dwc3: dwc3@8f94000 {
>
> usb@ was correct here. With that,
>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>
Applied on sti-dt-for-4.10 branch
Thanks
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
[parent not found: <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A,
linus.walleij-QSEj5FYQhm4dnm+yROfE0A,
linux-gpio-u79uwXL29TY76Z2rM5mHXA
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <linux-gpio-u79uwXL29TY76Z2rM5mHXA@public.gmane.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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, linus.walleij, linux-gpio
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
^ permalink raw reply related [flat|nested] 174+ messages in thread[parent not found: <1473859677-9231-14-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* Re: [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-15 12:33 ` Linus Walleij
-1 siblings, 0 replies; 174+ messages in thread
From: Linus Walleij @ 2016-09-15 12:33 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
open list:ARM/STI ARCHITECTURE, Patrice CHOTARD,
devicetree-u79uwXL29TY76Z2rM5mHXA, Lee Jones,
linux-gpio-u79uwXL29TY76Z2rM5mHXA
On Wed, Sep 14, 2016 at 3:27 PM, Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <linux-gpio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Patch applied.
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support.
@ 2016-09-15 12:33 ` Linus Walleij
0 siblings, 0 replies; 174+ messages in thread
From: Linus Walleij @ 2016-09-15 12:33 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 13/19] pinctrl: st: Remove STiH415/6 SoC pinctrl driver support.
@ 2016-09-15 12:33 ` Linus Walleij
0 siblings, 0 replies; 174+ messages in thread
From: Linus Walleij @ 2016-09-15 12:33 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, open list:ARM/STI ARCHITECTURE,
Patrice CHOTARD, devicetree, Lee Jones, linux-gpio
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, linus.walleij, robh+dt, linux-gpio
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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 at 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 at 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 at 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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, linus.walleij, robh+dt, linux-gpio
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
^ permalink raw reply related [flat|nested] 174+ messages in thread[parent not found: <1473859677-9231-15-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>]
* Re: [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-15 12:37 ` Linus Walleij
-1 siblings, 0 replies; 174+ messages in thread
From: Linus Walleij @ 2016-09-15 12:37 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
open list:ARM/STI ARCHITECTURE, Patrice CHOTARD,
devicetree-u79uwXL29TY76Z2rM5mHXA, Lee Jones, Rob Herring,
linux-gpio-u79uwXL29TY76Z2rM5mHXA
On Wed, Sep 14, 2016 at 3:27 PM, Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: <linux-gpio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Patch applied, had to do some rebasing so check the
result.
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc
@ 2016-09-15 12:37 ` Linus Walleij
0 siblings, 0 replies; 174+ messages in thread
From: Linus Walleij @ 2016-09-15 12:37 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 14/19] pinctrl: st: Remove obsolete platforms from pinctrl-st dt doc
@ 2016-09-15 12:37 ` Linus Walleij
0 siblings, 0 replies; 174+ messages in thread
From: Linus Walleij @ 2016-09-15 12:37 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, open list:ARM/STI ARCHITECTURE,
Patrice CHOTARD, devicetree, Lee Jones, Rob Herring, linux-gpio
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, p.zabel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA
Cc: peter.griffin-QSEj5FYQhm4dnm+yROfE0A,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ
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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
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-qxv4g6HH51o@public.gmane.org>
- * Author: Srinivas Kandagatla <srinivas.kandagatla-qxv4g6HH51o@public.gmane.org>
- *
- * 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-qxv4g6HH51o@public.gmane.org>
- * Author: Srinivas Kandagatla <srinivas.kandagatla-qxv4g6HH51o@public.gmane.org>
- *
- * 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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-09-27 8:02 ` Philipp Zabel
0 siblings, 0 replies; 174+ messages in thread
From: Philipp Zabel @ 2016-09-27 8:02 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones
Hi Peter,
Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> 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);
Can I pick up patches 15 and 19, or are there dependencies in the
series?
In the latter case,
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
to merge both together with the other patches. Currently there is no
conflict with changes queued from the reset tree.
regards
Philipp
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-09-27 8:02 ` Philipp Zabel
0 siblings, 0 replies; 174+ messages in thread
From: Philipp Zabel @ 2016-09-27 8:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi Peter,
Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> 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);
Can I pick up patches 15 and 19, or are there dependencies in the
series?
In the latter case,
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
to merge both together with the other patches. Currently there is no
conflict with changes queued from the reset tree.
regards
Philipp
^ permalink raw reply [flat|nested] 174+ messages in thread* Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-09-27 8:02 ` Philipp Zabel
0 siblings, 0 replies; 174+ messages in thread
From: Philipp Zabel @ 2016-09-27 8:02 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A
Hi Peter,
Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> ---
> 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-qxv4g6HH51o@public.gmane.org>
> - * Author: Srinivas Kandagatla <srinivas.kandagatla-qxv4g6HH51o@public.gmane.org>
> - *
> - * 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-qxv4g6HH51o@public.gmane.org>
> - * Author: Srinivas Kandagatla <srinivas.kandagatla-qxv4g6HH51o@public.gmane.org>
> - *
> - * 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);
Can I pick up patches 15 and 19, or are there dependencies in the
series?
In the latter case,
Acked-by: Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
to merge both together with the other patches. Currently there is no
conflict with changes queued from the reset tree.
regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread* Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
2016-09-27 8:02 ` Philipp Zabel
(?)
@ 2016-10-11 7:05 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-11 7:05 UTC (permalink / raw)
To: Philipp Zabel, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones
Hi Philipp
On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> Hi Peter,
>
> Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
>> 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>
>> ---
[...]
>> - .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);
>
> Can I pick up patches 15 and 19, or are there dependencies in the
> series?
Yes, you can pick up patches 15 and 19
> In the latter case,
> Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
> to merge both together with the other patches. Currently there is no
> conflict with changes queued from the reset tree.
>
> regards
> Philipp
>
Thanks
Patrice
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-10-11 7:05 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-11 7:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi Philipp
On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> Hi Peter,
>
> Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
>> 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>
>> ---
[...]
>> - .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);
>
> Can I pick up patches 15 and 19, or are there dependencies in the
> series?
Yes, you can pick up patches 15 and 19
> In the latter case,
> Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
> to merge both together with the other patches. Currently there is no
> conflict with changes queued from the reset tree.
>
> regards
> Philipp
>
Thanks
Patrice
^ permalink raw reply [flat|nested] 174+ messages in thread* Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-10-11 7:05 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-11 7:05 UTC (permalink / raw)
To: Philipp Zabel, Peter Griffin
Cc: devicetree, lee.jones, linux-kernel, linux-arm-kernel, kernel
Hi Philipp
On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> Hi Peter,
>
> Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
>> 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>
>> ---
[...]
>> - .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);
>
> Can I pick up patches 15 and 19, or are there dependencies in the
> series?
Yes, you can pick up patches 15 and 19
> In the latter case,
> Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
> to merge both together with the other patches. Currently there is no
> conflict with changes queued from the reset tree.
>
> regards
> Philipp
>
Thanks
Patrice
^ permalink raw reply [flat|nested] 174+ messages in thread* Re: [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
2016-10-11 7:05 ` Patrice Chotard
@ 2016-10-20 10:36 ` Philipp Zabel
-1 siblings, 0 replies; 174+ messages in thread
From: Philipp Zabel @ 2016-10-20 10:36 UTC (permalink / raw)
To: Patrice Chotard
Cc: Peter Griffin, linux-arm-kernel, linux-kernel, kernel,
devicetree, lee.jones
Am Dienstag, den 11.10.2016, 09:05 +0200 schrieb Patrice Chotard:
> Hi Philipp
>
> On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> > Hi Peter,
> >
> > Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> >> 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>
> >> ---
>
> [...]
>
> >> - .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);
> >
> > Can I pick up patches 15 and 19, or are there dependencies in the
> > series?
>
> Yes, you can pick up patches 15 and 19
Done.
regards
Philipp
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 15/19] reset: sti: Remove STiH415/6 reset support
@ 2016-10-20 10:36 ` Philipp Zabel
0 siblings, 0 replies; 174+ messages in thread
From: Philipp Zabel @ 2016-10-20 10:36 UTC (permalink / raw)
To: linux-arm-kernel
Am Dienstag, den 11.10.2016, 09:05 +0200 schrieb Patrice Chotard:
> Hi Philipp
>
> On 09/27/2016 10:02 AM, Philipp Zabel wrote:
> > Hi Peter,
> >
> > Am Mittwoch, den 14.09.2016, 14:27 +0100 schrieb Peter Griffin:
> >> 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>
> >> ---
>
> [...]
>
> >> - .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);
> >
> > Can I pick up patches 15 and 19, or are there dependencies in the
> > series?
>
> Yes, you can pick up patches 15 and 19
Done.
regards
Philipp
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, dwmw2, dbaryshkov, sre, linux-pm
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, dwmw2, dbaryshkov, sre, linux-pm
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 16/19] power: reset: st-poweroff: Remove obsolete platforms.
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-19 19:34 ` Sebastian Reichel
-1 siblings, 0 replies; 174+ messages in thread
From: Sebastian Reichel @ 2016-09-19 19:34 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, dwmw2, dbaryshkov, linux-pm
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 17/19] power: reset: st: Remove obsolete platforms from dt doc
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, dwmw2, dbaryshkov, sre, linux-pm
This patch removes support for STiH415/6 SoC's from the
st-restart dt binding documentation, as support for these
platforms is being removed from the kernel. It also updates
the dt example to a currently supported platform.
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>
---
Documentation/devicetree/bindings/power/reset/st-reset.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/power/reset/st-reset.txt b/Documentation/devicetree/bindings/power/reset/st-reset.txt
index 809af54..83734dc 100644
--- a/Documentation/devicetree/bindings/power/reset/st-reset.txt
+++ b/Documentation/devicetree/bindings/power/reset/st-reset.txt
@@ -1,11 +1,12 @@
*Device-Tree bindings for ST SW reset functionality
Required properties:
-- compatible: should be "st,<chip>-restart".
+- compatible: should be "stih407-restart".
- st,syscfg: should be a phandle of the syscfg node.
Example node:
restart {
- compatible = "st,stih416-restart";
- st,syscfg = <&syscfg_sbc>;
+ compatible = "st,stih407-restart";
+ st,syscfg = <&syscfg_sbc_reg>;
+ status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 17/19] power: reset: st: Remove obsolete platforms from dt doc
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
This patch removes support for STiH415/6 SoC's from the
st-restart dt binding documentation, as support for these
platforms is being removed from the kernel. It also updates
the dt example to a currently supported platform.
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>
---
Documentation/devicetree/bindings/power/reset/st-reset.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/power/reset/st-reset.txt b/Documentation/devicetree/bindings/power/reset/st-reset.txt
index 809af54..83734dc 100644
--- a/Documentation/devicetree/bindings/power/reset/st-reset.txt
+++ b/Documentation/devicetree/bindings/power/reset/st-reset.txt
@@ -1,11 +1,12 @@
*Device-Tree bindings for ST SW reset functionality
Required properties:
-- compatible: should be "st,<chip>-restart".
+- compatible: should be "stih407-restart".
- st,syscfg: should be a phandle of the syscfg node.
Example node:
restart {
- compatible = "st,stih416-restart";
- st,syscfg = <&syscfg_sbc>;
+ compatible = "st,stih407-restart";
+ st,syscfg = <&syscfg_sbc_reg>;
+ status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 17/19] power: reset: st: Remove obsolete platforms from dt doc
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, dwmw2, dbaryshkov, sre, linux-pm
This patch removes support for STiH415/6 SoC's from the
st-restart dt binding documentation, as support for these
platforms is being removed from the kernel. It also updates
the dt example to a currently supported platform.
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>
---
Documentation/devicetree/bindings/power/reset/st-reset.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/power/reset/st-reset.txt b/Documentation/devicetree/bindings/power/reset/st-reset.txt
index 809af54..83734dc 100644
--- a/Documentation/devicetree/bindings/power/reset/st-reset.txt
+++ b/Documentation/devicetree/bindings/power/reset/st-reset.txt
@@ -1,11 +1,12 @@
*Device-Tree bindings for ST SW reset functionality
Required properties:
-- compatible: should be "st,<chip>-restart".
+- compatible: should be "stih407-restart".
- st,syscfg: should be a phandle of the syscfg node.
Example node:
restart {
- compatible = "st,stih416-restart";
- st,syscfg = <&syscfg_sbc>;
+ compatible = "st,stih407-restart";
+ st,syscfg = <&syscfg_sbc_reg>;
+ status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 17/19] power: reset: st: Remove obsolete platforms from dt doc
@ 2016-09-19 19:34 ` Sebastian Reichel
0 siblings, 0 replies; 174+ messages in thread
From: Sebastian Reichel @ 2016-09-19 19:34 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, dwmw2, dbaryshkov, linux-pm
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
Hi,
On Wed, Sep 14, 2016 at 02:27:55PM +0100, Peter Griffin wrote:
> This patch removes support for STiH415/6 SoC's from the
> st-restart dt binding documentation, as support for these
> platforms is being removed from the kernel. It also updates
> the dt example to a currently supported platform.
>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Also queued to power-supply's for-next branch.
-- Sebastian
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 17/19] power: reset: st: Remove obsolete platforms from dt doc
@ 2016-09-19 19:34 ` Sebastian Reichel
0 siblings, 0 replies; 174+ messages in thread
From: Sebastian Reichel @ 2016-09-19 19:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Sep 14, 2016 at 02:27:55PM +0100, Peter Griffin wrote:
> This patch removes support for STiH415/6 SoC's from the
> st-restart dt binding documentation, as support for these
> platforms is being removed from the kernel. It also updates
> the dt example to a currently supported platform.
>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Also queued to power-supply's for-next branch.
-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160919/b61ceb5f/attachment-0001.sig>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 17/19] power: reset: st: Remove obsolete platforms from dt doc
@ 2016-09-19 19:34 ` Sebastian Reichel
0 siblings, 0 replies; 174+ messages in thread
From: Sebastian Reichel @ 2016-09-19 19:34 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, dwmw2-wEGCiKHe2LqWVfeAwA7xHQ,
dbaryshkov-Re5JQEeQqe8AvxtiuMwx3w,
linux-pm-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
Hi,
On Wed, Sep 14, 2016 at 02:27:55PM +0100, Peter Griffin wrote:
> This patch removes support for STiH415/6 SoC's from the
> st-restart dt binding documentation, as support for these
> platforms is being removed from the kernel. It also updates
> the dt example to a currently supported platform.
>
> Signed-off-by: Peter Griffin <peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Also queued to power-supply's for-next branch.
-- Sebastian
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, peppe.cavallaro, alexandre.torgue, netdev
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, peppe.cavallaro, alexandre.torgue, netdev
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-23 15:11 ` Rob Herring
-1 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:11 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, peppe.cavallaro, alexandre.torgue, netdev
On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
> 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 +-
Acked-by: Rob Herring <robh@kernel.org>
> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
> 2 files changed, 1 insertion(+), 39 deletions(-)
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-09-23 15:11 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:11 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
> 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 +-
Acked-by: Rob Herring <robh@kernel.org>
> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
> 2 files changed, 1 insertion(+), 39 deletions(-)
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
2016-09-23 15:11 ` Rob Herring
(?)
@ 2016-10-18 8:05 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:05 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones,
peppe.cavallaro, alexandre.torgue, netdev
On 09/23/2016 05:11 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
>> 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 +-
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
>> 2 files changed, 1 insertion(+), 39 deletions(-)
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-10-18 8:05 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:05 UTC (permalink / raw)
To: linux-arm-kernel
On 09/23/2016 05:11 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
>> 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 +-
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
>> 2 files changed, 1 insertion(+), 39 deletions(-)
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-10-18 8:05 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:05 UTC (permalink / raw)
To: Rob Herring, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones,
peppe.cavallaro, alexandre.torgue, netdev
On 09/23/2016 05:11 PM, Rob Herring wrote:
> On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
>> 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 +-
>
> Acked-by: Rob Herring <robh@kernel.org>
Applied on sti-dt-for-4.10 branch
Thanks
>
>> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
>> 2 files changed, 1 insertion(+), 39 deletions(-)
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-10-18 8:59 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:59 UTC (permalink / raw)
To: Rob Herring, Peter Griffin, Alexandre TORGUE, Peppe CAVALLARO
Cc: devicetree, kernel, netdev, linux-kernel, linux-arm-kernel
On 10/18/2016 10:05 AM, Patrice Chotard wrote:
>
>
> On 09/23/2016 05:11 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
>>> 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 +-
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in stmmac tree.
Peppe or Alexandre will you take care of it ?
Thanks
>
> Thanks
>
>>
>>> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
>>> 2 files changed, 1 insertion(+), 39 deletions(-)
>
> _______________________________________________
> Kernel mailing list
> Kernel@stlinux.com
> http://www.stlinux.com/mailman/listinfo/kernel
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [STLinux Kernel] [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-10-18 8:59 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:59 UTC (permalink / raw)
To: linux-arm-kernel
On 10/18/2016 10:05 AM, Patrice Chotard wrote:
>
>
> On 09/23/2016 05:11 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
>>> 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 +-
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in stmmac tree.
Peppe or Alexandre will you take care of it ?
Thanks
>
> Thanks
>
>>
>>> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
>>> 2 files changed, 1 insertion(+), 39 deletions(-)
>
> _______________________________________________
> Kernel mailing list
> Kernel at stlinux.com
> http://www.stlinux.com/mailman/listinfo/kernel
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-10-18 8:59 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:59 UTC (permalink / raw)
To: Rob Herring, Peter Griffin, Alexandre TORGUE, Peppe CAVALLARO
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, kernel-F5mvAk5X5gdBDgjK7y7TUQ,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 10/18/2016 10:05 AM, Patrice Chotard wrote:
>
>
> On 09/23/2016 05:11 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
>>> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>> Cc: <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>
>>> Cc: <alexandre.torgue-qxv4g6HH51o@public.gmane.org>
>>> Cc: <netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
>>> ---
>>> .../devicetree/bindings/net/sti-dwmac.txt | 3 +-
>>
>> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in stmmac tree.
Peppe or Alexandre will you take care of it ?
Thanks
>
> Thanks
>
>>
>>> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
>>> 2 files changed, 1 insertion(+), 39 deletions(-)
>
> _______________________________________________
> Kernel mailing list
> Kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org
> http://www.stlinux.com/mailman/listinfo/kernel
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [STLinux Kernel] [PATCH 18/19] stmmac: dwmac-sti: Remove obsolete STi platforms
@ 2016-10-18 8:59 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-10-18 8:59 UTC (permalink / raw)
To: Rob Herring, Peter Griffin, Alexandre TORGUE, Peppe CAVALLARO
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA, kernel-F5mvAk5X5gdBDgjK7y7TUQ,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On 10/18/2016 10:05 AM, Patrice Chotard wrote:
>
>
> On 09/23/2016 05:11 PM, Rob Herring wrote:
>> On Wed, Sep 14, 2016 at 02:27:56PM +0100, Peter Griffin wrote:
>>> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>> Cc: <peppe.cavallaro-qxv4g6HH51o@public.gmane.org>
>>> Cc: <alexandre.torgue-qxv4g6HH51o@public.gmane.org>
>>> Cc: <netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
>>> ---
>>> .../devicetree/bindings/net/sti-dwmac.txt | 3 +-
>>
>> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>
>
> Applied on sti-dt-for-4.10 branch
Sorry, i did a mistake, these patch should go in stmmac tree.
Peppe or Alexandre will you take care of it ?
Thanks
>
> Thanks
>
>>
>>> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 37 ----------------------
>>> 2 files changed, 1 insertion(+), 39 deletions(-)
>
> _______________________________________________
> Kernel mailing list
> Kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org
> http://www.stlinux.com/mailman/listinfo/kernel
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc.
2016-09-14 13:27 ` Peter Griffin
(?)
@ 2016-09-14 13:27 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, p.zabel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc.
@ 2016-09-14 13:27 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-14 13:27 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel, kernel, patrice.chotard, devicetree
Cc: peter.griffin, lee.jones, p.zabel
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
^ permalink raw reply related [flat|nested] 174+ messages in thread* Re: [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc.
@ 2016-09-23 15:12 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:12 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones, p.zabel
On Wed, Sep 14, 2016 at 02:27:57PM +0100, Peter Griffin wrote:
> 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(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc.
@ 2016-09-23 15:12 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:12 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 14, 2016 at 02:27:57PM +0100, Peter Griffin wrote:
> 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(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 19/19] reset: sti: softreset: Remove obsolete platforms from dt binding doc.
@ 2016-09-23 15:12 ` Rob Herring
0 siblings, 0 replies; 174+ messages in thread
From: Rob Herring @ 2016-09-23 15:12 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A, p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ
On Wed, Sep 14, 2016 at 02:27:57PM +0100, Peter Griffin wrote:
> 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-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> ---
> Documentation/devicetree/bindings/reset/st,sti-softreset.txt | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
[not found] ` <1473859677-9231-1-git-send-email-peter.griffin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-09-14 13:27 ` Peter Griffin
@ 2016-09-14 13:38 ` Arnd Bergmann
0 siblings, 0 replies; 174+ messages in thread
From: Arnd Bergmann @ 2016-09-14 13:38 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones
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
^ permalink raw reply [flat|nested] 174+ messages in thread* [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-14 13:38 ` Arnd Bergmann
0 siblings, 0 replies; 174+ messages in thread
From: Arnd Bergmann @ 2016-09-14 13:38 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-14 13:38 ` Arnd Bergmann
0 siblings, 0 replies; 174+ messages in thread
From: Arnd Bergmann @ 2016-09-14 13:38 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
2016-09-14 13:38 ` Arnd Bergmann
(?)
@ 2016-09-14 14:04 ` Patrice Chotard
-1 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-09-14 14:04 UTC (permalink / raw)
To: Arnd Bergmann, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones
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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-14 14:04 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-09-14 14:04 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-14 14:04 ` Patrice Chotard
0 siblings, 0 replies; 174+ messages in thread
From: Patrice Chotard @ 2016-09-14 14:04 UTC (permalink / raw)
To: Arnd Bergmann, Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, devicetree, lee.jones
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
>
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
2016-09-14 13:38 ` Arnd Bergmann
(?)
@ 2016-09-15 7:01 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-15 7:01 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones
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.
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-15 7:01 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-15 7:01 UTC (permalink / raw)
To: linux-arm-kernel
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.
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-15 7:01 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-15 7:01 UTC (permalink / raw)
To: Arnd Bergmann
Cc: devicetree, kernel, patrice.chotard, linux-kernel, lee.jones,
linux-arm-kernel
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.
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
2016-09-15 7:01 ` Peter Griffin
@ 2016-09-15 12:00 ` Arnd Bergmann
-1 siblings, 0 replies; 174+ messages in thread
From: Arnd Bergmann @ 2016-09-15 12:00 UTC (permalink / raw)
To: Peter Griffin
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-15 12:00 ` Arnd Bergmann
0 siblings, 0 replies; 174+ messages in thread
From: Arnd Bergmann @ 2016-09-15 12:00 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
2016-09-15 12:00 ` Arnd Bergmann
(?)
@ 2016-09-19 8:56 ` Peter Griffin
-1 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-19 8:56 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, kernel, patrice.chotard,
devicetree, lee.jones
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-19 8:56 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-19 8:56 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 174+ messages in thread
* Re: [PATCH 00/19] [RESEND] Remove STiH415 and STiH416 SoC platform support
@ 2016-09-19 8:56 ` Peter Griffin
0 siblings, 0 replies; 174+ messages in thread
From: Peter Griffin @ 2016-09-19 8:56 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
kernel-F5mvAk5X5gdBDgjK7y7TUQ, patrice.chotard-qxv4g6HH51o,
devicetree-u79uwXL29TY76Z2rM5mHXA,
lee.jones-QSEj5FYQhm4dnm+yROfE0A
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 174+ messages in thread