Re: [RESEND PATCH 4/4] omap3: igep0x00: Migrate to use upstream DT

2024-05-30 Thread Enric Balletbo Serra
Hi Javier,

Yay, many thanks for this change.

Missatge de Sumit Garg  del dia dl., 20 de maig
2024 a les 12:20:
>
> On Sat, 18 May 2024 at 18:36, Javier Martinez Canillas
>  wrote:
> >
> > From: Javier Martinez Canillas 
> >
> > Enable OF_UPSTREAM to use upstream DT and add a ti/omap/ prefix to the
> > DEFAULT_DEVICE_TREE config option.
> >
> > That way, a DTS from the upstream dts/upstream/src/ directory is used
> > instead of the arch/$(ARCH)/dts/ directory. These in turn are removed.
> >
> > Signed-off-by: Javier Martinez Canillas 

Reviewed-by: Enric Balletbo i Serra 

> > ---
> >
> >  arch/arm/dts/Makefile   |   3 -
> >  arch/arm/dts/omap3-igep.dtsi| 247 --
> >  arch/arm/dts/omap3-igep0020-common.dtsi | 261 
> >  arch/arm/dts/omap3-igep0020.dts |  47 -
> >  configs/igep00x0_defconfig  |   3 +-
> >  5 files changed, 2 insertions(+), 559 deletions(-)
> >  delete mode 100644 arch/arm/dts/omap3-igep.dtsi
> >  delete mode 100644 arch/arm/dts/omap3-igep0020-common.dtsi
> >  delete mode 100644 arch/arm/dts/omap3-igep0020.dts
> >
>
> Acked-by: Sumit Garg 
>
> -Sumit
>
> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > index a5c82ebf7a5f..a9bd4921718e 100644
> > --- a/arch/arm/dts/Makefile
> > +++ b/arch/arm/dts/Makefile
> > @@ -1030,9 +1030,6 @@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
> >
> >  dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
> >
> > -dtb-$(CONFIG_TARGET_OMAP3_IGEP00X0) += \
> > -   omap3-igep0020.dtb
> > -
> >  dtb-$(CONFIG_TARGET_OMAP4_PANDA) += \
> > omap4-panda.dtb \
> > omap4-panda-es.dtb
> > diff --git a/arch/arm/dts/omap3-igep.dtsi b/arch/arm/dts/omap3-igep.dtsi
> > deleted file mode 100644
> > index 219202610463..
> > --- a/arch/arm/dts/omap3-igep.dtsi
> > +++ /dev/null
> > @@ -1,247 +0,0 @@
> > -// SPDX-License-Identifier: GPL-2.0-only
> > -/*
> > - * Common device tree for IGEP boards based on AM/DM37x
> > - *
> > - * Copyright (C) 2012 Javier Martinez Canillas 
> > - * Copyright (C) 2012 Enric Balletbo i Serra 
> > - */
> > -/dts-v1/;
> > -
> > -#include "omap36xx.dtsi"
> > -
> > -/ {
> > -   memory@8000 {
> > -   device_type = "memory";
> > -   reg = <0x8000 0x2000>; /* 512 MB */
> > -   };
> > -
> > -   chosen {
> > -   stdout-path = &uart3;
> > -   };
> > -
> > -   sound {
> > -   compatible = "ti,omap-twl4030";
> > -   ti,model = "igep2";
> > -   ti,mcbsp = <&mcbsp2>;
> > -   };
> > -
> > -   vdd33: regulator-vdd33 {
> > -   compatible = "regulator-fixed";
> > -   regulator-name = "vdd33";
> > -   regulator-always-on;
> > -   };
> > -
> > -};
> > -
> > -&omap3_pmx_core {
> > -   gpmc_pins: pinmux_gpmc_pins {
> > -   pinctrl-single,pins = <
> > -   /* OneNAND seems to require PIN_INPUT on clock. */
> > -OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0)   
> >  /* gpmc_clk.gpmc_clk */
> > -   >;
> > -   };
> > -
> > -   uart1_pins: pinmux_uart1_pins {
> > -   pinctrl-single,pins = <
> > -   OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE0)
> > /* uart1_rx.uart1_rx */
> > -   OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0)   
> > /* uart1_tx.uart1_tx */
> > -   >;
> > -   };
> > -
> > -   uart3_pins: pinmux_uart3_pins {
> > -   pinctrl-single,pins = <
> > -   OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)
> > /* uart3_rx.uart3_rx */
> > -   OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)   
> > /* uart3_tx.uart3_tx */
> > -   >;
> > -   };
> > -
> > -   mcbsp2_pins: pinmux_mcbsp2_pins {
> > -   pinctrl-single,pins = <
> > -   OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0)
> > /* mcbsp2_fsx.mcbsp2_fsx */
> > -   OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0)
> > /* mcbsp2_clkx.mcbsp2_clkx */
> > -   OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0)
> > /* mcbsp2_dr.mcbsp2.dr */
> > -   OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0)   
> > /* mcbsp2_dx.mcbsp2_dx */
> > -   >;
> > -   };
> > -
> > -   mmc1_pins: pinmux_mmc1_pins {
> > -   pinctrl-single,pins = <
> > -   OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | 
> > MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */
> > -   OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | 
> > MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */
> > -   OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | 
> > MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */
> > -   OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP | 

Re: [RESEND PATCH 4/4] omap3: igep0x00: Migrate to use upstream DT

2024-05-20 Thread Sumit Garg
On Sat, 18 May 2024 at 18:36, Javier Martinez Canillas
 wrote:
>
> From: Javier Martinez Canillas 
>
> Enable OF_UPSTREAM to use upstream DT and add a ti/omap/ prefix to the
> DEFAULT_DEVICE_TREE config option.
>
> That way, a DTS from the upstream dts/upstream/src/ directory is used
> instead of the arch/$(ARCH)/dts/ directory. These in turn are removed.
>
> Signed-off-by: Javier Martinez Canillas 
> ---
>
>  arch/arm/dts/Makefile   |   3 -
>  arch/arm/dts/omap3-igep.dtsi| 247 --
>  arch/arm/dts/omap3-igep0020-common.dtsi | 261 
>  arch/arm/dts/omap3-igep0020.dts |  47 -
>  configs/igep00x0_defconfig  |   3 +-
>  5 files changed, 2 insertions(+), 559 deletions(-)
>  delete mode 100644 arch/arm/dts/omap3-igep.dtsi
>  delete mode 100644 arch/arm/dts/omap3-igep0020-common.dtsi
>  delete mode 100644 arch/arm/dts/omap3-igep0020.dts
>

Acked-by: Sumit Garg 

-Sumit

> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index a5c82ebf7a5f..a9bd4921718e 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1030,9 +1030,6 @@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
>
>  dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
>
> -dtb-$(CONFIG_TARGET_OMAP3_IGEP00X0) += \
> -   omap3-igep0020.dtb
> -
>  dtb-$(CONFIG_TARGET_OMAP4_PANDA) += \
> omap4-panda.dtb \
> omap4-panda-es.dtb
> diff --git a/arch/arm/dts/omap3-igep.dtsi b/arch/arm/dts/omap3-igep.dtsi
> deleted file mode 100644
> index 219202610463..
> --- a/arch/arm/dts/omap3-igep.dtsi
> +++ /dev/null
> @@ -1,247 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Common device tree for IGEP boards based on AM/DM37x
> - *
> - * Copyright (C) 2012 Javier Martinez Canillas 
> - * Copyright (C) 2012 Enric Balletbo i Serra 
> - */
> -/dts-v1/;
> -
> -#include "omap36xx.dtsi"
> -
> -/ {
> -   memory@8000 {
> -   device_type = "memory";
> -   reg = <0x8000 0x2000>; /* 512 MB */
> -   };
> -
> -   chosen {
> -   stdout-path = &uart3;
> -   };
> -
> -   sound {
> -   compatible = "ti,omap-twl4030";
> -   ti,model = "igep2";
> -   ti,mcbsp = <&mcbsp2>;
> -   };
> -
> -   vdd33: regulator-vdd33 {
> -   compatible = "regulator-fixed";
> -   regulator-name = "vdd33";
> -   regulator-always-on;
> -   };
> -
> -};
> -
> -&omap3_pmx_core {
> -   gpmc_pins: pinmux_gpmc_pins {
> -   pinctrl-single,pins = <
> -   /* OneNAND seems to require PIN_INPUT on clock. */
> -OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0) 
>/* gpmc_clk.gpmc_clk */
> -   >;
> -   };
> -
> -   uart1_pins: pinmux_uart1_pins {
> -   pinctrl-single,pins = <
> -   OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE0)  
>   /* uart1_rx.uart1_rx */
> -   OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0) 
>   /* uart1_tx.uart1_tx */
> -   >;
> -   };
> -
> -   uart3_pins: pinmux_uart3_pins {
> -   pinctrl-single,pins = <
> -   OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)  
>   /* uart3_rx.uart3_rx */
> -   OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0) 
>   /* uart3_tx.uart3_tx */
> -   >;
> -   };
> -
> -   mcbsp2_pins: pinmux_mcbsp2_pins {
> -   pinctrl-single,pins = <
> -   OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0)  
>   /* mcbsp2_fsx.mcbsp2_fsx */
> -   OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0)  
>   /* mcbsp2_clkx.mcbsp2_clkx */
> -   OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0)  
>   /* mcbsp2_dr.mcbsp2.dr */
> -   OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) 
>   /* mcbsp2_dx.mcbsp2_dx */
> -   >;
> -   };
> -
> -   mmc1_pins: pinmux_mmc1_pins {
> -   pinctrl-single,pins = <
> -   OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | 
> MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */
> -   OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | 
> MUX_MODE0) /* sdmmc1_cmd.sdmmc1_cmd */
> -   OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | 
> MUX_MODE0) /* sdmmc1_dat0.sdmmc1_dat0 */
> -   OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP | 
> MUX_MODE0) /* sdmmc1_dat1.sdmmc1_dat1 */
> -   OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT_PULLUP | 
> MUX_MODE0) /* sdmmc1_dat2.sdmmc1_dat2 */
> -   OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | 
> MUX_MODE0) /* sdmmc1_dat3.sdmmc1_dat3 */
> -   >;
> -   };
> -
> -   mmc2_pins: pinmux_mmc2_pins {
> -   pinctrl-single,pins = <
> - 

[RESEND PATCH 4/4] omap3: igep0x00: Migrate to use upstream DT

2024-05-18 Thread Javier Martinez Canillas
Enable OF_UPSTREAM to use upstream DT and add a ti/omap/ prefix to the
DEFAULT_DEVICE_TREE config option.

That way, a DTS from the upstream dts/upstream/src/ directory is used
instead of the arch/$(ARCH)/dts/ directory. These in turn are removed.

Signed-off-by: Javier Martinez Canillas 
---

 arch/arm/dts/Makefile   |   3 -
 arch/arm/dts/omap3-igep.dtsi| 247 --
 arch/arm/dts/omap3-igep0020-common.dtsi | 261 
 arch/arm/dts/omap3-igep0020.dts |  47 -
 configs/igep00x0_defconfig  |   3 +-
 5 files changed, 2 insertions(+), 559 deletions(-)
 delete mode 100644 arch/arm/dts/omap3-igep.dtsi
 delete mode 100644 arch/arm/dts/omap3-igep0020-common.dtsi
 delete mode 100644 arch/arm/dts/omap3-igep0020.dts

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index a5c82ebf7a5f..a9bd4921718e 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1030,9 +1030,6 @@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
 
 dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
 
-dtb-$(CONFIG_TARGET_OMAP3_IGEP00X0) += \
-   omap3-igep0020.dtb
-
 dtb-$(CONFIG_TARGET_OMAP4_PANDA) += \
omap4-panda.dtb \
omap4-panda-es.dtb
diff --git a/arch/arm/dts/omap3-igep.dtsi b/arch/arm/dts/omap3-igep.dtsi
deleted file mode 100644
index 219202610463..
--- a/arch/arm/dts/omap3-igep.dtsi
+++ /dev/null
@@ -1,247 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Common device tree for IGEP boards based on AM/DM37x
- *
- * Copyright (C) 2012 Javier Martinez Canillas 
- * Copyright (C) 2012 Enric Balletbo i Serra 
- */
-/dts-v1/;
-
-#include "omap36xx.dtsi"
-
-/ {
-   memory@8000 {
-   device_type = "memory";
-   reg = <0x8000 0x2000>; /* 512 MB */
-   };
-
-   chosen {
-   stdout-path = &uart3;
-   };
-
-   sound {
-   compatible = "ti,omap-twl4030";
-   ti,model = "igep2";
-   ti,mcbsp = <&mcbsp2>;
-   };
-
-   vdd33: regulator-vdd33 {
-   compatible = "regulator-fixed";
-   regulator-name = "vdd33";
-   regulator-always-on;
-   };
-
-};
-
-&omap3_pmx_core {
-   gpmc_pins: pinmux_gpmc_pins {
-   pinctrl-single,pins = <
-   /* OneNAND seems to require PIN_INPUT on clock. */
-OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0)   
 /* gpmc_clk.gpmc_clk */
-   >;
-   };
-
-   uart1_pins: pinmux_uart1_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE0)
/* uart1_rx.uart1_rx */
-   OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0)   
/* uart1_tx.uart1_tx */
-   >;
-   };
-
-   uart3_pins: pinmux_uart3_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)
/* uart3_rx.uart3_rx */
-   OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)   
/* uart3_tx.uart3_tx */
-   >;
-   };
-
-   mcbsp2_pins: pinmux_mcbsp2_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0)
/* mcbsp2_fsx.mcbsp2_fsx */
-   OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0)
/* mcbsp2_clkx.mcbsp2_clkx */
-   OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0)
/* mcbsp2_dr.mcbsp2.dr */
-   OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0)   
/* mcbsp2_dx.mcbsp2_dx */
-   >;
-   };
-
-   mmc1_pins: pinmux_mmc1_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_clk.sdmmc1_clk */
-   OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_cmd.sdmmc1_cmd */
-   OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat0.sdmmc1_dat0 */
-   OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat1.sdmmc1_dat1 */
-   OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat2.sdmmc1_dat2 */
-   OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat3.sdmmc1_dat3 */
-   >;
-   };
-
-   mmc2_pins: pinmux_mmc2_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc2_clk.sdmmc2_clk */
-   OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc2_cmd.sdmmc2_cmd */
-   OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc2_dat0.sdmmc2_dat0 */
-   OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sd

