pinctrl: ralink: fix ABI, improve driver, move to mediatek, improve dt-bindings
Subsystems (7)
v3 cover pinctrl: ralink: fix ABI, improve driver, move to mediatek, improve dt-bindings
This is an ambitious effort I've been wanting to do for months.
Straight off the bat, I'm fixing the ABI that I broke a while back, by reintroducing the ralink,rt2880-pinmux compatible string.
If you take a look at the schema for mt7620 and rt305x, some functions got multiple lists for groups. Like refclk on mt7620. Because mt7620 and mt7628/mt7688 SoCs use the same compatible string, it's impossible to differentiate on the binding which SoC a devicetree is actually for. Therefore, the binding will allow all groups listed for that function. For example, if the SoC is mt7620, only the refclk function for the mdio group can be used. If one were to put "spi cs1" as the function there, there wouldn't be a warning.
I address this by introducing new compatible strings for these SoCs, then split the schemas. I also separate mt7628/mt7688 from mt7620 pinctrl subdriver in the process.
I wanted to split the rt305x driver too but too much code would be reused so I backed down from that.
This platform from Ralink was acquired by MediaTek in 2011. Then, MediaTek introduced new SoCs which utilise this platform. We're moving the Ralink pinctrl driver to MediaTek, and rename the schemas for MediaTek SoCs to mediatek.
I've renamed the ralink core driver to mtmips. I decided to call the core mtmips as I've seen folks from MediaTek use the same name when they added support for MT7621 pinctrl on U-Boot. Feel free to comment on this.
Arınç
v3:
- Address Rob's indentation report.
- Add Rob's reviewed-by.
- Rebase to linusw/linux-pinctrl.git devel.
v2:
- Address Rob and Krzysztof's reviews, add Rob's acked-by.
- More more cleanups, hooray!
- Don't add new mediatek compatible strings, we don't do that here. RIP Chadwick Boseman.
- Don't deprecate ralink,mt7620-pinctrl, we need it now.
- More slight changes I can't currently remember to mention.
RFC to v1:
- Address Rob and Krzysztof's reviews, add Rob's acked-by.
- More cleanups, hooray!
- Keep ralink,rt2880-pinmux deprecated.
- Deprecate ralink,mt7620-pinctrl. Another one bites the dust!
- More slight changes I can't currently remember to mention.
Arınç ÜNAL (21):
pinctrl: ralink: reintroduce ralink,rt2880-pinmux compatible string
pinctrl: ralink: rt305x: add new compatible string for every SoC
pinctrl: ralink: mt7620: split out to mt76x8
pinctrl: ralink: move to mediatek as mtmips
pinctrl: mediatek: remove OF_GPIO as reverse dependency
dt-bindings: pinctrl: ralink: move additionalProperties to top
dt-bindings: pinctrl: ralink: drop quotes from referred schemas
dt-bindings: pinctrl: ralink: add new compatible strings
dt-bindings: pinctrl: ralink: {mt7620,mt7621}: rename to mediatek
dt-bindings: pinctrl: mediatek: mt6795: rename to mediatek,mt6795-pinctrl
dt-bindings: pinctrl: mediatek: mt8186: rename to mediatek,mt8186-pinctrl
dt-bindings: pinctrl: mediatek: mt8192: rename to mediatek,mt8192-pinctrl
dt-bindings: pinctrl: mediatek: mt8195: rename to mediatek,mt8195-pinctrl
dt-bindings: pinctrl: mediatek: fix naming inconsistency
dt-bindings: pinctrl: {mediatek,ralink}: fix formatting
dt-bindings: pinctrl: mediatek: fix pinmux header location
dt-bindings: pinctrl: mediatek: drop quotes from referred schemas
dt-bindings: pinctrl: mediatek: mt7986: fix patternProperties regex
dt-bindings: pinctrl: ralink: rt305x: split binding
dt-bindings: pinctrl: mediatek: mt7620: split binding
MAINTAINERS: move ralink pinctrl to mediatek mips pinctrl
.../pinctrl/mediatek,mt65xx-pinctrl.yaml | 32 +-
.../pinctrl/mediatek,mt6779-pinctrl.yaml | 39 +-
...mt6795.yaml => mediatek,mt6795-pinctrl.yaml} | 51 +--
.../pinctrl/mediatek,mt7620-pinctrl.yaml | 298 ++++++++++++++
...inctrl.yaml => mediatek,mt7621-pinctrl.yaml} | 17 +-
.../pinctrl/mediatek,mt7622-pinctrl.yaml | 34 +-
...inctrl.yaml => mediatek,mt76x8-pinctrl.yaml} | 252 ++----------
.../pinctrl/mediatek,mt7981-pinctrl.yaml | 35 +-
.../pinctrl/mediatek,mt7986-pinctrl.yaml | 80 ++--
.../pinctrl/mediatek,mt8183-pinctrl.yaml | 32 +-
...mt8186.yaml => mediatek,mt8186-pinctrl.yaml} | 55 ++-
.../pinctrl/mediatek,mt8188-pinctrl.yaml | 80 ++--
...mt8192.yaml => mediatek,mt8192-pinctrl.yaml} | 57 +--
...mt8195.yaml => mediatek,mt8195-pinctrl.yaml} | 51 ++-
.../pinctrl/mediatek,mt8365-pinctrl.yaml | 30 +-
.../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 11 +-
.../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 89 +----
.../bindings/pinctrl/ralink,rt3352-pinctrl.yaml | 243 ++++++++++++
.../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 11 +-
.../bindings/pinctrl/ralink,rt5350-pinctrl.yaml | 206 ++++++++++
MAINTAINERS | 29 +-
drivers/pinctrl/Kconfig | 1 -
drivers/pinctrl/Makefile | 1 -
drivers/pinctrl/mediatek/Kconfig | 54 ++-
drivers/pinctrl/mediatek/Makefile | 63 +--
drivers/pinctrl/mediatek/pinctrl-mt7620.c | 137 +++++++
.../{ralink => mediatek}/pinctrl-mt7621.c | 31 +-
drivers/pinctrl/mediatek/pinctrl-mt76x8.c | 283 ++++++++++++++
.../pinctrl-mtmips.c} | 90 ++---
.../pinctrl-mtmips.h} | 16 +-
.../{ralink => mediatek}/pinctrl-rt2880.c | 21 +-
.../{ralink => mediatek}/pinctrl-rt305x.c | 47 +--
.../{ralink => mediatek}/pinctrl-rt3883.c | 29 +-
drivers/pinctrl/ralink/Kconfig | 35 --
drivers/pinctrl/ralink/Makefile | 8 -
drivers/pinctrl/ralink/pinctrl-mt7620.c | 391 -------------------
36 files changed, 1742 insertions(+), 1197 deletions(-)PATCH v3 1/21 pinctrl: ralink: reintroduce ralink,rt2880-pinmux compatible string
From: Arınç ÜNAL <[email protected]>
There have been stable releases with the ralink,rt2880-pinmux compatible string included. Having it removed breaks the ABI. Reintroduce it.
--- drivers/pinctrl/ralink/pinctrl-mt7620.c | 1 + drivers/pinctrl/ralink/pinctrl-mt7621.c | 1 + drivers/pinctrl/ralink/pinctrl-rt2880.c | 1 + drivers/pinctrl/ralink/pinctrl-rt305x.c | 1 + drivers/pinctrl/ralink/pinctrl-rt3883.c | 1 + 5 files changed, 5 insertions(+)
drivers/pinctrl/ralink/pinctrl-mt7620.c +1 -0
@@ -372,6 +372,7 @@ static int mt7620_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id mt7620_pinctrl_match[] = { { .compatible ="ralink,mt7620-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, mt7620_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-mt7621.c +1 -0
@@ -97,6 +97,7 @@ static int mt7621_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id mt7621_pinctrl_match[] = { { .compatible ="ralink,mt7621-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, mt7621_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-rt2880.c +1 -0
@@ -41,6 +41,7 @@ static int rt2880_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id rt2880_pinctrl_match[] = { { .compatible ="ralink,rt2880-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, rt2880_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-rt305x.c +1 -0
@@ -118,6 +118,7 @@ static int rt305x_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id rt305x_pinctrl_match[] = { { .compatible ="ralink,rt305x-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, rt305x_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-rt3883.c +1 -0
@@ -88,6 +88,7 @@ static int rt3883_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id rt3883_pinctrl_match[] = { { .compatible ="ralink,rt3883-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, rt3883_pinctrl_match);
Signature · 1 line
2.37.2
Re: [PATCH v3 01/21] pinctrl: ralink: reintroduce ralink,rt2880-pinmux compatible string
Quoted 5 lines · On Fri, Mar 17, 2023 at 4:30 PM <[email protected]> wrote:
From: Arınç ÜNAL <[email protected]>
There have been stable releases with the ralink,rt2880-pinmux compatible string included. Having it removed breaks the ABI. Reintroduce it.
ralink,rt2880-pinmux now shows up as an undocumented compatible string in linux-next. Where's the binding for it?
Rob
Re: [PATCH v3 01/21] pinctrl: ralink: reintroduce ralink,rt2880-pinmux compatible string
Quoted 9 lines · Rob Herring
Quoted 5 lines · On Fri, Mar 17, 2023 at 4:30 PM <[email protected]> wrote:
From: Arınç ÜNAL <[email protected]>
There have been stable releases with the ralink,rt2880-pinmux compatible string included. Having it removed breaks the ABI. Reintroduce it.
ralink,rt2880-pinmux now shows up as an undocumented compatible string in linux-next. Where's the binding for it?
This is exactly what I was talking about here:
https://lore.kernel.org/linux-devicetree/[email protected]/
Arınç
PATCH v3 2/21 pinctrl: ralink: rt305x: add new compatible string for every SoC
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Add new compatible strings to make every SoC, or SoCs that use the same pinmux data have a unique compatible string. This ensures that the pin muxing information of every SoC, or a set of SoCs that use the same pinmux data can be properly documented.
--- drivers/pinctrl/ralink/pinctrl-rt305x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/ralink/pinctrl-rt305x.c +2 -0
@@ -118,6 +118,8 @@ static int rt305x_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id rt305x_pinctrl_match[] = { { .compatible ="ralink,rt305x-pinctrl" }, + { .compatible ="ralink,rt3352-pinctrl" }, + { .compatible ="ralink,rt5350-pinctrl" }, { .compatible ="ralink,rt2880-pinmux" }, {} };
Signature · 1 line
2.37.2
PATCH v3 3/21 pinctrl: ralink: mt7620: split out to mt76x8
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Split the driver out to pinctrl-mt76x8.c. Remove including the unnecessary headers since is_mt76x8() is not being used anymore.
Introduce a new compatible string to be able to document the pin muxing information properly.
--- drivers/pinctrl/ralink/Kconfig | 5 + drivers/pinctrl/ralink/Makefile | 1 + drivers/pinctrl/ralink/pinctrl-mt7620.c | 257 +-------------------- drivers/pinctrl/ralink/pinctrl-mt76x8.c | 283 ++++++++++++++++++++++++ 4 files changed, 290 insertions(+), 256 deletions(-) create mode 100644 drivers/pinctrl/ralink/pinctrl-mt76x8.c
drivers/pinctrl/ralink/Kconfig +5 -0
@@ -17,6 +17,11 @@ config PINCTRL_MT7621 depends on RALINK && SOC_MT7621 select PINCTRL_RALINK +config PINCTRL_MT76X8 + bool "MT76X8 pinctrl subdriver" + depends on RALINK && SOC_MT7620 + select PINCTRL_RALINK + config PINCTRL_RT2880 bool "RT2880 pinctrl subdriver" depends on RALINK && SOC_RT288X
drivers/pinctrl/ralink/Makefile +1 -0
@@ -3,6 +3,7 @@ obj-$(CONFIG_PINCTRL_RALINK) += pinctrl-ralink.o obj-$(CONFIG_PINCTRL_MT7620) += pinctrl-mt7620.o obj-$(CONFIG_PINCTRL_MT7621) += pinctrl-mt7621.o +obj-$(CONFIG_PINCTRL_MT76X8) += pinctrl-mt76x8.o obj-$(CONFIG_PINCTRL_RT2880) += pinctrl-rt2880.o obj-$(CONFIG_PINCTRL_RT305X) += pinctrl-rt305x.o obj-$(CONFIG_PINCTRL_RT3883) += pinctrl-rt3883.o
drivers/pinctrl/ralink/pinctrl-mt7620.c +1 -256
270 lines not on this page · raw message
drivers/pinctrl/ralink/pinctrl-mt76x8.c new file +283 -0
283 lines not on this page · raw message
Signature · 1 line
2.37.2
PATCH v3 4/21 pinctrl: ralink: move to mediatek as mtmips
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
This platform from Ralink was acquired by MediaTek in 2011. Then, MediaTek introduced new SoCs which utilise this platform. Move the driver to mediatek pinctrl directory. Rename the ralink core driver to mtmips.
---
drivers/pinctrl/Kconfig | 1 -
drivers/pinctrl/Makefile | 1 -
drivers/pinctrl/mediatek/Kconfig | 51 ++++++++++-
drivers/pinctrl/mediatek/Makefile | 63 +++++++------
.../{ralink => mediatek}/pinctrl-mt7620.c | 34 +++----
.../{ralink => mediatek}/pinctrl-mt7621.c | 30 +++----
.../{ralink => mediatek}/pinctrl-mt76x8.c | 60 ++++++-------
.../pinctrl-mtmips.c} | 90 +++++++++----------
.../pinctrl-mtmips.h} | 16 ++--
.../{ralink => mediatek}/pinctrl-rt2880.c | 20 ++---
.../{ralink => mediatek}/pinctrl-rt305x.c | 44 ++++-----
.../{ralink => mediatek}/pinctrl-rt3883.c | 28 +++---
drivers/pinctrl/ralink/Kconfig | 40 ---------
drivers/pinctrl/ralink/Makefile | 9 --
14 files changed, 246 insertions(+), 241 deletions(-)
rename drivers/pinctrl/{ralink => mediatek}/pinctrl-mt7620.c (81%)
rename drivers/pinctrl/{ralink => mediatek}/pinctrl-mt7621.c (80%)
rename drivers/pinctrl/{ralink => mediatek}/pinctrl-mt76x8.c (81%)
rename drivers/pinctrl/{ralink/pinctrl-ralink.c => mediatek/pinctrl-mtmips.c} (74%)
rename drivers/pinctrl/{ralink/pinctrl-ralink.h => mediatek/pinctrl-mtmips.h} (75%)
rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt2880.c (71%)
rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt305x.c (75%)
rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt3883.c (80%)
delete mode 100644 drivers/pinctrl/ralink/Kconfig
delete mode 100644 drivers/pinctrl/ralink/Makefiledrivers/pinctrl/Kconfig +0 -1
@@ -538,7 +538,6 @@ source "drivers/pinctrl/nuvoton/Kconfig" source "drivers/pinctrl/nxp/Kconfig" source "drivers/pinctrl/pxa/Kconfig" source "drivers/pinctrl/qcom/Kconfig" -source "drivers/pinctrl/ralink/Kconfig" source "drivers/pinctrl/renesas/Kconfig" source "drivers/pinctrl/samsung/Kconfig" source "drivers/pinctrl/spear/Kconfig"
drivers/pinctrl/Makefile +0 -1
@@ -67,7 +67,6 @@ obj-y += nuvoton/ obj-y += nxp/ obj-$(CONFIG_PINCTRL_PXA) += pxa/ obj-$(CONFIG_ARCH_QCOM) += qcom/ -obj-$(CONFIG_PINCTRL_RALINK) += ralink/ obj-$(CONFIG_PINCTRL_RENESAS) += renesas/ obj-$(CONFIG_PINCTRL_SAMSUNG) += samsung/ obj-$(CONFIG_PINCTRL_SPEAR) += spear/
drivers/pinctrl/mediatek/Kconfig +50 -1
68 lines not on this page · raw message
drivers/pinctrl/mediatek/Makefile +35 -28
67 lines not on this page · raw message
drivers/pinctrl/mediatek/pinctrl-mt7620.c renamed from drivers/pinctrl/ralink/pinctrl-mt7620.c +17 -17
@@ -3,7 +3,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h> -#include "pinctrl-ralink.h" +#include "pinctrl-mtmips.h" #define MT7620_GPIO_MODE_UART0_SHIFT 2#define MT7620_GPIO_MODE_UART0_MASK 0x7
@@ -52,20 +52,20 @@#define MT7620_GPIO_MODE_EPHY 15#define MT7620_GPIO_MODE_PA 20 -static struct ralink_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,1 ,2 ) }; -static struct ralink_pmx_func spi_grp[] = {FUNC ("spi" ,0 ,3 ,4 ) }; -static struct ralink_pmx_func uartlite_grp[] = {FUNC ("uartlite" ,0 ,15 ,2 ) }; -static struct ralink_pmx_func mdio_grp[] = { +static struct mtmips_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,1 ,2 ) }; +static struct mtmips_pmx_func spi_grp[] = {FUNC ("spi" ,0 ,3 ,4 ) }; +static struct mtmips_pmx_func uartlite_grp[] = {FUNC ("uartlite" ,0 ,15 ,2 ) }; +static struct mtmips_pmx_func mdio_grp[] = {FUNC ("mdio" ,MT7620_GPIO_MODE_MDIO ,22 ,2 ),FUNC ("refclk" ,MT7620_GPIO_MODE_MDIO_REFCLK ,22 ,2 ), }; -static struct ralink_pmx_func rgmii1_grp[] = {FUNC ("rgmii1" ,0 ,24 ,12 ) }; -static struct ralink_pmx_func refclk_grp[] = {FUNC ("spi refclk" ,0 ,37 ,3 ) }; -static struct ralink_pmx_func ephy_grp[] = {FUNC ("ephy" ,0 ,40 ,5 ) }; -static struct ralink_pmx_func rgmii2_grp[] = {FUNC ("rgmii2" ,0 ,60 ,12 ) }; -static struct ralink_pmx_func wled_grp[] = {FUNC ("wled" ,0 ,72 ,1 ) }; -static struct ralink_pmx_func pa_grp[] = {FUNC ("pa" ,0 ,18 ,4 ) }; -static struct ralink_pmx_func uartf_grp[] = { +static struct mtmips_pmx_func rgmii1_grp[] = {FUNC ("rgmii1" ,0 ,24 ,12 ) }; +static struct mtmips_pmx_func refclk_grp[] = {FUNC ("spi refclk" ,0 ,37 ,3 ) }; +static struct mtmips_pmx_func ephy_grp[] = {FUNC ("ephy" ,0 ,40 ,5 ) }; +static struct mtmips_pmx_func rgmii2_grp[] = {FUNC ("rgmii2" ,0 ,60 ,12 ) }; +static struct mtmips_pmx_func wled_grp[] = {FUNC ("wled" ,0 ,72 ,1 ) }; +static struct mtmips_pmx_func pa_grp[] = {FUNC ("pa" ,0 ,18 ,4 ) }; +static struct mtmips_pmx_func uartf_grp[] = {FUNC ("uartf" ,MT7620_GPIO_MODE_UARTF ,7 ,8 ),FUNC ("pcm uartf" ,MT7620_GPIO_MODE_PCM_UARTF ,7 ,8 ),FUNC ("pcm i2s" ,MT7620_GPIO_MODE_PCM_I2S ,7 ,8 ),
@@ -74,20 +74,20 @@ static struct ralink_pmx_func uartf_grp[] = {FUNC ("gpio uartf" ,MT7620_GPIO_MODE_GPIO_UARTF ,7 ,4 ), FUNC("gpio i2s", MT7620_GPIO_MODE_GPIO_I2S, 7, 4), }; -static struct ralink_pmx_func wdt_grp[] = { +static struct mtmips_pmx_func wdt_grp[] = {FUNC ("wdt rst" ,0 ,17 ,1 ),FUNC ("wdt refclk" ,0 ,17 ,1 ), }; -static struct ralink_pmx_func pcie_rst_grp[] = { +static struct mtmips_pmx_func pcie_rst_grp[] = {FUNC ("pcie rst" ,MT7620_GPIO_MODE_PCIE_RST ,36 ,1 ),FUNC ("pcie refclk" ,MT7620_GPIO_MODE_PCIE_REF ,36 ,1 ) }; -static struct ralink_pmx_func nd_sd_grp[] = { +static struct mtmips_pmx_func nd_sd_grp[] = {FUNC ("nand" ,MT7620_GPIO_MODE_NAND ,45 ,15 ),FUNC ("sd" ,MT7620_GPIO_MODE_SD ,47 ,13 ) }; -static struct ralink_pmx_group mt7620a_pinmux_data[] = { +static struct mtmips_pmx_group mt7620a_pinmux_data[] = {GRP ("i2c" , i2c_grp,1 ,MT7620_GPIO_MODE_I2C ),GRP ("uartf" , uartf_grp,MT7620_GPIO_MODE_UART0_MASK , MT7620_GPIO_MODE_UART0_SHIFT),
@@ -112,7 +112,7 @@ static struct ralink_pmx_group mt7620a_pinmux_data[] = {static int mt7620_pinctrl_probe (struct platform_device *pdev) { -return ralink_pinctrl_init (pdev, mt7620a_pinmux_data); +return mtmips_pinctrl_init (pdev, mt7620a_pinmux_data); }static const struct of_device_id mt7620_pinctrl_match[] = {
drivers/pinctrl/mediatek/pinctrl-mt7621.c renamed from drivers/pinctrl/ralink/pinctrl-mt7621.c +15 -15
@@ -3,7 +3,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h> -#include "pinctrl-ralink.h" +#include "pinctrl-mtmips.h" #define MT7621_GPIO_MODE_UART1 1#define MT7621_GPIO_MODE_I2C 2
@@ -34,40 +34,40 @@#define MT7621_GPIO_MODE_SDHCI_SHIFT 18#define MT7621_GPIO_MODE_SDHCI_GPIO 1 -static struct ralink_pmx_func uart1_grp[] = {FUNC ("uart1" ,0 ,1 ,2 ) }; -static struct ralink_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,3 ,2 ) }; -static struct ralink_pmx_func uart3_grp[] = { +static struct mtmips_pmx_func uart1_grp[] = {FUNC ("uart1" ,0 ,1 ,2 ) }; +static struct mtmips_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,3 ,2 ) }; +static struct mtmips_pmx_func uart3_grp[] = {FUNC ("uart3" ,0 ,5 ,4 ),FUNC ("i2s" ,2 ,5 ,4 ),FUNC ("spdif3" ,3 ,5 ,4 ), }; -static struct ralink_pmx_func uart2_grp[] = { +static struct mtmips_pmx_func uart2_grp[] = {FUNC ("uart2" ,0 ,9 ,4 ),FUNC ("pcm" ,2 ,9 ,4 ),FUNC ("spdif2" ,3 ,9 ,4 ), }; -static struct ralink_pmx_func jtag_grp[] = {FUNC ("jtag" ,0 ,13 ,5 ) }; -static struct ralink_pmx_func wdt_grp[] = { +static struct mtmips_pmx_func jtag_grp[] = {FUNC ("jtag" ,0 ,13 ,5 ) }; +static struct mtmips_pmx_func wdt_grp[] = {FUNC ("wdt rst" ,0 ,18 ,1 ),FUNC ("wdt refclk" ,2 ,18 ,1 ), }; -static struct ralink_pmx_func pcie_rst_grp[] = { +static struct mtmips_pmx_func pcie_rst_grp[] = {FUNC ("pcie rst" ,MT7621_GPIO_MODE_PCIE_RST ,19 ,1 ),FUNC ("pcie refclk" ,MT7621_GPIO_MODE_PCIE_REF ,19 ,1 ) }; -static struct ralink_pmx_func mdio_grp[] = {FUNC ("mdio" ,0 ,20 ,2 ) }; -static struct ralink_pmx_func rgmii2_grp[] = {FUNC ("rgmii2" ,0 ,22 ,12 ) }; -static struct ralink_pmx_func spi_grp[] = { +static struct mtmips_pmx_func mdio_grp[] = {FUNC ("mdio" ,0 ,20 ,2 ) }; +static struct mtmips_pmx_func rgmii2_grp[] = {FUNC ("rgmii2" ,0 ,22 ,12 ) }; +static struct mtmips_pmx_func spi_grp[] = {FUNC ("spi" ,0 ,34 ,7 ),FUNC ("nand1" ,2 ,34 ,7 ), }; -static struct ralink_pmx_func sdhci_grp[] = { +static struct mtmips_pmx_func sdhci_grp[] = {FUNC ("sdhci" ,0 ,41 ,8 ),FUNC ("nand2" ,2 ,41 ,8 ), }; -static struct ralink_pmx_func rgmii1_grp[] = {FUNC ("rgmii1" ,0 ,49 ,12 ) }; +static struct mtmips_pmx_func rgmii1_grp[] = {FUNC ("rgmii1" ,0 ,49 ,12 ) }; -static struct ralink_pmx_group mt7621_pinmux_data[] = { +static struct mtmips_pmx_group mt7621_pinmux_data[] = {GRP ("uart1" , uart1_grp,1 ,MT7621_GPIO_MODE_UART1 ),GRP ("i2c" , i2c_grp,1 ,MT7621_GPIO_MODE_I2C ), GRP_G("uart3", uart3_grp, MT7621_GPIO_MODE_UART3_MASK,
@@ -92,7 +92,7 @@ static struct ralink_pmx_group mt7621_pinmux_data[] = {static int mt7621_pinctrl_probe (struct platform_device *pdev) { -return ralink_pinctrl_init (pdev, mt7621_pinmux_data); +return mtmips_pinctrl_init (pdev, mt7621_pinmux_data); }static const struct of_device_id mt7621_pinctrl_match[] = {
drivers/pinctrl/mediatek/pinctrl-mt76x8.c renamed from drivers/pinctrl/ralink/pinctrl-mt76x8.c +30 -30
217 lines not on this page · raw message
drivers/pinctrl/mediatek/pinctrl-mtmips.c renamed from drivers/pinctrl/ralink/pinctrl-ralink.c +45 -45
219 lines not on this page · raw message
drivers/pinctrl/mediatek/pinctrl-mtmips.h renamed from drivers/pinctrl/ralink/pinctrl-ralink.h +8 -8
@@ -3,8 +3,8 @@* Copyright (C) 2012 John Crispin <[email protected]> */ -#ifndef _PINCTRL_RALINK_H__ -#define _PINCTRL_RALINK_H__ +#ifndef _PINCTRL_MTMIPS_H__ +#define _PINCTRL_MTMIPS_H__#define FUNC (name, value, pin_first, pin_count) \ { name, value, pin_first, pin_count }
@@ -19,9 +19,9 @@ .func = _func, .gpio = _gpio, \ .func_count = ARRAY_SIZE(_func) } -struct ralink_pmx_group ; +struct mtmips_pmx_group ; -struct ralink_pmx_func { +struct mtmips_pmx_func {const char *name;const char value;
@@ -35,7 +35,7 @@ struct ralink_pmx_func {int enabled; }; -struct ralink_pmx_group { +struct mtmips_pmx_group {const char *name;int enabled;
@@ -43,11 +43,11 @@ struct ralink_pmx_group {const char mask;const char gpio; -struct ralink_pmx_func *func; +struct mtmips_pmx_func *func; int func_count; }; -int ralink_pinctrl_init (struct platform_device *pdev, -struct ralink_pmx_group *data); +int mtmips_pinctrl_init (struct platform_device *pdev, +struct mtmips_pmx_group *data);#endif
drivers/pinctrl/mediatek/pinctrl-rt2880.c renamed from drivers/pinctrl/ralink/pinctrl-rt2880.c +10 -10
@@ -4,7 +4,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h> -#include "pinctrl-ralink.h" +#include "pinctrl-mtmips.h" #define RT2880_GPIO_MODE_I2C BIT(0)#define RT2880_GPIO_MODE_UART0 BIT(1)
@@ -15,15 +15,15 @@#define RT2880_GPIO_MODE_SDRAM BIT(6)#define RT2880_GPIO_MODE_PCI BIT(7) -static struct ralink_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,1 ,2 ) }; -static struct ralink_pmx_func spi_grp[] = {FUNC ("spi" ,0 ,3 ,4 ) }; -static struct ralink_pmx_func uartlite_grp[] = {FUNC ("uartlite" ,0 ,7 ,8 ) }; -static struct ralink_pmx_func jtag_grp[] = {FUNC ("jtag" ,0 ,17 ,5 ) }; -static struct ralink_pmx_func mdio_grp[] = {FUNC ("mdio" ,0 ,22 ,2 ) }; -static struct ralink_pmx_func sdram_grp[] = {FUNC ("sdram" ,0 ,24 ,16 ) }; -static struct ralink_pmx_func pci_grp[] = {FUNC ("pci" ,0 ,40 ,32 ) }; +static struct mtmips_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,1 ,2 ) }; +static struct mtmips_pmx_func spi_grp[] = {FUNC ("spi" ,0 ,3 ,4 ) }; +static struct mtmips_pmx_func uartlite_grp[] = {FUNC ("uartlite" ,0 ,7 ,8 ) }; +static struct mtmips_pmx_func jtag_grp[] = {FUNC ("jtag" ,0 ,17 ,5 ) }; +static struct mtmips_pmx_func mdio_grp[] = {FUNC ("mdio" ,0 ,22 ,2 ) }; +static struct mtmips_pmx_func sdram_grp[] = {FUNC ("sdram" ,0 ,24 ,16 ) }; +static struct mtmips_pmx_func pci_grp[] = {FUNC ("pci" ,0 ,40 ,32 ) }; -static struct ralink_pmx_group rt2880_pinmux_data_act[] = { +static struct mtmips_pmx_group rt2880_pinmux_data_act[] = {GRP ("i2c" , i2c_grp,1 ,RT2880_GPIO_MODE_I2C ),GRP ("spi" , spi_grp,1 ,RT2880_GPIO_MODE_SPI ),GRP ("uartlite" , uartlite_grp,1 ,RT2880_GPIO_MODE_UART0 ),
@@ -36,7 +36,7 @@ static struct ralink_pmx_group rt2880_pinmux_data_act[] = {static int rt2880_pinctrl_probe (struct platform_device *pdev) { -return ralink_pinctrl_init (pdev, rt2880_pinmux_data_act); +return mtmips_pinctrl_init (pdev, rt2880_pinmux_data_act); }static const struct of_device_id rt2880_pinctrl_match[] = {
drivers/pinctrl/mediatek/pinctrl-rt305x.c renamed from drivers/pinctrl/ralink/pinctrl-rt305x.c +22 -22
91 lines not on this page · raw message
drivers/pinctrl/mediatek/pinctrl-rt3883.c renamed from drivers/pinctrl/ralink/pinctrl-rt3883.c +14 -14
@@ -3,7 +3,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h> -#include "pinctrl-ralink.h" +#include "pinctrl-mtmips.h" #define RT3883_GPIO_MODE_UART0_SHIFT 2#define RT3883_GPIO_MODE_UART0_MASK 0x7
@@ -39,9 +39,9 @@#define RT3883_GPIO_MODE_LNA_G_GPIO 0x3#define RT3883_GPIO_MODE_LNA_G _RT3883_GPIO_MODE_LNA_G(RT3883_GPIO_MODE_LNA_G_MASK) -static struct ralink_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,1 ,2 ) }; -static struct ralink_pmx_func spi_grp[] = {FUNC ("spi" ,0 ,3 ,4 ) }; -static struct ralink_pmx_func uartf_grp[] = { +static struct mtmips_pmx_func i2c_grp[] = {FUNC ("i2c" ,0 ,1 ,2 ) }; +static struct mtmips_pmx_func spi_grp[] = {FUNC ("spi" ,0 ,3 ,4 ) }; +static struct mtmips_pmx_func uartf_grp[] = {FUNC ("uartf" ,RT3883_GPIO_MODE_UARTF ,7 ,8 ),FUNC ("pcm uartf" ,RT3883_GPIO_MODE_PCM_UARTF ,7 ,8 ),FUNC ("pcm i2s" ,RT3883_GPIO_MODE_PCM_I2S ,7 ,8 ),
@@ -50,21 +50,21 @@ static struct ralink_pmx_func uartf_grp[] = { FUNC("gpio uartf", RT3883_GPIO_MODE_GPIO_UARTF, 7, 4), FUNC("gpio i2s", RT3883_GPIO_MODE_GPIO_I2S, 7, 4), }; -static struct ralink_pmx_func uartlite_grp[] = {FUNC ("uartlite" ,0 ,15 ,2 ) }; -static struct ralink_pmx_func jtag_grp[] = {FUNC ("jtag" ,0 ,17 ,5 ) }; -static struct ralink_pmx_func mdio_grp[] = {FUNC ("mdio" ,0 ,22 ,2 ) }; -static struct ralink_pmx_func lna_a_grp[] = {FUNC ("lna a" ,0 ,32 ,3 ) }; -static struct ralink_pmx_func lna_g_grp[] = {FUNC ("lna g" ,0 ,35 ,3 ) }; -static struct ralink_pmx_func pci_grp[] = { +static struct mtmips_pmx_func uartlite_grp[] = {FUNC ("uartlite" ,0 ,15 ,2 ) }; +static struct mtmips_pmx_func jtag_grp[] = {FUNC ("jtag" ,0 ,17 ,5 ) }; +static struct mtmips_pmx_func mdio_grp[] = {FUNC ("mdio" ,0 ,22 ,2 ) }; +static struct mtmips_pmx_func lna_a_grp[] = {FUNC ("lna a" ,0 ,32 ,3 ) }; +static struct mtmips_pmx_func lna_g_grp[] = {FUNC ("lna g" ,0 ,35 ,3 ) }; +static struct mtmips_pmx_func pci_grp[] = {FUNC ("pci-dev" ,0 ,40 ,32 ),FUNC ("pci-host2" ,1 ,40 ,32 ),FUNC ("pci-host1" ,2 ,40 ,32 ),FUNC ("pci-fnc" ,3 ,40 ,32 ) }; -static struct ralink_pmx_func ge1_grp[] = {FUNC ("ge1" ,0 ,72 ,12 ) }; -static struct ralink_pmx_func ge2_grp[] = {FUNC ("ge2" ,0 ,84 ,12 ) }; +static struct mtmips_pmx_func ge1_grp[] = {FUNC ("ge1" ,0 ,72 ,12 ) }; +static struct mtmips_pmx_func ge2_grp[] = {FUNC ("ge2" ,0 ,84 ,12 ) }; -static struct ralink_pmx_group rt3883_pinmux_data[] = { +static struct mtmips_pmx_group rt3883_pinmux_data[] = {GRP ("i2c" , i2c_grp,1 ,RT3883_GPIO_MODE_I2C ),GRP ("spi" , spi_grp,1 ,RT3883_GPIO_MODE_SPI ), GRP("uartf", uartf_grp, RT3883_GPIO_MODE_UART0_MASK,
@@ -83,7 +83,7 @@ static struct ralink_pmx_group rt3883_pinmux_data[] = {static int rt3883_pinctrl_probe (struct platform_device *pdev) { -return ralink_pinctrl_init (pdev, rt3883_pinmux_data); +return mtmips_pinctrl_init (pdev, rt3883_pinmux_data); }static const struct of_device_id rt3883_pinctrl_match[] = {
drivers/pinctrl/ralink/Kconfig deleted +0 -40
@@ -1,40 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -menu "Ralink pinctrl drivers" - depends on RALINK - -config PINCTRL_RALINK - bool "Ralink pinctrl driver" - select PINMUX - select GENERIC_PINCONF - -config PINCTRL_MT7620 - bool "MT7620 pinctrl subdriver" - depends on RALINK && SOC_MT7620 - select PINCTRL_RALINK - -config PINCTRL_MT7621 - bool "MT7621 pinctrl subdriver" - depends on RALINK && SOC_MT7621 - select PINCTRL_RALINK - -config PINCTRL_MT76X8 - bool "MT76X8 pinctrl subdriver" - depends on RALINK && SOC_MT7620 - select PINCTRL_RALINK - -config PINCTRL_RT2880 - bool "RT2880 pinctrl subdriver" - depends on RALINK && SOC_RT288X - select PINCTRL_RALINK - -config PINCTRL_RT305X - bool "RT305X pinctrl subdriver" - depends on RALINK && SOC_RT305X - select PINCTRL_RALINK - -config PINCTRL_RT3883 - bool "RT3883 pinctrl subdriver" - depends on RALINK && SOC_RT3883 - select PINCTRL_RALINK - -endmenu
drivers/pinctrl/ralink/Makefile deleted +0 -9
@@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_PINCTRL_RALINK) += pinctrl-ralink.o - -obj-$(CONFIG_PINCTRL_MT7620) += pinctrl-mt7620.o -obj-$(CONFIG_PINCTRL_MT7621) += pinctrl-mt7621.o -obj-$(CONFIG_PINCTRL_MT76X8) += pinctrl-mt76x8.o -obj-$(CONFIG_PINCTRL_RT2880) += pinctrl-rt2880.o -obj-$(CONFIG_PINCTRL_RT305X) += pinctrl-rt305x.o -obj-$(CONFIG_PINCTRL_RT3883) += pinctrl-rt3883.o
Signature · 1 line
2.37.2
PATCH v3 5/21 pinctrl: mediatek: remove OF_GPIO as reverse dependency
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
The OF_GPIO option is enabled by default when GPIOLIB is enabled, and cannot be disabled. Remove it as a reverse dependency where GPIOLIB is also set as a reverse dependency.
--- drivers/pinctrl/mediatek/Kconfig | 3 --- 1 file changed, 3 deletions(-)
drivers/pinctrl/mediatek/Kconfig +0 -3
@@ -17,7 +17,6 @@ config PINCTRL_MTK select GENERIC_PINCONF select GPIOLIB select EINT_MTK - select OF_GPIO config PINCTRL_MTK_V2 tristate
@@ -35,7 +34,6 @@ config PINCTRL_MTK_MOORE select GENERIC_PINCTRL_GROUPS select GENERIC_PINMUX_FUNCTIONS select GPIOLIB - select OF_GPIO select EINT_MTK select PINCTRL_MTK_V2
@@ -46,7 +44,6 @@ config PINCTRL_MTK_PARIS select GENERIC_PINCONF select GPIOLIB select EINT_MTK - select OF_GPIO select PINCTRL_MTK_V2 # For MIPS SoCs
Signature · 1 line
2.37.2
Re: [PATCH v3 05/21] pinctrl: mediatek: remove OF_GPIO as reverse dependency
Il 17/03/23 22:29, [email protected] ha scritto:
Quoted 8 lines
From: Arınç ÜNAL <[email protected]>
The
OF_GPIOoption is enabled by default when GPIOLIB is enabled, and cannot be disabled. Remove it as a reverse dependency where GPIOLIB is also set as a reverse dependency.Signed-off-by Arınç ÜNAL <[email protected]>Reviewed-by Sergio Paracuellos <[email protected]>
PATCH v3 6/21 dt-bindings: pinctrl: ralink: move additionalProperties to top
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Move additionalProperties to the top. It's easier to read than after a long indented section.
--- .../devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml | 7 +++---- .../devicetree/bindings/pinctrl/ralink,mt7621-pinctrl.yaml | 7 +++---- .../devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 7 +++---- .../devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 7 +++---- .../devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 7 +++---- 5 files changed, 15 insertions(+), 20 deletions(-)
Documentation/devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml +3 -4
@@ -22,11 +22,14 @@ properties: patternProperties: '-pins$': type: object + additionalProperties: false + patternProperties: '^(.*-)?pinmux$': type: object description: node for pinctrl. $ref: pinmux-node.yaml# + additionalProperties: false properties: function:
@@ -632,10 +635,6 @@ patternProperties: groups: enum: [i2c, spi cs1, uart0] - additionalProperties: false - - additionalProperties: false - allOf: - $ref: "pinctrl.yaml#"
Documentation/devicetree/bindings/pinctrl/ralink,mt7621-pinctrl.yaml +3 -4
@@ -22,11 +22,14 @@ properties: patternProperties: '-pins$': type: object + additionalProperties: false + patternProperties: '^(.*-)?pinmux$': type: object description: node for pinctrl. $ref: pinmux-node.yaml# + additionalProperties: false properties: function:
@@ -236,10 +239,6 @@ patternProperties: groups: enum: [wdt] - additionalProperties: false - - additionalProperties: false - allOf: - $ref: "pinctrl.yaml#"
Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml +3 -4
@@ -22,11 +22,14 @@ properties: patternProperties: '-pins$': type: object + additionalProperties: false + patternProperties: '^(.*-)?pinmux$': type: object description: node for pinctrl. $ref: pinmux-node.yaml# + additionalProperties: false properties: function:
@@ -116,10 +119,6 @@ patternProperties: groups: enum: [pci] - additionalProperties: false - - additionalProperties: false - allOf: - $ref: "pinctrl.yaml#"
Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml +3 -4
@@ -23,11 +23,14 @@ properties: patternProperties: '-pins$': type: object + additionalProperties: false + patternProperties: '^(.*-)?pinmux$': type: object description: node for pinctrl. $ref: pinmux-node.yaml# + additionalProperties: false properties: function:
@@ -249,10 +252,6 @@ patternProperties: groups: enum: [spi_cs1] - additionalProperties: false - - additionalProperties: false - allOf: - $ref: "pinctrl.yaml#"
Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml +3 -4
@@ -22,11 +22,14 @@ properties: patternProperties: '-pins$': type: object + additionalProperties: false + patternProperties: '^(.*-)?pinmux$': type: object description: node for pinctrl. $ref: pinmux-node.yaml# + additionalProperties: false properties: function:
@@ -236,10 +239,6 @@ patternProperties: groups: enum: [uartlite] - additionalProperties: false - - additionalProperties: false - allOf: - $ref: "pinctrl.yaml#"
Signature · 1 line
2.37.2
PATCH v3 7/21 dt-bindings: pinctrl: ralink: drop quotes from referred schemas
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Drop the quotes from the referred schemas.
--- .../devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/ralink,mt7621-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml +1 -1
@@ -636,7 +636,7 @@ patternProperties: enum: [i2c, spi cs1, uart0] allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Documentation/devicetree/bindings/pinctrl/ralink,mt7621-pinctrl.yaml +1 -1
@@ -240,7 +240,7 @@ patternProperties: enum: [wdt] allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml +1 -1
@@ -120,7 +120,7 @@ patternProperties: enum: [pci] allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml +1 -1
@@ -253,7 +253,7 @@ patternProperties: enum: [spi_cs1] allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml +1 -1
@@ -240,7 +240,7 @@ patternProperties: enum: [uartlite] allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Signature · 1 line
2.37.2
PATCH v3 8/21 dt-bindings: pinctrl: ralink: add new compatible strings
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Add the new compatible strings for mt7620, mt76x8, and rt305x to be able to properly document the pin muxing information of each SoC, or SoCs that use the same pinmux data.
--- .../devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml | 4 +++- .../devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml +3 -1
@@ -17,7 +17,9 @@ description: properties: compatible: - const: ralink,mt7620-pinctrl + enum: + - ralink,mt7620-pinctrl + - ralink,mt76x8-pinctrl patternProperties: '-pins$':
Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml +4 -1
@@ -18,7 +18,10 @@ description: properties: compatible: - const: ralink,rt305x-pinctrl + enum: + - ralink,rt305x-pinctrl + - ralink,rt3352-pinctrl + - ralink,rt5350-pinctrl patternProperties: '-pins$':
Signature · 1 line
2.37.2
PATCH v3 9/21 dt-bindings: pinctrl: ralink: {mt7620,mt7621}: rename to mediatek
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Rename schemas of pin controllers for MediaTek MT7620 and MT7621 SoCs to be on par with other pin controllers for MediaTek SoCs.
---
...ink,mt7620-pinctrl.yaml => mediatek,mt7620-pinctrl.yaml} | 6 +++---
...ink,mt7621-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7620-pinctrl.yaml => mediatek,mt7620-pinctrl.yaml} (98%)
rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7621-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} (97%)Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml renamed from Documentation/devicetree/bindings/pinctrl/ralink,mt7620-pinctrl.yaml +3 -3
@@ -1,17 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2 --- -$id: http://devicetree.org/schemas/pinctrl/ralink,mt7620-pinctrl.yaml# +$id: http://devicetree.org/schemas/pinctrl/mediatek,mt7620-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Ralink MT7620 Pin Controller +title: MediaTek MT7620 Pin Controller maintainers: - Arınç ÜNAL <[email protected]> - Sergio Paracuellos <[email protected]> description: - Ralink MT7620 pin controller for MT7620, MT7628 and MT7688 SoCs. + MediaTek MT7620 pin controller for MT7620, MT7628 and MT7688 SoCs. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support.
Documentation/devicetree/bindings/pinctrl/mediatek,mt7621-pinctrl.yaml renamed from Documentation/devicetree/bindings/pinctrl/ralink,mt7621-pinctrl.yaml +3 -3
@@ -1,17 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2 --- -$id: http://devicetree.org/schemas/pinctrl/ralink,mt7621-pinctrl.yaml# +$id: http://devicetree.org/schemas/pinctrl/mediatek,mt7621-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Ralink MT7621 Pin Controller +title: MediaTek MT7621 Pin Controller maintainers: - Arınç ÜNAL <[email protected]> - Sergio Paracuellos <[email protected]> description: - Ralink MT7621 pin controller for MT7621 SoC. + MediaTek MT7621 pin controller for MT7621 SoC. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support.
Signature · 1 line
2.37.2
PATCH v3 10/21 dt-bindings: pinctrl: mediatek: mt6795: rename to mediatek,mt6795-pinctrl
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Rename mediatek,pinctrl-mt6795.yaml to mediatek,mt6795-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.
---
...ediatek,pinctrl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Documentation/devicetree/bindings/pinctrl/{mediatek,pinctrl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} (98%)Documentation/devicetree/bindings/pinctrl/mediatek,mt6795-pinctrl.yaml renamed from Documentation/devicetree/bindings/pinctrl/mediatek,pinctrl-mt6795.yaml +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/pinctrl/mediatek,pinctrl-mt6795.yaml# +$id: http://devicetree.org/schemas/pinctrl/mediatek,mt6795-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Mediatek MT6795 Pin Controller
Signature · 1 line
2.37.2
Re: [PATCH v3 10/21] dt-bindings: pinctrl: mediatek: mt6795: rename to mediatek,mt6795-pinctrl
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 7 lines
From: Arınç ÜNAL <[email protected]>
Rename mediatek,pinctrl-mt6795.yaml to mediatek,mt6795-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.
Signed-off-by Arınç ÜNAL <[email protected]>Acked-by Rob Herring <[email protected]>
PATCH v3 11/21 dt-bindings: pinctrl: mediatek: mt8186: rename to mediatek,mt8186-pinctrl
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Rename pinctrl-mt8186.yaml to mediatek,mt8186-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.
---
.../{pinctrl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} (99%)Documentation/devicetree/bindings/pinctrl/mediatek,mt8186-pinctrl.yaml renamed from Documentation/devicetree/bindings/pinctrl/pinctrl-mt8186.yaml +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/pinctrl/pinctrl-mt8186.yaml# +$id: http://devicetree.org/schemas/pinctrl/mediatek,mt8186-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Mediatek MT8186 Pin Controller
Signature · 1 line
2.37.2
Re: [PATCH v3 11/21] dt-bindings: pinctrl: mediatek: mt8186: rename to mediatek,mt8186-pinctrl
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 7 lines
From: Arınç ÜNAL <[email protected]>
Rename
pinctrl-mt8186.yamlto mediatek,mt8186-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.Signed-off-by Arınç ÜNAL <[email protected]>Acked-by Rob Herring <[email protected]>
PATCH v3 12/21 dt-bindings: pinctrl: mediatek: mt8192: rename to mediatek,mt8192-pinctrl
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Rename pinctrl-mt8192.yaml to mediatek,mt8192-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.
---
.../{pinctrl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} (98%)Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml renamed from Documentation/devicetree/bindings/pinctrl/pinctrl-mt8192.yaml +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/pinctrl/pinctrl-mt8192.yaml# +$id: http://devicetree.org/schemas/pinctrl/mediatek,mt8192-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Mediatek MT8192 Pin Controller
Signature · 1 line
2.37.2
Re: [PATCH v3 12/21] dt-bindings: pinctrl: mediatek: mt8192: rename to mediatek,mt8192-pinctrl
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 7 lines
From: Arınç ÜNAL <[email protected]>
Rename
pinctrl-mt8192.yamlto mediatek,mt8192-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.Signed-off-by Arınç ÜNAL <[email protected]>Acked-by Rob Herring <[email protected]>
PATCH v3 13/21 dt-bindings: pinctrl: mediatek: mt8195: rename to mediatek,mt8195-pinctrl
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Rename pinctrl-mt8195.yaml to mediatek,mt8195-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.
---
.../{pinctrl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} (99%)Documentation/devicetree/bindings/pinctrl/mediatek,mt8195-pinctrl.yaml renamed from Documentation/devicetree/bindings/pinctrl/pinctrl-mt8195.yaml +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/pinctrl/pinctrl-mt8195.yaml# +$id: http://devicetree.org/schemas/pinctrl/mediatek,mt8195-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Mediatek MT8195 Pin Controller
Signature · 1 line
2.37.2
Re: [PATCH v3 13/21] dt-bindings: pinctrl: mediatek: mt8195: rename to mediatek,mt8195-pinctrl
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 7 lines
From: Arınç ÜNAL <[email protected]>
Rename
pinctrl-mt8195.yamlto mediatek,mt8195-pinctrl.yaml to be on par with the compatible string and other mediatek dt-binding schemas.Signed-off-by Arınç ÜNAL <[email protected]>Acked-by Rob Herring <[email protected]>
PATCH v3 14/21 dt-bindings: pinctrl: mediatek: fix naming inconsistency
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Some schemas include "MediaTek", some "Mediatek". Rename all to "MediaTek" to address the naming inconsistency.
--- .../devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 4 ++-- .../devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/mediatek,mt6795-pinctrl.yaml | 4 ++-- .../devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/mediatek,mt7981-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/mediatek,mt8186-pinctrl.yaml | 4 ++-- .../devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml | 4 ++-- .../devicetree/bindings/pinctrl/mediatek,mt8195-pinctrl.yaml | 4 ++-- .../devicetree/bindings/pinctrl/mediatek,mt8365-pinctrl.yaml | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-)
Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml +2 -2
@@ -4,13 +4,13 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt65xx-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT65xx Pin Controller +title: MediaTek MT65xx Pin Controller maintainers: - Sean Wang <[email protected]> description: |+ - The Mediatek's Pin controller is used to control SoC pins. + The MediaTek's MT65xx Pin controller is used to control SoC pins. properties: compatible:
Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml +1 -1
@@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt6779-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT6779 Pin Controller +title: MediaTek MT6779 Pin Controller maintainers: - Andy Teng <[email protected]>
Documentation/devicetree/bindings/pinctrl/mediatek,mt6795-pinctrl.yaml +2 -2
@@ -4,14 +4,14 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt6795-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT6795 Pin Controller +title: MediaTek MT6795 Pin Controller maintainers: - AngeloGioacchino Del Regno <[email protected]> - Sean Wang <[email protected]> description: | - The Mediatek's Pin controller is used to control SoC pins. + The MediaTek's MT6795 Pin controller is used to control SoC pins. properties: compatible:
Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml +1 -1
@@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt7622-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT7622 Pin Controller +title: MediaTek MT7622 Pin Controller maintainers: - Sean Wang <[email protected]>
Documentation/devicetree/bindings/pinctrl/mediatek,mt7981-pinctrl.yaml +1 -1
@@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt7981-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT7981 Pin Controller +title: MediaTek MT7981 Pin Controller maintainers: - Daniel Golle <[email protected]>
Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml +1 -1
@@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt7986-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT7986 Pin Controller +title: MediaTek MT7986 Pin Controller maintainers: - Sean Wang <[email protected]>
Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml +1 -1
@@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt8183-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT8183 Pin Controller +title: MediaTek MT8183 Pin Controller maintainers: - Sean Wang <[email protected]>
Documentation/devicetree/bindings/pinctrl/mediatek,mt8186-pinctrl.yaml +2 -2
@@ -4,13 +4,13 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt8186-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT8186 Pin Controller +title: MediaTek MT8186 Pin Controller maintainers: - Sean Wang <[email protected]> description: | - The Mediatek's Pin controller is used to control SoC pins. + The MediaTek's MT8186 Pin controller is used to control SoC pins. properties: compatible:
Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml +2 -2
@@ -4,13 +4,13 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt8192-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT8192 Pin Controller +title: MediaTek MT8192 Pin Controller maintainers: - Sean Wang <[email protected]> description: | - The Mediatek's Pin controller is used to control SoC pins. + The MediaTek's MT8192 Pin controller is used to control SoC pins. properties: compatible:
Documentation/devicetree/bindings/pinctrl/mediatek,mt8195-pinctrl.yaml +2 -2
@@ -4,13 +4,13 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt8195-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT8195 Pin Controller +title: MediaTek MT8195 Pin Controller maintainers: - Sean Wang <[email protected]> description: | - The Mediatek's Pin controller is used to control SoC pins. + The MediaTek's MT8195 Pin controller is used to control SoC pins. properties: compatible:
Documentation/devicetree/bindings/pinctrl/mediatek,mt8365-pinctrl.yaml +1 -1
@@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/pinctrl/mediatek,mt8365-pinctrl.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Mediatek MT8365 Pin Controller +title: MediaTek MT8365 Pin Controller maintainers: - Zhiyong Tao <[email protected]>
Signature · 1 line
2.37.2
Re: [PATCH v3 14/21] dt-bindings: pinctrl: mediatek: fix naming inconsistency
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 7 lines
From: Arınç ÜNAL <[email protected]>
Some schemas include "MediaTek", some "Mediatek". Rename all to "MediaTek" to address the naming inconsistency.
Signed-off-by Arınç ÜNAL <[email protected]>Reviewed-by Rob Herring <[email protected]>
PATCH v3 15/21 dt-bindings: pinctrl: {mediatek,ralink}: fix formatting
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Change the style of description properties to plain style where there's no need to preserve the line endings, and vice versa.
Fix capitalisation and indentation.
Fit the schemas to 80 columns for each line.
--- .../pinctrl/mediatek,mt65xx-pinctrl.yaml | 22 +++--- .../pinctrl/mediatek,mt6779-pinctrl.yaml | 33 +++++---- .../pinctrl/mediatek,mt6795-pinctrl.yaml | 41 +++++----- .../pinctrl/mediatek,mt7620-pinctrl.yaml | 2 +- .../pinctrl/mediatek,mt7621-pinctrl.yaml | 2 +- .../pinctrl/mediatek,mt7622-pinctrl.yaml | 26 +++---- .../pinctrl/mediatek,mt7981-pinctrl.yaml | 33 +++++---- .../pinctrl/mediatek,mt7986-pinctrl.yaml | 68 ++++++++--------- .../pinctrl/mediatek,mt8183-pinctrl.yaml | 26 ++++--- .../pinctrl/mediatek,mt8186-pinctrl.yaml | 47 ++++++------ .../pinctrl/mediatek,mt8188-pinctrl.yaml | 74 ++++++++++--------- .../pinctrl/mediatek,mt8192-pinctrl.yaml | 47 ++++++------ .../pinctrl/mediatek,mt8195-pinctrl.yaml | 41 +++++----- .../pinctrl/mediatek,mt8365-pinctrl.yaml | 28 +++---- .../pinctrl/ralink,rt2880-pinctrl.yaml | 2 +- .../pinctrl/ralink,rt305x-pinctrl.yaml | 2 +- .../pinctrl/ralink,rt3883-pinctrl.yaml | 2 +- 17 files changed, 258 insertions(+), 238 deletions(-)
Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml +11 -11
@@ -9,7 +9,7 @@ title: MediaTek MT65xx Pin Controller maintainers: - Sean Wang <[email protected]> -description: |+ +description: The MediaTek's MT65xx Pin controller is used to control SoC pins. properties:
@@ -30,7 +30,7 @@ properties: pins-are-numbered: $ref: /schemas/types.yaml#/definitions/flag - description: | + description: Specify the subnodes are using numbered pinmux to specify pins. (UNUSED) deprecated: true
@@ -38,10 +38,10 @@ properties: "#gpio-cells": const: 2 - description: | - Number of cells in GPIO specifier. Since the generic GPIO - binding is used, the amount of cells must be specified as 2. See the below - mentioned gpio binding representation for description of particular cells. + description: + Number of cells in GPIO specifier. Since the generic GPIO binding is used, + the amount of cells must be specified as 2. See the below mentioned gpio + binding representation for description of particular cells. mediatek,pctl-regmap: $ref: /schemas/types.yaml#/definitions/phandle-array
@@ -49,7 +49,7 @@ properties: maxItems: 1 minItems: 1 maxItems: 2 - description: | + description: Should be phandles of the syscfg node. interrupt-controller: true
@@ -77,7 +77,7 @@ patternProperties: '(^pins|pins?$)': type: object additionalProperties: false - description: | + description: A pinctrl node should contain at least one subnodes representing the pinctrl groups available on the machine. Each subnode will list the pins it needs, and how they should be configured, with regard to muxer
@@ -88,14 +88,14 @@ patternProperties: properties: pinmux: description: - integer array, represents gpio pin number and mux setting. + Integer array, represents gpio pin number and mux setting. Supported pin number and mux varies for different SoCs, and are defined as macros in <soc>-pinfunc.h directly. bias-disable: true bias-pull-up: - description: | + description: Besides generic pinconfig options, it can be used as the pull up settings for 2 pull resistors, R0 and R1. User can configure those special pins. Some macros have been defined for this usage, such
@@ -117,7 +117,7 @@ patternProperties: input-schmitt-disable: true drive-strength: - description: | + description: Can support some arguments, such as MTK_DRIVE_4mA, MTK_DRIVE_6mA, etc. See dt-bindings/pinctrl/mt65xx.h for valid arguments.
Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml +18 -15
@@ -11,8 +11,8 @@ maintainers: - Sean Wang <[email protected]> description: - The MediaTek pin controller on MT6779 is used to control pin - functions, pull up/down resistance and drive strength options. + The MediaTek pin controller on MT6779 is used to control pin functions, pull + up/down resistance and drive strength options. properties: compatible:
@@ -29,22 +29,22 @@ properties: "#gpio-cells": const: 2 - description: | - Number of cells in GPIO specifier. Since the generic GPIO - binding is used, the amount of cells must be specified as 2. See the below - mentioned gpio binding representation for description of particular cells. + description: + Number of cells in GPIO specifier. Since the generic GPIO binding is used, + the amount of cells must be specified as 2. See the below mentioned gpio + binding representation for description of particular cells. gpio-ranges: minItems: 1 maxItems: 5 - description: | + description: GPIO valid number range. interrupt-controller: true interrupts: maxItems: 1 - description: | + description: Specifies the summary IRQ. "#interrupt-cells":
@@ -118,19 +118,20 @@ patternProperties: patternProperties: '-pins*$': type: object - description: | + description: A pinctrl node should contain at least one subnodes representing the pinctrl groups available on the machine. Each subnode will list the pins it needs, and how they should be configured, with regard to muxer - configuration, pullups, drive strength, input enable/disable and input schmitt. + configuration, pullups, drive strength, input enable/disable and input + schmitt. $ref: "/schemas/pinctrl/pincfg-node.yaml" properties: pinmux: description: - integer array, represents gpio pin number and mux setting. - Supported pin number and mux varies for different SoCs, and are defined - as macros in boot/dts/<soc>-pinfunc.h directly. + Integer array, represents gpio pin number and mux setting. + Supported pin number and mux varies for different SoCs, and are + defined as macros in boot/dts/<soc>-pinfunc.h directly. bias-disable: true
@@ -159,7 +160,8 @@ patternProperties: mediatek,pull-up-adv: description: | Pull up setings for 2 pull resistors, R0 and R1. User can - configure those special pins. Valid arguments are described as below: + configure those special pins. Valid arguments are described as + below: 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled.
@@ -170,7 +172,8 @@ patternProperties: mediatek,pull-down-adv: description: | Pull down settings for 2 pull resistors, R0 and R1. User can - configure those special pins. Valid arguments are described as below: + configure those special pins. Valid arguments are described as + below: 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled.
Documentation/devicetree/bindings/pinctrl/mediatek,mt6795-pinctrl.yaml +21 -20
98 lines not on this page · raw message
Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml +1 -1
@@ -10,7 +10,7 @@ maintainers: - Arınç ÜNAL <[email protected]> - Sergio Paracuellos <[email protected]> -description: +description: | MediaTek MT7620 pin controller for MT7620, MT7628 and MT7688 SoCs. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support.
Documentation/devicetree/bindings/pinctrl/mediatek,mt7621-pinctrl.yaml +1 -1
@@ -10,7 +10,7 @@ maintainers: - Arınç ÜNAL <[email protected]> - Sergio Paracuellos <[email protected]> -description: +description: | MediaTek MT7621 pin controller for MT7621 SoC. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support.
Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml +13 -13
@@ -9,7 +9,7 @@ title: MediaTek MT7622 Pin Controller maintainers: - Sean Wang <[email protected]> -description: |+ +description: The MediaTek's MT7622 Pin controller is used to control SoC pins. properties:
@@ -29,10 +29,10 @@ properties: "#gpio-cells": const: 2 - description: | - Number of cells in GPIO specifier. Since the generic GPIO - binding is used, the amount of cells must be specified as 2. See the below - mentioned gpio binding representation for description of particular cells. + description: + Number of cells in GPIO specifier. Since the generic GPIO binding is used, + the amount of cells must be specified as 2. See the below mentioned gpio + binding representation for description of particular cells. interrupt-controller: true
@@ -68,18 +68,18 @@ patternProperties: '^mux(-|$)': type: object additionalProperties: false - description: | + description: pinmux configuration nodes. $ref: "/schemas/pinctrl/pinmux-node.yaml" properties: function: - description: | + description: A string containing the name of the function to mux to the group. enum: [emmc, eth, i2c, i2s, ir, led, flash, pcie, pmic, pwm, sd, spi, tdm, uart, watchdog, wifi] groups: - description: | + description: An array of strings. Each string contains the name of a group. drive-strength:
@@ -247,18 +247,18 @@ patternProperties: '^conf(-|$)': type: object additionalProperties: false - description: | + description: pinconf configuration nodes. $ref: "/schemas/pinctrl/pincfg-node.yaml" properties: groups: - description: | + description: An array of strings. Each string contains the name of a group. Valid values are the same as the pinmux node. pins: - description: | + description: An array of strings. Each string contains the name of a pin. enum: [GPIO_A, I2S1_IN, I2S1_OUT, I2S_BCLK, I2S_WS, I2S_MCLK, TXD0, RXD0, SPI_WP, SPI_HOLD, SPI_CLK, SPI_MOSI, SPI_MISO, SPI_CS,
@@ -315,14 +315,14 @@ patternProperties: enum: [0, 1] mediatek,tdsel: - description: | + description: An integer describing the steps for output level shifter duty cycle when asserted (high pulse width adjustment). Valid arguments are from 0 to 15. $ref: /schemas/types.yaml#/definitions/uint32 mediatek,rdsel: - description: | + description: An integer describing the steps for input level shifter duty cycle when asserted (high pulse width adjustment). Valid arguments are from 0 to 63.
Documentation/devicetree/bindings/pinctrl/mediatek,mt7981-pinctrl.yaml +19 -14
@@ -37,7 +37,7 @@ properties: "#gpio-cells": const: 2 - description: > + description: Number of cells in GPIO specifier. Since the generic GPIO binding is used, the amount of cells must be specified as 2. See the below mentioned gpio binding representation for description of particular cells.
@@ -111,7 +111,9 @@ patternProperties: "watchdog1" "watchdog" 13 "udi" "udi" 9, 10, 11, 12, 13 "drv_vbus" "usb" 14 - "emmc_45" "flash" 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 + "emmc_45" "flash" 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25 + "snfi" "flash" 16, 17, 18, 19, 20, 21 "spi0" "spi" 16, 17, 18, 19 "spi0_wp_hold" "spi" 20, 21
@@ -148,7 +150,7 @@ patternProperties: "wf5g_led0" "led" 31 "wf5g_led1" "led" 35 "mt7531_int" "eth" 38 - "ant_sel" "ant" 14, 15, 16, 17, 18, 19, 20, 21, 22 + "ant_sel" "ant" 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 34, 35 $ref: /schemas/pinctrl/pinmux-node.yaml
@@ -256,7 +258,8 @@ patternProperties: then: properties: groups: - enum: [gbe_led0, gbe_led1, wf2g_led0, wf2g_led1, wf5g_led0, wf5g_led1] + enum: [gbe_led0, gbe_led1, wf2g_led0, wf2g_led1, wf5g_led0, + wf5g_led1] - if: properties: function:
@@ -275,7 +278,8 @@ patternProperties: properties: groups: items: - enum: [spi1_0, spi0, spi0_wp_hold, spi1_1, spi2, spi2_wp_hold] + enum: [spi1_0, spi0, spi0_wp_hold, spi1_1, spi2, + spi2_wp_hold] maxItems: 4 - if: properties:
@@ -332,13 +336,14 @@ patternProperties: JTAG_JTDO, JTAG_JTDI, JTAG_JTMS, JTAG_JTCLK, JTAG_JTRST_N, WO_JTAG_JTDO, WO_JTAG_JTDI, WO_JTAG_JTMS, WO_JTAG_JTCLK, WO_JTAG_JTRST_N, USB_VBUS, PWM0, SPI0_CLK, SPI0_MOSI, - SPI0_MISO, SPI0_CS, SPI0_HOLD, SPI0_WP, SPI1_CLK, SPI1_MOSI, - SPI1_MISO, SPI1_CS, SPI2_CLK, SPI2_MOSI, SPI2_MISO, SPI2_CS, - SPI2_HOLD, SPI2_WP, UART0_RXD, UART0_TXD, PCIE_CLK_REQ, - PCIE_WAKE_N, SMI_MDC, SMI_MDIO, GBE_INT, GBE_RESET, - WF_DIG_RESETB, WF_CBA_RESETB, WF_XO_REQ, WF_TOP_CLK, - WF_TOP_DATA, WF_HB1, WF_HB2, WF_HB3, WF_HB4, WF_HB0, - WF_HB0_B, WF_HB5, WF_HB6, WF_HB7, WF_HB8, WF_HB9, WF_HB10] + SPI0_MISO, SPI0_CS, SPI0_HOLD, SPI0_WP, SPI1_CLK, + SPI1_MOSI, SPI1_MISO, SPI1_CS, SPI2_CLK, SPI2_MOSI, + SPI2_MISO, SPI2_CS, SPI2_HOLD, SPI2_WP, UART0_RXD, + UART0_TXD, PCIE_CLK_REQ, PCIE_WAKE_N, SMI_MDC, SMI_MDIO, + GBE_INT, GBE_RESET, WF_DIG_RESETB, WF_CBA_RESETB, + WF_XO_REQ, WF_TOP_CLK, WF_TOP_DATA, WF_HB1, WF_HB2, WF_HB3, + WF_HB4, WF_HB0, WF_HB0_B, WF_HB5, WF_HB6, WF_HB7, WF_HB8, + WF_HB9, WF_HB10] maxItems: 57 bias-disable: true
@@ -348,7 +353,7 @@ patternProperties: - type: boolean description: normal pull up. - enum: [100, 101, 102, 103] - description: > + description: PUPD/R1/R0 pull down type. See MTK_PUPD_SET_R1R0 defines in dt-bindings/pinctrl/mt65xx.h.
@@ -357,7 +362,7 @@ patternProperties: - type: boolean description: normal pull down. - enum: [100, 101, 102, 103] - description: > + description: PUPD/R1/R0 pull down type. See MTK_PUPD_SET_R1R0 defines in dt-bindings/pinctrl/mt65xx.h.
Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml +35 -33
141 lines not on this page · raw message
Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml +14 -12
@@ -9,7 +9,7 @@ title: MediaTek MT8183 Pin Controller maintainers: - Sean Wang <[email protected]> -description: |+ +description: The MediaTek's MT8183 Pin controller is used to control SoC pins. properties:
@@ -37,15 +37,15 @@ properties: "#gpio-cells": const: 2 - description: | - Number of cells in GPIO specifier. Since the generic GPIO - binding is used, the amount of cells must be specified as 2. See the below - mentioned gpio binding representation for description of particular cells. + description: + Number of cells in GPIO specifier. Since the generic GPIO binding is used, + the amount of cells must be specified as 2. See the below mentioned gpio + binding representation for description of particular cells. gpio-ranges: minItems: 1 maxItems: 5 - description: | + description: GPIO valid number range. interrupt-controller: true
@@ -74,7 +74,7 @@ patternProperties: '^pins': type: object additionalProperties: false - description: | + description: A pinctrl node should contain at least one subnodes representing the pinctrl groups available on the machine. Each subnode will list the pins it needs, and how they should be configured, with regard to muxer
@@ -85,7 +85,7 @@ patternProperties: properties: pinmux: description: - integer array, represents gpio pin number and mux setting. + Integer array, represents gpio pin number and mux setting. Supported pin number and mux varies for different SoCs, and are defined as macros in <soc>-pinfunc.h directly.
@@ -139,7 +139,8 @@ patternProperties: mediatek,pull-up-adv: description: | Pull up setings for 2 pull resistors, R0 and R1. User can - configure those special pins. Valid arguments are described as below: + configure those special pins. Valid arguments are described as + below: 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled.
@@ -150,7 +151,8 @@ patternProperties: mediatek,pull-down-adv: description: | Pull down settings for 2 pull resistors, R0 and R1. User can - configure those special pins. Valid arguments are described as below: + configure those special pins. Valid arguments are described as + below: 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled.
@@ -159,14 +161,14 @@ patternProperties: enum: [0, 1, 2, 3] mediatek,tdsel: - description: | + description: An integer describing the steps for output level shifter duty cycle when asserted (high pulse width adjustment). Valid arguments are from 0 to 15. $ref: /schemas/types.yaml#/definitions/uint32 mediatek,rdsel: - description: | + description: An integer describing the steps for input level shifter duty cycle when asserted (high pulse width adjustment). Valid arguments are from 0 to 63.
Documentation/devicetree/bindings/pinctrl/mediatek,mt8186-pinctrl.yaml +23 -24
102 lines not on this page · raw message
Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml +40 -34
118 lines not on this page · raw message
Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml +24 -23
99 lines not on this page · raw message
Documentation/devicetree/bindings/pinctrl/mediatek,mt8195-pinctrl.yaml +20 -21
91 lines not on this page · raw message
Documentation/devicetree/bindings/pinctrl/mediatek,mt8365-pinctrl.yaml +15 -13
@@ -10,7 +10,7 @@ maintainers: - Zhiyong Tao <[email protected]> - Bernhard Rosenkränzer <[email protected]> -description: | +description: The MediaTek's MT8365 Pin controller is used to control SoC pins. properties:
@@ -26,17 +26,17 @@ properties: maxItems: 1 minItems: 1 maxItems: 2 - description: | + description: Should be phandles of the syscfg node. gpio-controller: true "#gpio-cells": const: 2 - description: | - Number of cells in GPIO specifier. Since the generic GPIO - binding is used, the amount of cells must be specified as 2. See the below - mentioned gpio binding representation for description of particular cells. + description: + Number of cells in GPIO specifier. Since the generic GPIO binding is used, + the amount of cells must be specified as 2. See the below mentioned gpio + binding representation for description of particular cells. interrupt-controller: true
@@ -54,7 +54,7 @@ patternProperties: "pins$": type: object additionalProperties: false - description: | + description: A pinctrl node should contain at least one subnode representing the pinctrl groups available on the machine. Each subnode will list the pins it needs, and how they should be configured, with regard to muxer
@@ -65,14 +65,14 @@ patternProperties: properties: pinmux: description: - integer array, represents gpio pin number and mux setting. + Integer array, represents gpio pin number and mux setting. Supported pin number and mux varies for different SoCs, and are defined as macros in <soc>-pinfunc.h directly. bias-disable: true bias-pull-up: - description: | + description: Besides generic pinconfig options, it can be used as the pull up settings for 2 pull resistors, R0 and R1. User can configure those special pins.
@@ -120,7 +120,8 @@ patternProperties: mediatek,pull-up-adv: description: | Pull up setings for 2 pull resistors, R0 and R1. User can - configure those special pins. Valid arguments are described as below: + configure those special pins. Valid arguments are described as + below: 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled.
@@ -131,7 +132,8 @@ patternProperties: mediatek,pull-down-adv: description: | Pull down settings for 2 pull resistors, R0 and R1. User can - configure those special pins. Valid arguments are described as below: + configure those special pins. Valid arguments are described as + below: 0: (R1, R0) = (0, 0) which means R1 disabled and R0 disabled. 1: (R1, R0) = (0, 1) which means R1 disabled and R0 enabled. 2: (R1, R0) = (1, 0) which means R1 enabled and R0 disabled.
@@ -140,14 +142,14 @@ patternProperties: enum: [0, 1, 2, 3] mediatek,tdsel: - description: | + description: An integer describing the steps for output level shifter duty cycle when asserted (high pulse width adjustment). Valid arguments are from 0 to 15. $ref: /schemas/types.yaml#/definitions/uint32 mediatek,rdsel: - description: | + description: An integer describing the steps for input level shifter duty cycle when asserted (high pulse width adjustment). Valid arguments are from 0 to 63.
Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml +1 -1
@@ -10,7 +10,7 @@ maintainers: - Arınç ÜNAL <[email protected]> - Sergio Paracuellos <[email protected]> -description: +description: | Ralink RT2880 pin controller for RT2880 SoC. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support.
Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml +1 -1
@@ -10,7 +10,7 @@ maintainers: - Arınç ÜNAL <[email protected]> - Sergio Paracuellos <[email protected]> -description: +description: | Ralink RT305X pin controller for RT3050, RT3052, RT3350, RT3352 and RT5350 SoCs. The pin controller can only set the muxing of pin groups. Muxing individual
Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml +1 -1
@@ -10,7 +10,7 @@ maintainers: - Arınç ÜNAL <[email protected]> - Sergio Paracuellos <[email protected]> -description: +description: | Ralink RT3883 pin controller for RT3883 SoC. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support.
Signature · 1 line
2.37.2
Re: [PATCH v3 15/21] dt-bindings: pinctrl: {mediatek,ralink}: fix formatting
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 11 lines
From: Arınç ÜNAL <[email protected]>
Change the style of description properties to plain style where there's no need to preserve the line endings, and vice versa.
Fix capitalisation and indentation.
Fit the schemas to 80 columns for each line.
Signed-off-by Arınç ÜNAL <[email protected]>Reviewed-by Rob Herring <[email protected]>
PATCH v3 16/21 dt-bindings: pinctrl: mediatek: fix pinmux header location
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Fix the location of the pinmux header files mentioned on the schemas.
--- .../devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 2 +- .../devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml +1 -1
@@ -90,7 +90,7 @@ patternProperties: description: Integer array, represents gpio pin number and mux setting. Supported pin number and mux varies for different SoCs, and are - defined as macros in <soc>-pinfunc.h directly. + defined as macros in dt-bindings/pinctrl/<soc>-pinfunc.h directly. bias-disable: true
Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml +1 -1
@@ -131,7 +131,7 @@ patternProperties: description: Integer array, represents gpio pin number and mux setting. Supported pin number and mux varies for different SoCs, and are - defined as macros in boot/dts/<soc>-pinfunc.h directly. + defined as macros in dt-bindings/pinctrl/<soc>-pinfunc.h directly. bias-disable: true
Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml +2 -2
@@ -88,8 +88,8 @@ patternProperties: description: Integer array, represents gpio pin number and mux setting. Supported pin number and mux varies for different SoCs, and are - defined as macros in dt-bindings/pinctrl/mediatek,<soc>-pinfunc.h - directly. + defined as macros in dt-bindings/pinctrl/mediatek,mt8188-pinfunc.h + directly, for this SoC. drive-strength: enum: [2, 4, 6, 8, 10, 12, 14, 16]
Signature · 1 line
2.37.2
Re: [PATCH v3 16/21] dt-bindings: pinctrl: mediatek: fix pinmux header location
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 6 lines
From: Arınç ÜNAL <[email protected]>
Fix the location of the pinmux header files mentioned on the schemas.
Signed-off-by Arınç ÜNAL <[email protected]>Reviewed-by Rob Herring <[email protected]>
PATCH v3 17/21 dt-bindings: pinctrl: mediatek: drop quotes from referred schemas
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Drop the quotes from the referred schemas.
--- .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 4 ++-- .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 4 ++-- .../bindings/pinctrl/mediatek,mt6795-pinctrl.yaml | 4 ++-- .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 6 +++--- .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 6 +++--- .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 4 ++-- .../bindings/pinctrl/mediatek,mt8186-pinctrl.yaml | 2 +- .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 2 +- .../bindings/pinctrl/mediatek,mt8192-pinctrl.yaml | 4 ++-- .../bindings/pinctrl/mediatek,mt8195-pinctrl.yaml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-)
Documentation/devicetree/bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml +2 -2
@@ -67,7 +67,7 @@ required: - "#gpio-cells" allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# patternProperties: 'pins$':
@@ -83,7 +83,7 @@ patternProperties: pins it needs, and how they should be configured, with regard to muxer configuration, pullups, drive strength, input enable/disable and input schmitt. - $ref: "/schemas/pinctrl/pincfg-node.yaml" + $ref: /schemas/pinctrl/pincfg-node.yaml properties: pinmux:
Documentation/devicetree/bindings/pinctrl/mediatek,mt6779-pinctrl.yaml +2 -2
@@ -58,7 +58,7 @@ required: - "#gpio-cells" allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# - if: properties: compatible:
@@ -124,7 +124,7 @@ patternProperties: pins it needs, and how they should be configured, with regard to muxer configuration, pullups, drive strength, input enable/disable and input schmitt. - $ref: "/schemas/pinctrl/pincfg-node.yaml" + $ref: /schemas/pinctrl/pincfg-node.yaml properties: pinmux:
Documentation/devicetree/bindings/pinctrl/mediatek,mt6795-pinctrl.yaml +2 -2
@@ -82,7 +82,7 @@ patternProperties: } }; }; - $ref: "pinmux-node.yaml" + $ref: pinmux-node.yaml properties: pinmux:
@@ -156,7 +156,7 @@ patternProperties: - pinmux allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml +3 -3
@@ -43,7 +43,7 @@ properties: const: 2 allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
@@ -70,7 +70,7 @@ patternProperties: additionalProperties: false description: pinmux configuration nodes. - $ref: "/schemas/pinctrl/pinmux-node.yaml" + $ref: /schemas/pinctrl/pinmux-node.yaml properties: function: description:
@@ -249,7 +249,7 @@ patternProperties: additionalProperties: false description: pinconf configuration nodes. - $ref: "/schemas/pinctrl/pincfg-node.yaml" + $ref: /schemas/pinctrl/pincfg-node.yaml properties: groups:
Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml +3 -3
@@ -57,7 +57,7 @@ properties: const: 2 allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
@@ -128,7 +128,7 @@ patternProperties: "wf_dbdc" "wifi" 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85 - $ref: "/schemas/pinctrl/pinmux-node.yaml" + $ref: /schemas/pinctrl/pinmux-node.yaml properties: function: description:
@@ -261,7 +261,7 @@ patternProperties: additionalProperties: false description: pinconf configuration nodes. - $ref: "/schemas/pinctrl/pincfg-node.yaml" + $ref: /schemas/pinctrl/pincfg-node.yaml properties: pins:
Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml +2 -2
@@ -57,7 +57,7 @@ properties: const: 2 allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
@@ -80,7 +80,7 @@ patternProperties: pins it needs, and how they should be configured, with regard to muxer configuration, pullups, drive strength, input enable/disable and input schmitt. - $ref: "/schemas/pinctrl/pincfg-node.yaml" + $ref: /schemas/pinctrl/pincfg-node.yaml properties: pinmux:
Documentation/devicetree/bindings/pinctrl/mediatek,mt8186-pinctrl.yaml +1 -1
@@ -94,7 +94,7 @@ patternProperties: } }; }; - $ref: "pinmux-node.yaml" + $ref: pinmux-node.yaml properties: pinmux:
Documentation/devicetree/bindings/pinctrl/mediatek,mt8188-pinctrl.yaml +1 -1
@@ -74,7 +74,7 @@ patternProperties: patternProperties: '^pins': type: object - $ref: "/schemas/pinctrl/pincfg-node.yaml" + $ref: /schemas/pinctrl/pincfg-node.yaml additionalProperties: false description: A pinctrl node should contain at least one subnode representing the
Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml +2 -2
@@ -65,7 +65,7 @@ patternProperties: pins it needs, and how they should be configured, with regard to muxer configuration, pullups, drive strength, input enable/disable and input schmitt. - $ref: "pinmux-node.yaml" + $ref: pinmux-node.yaml properties: pinmux:
@@ -126,7 +126,7 @@ patternProperties: additionalProperties: false allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Documentation/devicetree/bindings/pinctrl/mediatek,mt8195-pinctrl.yaml +2 -2
@@ -87,7 +87,7 @@ patternProperties: } }; }; - $ref: "pinmux-node.yaml" + $ref: pinmux-node.yaml properties: pinmux:
@@ -216,7 +216,7 @@ patternProperties: - pinmux allOf: - - $ref: "pinctrl.yaml#" + - $ref: pinctrl.yaml# required: - compatible
Signature · 1 line
2.37.2
Re: [PATCH v3 17/21] dt-bindings: pinctrl: mediatek: drop quotes from referred schemas
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 6 lines
From: Arınç ÜNAL <[email protected]>
Drop the quotes from the referred schemas.
Signed-off-by Arınç ÜNAL <[email protected]>Reviewed-by Rob Herring <[email protected]>
PATCH v3 18/21 dt-bindings: pinctrl: mediatek: mt7986: fix patternProperties regex
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
Set second level patternProperties to '^.*mux.*$' and '^.*conf.*$' on mediatek,mt7986-pinctrl.yaml to be on par with other schemas.
--- .../devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/pinctrl/mediatek,mt7986-pinctrl.yaml +2 -2
@@ -72,7 +72,7 @@ patternProperties: additionalProperties: false patternProperties: - '.*mux.*': + '^.*mux.*$': type: object additionalProperties: false description: |
@@ -256,7 +256,7 @@ patternProperties: items: enum: [wf_2g, wf_5g, wf_dbdc] maxItems: 3 - '.*conf.*': + '^.*conf.*$': type: object additionalProperties: false description:
Signature · 1 line
2.37.2
PATCH v3 19/21 dt-bindings: pinctrl: ralink: rt305x: split binding
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
The RT3352 and RT5350 SoCs each contain different pin muxing information, therefore, should be split. This can be done now that there are compatible strings to distinguish them from other SoCs.
Split the schema out to ralink,rt3352-pinctrl.yaml and ralink,rt5350-pinctrl.yaml.
Remove ralink,rt3352-pinctrl and ralink,rt5350-pinctrl from rt305x.
--- .../pinctrl/ralink,rt305x-pinctrl.yaml | 83 +----- .../pinctrl/ralink,rt3352-pinctrl.yaml | 243 ++++++++++++++++++ .../pinctrl/ralink,rt5350-pinctrl.yaml | 206 +++++++++++++++ 3 files changed, 455 insertions(+), 77 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml
Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml +6 -77
@@ -11,17 +11,13 @@ maintainers: - Sergio Paracuellos <[email protected]> description: | - Ralink RT305X pin controller for RT3050, RT3052, RT3350, RT3352 and RT5350 - SoCs. + Ralink RT305X pin controller for RT3050, RT3052, and RT3350 SoCs. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support. properties: compatible: - enum: - - ralink,rt305x-pinctrl - - ralink,rt3352-pinctrl - - ralink,rt5350-pinctrl + const: ralink,rt305x-pinctrl patternProperties: '-pins$':
@@ -39,21 +35,9 @@ patternProperties: function: description: A string containing the name of the function to mux to the group. - anyOf: - - description: For RT3050, RT3052 and RT3350 SoCs - enum: [gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, mdio, - pcm gpio, pcm i2s, pcm uartf, rgmii, sdram, spi, uartf, - uartlite] - - - description: For RT3352 SoC - enum: [gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, led, - lna, mdio, pa, pcm gpio, pcm i2s, pcm uartf, rgmii, spi, - spi_cs1, uartf, uartlite, wdg_cs1] - - - description: For RT5350 SoC - enum: [gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, led, - pcm gpio, pcm i2s, pcm uartf, spi, spi_cs1, uartf, - uartlite, wdg_cs1] + enum: [gpio, gpio i2s, gpio uartf, i2c, i2s uartf, jtag, mdio, + pcm gpio, pcm i2s, pcm uartf, rgmii, sdram, spi, uartf, + uartlite] groups: description:
@@ -72,17 +56,7 @@ patternProperties: then: properties: groups: - anyOf: - - description: For RT3050, RT3052 and RT3350 SoCs - enum: [i2c, jtag, mdio, rgmii, sdram, spi, uartf, - uartlite] - - - description: For RT3352 SoC - enum: [i2c, jtag, led, lna, mdio, pa, rgmii, spi, spi_cs1, - uartf, uartlite] - - - description: For RT5350 SoC - enum: [i2c, jtag, led, spi, spi_cs1, uartf, uartlite] + enum: [i2c, jtag, mdio, rgmii, sdram, spi, uartf, uartlite] - if: properties:
@@ -129,24 +103,6 @@ patternProperties: groups: enum: [jtag] - - if: - properties: - function: - const: led - then: - properties: - groups: - enum: [led] - - - if: - properties: - function: - const: lna - then: - properties: - groups: - enum: [lna] - - if: properties: function:
@@ -156,15 +112,6 @@ patternProperties: groups: enum: [mdio] - - if: - properties: - function: - const: pa - then: - properties: - groups: - enum: [pa] - - if: properties: function:
@@ -219,15 +166,6 @@ patternProperties: groups: enum: [spi] - - if: - properties: - function: - const: spi_cs1 - then: - properties: - groups: - enum: [spi_cs1] - - if: properties: function:
@@ -246,15 +184,6 @@ patternProperties: groups: enum: [uartlite] - - if: - properties: - function: - const: wdg_cs1 - then: - properties: - groups: - enum: [spi_cs1] - allOf: - $ref: pinctrl.yaml#
Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml new file +243 -0
243 lines not on this page · raw message
Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml new file +206 -0
206 lines not on this page · raw message
Signature · 1 line
2.37.2
PATCH v3 20/21 dt-bindings: pinctrl: mediatek: mt7620: split binding
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
The MT7628 and MT7688 SoCs contain different pin muxing information, therefore, should be split. This can be done now that there are compatible strings to distinguish them from other SoCs.
Split the schema out to mediatek,mt76x8-pinctrl.yaml.
Remove mediatek,mt76x8-pinctrl from mt7620.
--- .../pinctrl/mediatek,mt7620-pinctrl.yaml | 379 +-------------- .../pinctrl/mediatek,mt76x8-pinctrl.yaml | 450 ++++++++++++++++++ 2 files changed, 459 insertions(+), 370 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt76x8-pinctrl.yaml
Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml +9 -370
@@ -11,15 +11,13 @@ maintainers: - Sergio Paracuellos <[email protected]> description: | - MediaTek MT7620 pin controller for MT7620, MT7628 and MT7688 SoCs. + MediaTek MT7620 pin controller for MT7620 SoC. The pin controller can only set the muxing of pin groups. Muxing individual pins is not supported. There is no pinconf support. properties: compatible: - enum: - - ralink,mt7620-pinctrl - - ralink,mt76x8-pinctrl + const: ralink,mt7620-pinctrl patternProperties: '-pins$':
@@ -37,19 +35,10 @@ patternProperties: function: description: A string containing the name of the function to mux to the group. - anyOf: - - description: For MT7620 SoC - enum: [ephy, gpio, gpio i2s, gpio uartf, i2c, i2s uartf, mdio, nand, pa, - pcie refclk, pcie rst, pcm gpio, pcm i2s, pcm uartf, refclk, - rgmii1, rgmii2, sd, spi, spi refclk, uartf, uartlite, wdt refclk, - wdt rst, wled] - - - description: For MT7628 and MT7688 SoCs - enum: [antenna, debug, gpio, i2c, i2s, jtag, p0led_an, p0led_kn, - p1led_an, p1led_kn, p2led_an, p2led_kn, p3led_an, p3led_kn, - p4led_an, p4led_kn, pcie, pcm, perst, pwm, pwm0, pwm1, pwm_uart2, - refclk, rsvd, sdxc, sdxc d5 d4, sdxc d6, sdxc d7, spi, spi cs1, - spis, sw_r, uart0, uart1, uart2, utif, wdt, wled_an, wled_kn, -] + enum: [ephy, gpio, gpio i2s, gpio uartf, i2c, i2s uartf, mdio, nand, + pa, pcie refclk, pcie rst, pcm gpio, pcm i2s, pcm uartf, + refclk, rgmii1, rgmii2, sd, spi, spi refclk, uartf, uartlite, + wdt refclk, wdt rst, wled] groups: description:
@@ -61,24 +50,6 @@ patternProperties: - function allOf: - - if: - properties: - function: - const: antenna - then: - properties: - groups: - enum: [i2s] - - - if: - properties: - function: - const: debug - then: - properties: - groups: - enum: [i2c] - - if: properties: function:
@@ -95,17 +66,8 @@ patternProperties: then: properties: groups: - anyOf: - - description: For MT7620 SoC - enum: [ephy, i2c, mdio, nd_sd, pa, pcie, rgmii1, rgmii2, - spi, spi refclk, uartf, uartlite, wdt, wled] - - - description: For MT7628 and MT7688 SoCs - enum: [gpio, i2c, i2s, p0led_an, p0led_kn, p1led_an, - p1led_kn, p2led_an, p2led_kn, p3led_an, p3led_kn, - p4led_an, p4led_kn, perst, pwm0, pwm1, refclk, - sdmode, spi, spi cs1, spis, uart0, uart1, uart2, - wdt, wled_an, wled_kn] + enum: [ephy, i2c, mdio, nd_sd, pa, pcie, rgmii1, rgmii2, spi, + spi refclk, uartf, uartlite, wdt, wled] - if: properties:
@@ -134,15 +96,6 @@ patternProperties: groups: enum: [i2c] - - if: - properties: - function: - const: i2s - then: - properties: - groups: - enum: [i2s] - - if: properties: function:
@@ -152,17 +105,6 @@ patternProperties: groups: enum: [uartf] - - if: - properties: - function: - const: jtag - then: - properties: - groups: - enum: [p0led_an, p0led_kn, p1led_an, p1led_kn, p2led_an, - p2led_kn, p3led_an, p3led_kn, p4led_an, p4led_kn, - sdmode] - - if: properties: function:
@@ -181,96 +123,6 @@ patternProperties: groups: enum: [nd_sd] - - if: - properties: - function: - const: p0led_an - then: - properties: - groups: - enum: [p0led_an] - - - if: - properties: - function: - const: p0led_kn - then: - properties: - groups: - enum: [p0led_kn] - - - if: - properties: - function: - const: p1led_an - then: - properties: - groups: - enum: [p1led_an] - - - if: - properties: - function: - const: p1led_kn - then: - properties: - groups: - enum: [p1led_kn] - - - if: - properties: - function: - const: p2led_an - then: - properties: - groups: - enum: [p2led_an] - - - if: - properties: - function: - const: p2led_kn - then: - properties: - groups: - enum: [p2led_kn] - - - if: - properties: - function: - const: p3led_an - then: - properties: - groups: - enum: [p3led_an] - - - if: - properties: - function: - const: p3led_kn - then: - properties: - groups: - enum: [p3led_kn] - - - if: - properties: - function: - const: p4led_an - then: - properties: - groups: - enum: [p4led_an] - - - if: - properties: - function: - const: p4led_kn - then: - properties: - groups: - enum: [p4led_kn] - - if: properties: function:
@@ -280,15 +132,6 @@ patternProperties: groups: enum: [pa] - - if: - properties: - function: - const: pcie - then: - properties: - groups: - enum: [gpio] - - if: properties: function:
@@ -307,15 +150,6 @@ patternProperties: groups: enum: [pcie] - - if: - properties: - function: - const: pcm - then: - properties: - groups: - enum: [i2s] - - if: properties: function:
@@ -343,51 +177,6 @@ patternProperties: groups: enum: [uartf] - - if: - properties: - function: - const: perst - then: - properties: - groups: - enum: [perst] - - - if: - properties: - function: - const: pwm - then: - properties: - groups: - enum: [uart1, uart2] - - - if: - properties: - function: - const: pwm0 - then: - properties: - groups: - enum: [pwm0] - - - if: - properties: - function: - const: pwm1 - then: - properties: - groups: - enum: [pwm1] - - - if: - properties: - function: - const: pwm_uart2 - then: - properties: - groups: - enum: [spis] - - if: properties: function:
@@ -395,12 +184,7 @@ patternProperties: then: properties: groups: - anyOf: - - description: For MT7620 SoC - enum: [mdio] - - - description: For MT7628 and MT7688 SoCs - enum: [gpio, refclk, spi cs1] + enum: [mdio] - if: properties:
@@ -420,15 +204,6 @@ patternProperties: groups: enum: [rgmii2] - - if: - properties: - function: - const: rsvd - then: - properties: - groups: - enum: [p0led_an, p0led_kn, wled_an, wled_kn] - - if: properties: function:
@@ -438,42 +213,6 @@ patternProperties: groups: enum: [nd_sd] - - if: - properties: - function: - const: sdxc - then: - properties: - groups: - enum: [sdmode] - - - if: - properties: - function: - const: sdxc d5 d4 - then: - properties: - groups: - enum: [uart2] - - - if: - properties: - function: - const: sdxc d6 - then: - properties: - groups: - enum: [pwm1] - - - if: - properties: - function: - const: sdxc d7 - then: - properties: - groups: - enum: [pwm0] - - if: properties: function:
@@ -483,15 +222,6 @@ patternProperties: groups: enum: [spi] - - if: - properties: - function: - const: spi cs1 - then: - properties: - groups: - enum: [spi cs1] - - if: properties: function:
@@ -501,51 +231,6 @@ patternProperties: groups: enum: [spi refclk] - - if: - properties: - function: - const: spis - then: - properties: - groups: - enum: [spis] - - - if: - properties: - function: - const: sw_r - then: - properties: - groups: - enum: [uart1] - - - if: - properties: - function: - const: uart0 - then: - properties: - groups: - enum: [uart0] - - - if: - properties: - function: - const: uart1 - then: - properties: - groups: - enum: [uart1] - - - if: - properties: - function: - const: uart2 - then: - properties: - groups: - enum: [uart2] - - if: properties: function:
@@ -564,25 +249,6 @@ patternProperties: groups: enum: [uartlite] - - if: - properties: - function: - const: utif - then: - properties: - groups: - enum: [p1led_an, p1led_kn, p2led_an, p2led_kn, p3led_an, - p3led_kn, p4led_an, p4led_kn, pwm0, pwm1, sdmode, spis] - - - if: - properties: - function: - const: wdt - then: - properties: - groups: - enum: [wdt] - - if: properties: function:
@@ -610,33 +276,6 @@ patternProperties: groups: enum: [wled] - - if: - properties: - function: - const: wled_an - then: - properties: - groups: - enum: [wled_an] - - - if: - properties: - function: - const: wled_kn - then: - properties: - groups: - enum: [wled_kn] - - - if: - properties: - function: - const: "-" - then: - properties: - groups: - enum: [i2c, spi cs1, uart0] - allOf: - $ref: pinctrl.yaml#
Documentation/devicetree/bindings/pinctrl/mediatek,mt76x8-pinctrl.yaml new file +450 -0
450 lines not on this page · raw message
Signature · 1 line
2.37.2
AngeloGioacchino Del Regno
maintainerRe: [PATCH v3 20/21] dt-bindings: pinctrl: mediatek: mt7620: split binding
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 8 lines
From: Arınç ÜNAL <[email protected]>
The MT7628 and MT7688 SoCs contain different pin muxing information, therefore, should be split. This can be done now that there are compatible strings to distinguish them from other SoCs.
Split the schema out to mediatek,mt76x8-pinctrl.yaml.
Quoted 7 lines
Remove mediatek,mt76x8-pinctrl from mt7620.
Signed-off-by Arınç ÜNAL <[email protected]>Reviewed-by Rob Herring <[email protected]>--- .../pinctrl/mediatek,mt7620-pinctrl.yaml | 379 +-------------- .../pinctrl/mediatek,mt76x8-pinctrl.yaml | 450 ++++++++++++++++++
AFAIK, wildcards aren't allowed, so the new file should instead be called "mediatek,mt7628-pinctrl.yaml", the compatible string "ralink,mt76x8-pinctrl" should be deprecated (but still present as to not break ABI), and the driver updated to accept the compatible string "ralink,mt7628-pinctrl".
At that point, you could update the devicetrees as well: for MT7628, you'd have a node using
compatible = "ralink,mt7628-pinctrl";
while for MT7688, you'd have
compatible = "ralink,mt7688-pinctrl", "ralink,mt7628-pinctrl";
If you don't want to go through those lengths, you could still do the cleanup that you wanted to perform, but with a filename containing no wildcards - anyway.
Regards,
Angelo
Re: [PATCH v3 20/21] dt-bindings: pinctrl: mediatek: mt7620: split binding
Quoted 27 lines · AngeloGioacchino Del Regno
Il 17/03/23 22:30, [email protected] ha scritto:
Quoted 8 lines
From: Arınç ÜNAL <[email protected]>
The MT7628 and MT7688 SoCs contain different pin muxing information, therefore, should be split. This can be done now that there are compatible strings to distinguish them from other SoCs.
Split the schema out to mediatek,mt76x8-pinctrl.yaml.
Quoted 7 lines
Remove mediatek,mt76x8-pinctrl from mt7620.
Signed-off-by Arınç ÜNAL <[email protected]>Reviewed-by Rob Herring <[email protected]>---
.../pinctrl/mediatek,mt7620-pinctrl.yaml | 379 +-------------- .../pinctrl/mediatek,mt76x8-pinctrl.yaml | 450 ++++++++++++++++++AFAIK, wildcards aren't allowed, so the new file should instead be called "mediatek,mt7628-pinctrl.yaml", the compatible string "ralink,mt76x8-pinctrl" should be deprecated (but still present as to not break ABI), and the driver updated to accept the compatible string "ralink,mt7628-pinctrl".
At that point, you could update the devicetrees as well: for MT7628, you'd have a node using
compatible = "ralink,mt7628-pinctrl";
Quoted 7 lines
while for MT7688, you'd have
compatible = "ralink,mt7688-pinctrl", "ralink,mt7628-pinctrl";
If you don't want to go through those lengths, you could still do the cleanup that you wanted to perform, but with a filename containing no wildcards - anyway.
I was able to have it accepted by Rob, and the patches are already applied so I'm going to leave it as is for now.
Arınç
PATCH v3 21/21 MAINTAINERS: move ralink pinctrl to mediatek mips pinctrl
In reply to [email protected]From: Arınç ÜNAL <[email protected]>
The Ralink pinctrl driver is now under the name of MediaTek MIPS pin controller. Move the maintainer information accordingly. Add dt-binding schema files. Add [email protected] as an associated mailing list.
--- MAINTAINERS | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
MAINTAINERS +22 -7
@@ -16521,6 +16521,28 @@ F: Documentation/devicetree/bindings/pinctrl/mediatek,mt7622-pinctrl.yaml F: Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml F: drivers/pinctrl/mediatek/ +PIN CONTROLLER - MEDIATEK MIPS +M: Arınç ÜNAL <[email protected]> +M: Sergio Paracuellos <[email protected]> +L: [email protected] (moderated for non-subscribers) +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml +F: Documentation/devicetree/bindings/pinctrl/mediatek,mt7621-pinctrl.yaml +F: Documentation/devicetree/bindings/pinctrl/mediatek,mt76x8-pinctrl.yaml +F: Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinctrl.yaml +F: Documentation/devicetree/bindings/pinctrl/ralink,rt305x-pinctrl.yaml +F: Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml +F: Documentation/devicetree/bindings/pinctrl/ralink,rt3883-pinctrl.yaml +F: Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml +F: drivers/pinctrl/mediatek/pinctrl-mt7620.c +F: drivers/pinctrl/mediatek/pinctrl-mt7621.c +F: drivers/pinctrl/mediatek/pinctrl-mt76x8.c +F: drivers/pinctrl/mediatek/pinctrl-mtmips.* +F: drivers/pinctrl/mediatek/pinctrl-rt2880.c +F: drivers/pinctrl/mediatek/pinctrl-rt305x.c +F: drivers/pinctrl/mediatek/pinctrl-rt3883.c + PIN CONTROLLER - MICROCHIP AT91 M: Ludovic Desroches <[email protected]> L: [email protected] (moderated for non-subscribers)
@@ -17496,13 +17518,6 @@ L: [email protected] S: Maintained F: arch/mips/boot/dts/ralink/mt7621* -RALINK PINCTRL DRIVER -M: Arınç ÜNAL <[email protected]> -M: Sergio Paracuellos <[email protected]> -L: [email protected] -S: Maintained -F: drivers/pinctrl/ralink/ - RALINK RT2X00 WIRELESS LAN DRIVER M: Stanislaw Gruszka <[email protected]> M: Helmut Schaa <[email protected]>
Signature · 1 line
2.37.2
Quoted 1 line · On Fri, Mar 17, 2023 at 10:30 PM <[email protected]> wrote:
This is an ambitious effort I've been wanting to do for months.
I don't see any major missing ACKs so I just applied the patches, we can fix any remaining issues in-tree.
Good work!
Yours,
Linus Walleij
Quoted 8 lines · Linus Walleij
Quoted 1 line · On Fri, Mar 17, 2023 at 10:30 PM <[email protected]> wrote:
This is an ambitious effort I've been wanting to do for months.
I don't see any major missing ACKs so I just applied the patches, we can fix any remaining issues in-tree.
Good work!
Music to my ears. It was pretty final so I don't expect more issues.
Thanks for applying them.
Cheers.
Arınç