[permalink] [raw]

Subject: Re: [PATCH v3 6/9] pinctrl: mvebu: add driver for Armada CP110 pinctrl

On Mon, Jun 12, 2017 at 5:34 PM, Gregory CLEMENT
<[email protected]> wrote:

> From: Hanna Hawa <[email protected]>
>
> This commit adds a pinctrl driver for the CP110 part of the Marvell
> Armada 7K and 8K SoCs. The Armada 7K has a single CP110, where almost all
> the MPP pins are available. On the other side, the Armada 8K has two
> CP110, and the available MPPs are split between the master CP110 (MPPs 32
> to 62) and the slave CP110 (MPPs 0 to 31).
>
> The register interface to control the MPPs is however the same as all
> other mvebu SoCs, so we can reuse the common pinctrl-mvebu.c logic.
>
> Signed-off-by: Hanna Hawa <[email protected]>
> Reviewed-by: Shadi Ammouri <[email protected]>
>
> [updated for mvebu pinctrl and 4.9 changes:
> - converted to simple_mmio
> - converted to syscon/regmap
> - removed unimplemented .remove function
> - dropped DTS changes
> - defered gpio ranges to DT
> - fixed warning
> - properly set soc->nmodes
> -- rmk]
> Signed-off-by: Russell King <[email protected]>
>
> [ add missing MPP[61:56] function 14 (SDIO)
> -- Konstantin Porotchkin]
> Signed-off-by: Konstantin Porotchkin <[email protected]>
>
> [ allow to properly register more then one instance of this driver
> -- Grzegorz Jaszczyk]
> Signed-off-by: Grzegorz Jaszczyk <[email protected]>
>
> [ - rebased on 4.12-rc1
> - fixed the 80 character limit for mvebu_mpp_mode array
> - aligned the compatible name on the ones already used
> - fixed the MPP table for CP110: some MPP are not available on Armada 7K
> -- Gregory CLEMENT]
> Signed-off-by: Gregory CLEMENT <[email protected]>
>
> Tested-by: Thomas Petazzoni <[email protected]>

Patch applied.

Yours,
Linus Walleij

2017-06-16 09:29:27

by Linus Walleij

[permalink] [raw]

Subject: Re: [PATCH v3 8/9] gpio: mvebu: Add support for the Armada 7K/8K SoCs

On Mon, Jun 12, 2017 at 5:34 PM, Gregory CLEMENT
<[email protected]> wrote:

> The Armada 7K and 8K SoCs use the same gpio controller as most of the
> other mvebu SoCs. However, the main difference is that the GPIO
> controller is part of a bigger system controller, and a syscon is used to
> control the overall system controller. Therefore, the driver needs to be
> adjusted to retrieve the regmap of the syscon to access registers, and
> account for the fact that registers are located at a certain offset
> within the regmap.
>
> This commit add the support of the syscon and introduce a new variant for
> this case.
>
> It was based on the preliminary work of Thomas Petazzoni.
>
> Tested-by: Thomas Petazzoni <[email protected]>
> Signed-off-by: Gregory CLEMENT <[email protected]>

Patch applied.

Yours,
Linus Walleij

2017-06-20 14:34:21

by Gregory CLEMENT

[permalink] [raw]

Subject: Re: [PATCH v3 7/9] arm64: dts: marvell: add pinctrl support for Armada 7K/8K

Hi,

On lun., juin 12 2017, Gregory CLEMENT <[email protected]> wrote:

