* [PATCH] ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi
@ 2015-09-07 16:24 Javier Martinez Canillas
2015-09-07 19:39 ` Enric Balletbo Serra
0 siblings, 1 reply; 3+ messages in thread
From: Javier Martinez Canillas @ 2015-09-07 16:24 UTC (permalink / raw)
To: linux-arm-kernel
Only the IGEPv2 boards have a LAN9221i chip connected to the GPMC
so the pinmux configuration for the GPIO connected to the IRQ line
of the LAN chip should not be defined in the IGEP common dtsi but
in the one common to the IGEPv2 boards.
While there, use the OMAP3_CORE1_IOPAD() macro for the padconf reg.
Suggested-by: Ladislav Michl <ladis@linux-mips•org>
Signed-off-by: Javier Martinez Canillas <javier@osg•samsung.com>
---
arch/arm/boot/dts/omap3-igep.dtsi | 6 ------
arch/arm/boot/dts/omap3-igep0020-common.dtsi | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index d5e5cd449b16..2230e1c03320 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -78,12 +78,6 @@
>;
};
- smsc9221_pins: pinmux_smsc9221_pins {
- pinctrl-single,pins = <
- 0x1a2 (PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
- >;
- };
-
i2c1_pins: pinmux_i2c1_pins {
pinctrl-single,pins = <
0x18a (PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
diff --git a/arch/arm/boot/dts/omap3-igep0020-common.dtsi b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
index e458c2185e3c..5ad688c57a00 100644
--- a/arch/arm/boot/dts/omap3-igep0020-common.dtsi
+++ b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
@@ -156,6 +156,12 @@
OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
>;
};
+
+ smsc9221_pins: pinmux_smsc9221_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
+ >;
+ };
};
&omap3_pmx_core2 {
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi
2015-09-07 16:24 [PATCH] ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi Javier Martinez Canillas
@ 2015-09-07 19:39 ` Enric Balletbo Serra
2015-09-14 18:58 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Enric Balletbo Serra @ 2015-09-07 19:39 UTC (permalink / raw)
To: linux-arm-kernel
2015-09-07 18:24 GMT+02:00 Javier Martinez Canillas <javier@osg•samsung.com>:
> Only the IGEPv2 boards have a LAN9221i chip connected to the GPMC
> so the pinmux configuration for the GPIO connected to the IRQ line
> of the LAN chip should not be defined in the IGEP common dtsi but
> in the one common to the IGEPv2 boards.
>
> While there, use the OMAP3_CORE1_IOPAD() macro for the padconf reg.
>
> Suggested-by: Ladislav Michl <ladis@linux-mips•org>
> Signed-off-by: Javier Martinez Canillas <javier@osg•samsung.com>
>
> ---
>
> arch/arm/boot/dts/omap3-igep.dtsi | 6 ------
> arch/arm/boot/dts/omap3-igep0020-common.dtsi | 6 ++++++
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
> index d5e5cd449b16..2230e1c03320 100644
> --- a/arch/arm/boot/dts/omap3-igep.dtsi
> +++ b/arch/arm/boot/dts/omap3-igep.dtsi
> @@ -78,12 +78,6 @@
> >;
> };
>
> - smsc9221_pins: pinmux_smsc9221_pins {
> - pinctrl-single,pins = <
> - 0x1a2 (PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
> - >;
> - };
> -
> i2c1_pins: pinmux_i2c1_pins {
> pinctrl-single,pins = <
> 0x18a (PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
> diff --git a/arch/arm/boot/dts/omap3-igep0020-common.dtsi b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
> index e458c2185e3c..5ad688c57a00 100644
> --- a/arch/arm/boot/dts/omap3-igep0020-common.dtsi
> +++ b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
> @@ -156,6 +156,12 @@
> OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
> >;
> };
> +
> + smsc9221_pins: pinmux_smsc9221_pins {
> + pinctrl-single,pins = <
> + OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT | MUX_MODE4) /* mcspi1_cs2.gpio_176 */
> + >;
> + };
> };
>
> &omap3_pmx_core2 {
> --
> 2.4.3
>
Looks good to me.
Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora•com>
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi
2015-09-07 19:39 ` Enric Balletbo Serra
@ 2015-09-14 18:58 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2015-09-14 18:58 UTC (permalink / raw)
To: linux-arm-kernel
* Enric Balletbo Serra <eballetbo@gmail•com> [150907 12:43]:
> 2015-09-07 18:24 GMT+02:00 Javier Martinez Canillas <javier@osg•samsung.com>:
> > Only the IGEPv2 boards have a LAN9221i chip connected to the GPMC
> > so the pinmux configuration for the GPIO connected to the IRQ line
> > of the LAN chip should not be defined in the IGEP common dtsi but
> > in the one common to the IGEPv2 boards.
> >
> > While there, use the OMAP3_CORE1_IOPAD() macro for the padconf reg.
> >
> > Suggested-by: Ladislav Michl <ladis@linux-mips•org>
> > Signed-off-by: Javier Martinez Canillas <javier@osg•samsung.com>
...
>
> Looks good to me.
>
> Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora•com>
Applying into omap-for-v4.3/fixes thanks.
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-14 18:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-07 16:24 [PATCH] ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi Javier Martinez Canillas
2015-09-07 19:39 ` Enric Balletbo Serra
2015-09-14 18:58 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox