On 31/07/2015 11:14, Sven Eckelmann wrote:
> The pinctrl-rt2880 code doesn't support multiple functions with the same
> name. This will result in a incorrect pinmux configuration.
>
> Signed-off-by: Sven Eckelmann <s...@open-mesh.com>
> ---
> This is the patch which John Crispin <blo...@openwrt.org> wanted to
> drop and instead rewrite the pinctrl-rt2880. It is just here for
> completeness.
>
i merged this as i had no time to come up with a better fix yet. i
already looked at the driver and it will require a bit of code moving to
get this working so dont hold your breath.
> v2:
> - split into multiple patches
>
>
> target/linux/ramips/dts/mt7621.dtsi | 14 +++++++-------
> .../0012-MIPS-ralink-add-MT7621-support.patch | 18
> +++++++++---------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/target/linux/ramips/dts/mt7621.dtsi
> b/target/linux/ramips/dts/mt7621.dtsi
> index 53b215f40f10..f09ec3e5b694 100644
> --- a/target/linux/ramips/dts/mt7621.dtsi
> +++ b/target/linux/ramips/dts/mt7621.dtsi
> @@ -130,31 +130,31 @@
> uart1_pins: uart1 {
> uart1 {
> ralink,group = "uart1";
> - ralink,function = "uart";
> + ralink,function = "uart1";
> };
> };
> uart2_pins: uart2 {
> uart2 {
> ralink,group = "uart2";
> - ralink,function = "uart";
> + ralink,function = "uart2";
> };
> };
> uart3_pins: uart3 {
> uart3 {
> ralink,group = "uart3";
> - ralink,function = "uart";
> + ralink,function = "uart3";
> };
> };
> rgmii1_pins: rgmii1 {
> rgmii1 {
> ralink,group = "rgmii1";
> - ralink,function = "rgmii";
> + ralink,function = "rgmii1";
> };
> };
> rgmii2_pins: rgmii2 {
> rgmii2 {
> ralink,group = "rgmii2";
> - ralink,function = "rgmii";
> + ralink,function = "rgmii2";
> };
> };
> mdio_pins: mdio {
> @@ -172,11 +172,11 @@
> nand_pins: nand {
> spi-nand {
> ralink,group = "spi";
> - ralink,function = "nand";
> + ralink,function = "nand1";
> };
> sdhci-nand {
> ralink,group = "sdhci";
> - ralink,function = "nand";
> + ralink,function = "nand2";
> };
> };
> sdhci_pins: sdhci {
> diff --git
> a/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
> b/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
> index 69401549becd..23d32681bf77 100644
> ---
> a/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
> +++
> b/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
> @@ -582,17 +582,17 @@ Signed-off-by: John Crispin <blo...@openwrt.org>
> +#define MT7621_GPIO_MODE_SDHCI_SHIFT 18
> +#define MT7621_GPIO_MODE_SDHCI_GPIO 1
> +
> -+static struct rt2880_pmx_func uart1_grp[] = { FUNC("uart", 0, 1, 2) };
> ++static struct rt2880_pmx_func uart1_grp[] = { FUNC("uart1", 0, 1, 2) };
> +static struct rt2880_pmx_func i2c_grp[] = { FUNC("i2c", 0, 3, 2) };
> +static struct rt2880_pmx_func uart3_grp[] = {
> -+ FUNC("uart", 0, 5, 4),
> ++ FUNC("uart3", 0, 5, 4),
> + FUNC("i2s", 2, 5, 4),
> -+ FUNC("spdif", 3, 5, 4),
> ++ FUNC("spdif3", 3, 5, 4),
> +};
> +static struct rt2880_pmx_func uart2_grp[] = {
> -+ FUNC("uart", 0, 9, 4),
> ++ FUNC("uart2", 0, 9, 4),
> + FUNC("pcm", 2, 9, 4),
> -+ FUNC("spdif", 3, 9, 4),
> ++ FUNC("spdif2", 3, 9, 4),
> +};
> +static struct rt2880_pmx_func jtag_grp[] = { FUNC("jtag", 0, 13, 5) };
> +static struct rt2880_pmx_func wdt_grp[] = {
> @@ -604,16 +604,16 @@ Signed-off-by: John Crispin <blo...@openwrt.org>
> + FUNC("pcie refclk", MT7621_GPIO_MODE_PCIE_REF, 19, 1)
> +};
> +static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 0, 20, 2) };
> -+static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii", 0, 22, 12) };
> ++static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 22, 12) };
> +static struct rt2880_pmx_func spi_grp[] = {
> + FUNC("spi", 0, 34, 7),
> -+ FUNC("nand", 2, 34, 7),
> ++ FUNC("nand1", 2, 34, 7),
> +};
> +static struct rt2880_pmx_func sdhci_grp[] = {
> + FUNC("sdhci", 0, 41, 8),
> -+ FUNC("nand", 2, 41, 8),
> ++ FUNC("nand2", 2, 41, 8),
> +};
> -+static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii", 0, 49, 12) };
> ++static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 49, 12) };
> +
> +static struct rt2880_pmx_group mt7621_pinmux_data[] = {
> + GRP("uart1", uart1_grp, 1, MT7621_GPIO_MODE_UART1),
>
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