[RESEND PATCH 4/4] omap3: igep0x00: Migrate to use upstream DT

2024-05-18 Thread Javier Martinez Canillas
From: Javier Martinez Canillas 

Enable OF_UPSTREAM to use upstream DT and add a ti/omap/ prefix to the
DEFAULT_DEVICE_TREE config option.

That way, a DTS from the upstream dts/upstream/src/ directory is used
instead of the arch/$(ARCH)/dts/ directory. These in turn are removed.

Signed-off-by: Javier Martinez Canillas 
---

 arch/arm/dts/Makefile   |   3 -
 arch/arm/dts/omap3-igep.dtsi| 247 --
 arch/arm/dts/omap3-igep0020-common.dtsi | 261 
 arch/arm/dts/omap3-igep0020.dts |  47 -
 configs/igep00x0_defconfig  |   3 +-
 5 files changed, 2 insertions(+), 559 deletions(-)
 delete mode 100644 arch/arm/dts/omap3-igep.dtsi
 delete mode 100644 arch/arm/dts/omap3-igep0020-common.dtsi
 delete mode 100644 arch/arm/dts/omap3-igep0020.dts

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index a5c82ebf7a5f..a9bd4921718e 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1030,9 +1030,6 @@ dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
 
 dtb-$(CONFIG_TARGET_DEVKIT8000) += omap3-devkit8000.dtb
 