> Enable pinctrl support for CP and AP on the Armada 7K/8K SoCs.
>
> The CP master being different between Armada 7k and Armada 8k. This
> commit introduces the intermediates files armada-70x0.dtsi and
> armada-80x0.dtsi.
>
> These new files will provide different compatible strings depending of
> the SoC family. They will also be the location for the pinmux
> configuration at the SoC level.
>
> Signed-off-by: Gregory CLEMENT <[email protected]>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
> arch/arm64/boot/dts/marvell/armada-7020.dtsi | 2 +-
> arch/arm64/boot/dts/marvell/armada-7040.dtsi | 2 +-
> arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 53 ++++++++++++++++++-
> arch/arm64/boot/dts/marvell/armada-8020.dtsi | 3 +-
> arch/arm64/boot/dts/marvell/armada-8040.dtsi | 3 +-
> arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 60 ++++++++++++++++++++-
> arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 4 +-
> 7 files changed, 121 insertions(+), 6 deletions(-)
> create mode 100644 arch/arm64/boot/dts/marvell/armada-70x0.dtsi
> create mode 100644 arch/arm64/boot/dts/marvell/armada-80x0.dtsi
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-7020.dtsi b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
> index 975e73302753..4ab012991d9d 100644
> --- a/arch/arm64/boot/dts/marvell/armada-7020.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-7020.dtsi
> @@ -46,7 +46,7 @@
> */
>
> #include "armada-ap806-dual.dtsi"
> -#include "armada-cp110-master.dtsi"
> +#include "armada-70x0.dtsi"
>
> / {
> model = "Marvell Armada 7020";
> diff --git a/arch/arm64/boot/dts/marvell/armada-7040.dtsi b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
> index 78d995d62707..cbe460b8fc00 100644
> --- a/arch/arm64/boot/dts/marvell/armada-7040.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-7040.dtsi
> @@ -46,7 +46,7 @@
> */
>
> #include "armada-ap806-quad.dtsi"
> -#include "armada-cp110-master.dtsi"
> +#include "armada-70x0.dtsi"
>
> / {
> model = "Marvell Armada 7040";
> diff --git a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
> new file mode 100644
> index 000000000000..f6c22665d091
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
> @@ -0,0 +1,53 @@
> +/*
> + * Copyright (C) 2017 Marvell Technology Group Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPLv2 or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of the
> + * License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/*
> + * Device Tree file for the Armada 70x0 SoC
> + */
> +
> +#include "armada-cp110-master.dtsi"
> +
> +&cpm_syscon0 {
> + cpm_pinctrl: pinctrl {
> + compatible = "marvell,armada-7k-pinctrl";
> + };
> +};
> diff --git a/arch/arm64/boot/dts/marvell/armada-8020.dtsi b/arch/arm64/boot/dts/marvell/armada-8020.dtsi
> index 7c08f1f28d9e..0ba0bc942598 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8020.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-8020.dtsi
> @@ -46,8 +46,7 @@
> */
>
> #include "armada-ap806-dual.dtsi"
> -#include "armada-cp110-master.dtsi"
> -#include "armada-cp110-slave.dtsi"
> +#include "armada-80x0.dtsi"
>
> / {
> model = "Marvell Armada 8020";
> diff --git a/arch/arm64/boot/dts/marvell/armada-8040.dtsi b/arch/arm64/boot/dts/marvell/armada-8040.dtsi
> index 33813a75bc30..60fe84f5cbcc 100644
> --- a/arch/arm64/boot/dts/marvell/armada-8040.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-8040.dtsi
> @@ -46,8 +46,7 @@
> */
>
> #include "armada-ap806-quad.dtsi"
> -#include "armada-cp110-master.dtsi"
> -#include "armada-cp110-slave.dtsi"
> +#include "armada-80x0.dtsi"
>
> / {
> model = "Marvell Armada 8040";
> diff --git a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
> new file mode 100644
> index 000000000000..93d1de03b39a
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
> @@ -0,0 +1,60 @@
> +/*
> + * Copyright (C) 2017 Marvell Technology Group Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPLv2 or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of the
> + * License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/*
> + * Device Tree file for the Armada 80x0 SoC family
> + */
> +
> +#include "armada-cp110-master.dtsi"
> +#include "armada-cp110-slave.dtsi"
> +
> +&cpm_syscon0 {
> + cpm_pinctrl: pinctrl {
> + compatible = "marvell,armada-8k-cpm-pinctrl";
> + };
> +};
> +
> +&cps_syscon0 {
> + cps_pinctrl: pinctrl {
> + compatible = "marvell,armada-8k-cps-pinctrl";
> + };
> +};
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> index 205037e3e7dc..4a1b6e0a604a 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> @@ -248,6 +248,10 @@
> compatible = "marvell,ap806-clock";
> #clock-cells = <1>;
> };
> +
> + ap_pinctrl: pinctrl {
> + compatible = "marvell,ap806-pinctrl";
> + };
> };
> };
> };
> --
> git-series 0.9.1
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

2017-06-20 14:34:47

by Gregory CLEMENT

[permalink] [raw]

Subject: Re: [PATCH v3 9/9] arm64: dts: marvell: add gpio support for Armada 7K/8K

Hi,

On lun., juin 12 2017, Gregory CLEMENT <[email protected]> wrote:

