git.openpandora.org / pandora-u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5451d21)
ARM: dts: at91: sam9x60: Move pinmux node to board DTS
authorManikandan Muralidharan <manikandan.m@microchip.com>
Mon, 10 Feb 2025 06:51:39 +0000 (12:21 +0530)
committerEugen Hristev <eugen.hristev@linaro.org>
Wed, 12 Feb 2025 08:31:35 +0000 (10:31 +0200)
Move pinmux nodes defined under the pinctrl node from sam9x60 SoC
DT to its board specific DTS files.

Signed-off-by: Manikandan Muralidharan <manikandan.m@microchip.com>
Reviewed-by: Eugen Hristev <eugen.hristev@linaro.org>
arch/arm/dts/at91-sam9x60_curiosity.dts patch | blob | history
arch/arm/dts/sam9x60.dtsi patch | blob | history
arch/arm/dts/sam9x60ek.dts patch | blob | history

diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts
index 99867d2..7f00014 100644 (file)
--- a/arch/arm/dts/at91-sam9x60_curiosity.dts
+++ b/arch/arm/dts/at91-sam9x60_curiosity.dts
@@ -82,6 +82,11 @@
        };
 };
 
+&dbgu {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_dbgu>;
+};
+
 &ebi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ebi_addr_nand &pinctrl_ebi_data_0_7>;
@@ -171,10 +176,20 @@
 
 &macb0 {
        phy-mode = "rmii";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_macb0_rmii>;
        status = "okay";
 };
 
 &pinctrl {
+       dbgu {
+               pinctrl_dbgu: dbgu-0 {
+                       atmel,pins =
+                               <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+               };
+       };
+
        ebi {
                pinctrl_ebi_data_0_7: ebi-data-lsb-0 {
                        atmel,pins =
@@ -217,6 +232,22 @@
                };
        };
 
+       macb0 {
+               pinctrl_macb0_rmii: macb0_rmii-0 {
+                       atmel,pins =
+                               <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A */
+                                AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A */
+                                AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB2 periph A */
+                                AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB3 periph A */
+                                AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A */
+                                AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB5 periph A */
+                                AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB6 periph A */
+                                AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB7 periph A */
+                                AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A */
+                                AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */
+               };
+       };
+
        nand {
                pinctrl_nand_oe_we: nand-oe-we-0 {
                        atmel,pins =
@@ -240,6 +271,36 @@
                        <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
        };
 
+       sdhci0 {
+               pinctrl_sdhci0: sdhci0 {
+                       atmel,pins =
+                               <AT91_PIOA 17 AT91_PERIPH_A
+                                (AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)   /* PA17 CK  periph A with pullup */
+                                AT91_PIOA 16 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA16 CMD periph A with pullup */
+                                AT91_PIOA 15 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA15 DAT0 periph A */
+                                AT91_PIOA 18 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA18 DAT1 periph A with pullup */
+                                AT91_PIOA 19 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA19 DAT2 periph A with pullup */
+                                AT91_PIOA 20 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)>;  /* PA20 DAT3 periph A with pullup */
+               };
+       };
+
+       sdhci1 {
+               pinctrl_sdhci1: sdhci1 {
+                       atmel,pins =
+                               <AT91_PIOA 13 AT91_PERIPH_B (AT91_PINCTRL_DRIVE_STRENGTH_HI)                            /* PA13 CK periph B */
+                                AT91_PIOA 12 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA12 CMD periph B with pullup */
+                                AT91_PIOA 11 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA11 DAT0 periph B with pullup */
+                                AT91_PIOA 2 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)      /* PA2 DAT1 periph B with pullup */
+                                AT91_PIOA 3 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)      /* PA3 DAT2 periph B with pullup */
+                                AT91_PIOA 4 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>;    /* PA4 DAT3 periph B with pullup */
+               };
+       };
+
        usb1 {
                pinctrl_usb_default: usb_default {
                        atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
@@ -248,6 +309,16 @@
        };
 };
 
+&sdhci0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sdhci0>;
+};
+
+&sdhci1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sdhci1>;
+};
+
 &usb1 {
        num-ports = <3>;
        atmel,vbus-gpio = <0
diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi
index 4ff1085..97d9c5c 100644 (file)
--- a/arch/arm/dts/sam9x60.dtsi
+++ b/arch/arm/dts/sam9x60.dtsi
@@ -123,8 +123,6 @@
                        assigned-clock-rates = <100000000>;
                        assigned-clock-parents = <&pmc PMC_TYPE_CORE 10>; /* ID_PLL_A_DIV */
                        bus-width = <4>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_sdhci0>;
                };
 
                sdhci1: sdhci-host@90000000 {
@@ -136,8 +134,6 @@
                        assigned-clock-rates = <100000000>;
                        assigned-clock-parents = <&pmc PMC_TYPE_CORE 10>; /* ID_PLL_A_DIV */
                        bus-width = <4>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_sdhci1>;
                };
 
                apb {
@@ -177,8 +173,6 @@
                        macb0: ethernet@f802c000 {
                                compatible = "cdns,sam9x60-macb", "cdns,macb";
                                reg = <0xf802c000 0x100>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_macb0_rmii>;
                                clock-names = "hclk", "pclk";
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 24>, <&pmc PMC_TYPE_PERIPHERAL 24>;
                                status = "disabled";
@@ -211,8 +205,6 @@
                        dbgu: serial@fffff200 {
                                compatible = "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
                                reg = <0xfffff200 0x200>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_dbgu>;
                                clocks = <&pmc PMC_TYPE_PERIPHERAL 47>;
                                clock-names = "usart";
                        };
@@ -226,61 +218,6 @@
                                       0xfffff600 0x200         /* pioB */
                                       0xfffff800 0x200         /* pioC */
                                       0xfffffa00 0x200>;       /* pioD */
-
-                               /* shared pinctrl settings */
-                               dbgu {
-                                       pinctrl_dbgu: dbgu-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
-                                                        AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;
-                                       };
-                               };
-
-                               macb0 {
-                                       pinctrl_macb0_rmii: macb0_rmii-0 {
-                                               atmel,pins =
-                                                       <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A */
-                                                        AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A */
-                                                        AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB2 periph A */
-                                                        AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB3 periph A */
-                                                        AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A */
-                                                        AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB5 periph A */
-                                                        AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB6 periph A */
-                                                        AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB7 periph A */
-                                                        AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A */
-                                                        AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */
-                                       };
-                               };
-
-                               sdhci0 {
-                                       pinctrl_sdhci0: sdhci0 {
-                                               atmel,pins =
-                                                       <AT91_PIOA 17 AT91_PERIPH_A
-                                                        (AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)   /* PA17 CK  periph A with pullup */
-                                                        AT91_PIOA 16 AT91_PERIPH_A
-                                                        (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA16 CMD periph A with pullup */
-                                                        AT91_PIOA 15 AT91_PERIPH_A
-                                                        (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA15 DAT0 periph A */
-                                                        AT91_PIOA 18 AT91_PERIPH_A
-                                                        (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA18 DAT1 periph A with pullup */
-                                                        AT91_PIOA 19 AT91_PERIPH_A
-                                                        (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA19 DAT2 periph A with pullup */
-                                                        AT91_PIOA 20 AT91_PERIPH_A
-                                                        (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)>;  /* PA20 DAT3 periph A with pullup */
-                                       };
-                               };
-
-                               sdhci1 {
-                                       pinctrl_sdhci1: sdhci1 {
-                                               atmel,pins =
-                                                       <AT91_PIOA 13 AT91_PERIPH_B (AT91_PINCTRL_DRIVE_STRENGTH_HI)                            /* PA13 CK periph B */
-                                                        AT91_PIOA 12 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA12 CMD periph B with pullup */
-                                                        AT91_PIOA 11 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA11 DAT0 periph B with pullup */
-                                                        AT91_PIOA  2 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA2 DAT1 periph B with pullup */
-                                                        AT91_PIOA  3 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA3 DAT2 periph B with pullup */
-                                                        AT91_PIOA  4 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>;   /* PA4 DAT3 periph B with pullup */
-                                       };
-                               };
                        };
 
                        pioA: gpio@fffff400 {
diff --git a/arch/arm/dts/sam9x60ek.dts b/arch/arm/dts/sam9x60ek.dts
index 3bf45c1..6521585 100644 (file)
--- a/arch/arm/dts/sam9x60ek.dts
+++ b/arch/arm/dts/sam9x60ek.dts
@@ -82,6 +82,11 @@
        };
 };
 
+&dbgu {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_dbgu>;
+};
+
 &ebi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ebi_addr_nand &pinctrl_ebi_data_0_7>;
@@ -149,11 +154,21 @@
 
 &macb0 {
        phy-mode = "rmii";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_macb0_rmii>;
        status = "okay";
 };
 
 &pinctrl {
        /* shared pinctrl settings */
+       dbgu {
+               pinctrl_dbgu: dbgu-0 {
+                       atmel,pins =
+                               <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
+                                AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+               };
+       };
+
        qspi {
                pinctrl_qspi: qspi {
                        atmel,pins =
@@ -212,11 +227,57 @@
                };
        };
 
+       macb0 {
+               pinctrl_macb0_rmii: macb0_rmii-0 {
+                       atmel,pins =
+                               <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB0 periph A */
+                                AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB1 periph A */
+                                AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB2 periph A */
+                                AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB3 periph A */
+                                AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB4 periph A */
+                                AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB5 periph A */
+                                AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB6 periph A */
+                                AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB7 periph A */
+                                AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE    /* PB9 periph A */
+                                AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */
+               };
+       };
+
        pinctrl_onewire_tm_default: onewire_tm_default {
                atmel,pins =
                        <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;
        };
 
+       sdhci0 {
+               pinctrl_sdhci0: sdhci0 {
+                       atmel,pins =
+                               <AT91_PIOA 17 AT91_PERIPH_A
+                                (AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)   /* PA17 CK  periph A with pullup */
+                                AT91_PIOA 16 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA16 CMD periph A with pullup */
+                                AT91_PIOA 15 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA15 DAT0 periph A */
+                                AT91_PIOA 18 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA18 DAT1 periph A with pullup */
+                                AT91_PIOA 19 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)    /* PA19 DAT2 periph A with pullup */
+                                AT91_PIOA 20 AT91_PERIPH_A
+                                (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI | AT91_PINCTRL_SLEWRATE_ENA)>;  /* PA20 DAT3 periph A with pullup */
+               };
+       };
+
+       sdhci1 {
+               pinctrl_sdhci1: sdhci1 {
+                       atmel,pins =
+                               <AT91_PIOA 13 AT91_PERIPH_B (AT91_PINCTRL_DRIVE_STRENGTH_HI)                            /* PA13 CK periph B */
+                                AT91_PIOA 12 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA12 CMD periph B with pullup */
+                                AT91_PIOA 11 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)     /* PA11 DAT0 periph B with pullup */
+                                AT91_PIOA 2 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)      /* PA2 DAT1 periph B with pullup */
+                                AT91_PIOA 3 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)      /* PA3 DAT2 periph B with pullup */
+                                AT91_PIOA 4 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>;    /* PA4 DAT3 periph B with pullup */
+               };
+       };
+
        usb1 {
                pinctrl_usb_default: usb_default {
                        atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
@@ -225,6 +286,16 @@
        };
 };
 
+&sdhci0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sdhci0>;
+};
+
+&sdhci1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sdhci1>;
+};
+
 &usb1 {
        num-ports = <3>;
        atmel,vbus-gpio = <0
Pandora U-Boot Repository