From: Stefan Agner <[email protected]>
Add Colibri SODIMM numbers as GPIO line names on module level. The GPIO
lines with a name are all available on the SODIMM edge connector of the
Colibri iMX7 module and therefore a customer might use it as a GPIO. The
Toradex Evaluation Board has the SODIMM numbers printed on the silk-
screen. This allows a customer to quickly control a GPIO on a pin-header
by using the name printed next to it.
Putting the GPIO line name on module level makes sure that a customer
gets a reasonable default. If more meaningful names are available on a
custom carrier board, the user can overwrite the line names in a carrier
board level device tree.
The eMMC based modules share all GPIO names except two GPIOs on bank 6
which are not available on the raw NAND devices. Hence overwrite GPIO
line names of bank 6 in the eMMC specific device tree file.
Signed-off-by: Stefan Agner <[email protected]>
---
arch/arm/boot/dts/imx7-colibri.dtsi | 178 ++++++++++++++++++++++
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 26 ++++
2 files changed, 204 insertions(+)
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index d05be3f0e2a7..10d8880e8d13 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -130,6 +130,184 @@ &flexcan2 {
status = "disabled";
};
+&gpio1 {
+ gpio-line-names = "SODIMM_43",
+ "SODIMM_45",
+ "SODIMM_135",
+ "SODIMM_22",
+ "",
+ "",
+ "SODIMM_37",
+ "SODIMM_29",
+ "SODIMM_59",
+ "SODIMM_28",
+ "SODIMM_30",
+ "SODIMM_67",
+ "",
+ "",
+ "SODIMM_188",
+ "SODIMM_178";
+};
+
+&gpio2 {
+ gpio-line-names = "SODIMM_111",
+ "SODIMM_113",
+ "SODIMM_115",
+ "SODIMM_117",
+ "SODIMM_119",
+ "SODIMM_121",
+ "SODIMM_123",
+ "SODIMM_125",
+ "SODIMM_91",
+ "SODIMM_89",
+ "SODIMM_105",
+ "SODIMM_152",
+ "SODIMM_150",
+ "SODIMM_95",
+ "SODIMM_126",
+ "SODIMM_107",
+ "SODIMM_114",
+ "SODIMM_116",
+ "SODIMM_118",
+ "SODIMM_120",
+ "SODIMM_122",
+ "SODIMM_124",
+ "SODIMM_127",
+ "SODIMM_130",
+ "SODIMM_132",
+ "SODIMM_134",
+ "SODIMM_133",
+ "SODIMM_104",
+ "SODIMM_106",
+ "SODIMM_110",
+ "SODIMM_112",
+ "SODIMM_128";
+};
+
+&gpio3 {
+ gpio-line-names = "SODIMM_56",
+ "SODIMM_44",
+ "SODIMM_68",
+ "SODIMM_82",
+ "SODIMM_93",
+ "SODIMM_76",
+ "SODIMM_70",
+ "SODIMM_60",
+ "SODIMM_58",
+ "SODIMM_78",
+ "SODIMM_72",
+ "SODIMM_80",
+ "SODIMM_46",
+ "SODIMM_62",
+ "SODIMM_48",
+ "SODIMM_74",
+ "SODIMM_50",
+ "SODIMM_52",
+ "SODIMM_54",
+ "SODIMM_66",
+ "SODIMM_64",
+ "SODIMM_57",
+ "SODIMM_61",
+ "SODIMM_136",
+ "SODIMM_138",
+ "SODIMM_140",
+ "SODIMM_142",
+ "SODIMM_144",
+ "SODIMM_146";
+};
+
+&gpio4 {
+ gpio-line-names = "SODIMM_35",
+ "SODIMM_33",
+ "SODIMM_38",
+ "SODIMM_36",
+ "SODIMM_21",
+ "SODIMM_19",
+ "SODIMM_131",
+ "SODIMM_129",
+ "SODIMM_90",
+ "SODIMM_92",
+ "SODIMM_88",
+ "SODIMM_86",
+ "SODIMM_81",
+ "SODIMM_94",
+ "SODIMM_96",
+ "SODIMM_75",
+ "SODIMM_101",
+ "SODIMM_103",
+ "SODIMM_79",
+ "SODIMM_97",
+ "SODIMM_67",
+ "SODIMM_59",
+ "SODIMM_85",
+ "SODIMM_65";
+};
+
+&gpio5 {
+ gpio-line-names = "SODIMM_69",
+ "SODIMM_71",
+ "SODIMM_73",
+ "SODIMM_47",
+ "SODIMM_190",
+ "SODIMM_192",
+ "SODIMM_49",
+ "SODIMM_51",
+ "SODIMM_53",
+ "",
+ "",
+ "SODIMM_98",
+ "SODIMM_184",
+ "SODIMM_186",
+ "SODIMM_23",
+ "SODIMM_31",
+ "SODIMM_100",
+ "SODIMM_102";
+};
+
+&gpio6 {
+ gpio-line-names = "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "SODIMM_169",
+ "",
+ "",
+ "",
+ "SODIMM_77",
+ "SODIMM_24",
+ "",
+ "SODIMM_25",
+ "SODIMM_27",
+ "SODIMM_32",
+ "SODIMM_34";
+};
+
+&gpio7 {
+ gpio-line-names = "",
+ "",
+ "SODIMM_63",
+ "SODIMM_55",
+ "",
+ "",
+ "",
+ "",
+ "SODIMM_196",
+ "SODIMM_194",
+ "",
+ "SODIMM_99",
+ "",
+ "",
+ "SODIMM_137";
+};
+
&gpmi {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpmi_nand>;
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
index 898f4b8d7421..af39e5370fa1 100644
--- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@ -13,6 +13,32 @@ memory@80000000 {
};
};
+&gpio6 {
+ gpio-line-names = "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "SODIMM_169",
+ "SODIMM_157",
+ "",
+ "SODIMM_163",
+ "SODIMM_77",
+ "SODIMM_24",
+ "",
+ "SODIMM_25",
+ "SODIMM_27",
+ "SODIMM_32",
+ "SODIMM_34";
+};
+
&usbotg2 {
dr_mode = "host";
};
--
2.25.0
On Wed, 2020-01-29 at 22:53 +0100, Stefan Agner wrote:
> From: Stefan Agner <[email protected]>
>
> Add Colibri SODIMM numbers as GPIO line names on module level. The
> GPIO
> lines with a name are all available on the SODIMM edge connector of
> the
> Colibri iMX7 module and therefore a customer might use it as a GPIO.
> The
> Toradex Evaluation Board has the SODIMM numbers printed on the silk-
> screen. This allows a customer to quickly control a GPIO on a pin-
> header
> by using the name printed next to it.
>
> Putting the GPIO line name on module level makes sure that a customer
> gets a reasonable default. If more meaningful names are available on a
> custom carrier board, the user can overwrite the line names in a
> carrier
> board level device tree.
>
> The eMMC based modules share all GPIO names except two GPIOs on bank 6
> which are not available on the raw NAND devices. Hence overwrite GPIO
> line names of bank 6 in the eMMC specific device tree file.
>
> Signed-off-by: Stefan Agner <[email protected]>
Reviewed-by: Philippe Schenker <[email protected]>
> ---
> arch/arm/boot/dts/imx7-colibri.dtsi | 178
> ++++++++++++++++++++++
> arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 26 ++++
> 2 files changed, 204 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi
> b/arch/arm/boot/dts/imx7-colibri.dtsi
> index d05be3f0e2a7..10d8880e8d13 100644
> --- a/arch/arm/boot/dts/imx7-colibri.dtsi
> +++ b/arch/arm/boot/dts/imx7-colibri.dtsi
> @@ -130,6 +130,184 @@ &flexcan2 {
> status = "disabled";
> };
>
> +&gpio1 {
> + gpio-line-names = "SODIMM_43",
> + "SODIMM_45",
> + "SODIMM_135",
> + "SODIMM_22",
> + "",
> + "",
> + "SODIMM_37",
> + "SODIMM_29",
> + "SODIMM_59",
> + "SODIMM_28",
> + "SODIMM_30",
> + "SODIMM_67",
> + "",
> + "",
> + "SODIMM_188",
> + "SODIMM_178";
> +};
> +
> +&gpio2 {
> + gpio-line-names = "SODIMM_111",
> + "SODIMM_113",
> + "SODIMM_115",
> + "SODIMM_117",
> + "SODIMM_119",
> + "SODIMM_121",
> + "SODIMM_123",
> + "SODIMM_125",
> + "SODIMM_91",
> + "SODIMM_89",
> + "SODIMM_105",
> + "SODIMM_152",
> + "SODIMM_150",
> + "SODIMM_95",
> + "SODIMM_126",
> + "SODIMM_107",
> + "SODIMM_114",
> + "SODIMM_116",
> + "SODIMM_118",
> + "SODIMM_120",
> + "SODIMM_122",
> + "SODIMM_124",
> + "SODIMM_127",
> + "SODIMM_130",
> + "SODIMM_132",
> + "SODIMM_134",
> + "SODIMM_133",
> + "SODIMM_104",
> + "SODIMM_106",
> + "SODIMM_110",
> + "SODIMM_112",
> + "SODIMM_128";
> +};
> +
> +&gpio3 {
> + gpio-line-names = "SODIMM_56",
> + "SODIMM_44",
> + "SODIMM_68",
> + "SODIMM_82",
> + "SODIMM_93",
> + "SODIMM_76",
> + "SODIMM_70",
> + "SODIMM_60",
> + "SODIMM_58",
> + "SODIMM_78",
> + "SODIMM_72",
> + "SODIMM_80",
> + "SODIMM_46",
> + "SODIMM_62",
> + "SODIMM_48",
> + "SODIMM_74",
> + "SODIMM_50",
> + "SODIMM_52",
> + "SODIMM_54",
> + "SODIMM_66",
> + "SODIMM_64",
> + "SODIMM_57",
> + "SODIMM_61",
> + "SODIMM_136",
> + "SODIMM_138",
> + "SODIMM_140",
> + "SODIMM_142",
> + "SODIMM_144",
> + "SODIMM_146";
> +};
> +
> +&gpio4 {
> + gpio-line-names = "SODIMM_35",
> + "SODIMM_33",
> + "SODIMM_38",
> + "SODIMM_36",
> + "SODIMM_21",
> + "SODIMM_19",
> + "SODIMM_131",
> + "SODIMM_129",
> + "SODIMM_90",
> + "SODIMM_92",
> + "SODIMM_88",
> + "SODIMM_86",
> + "SODIMM_81",
> + "SODIMM_94",
> + "SODIMM_96",
> + "SODIMM_75",
> + "SODIMM_101",
> + "SODIMM_103",
> + "SODIMM_79",
> + "SODIMM_97",
> + "SODIMM_67",
> + "SODIMM_59",
> + "SODIMM_85",
> + "SODIMM_65";
> +};
> +
> +&gpio5 {
> + gpio-line-names = "SODIMM_69",
> + "SODIMM_71",
> + "SODIMM_73",
> + "SODIMM_47",
> + "SODIMM_190",
> + "SODIMM_192",
> + "SODIMM_49",
> + "SODIMM_51",
> + "SODIMM_53",
> + "",
> + "",
> + "SODIMM_98",
> + "SODIMM_184",
> + "SODIMM_186",
> + "SODIMM_23",
> + "SODIMM_31",
> + "SODIMM_100",
> + "SODIMM_102";
> +};
> +
> +&gpio6 {
> + gpio-line-names = "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "SODIMM_169",
> + "",
> + "",
> + "",
> + "SODIMM_77",
> + "SODIMM_24",
> + "",
> + "SODIMM_25",
> + "SODIMM_27",
> + "SODIMM_32",
> + "SODIMM_34";
> +};
> +
> +&gpio7 {
> + gpio-line-names = "",
> + "",
> + "SODIMM_63",
> + "SODIMM_55",
> + "",
> + "",
> + "",
> + "",
> + "SODIMM_196",
> + "SODIMM_194",
> + "",
> + "SODIMM_99",
> + "",
> + "",
> + "SODIMM_137";
> +};
> +
> &gpmi {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_gpmi_nand>;
> diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
> b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
> index 898f4b8d7421..af39e5370fa1 100644
> --- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
> +++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
> @@ -13,6 +13,32 @@ memory@80000000 {
> };
> };
>
> +&gpio6 {
> + gpio-line-names = "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "",
> + "SODIMM_169",
> + "SODIMM_157",
> + "",
> + "SODIMM_163",
> + "SODIMM_77",
> + "SODIMM_24",
> + "",
> + "SODIMM_25",
> + "SODIMM_27",
> + "SODIMM_32",
> + "SODIMM_34";
> +};
> +
> &usbotg2 {
> dr_mode = "host";
> };
On Wed, Jan 29, 2020 at 10:53:36PM +0100, Stefan Agner wrote:
> From: Stefan Agner <[email protected]>
>
> Add Colibri SODIMM numbers as GPIO line names on module level. The GPIO
> lines with a name are all available on the SODIMM edge connector of the
> Colibri iMX7 module and therefore a customer might use it as a GPIO. The
> Toradex Evaluation Board has the SODIMM numbers printed on the silk-
> screen. This allows a customer to quickly control a GPIO on a pin-header
> by using the name printed next to it.
>
> Putting the GPIO line name on module level makes sure that a customer
> gets a reasonable default. If more meaningful names are available on a
> custom carrier board, the user can overwrite the line names in a carrier
> board level device tree.
>
> The eMMC based modules share all GPIO names except two GPIOs on bank 6
> which are not available on the raw NAND devices. Hence overwrite GPIO
> line names of bank 6 in the eMMC specific device tree file.
>
> Signed-off-by: Stefan Agner <[email protected]>
Applied, thanks.