-dtb-$(CONFIG_TARGET_OMAP3_IGEP00X0) += \
-   omap3-igep0020.dtb
-
 dtb-$(CONFIG_TARGET_OMAP4_PANDA) += \
omap4-panda.dtb \
omap4-panda-es.dtb
diff --git a/arch/arm/dts/omap3-igep.dtsi b/arch/arm/dts/omap3-igep.dtsi
deleted file mode 100644
index 219202610463..
--- a/arch/arm/dts/omap3-igep.dtsi
+++ /dev/null
@@ -1,247 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Common device tree for IGEP boards based on AM/DM37x
- *
- * Copyright (C) 2012 Javier Martinez Canillas 
- * Copyright (C) 2012 Enric Balletbo i Serra 
- */
-/dts-v1/;
-
-#include "omap36xx.dtsi"
-
-/ {
-   memory@8000 {
-   device_type = "memory";
-   reg = <0x8000 0x2000>; /* 512 MB */
-   };
-
-   chosen {
-   stdout-path = &uart3;
-   };
-
-   sound {
-   compatible = "ti,omap-twl4030";
-   ti,model = "igep2";
-   ti,mcbsp = <&mcbsp2>;
-   };
-
-   vdd33: regulator-vdd33 {
-   compatible = "regulator-fixed";
-   regulator-name = "vdd33";
-   regulator-always-on;
-   };
-
-};
-
-&omap3_pmx_core {
-   gpmc_pins: pinmux_gpmc_pins {
-   pinctrl-single,pins = <
-   /* OneNAND seems to require PIN_INPUT on clock. */
-OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0)   
 /* gpmc_clk.gpmc_clk */
-   >;
-   };
-
-   uart1_pins: pinmux_uart1_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x2182, PIN_INPUT | MUX_MODE0)
/* uart1_rx.uart1_rx */
-   OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0)   
/* uart1_tx.uart1_tx */
-   >;
-   };
-
-   uart3_pins: pinmux_uart3_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)
/* uart3_rx.uart3_rx */
-   OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)   
/* uart3_tx.uart3_tx */
-   >;
-   };
-
-   mcbsp2_pins: pinmux_mcbsp2_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0)
/* mcbsp2_fsx.mcbsp2_fsx */
-   OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0)
/* mcbsp2_clkx.mcbsp2_clkx */
-   OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0)
/* mcbsp2_dr.mcbsp2.dr */
-   OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0)   
/* mcbsp2_dx.mcbsp2_dx */
-   >;
-   };
-
-   mmc1_pins: pinmux_mmc1_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_clk.sdmmc1_clk */
-   OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_cmd.sdmmc1_cmd */
-   OMAP3_CORE1_IOPAD(0x2148, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat0.sdmmc1_dat0 */
-   OMAP3_CORE1_IOPAD(0x214a, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat1.sdmmc1_dat1 */
-   OMAP3_CORE1_IOPAD(0x214c, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat2.sdmmc1_dat2 */
-   OMAP3_CORE1_IOPAD(0x214e, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc1_dat3.sdmmc1_dat3 */
-   >;
-   };
-
-   mmc2_pins: pinmux_mmc2_pins {
-   pinctrl-single,pins = <
-   OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc2_clk.sdmmc2_clk */
-   OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc2_cmd.sdmmc2_cmd */
-   OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) 
/* sdmmc2_dat0.sdmmc2_dat0 */
-   OMAP3_CORE1_IOPAD(0x215e, PIN