> Enable gpio support for CP and AP on the Marvell Armada 7K/8K SoCs.
>
> The Armada 8K has two CP110 blocks, each having two GPIO controllers.
> However, in each CP110 block, one of the GPIO controller cannot be
> used: in the master CP110, only the second GPIO controller can be used,
> while on the slave CP110, only the first GPIO controller can be used.
>
> On the other side, the Armada 7K has only one CP110, but both its GPIO
> controllers can be used.
>
> For this reason, the GPIO controllers are marked as "disabled" in the
> armada-cp110-master.dtsi and armada-cp110-slave.dtsi files, and only
> enabled in the per-SoC dtsi files.
>
> Signed-off-by: Gregory CLEMENT <[email protected]>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
> arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 15 +++++++++-
> arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 16 +++++++++-
> arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 10 ++++++-
> arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 21 ++++++++++++-
> arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 22 +++++++++++++-
> 5 files changed, 84 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
> index f6c22665d091..860b6ae9dcc5 100644
> --- a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
> @@ -46,6 +46,21 @@
>
> #include "armada-cp110-master.dtsi"
>
> +/ {
> + aliases {
> + gpio1 = &cpm_gpio1;
> + gpio2 = &cpm_gpio2;
> + };
> +};
> +
> +&cpm_gpio1 {
> + status = "okay";
> +};
> +
> +&cpm_gpio2 {
> + status = "okay";
> +};
> +
> &cpm_syscon0 {
> cpm_pinctrl: pinctrl {
> compatible = "marvell,armada-7k-pinctrl";
> diff --git a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
> index 93d1de03b39a..666ebe96ba0d 100644
> --- a/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-80x0.dtsi
> @@ -47,6 +47,22 @@
> #include "armada-cp110-master.dtsi"
> #include "armada-cp110-slave.dtsi"
>
> +/ {
> + aliases {
> + gpio1 = &cps_gpio1;
> + gpio2 = &cpm_gpio2;
> + };
> +};
> +
> +/* The 80x0 has two CP blocks, but uses only one block from each. */
> +&cps_gpio1 {
> + status = "okay";
> +};
> +
> +&cpm_gpio2 {
> + status = "okay";
> +};
> +
> &cpm_syscon0 {
> cpm_pinctrl: pinctrl {
> compatible = "marvell,armada-8k-cpm-pinctrl";
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> index 4a1b6e0a604a..64608658de5a 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
> @@ -57,6 +57,7 @@
> aliases {
> serial0 = &uart0;
> serial1 = &uart1;
> + gpio0 = &ap_gpio;
> };
>
> psci {
> @@ -252,6 +253,15 @@
> ap_pinctrl: pinctrl {
> compatible = "marvell,ap806-pinctrl";
> };
> +
> + ap_gpio: gpio {
> + compatible = "marvell,armada-8k-gpio";
> + offset = <0x1040>;
> + ngpios = <19>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&ap_pinctrl 0 0 19>;
> + };
> };
> };
> };
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> index 96a4ff75b3b0..f88618185d58 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> @@ -104,6 +104,27 @@
> compatible = "marvell,cp110-clock";
> #clock-cells = <2>;
> };
> +
> + cpm_gpio1: gpio@100 {
> + compatible = "marvell,armada-8k-gpio";
> + offset = <0x100>;
> + ngpios = <32>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&cpm_pinctrl 0 0 32>;
> + status = "disabled";
> +
> + };
> +
> + cpm_gpio2: gpio@140 {
> + compatible = "marvell,armada-8k-gpio";
> + offset = <0x140>;
> + ngpios = <31>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&cpm_pinctrl 0 32 31>;
> + status = "disabled";
> + };
> };
>
> cpm_rtc: rtc@284000 {
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> index 48a658aa5b32..f3a6e6742442 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> @@ -111,6 +111,28 @@
> compatible = "marvell,cp110-clock";
> #clock-cells = <2>;
> };
> +
> + cps_gpio1: gpio@100 {
> + compatible = "marvell,armada-8k-gpio";
> + offset = <0x100>;
> + ngpios = <32>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&cps_pinctrl 0 0 32>;
> + status = "disabled";
> +
> + };
> +
> + cps_gpio2: gpio@140 {
> + compatible = "marvell,armada-8k-gpio";
> + offset = <0x140>;
> + ngpios = <31>;
> + gpio-controller;
> + #gpio-cells = <2>;
> + gpio-ranges = <&cps_pinctrl 0 32 31>;
> + status = "disabled";
> + };
> +
> };
>
> cps_sata0: sata@540000 {
> --
> git-series 0.9.1
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

2017-06-21 12:53:17

by Gregory CLEMENT

[permalink] [raw]

Subject: Re: [PATCH v3 4/9] arm64: marvell: enable the Armada 7K/8K pinctrl driver

Hi Linus,

On ven., juin 16 2017, Linus Walleij <[email protected]> wrote:

> On Mon, Jun 12, 2017 at 5:34 PM, Gregory CLEMENT
> <[email protected]> wrote:
>
>> This commit makes sure the drivers for the Armada 7K/8K pin controllers
>> are enabled.
>>
>> Reviewed-by: Thomas Petazzoni <[email protected]>
>> Signed-off-by: Gregory CLEMENT <[email protected]>
>
> Acked-by: Linus Walleij <[email protected]>
>
> Please merge this through ARM SoC.

Applied on mvebu/arm64

Thanks,

Gregory

>
> Yours,
> Linus Walleij

--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com