Skip to contentSkip to conversation

Support for Variscite OM44 modules and boards

PATCH Superseded Joachim Eastwood 3 participants 12 messages Apr 18, 2014 – Apr 30, 2014

Subsystems (5)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Support for Variscite OM44 modules and boards

Hello,

This patch set adds support for Variscite OM44 series of system on modules and boards.

Patch 1: Add support for the SoM itself and the reference carrier board. Together these make the VAR-STK-OM44 dev kit.

Patch 2: Add support for VAR-DVK-OM44 which is just the STK with a LCD display.

Last two patches add support for the WLAN/BT version of the SoM. If DT bindings for wl12xx gets ready for 3.16 the last patch, adding quirks, can be dropped.

Note that patch 1 relies upon a patch from Tomi Valkeinen add hpd-gpio (hotplug detect) to the "hdmi-connector".
See: http://marc.info/?l=linux-omap&m=139771947508021&w=2

Patch 2 also relies upon a patch from Tomi that adds DT support to panel-dpi.
See: http://marc.info/?l=devicetree&m=139030201815380&w=2

If it makes it easier to merge this patch set without the two dependencies above I can move the display stuff the separate patches. This patch set replace the patch posted eariler here: http://marc.info/?l=linux-omap&m=139732809411445&w=2

Joachim Eastwood (4):
ARM: dts: Add support for OMAP4 Variscite OM44 family
ARM: dts: Add support for OMAP4 VAR-DVK-OM44
ARM: dts: Add VAR-SOM-OM44 WLAN nodes
ARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44

 .../devicetree/bindings/arm/omap/omap.txt          |   6 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   3 +-
 arch/arm/boot/dts/omap4-var-dvk-om44.dts           |  71 +++++
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   | 235 ++++++++++++++
 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi     |  68 ++++
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          | 343 +++++++++++++++++++++
 arch/arm/boot/dts/omap4-var-som.dts                |  96 ------
 arch/arm/boot/dts/omap4-var-stk-om44.dts           |  17 +
 arch/arm/mach-omap2/pdata-quirks.c                 |   7 +
 10 files changed, 750 insertions(+), 97 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4-var-dvk-om44.dts
 create mode 100644 arch/arm/boot/dts/omap4-var-om44customboard.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44.dtsi
 delete mode 100644 arch/arm/boot/dts/omap4-var-som.dts
 create mode 100644 arch/arm/boot/dts/omap4-var-stk-om44.dts
Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

Add support for VAR-SOM-OM44[1] SODIMM system on module from Variscite. SoM features a OMAP4460, 1GB RAM, Gigabit Ethernet (LAN7500) and optional WLAN/BT.

Also add support for VAR-STK-OM44 development board from Variscite. This kit features a VAR-SOM-OM44 and the carrier board VAR-OM44CustomBoard[2]. The VAR-STK-OM44 is the same as VAR-DVK-OM44 but without the LCD display.

omap4-var-stk-om44.dts replace the old and very limited omap4-var-som.dts.

[1] http://www.variscite.com/products/system-on-module-som/cortex-a9/var-som-om44-cpu-ti-omap-4-omap4460
[2] http://www.variscite.com/products/single-board-computers/var-om44customboard

---
 .../devicetree/bindings/arm/omap/omap.txt          |   3 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   | 235 ++++++++++++++
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          | 343 +++++++++++++++++++++
 arch/arm/boot/dts/omap4-var-som.dts                |  96 ------
 arch/arm/boot/dts/omap4-var-stk-om44.dts           |  16 +
 7 files changed, 599 insertions(+), 97 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4-var-om44customboard.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44.dtsi
 delete mode 100644 arch/arm/boot/dts/omap4-var-som.dts
 create mode 100644 arch/arm/boot/dts/omap4-var-stk-om44.dts
Documentation/devicetree/bindings/arm/omap/omap.txt +3 -0
index 36ede19a1630..7db69ac46188 100644
@@ -102,6 +102,9 @@ Boards:
 - OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board
   compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
 
+- OMAP4 VAR-STK-OM44 : Commercial dev kit with VAR-OM44CustomBoard and VAR-SOM-OM44 w/WLAN
+  compatible = "variscite,var-stk-om44", "variscite,var-som-om44", "ti,omap4430", "ti,omap4";
+
 - OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x
   compatible = "ti,omap3-evm", "ti,omap3"
 
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index 0f01c9bf19c8..8a149a4b07de 100644
@@ -112,6 +112,7 @@ tlm	Trusted Logic Mobility
 toshiba	Toshiba Corporation
 toumaz	Toumaz
 v3	V3 Semiconductor
+variscite	Variscite Ltd.
 via	VIA Technologies, Inc.
 voipac	Voipac Technologies s.r.o.
 winbond Winbond Electronics corp.
arch/arm/boot/dts/Makefile +1 -1
index 35c146f31e46..f443ade8ae3c 100644
@@ -273,7 +273,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap4-panda.dtb \
 	omap4-panda-a4.dtb \
 	omap4-panda-es.dtb \
-	omap4-var-som.dtb \
+	omap4-var-stk-om44.dtb \
 	omap4-sdp.dtb \
 	omap4-sdp-es23plus.dtb \
 	omap5-uevm.dtb \
arch/arm/boot/dts/omap4-var-om44customboard.dtsi new file +235 -0

235 lines not on this page · raw message

arch/arm/boot/dts/omap4-var-som-om44.dtsi new file +343 -0

343 lines not on this page · raw message

arch/arm/boot/dts/omap4-var-som.dts deleted +0 -96

96 lines not on this page · raw message

arch/arm/boot/dts/omap4-var-stk-om44.dts new file +16 -0
new file mode 100644
index 000000000000..35e2364374f7
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2014 Joachim Eastwood <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "omap4-var-som-om44.dtsi"
+#include "omap4-var-om44customboard.dtsi"
+
+/ {
+	model = "Variscite VAR-STK-OM44";
+	compatible = "variscite,var-stk-om44", "variscite,var-som-om44", "ti,omap4430", "ti,omap4";
+};
Signature · 1 line
1.8.0
maintainer
#2 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

Quoted 13 lines · Joachim Eastwood

Add support for VAR-SOM-OM44[1] SODIMM system on module from Variscite. SoM features a OMAP4460, 1GB RAM, Gigabit Ethernet (LAN7500) and optional WLAN/BT.

Also add support for VAR-STK-OM44 development board from Variscite. This kit features a VAR-SOM-OM44 and the carrier board VAR-OM44CustomBoard[2]. The VAR-STK-OM44 is the same as VAR-DVK-OM44 but without the LCD display.

omap4-var-stk-om44.dts replace the old and very limited omap4-var-som.dts.

[1] http://www.variscite.com/products/system-on-module-som/cortex-a9/var-som-om44-cpu-ti-omap-4-omap4460
[2] http://www.variscite.com/products/single-board-computers/var-om44customboard

Quoted 13 lines
---
 .../devicetree/bindings/arm/omap/omap.txt          |   3 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   | 235 ++++++++++++++
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          | 343 +++++++++++++++++++++
 arch/arm/boot/dts/omap4-var-som.dts                |  96 ------
 arch/arm/boot/dts/omap4-var-stk-om44.dts           |  16 +
 7 files changed, 599 insertions(+), 97 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4-var-om44customboard.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44.dtsi
 delete mode 100644 arch/arm/boot/dts/omap4-var-som.dts
 create mode 100644 arch/arm/boot/dts/omap4-var-stk-om44.dts

Hmm don't you still need to keep omap4-var-som.dts to build just the core SoC module without any add-on boards?

Also, you might want to use the OMAP4_CORE_IOPAD and OMAP4_WKUP_IOPAD macros in include/dt-bindings/pinctrl/omap.h to be able to check the registers against the TRM easier as you can use the physical register offset listed in the TRM.

Regards,

Tony

#3 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

Quoted 28 lines · Tony Lindgren
Quoted 13 lines · Joachim Eastwood

Add support for VAR-SOM-OM44[1] SODIMM system on module from Variscite. SoM features a OMAP4460, 1GB RAM, Gigabit Ethernet (LAN7500) and optional WLAN/BT.

Also add support for VAR-STK-OM44 development board from Variscite. This kit features a VAR-SOM-OM44 and the carrier board VAR-OM44CustomBoard[2]. The VAR-STK-OM44 is the same as VAR-DVK-OM44 but without the LCD display.

omap4-var-stk-om44.dts replace the old and very limited omap4-var-som.dts.

[1] http://www.variscite.com/products/system-on-module-som/cortex-a9/var-som-om44-cpu-ti-omap-4-omap4460
[2] http://www.variscite.com/products/single-board-computers/var-om44customboard

Quoted 13 lines
---
 .../devicetree/bindings/arm/omap/omap.txt          |   3 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   | 235 ++++++++++++++
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          | 343 +++++++++++++++++++++
 arch/arm/boot/dts/omap4-var-som.dts                |  96 ------
 arch/arm/boot/dts/omap4-var-stk-om44.dts           |  16 +
 7 files changed, 599 insertions(+), 97 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4-var-om44customboard.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44.dtsi
 delete mode 100644 arch/arm/boot/dts/omap4-var-som.dts
 create mode 100644 arch/arm/boot/dts/omap4-var-stk-om44.dts
Quoted 2 lines

Hmm don't you still need to keep omap4-var-som.dts to build just the core SoC module without any add-on boards?

Since VAR-SOM-OM44 is a SODIMM module it is not possible to use without a carrier board. Variscite's carrier board is called OM44CustomBoard and I am in process of creating my own application specific one so the omap4-var-som-om44 should be a dtsi-file.

Quoted 4 lines

Also, you might want to use the OMAP4_CORE_IOPAD and OMAP4_WKUP_IOPAD macros in include/dt-bindings/pinctrl/omap.h to be able to check the registers against the TRM easier as you can use the physical register offset listed in the TRM.

I don't see any other OMAP4 using these macros. Is there a plan for a mass conversion?
It's really a job for an automated script. But the macro are indeed nice. That offset has bothered me more than once.

regards
Joachim Eastwood

maintainer
#4 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

Quoted 29 lines · Joachim Eastwood
Quoted 28 lines · Tony Lindgren
Quoted 26 lines · Joachim Eastwood

Add support for VAR-SOM-OM44[1] SODIMM system on module from Variscite. SoM features a OMAP4460, 1GB RAM, Gigabit Ethernet (LAN7500) and optional WLAN/BT.

Also add support for VAR-STK-OM44 development board from Variscite. This kit features a VAR-SOM-OM44 and the carrier board VAR-OM44CustomBoard[2]. The VAR-STK-OM44 is the same as VAR-DVK-OM44 but without the LCD display.

omap4-var-stk-om44.dts replace the old and very limited omap4-var-som.dts.

[1] http://www.variscite.com/products/system-on-module-som/cortex-a9/var-som-om44-cpu-ti-omap-4-omap4460
[2] http://www.variscite.com/products/single-board-computers/var-om44customboard

---
 .../devicetree/bindings/arm/omap/omap.txt          |   3 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   | 235 ++++++++++++++
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          | 343 +++++++++++++++++++++
 arch/arm/boot/dts/omap4-var-som.dts                |  96 ------
 arch/arm/boot/dts/omap4-var-stk-om44.dts           |  16 +
 7 files changed, 599 insertions(+), 97 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4-var-om44customboard.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44.dtsi
 delete mode 100644 arch/arm/boot/dts/omap4-var-som.dts
 create mode 100644 arch/arm/boot/dts/omap4-var-stk-om44.dts
Quoted 7 lines
Quoted 2 lines

Hmm don't you still need to keep omap4-var-som.dts to build just the core SoC module without any add-on boards?

Since VAR-SOM-OM44 is a SODIMM module it is not possible to use without a carrier board. Variscite's carrier board is called OM44CustomBoard and I am in process of creating my own application specific one so the omap4-var-som-om44 should be a dtsi-file.

OK, thanks for clarifying that.

Quoted 7 lines
Quoted 4 lines

Also, you might want to use the OMAP4_CORE_IOPAD and OMAP4_WKUP_IOPAD macros in include/dt-bindings/pinctrl/omap.h to be able to check the registers against the TRM easier as you can use the physical register offset listed in the TRM.

I don't see any other OMAP4 using these macros. Is there a plan for a mass conversion?

Makes sense to do while doing other clean-up to avoid extra churn, but no mass conversion planned so far.

Quoted 2 lines

It's really a job for an automated script. But the macro are indeed nice. That offset has bothered me more than once.

Yeah and we can also add some range checking to the OMAP_IOPAD_OFFSET macro eventually :)

I did a check script when we split omap3 pinctrl core instance into two separate instance to deal with the large hole in the register space. Some parts of that might be usable for a generic conversion script too. The script I used is below for reference.

Regards,

Tony

8< --------------
#!/usr/bin/perl
use strict;

# usage: grep omap3_pmx_core *.dts* | pinctrl-check-offsets

sub check_soc($) {
	my($file) = @_;
	my $revision = 0;

	my @includes;

	open(IN, "<$file") or die("Could not read $file\n");
	while (<IN>) {
		if (!/\#include/) {
			next;
		}

		if (/\#include \"/) {
			if (!/skeleton.dtsi/ && !/omap34xx.dtsi/ && !/omap36xx.dtsi/) {
				my ($junk, $include) = split(" ", $_);
				$include =~ s/\"//g;
				push(@includes, $include);
			}
		}

		if (/omap34xx.dtsi/) {
			$revision = 3430;
			last;
		};

		if (/omap36xx.dtsi/) {
			$revision = 3630;
			last;
		};
	}
	close(IN);

	if (!$revision) {
		foreach my $include (@includes) {
			$revision = check_soc($include);
			if ($revision) {
				last;
			}
		}
	}

	return $revision;
}
sub check_file($ $) {
	my ($revision, $file) = @_;

	my $line = 0;
	my $check = 0;
	my $core2_base = 0;
	my $base_offset = 0;

	if ($revision == 3430) {
		$core2_base = 0x25d8;
	} elsif ($revision = 3630) {
		$core2_base = 0x25a0;
	}
	$base_offset = $core2_base - 0x2030;

	open(IN, "$file") or die("Could not open file $file\n");
	while(<IN>) {
		$line++;

		if (/omap3_pmx_core {/) {
			$check = 1;
		}

		if (/omap3_pmx_core2/ || /omap3_pmx_wkup/) {
			$check = 0;
		}

		if ($check && / \(PIN_/) {
			my ($offset, $rest) = split(" \\(PIN_", $_);
			$offset =~ s/\t+//g;
			$offset =~ s/ +//g;
			$offset = hex($offset);
			$rest = "PIN_".$rest;
			$rest =~ s/\)/\);/;
			$rest =~ s/\n//;

			if ($offset >= $base_offset) {
				my $fixed;
				my $val = $offset + 0x2030;

				if ($revision == 3430) {
					$fixed = sprintf("OMAP3430_CORE2_IOPAD(0x%04x, %s",
							  $val, $rest);
				} elsif ($revision = 3630) {
					$fixed = sprintf("OMAP3630_CORE2_IOPAD(0x%04x, %s",
							  $val, $rest);
				}

				printf("%s:%i: 0x%04x should be %s\n",
				       $file, $line, $offset, $fixed);
			}
		}

	}
	close(IN);
}
while (<STDIN>) {
	my($file, $junk) = split(":", $_);

	if ($file =~ /omap3.dtsi/) {
		next;
	}

	my $revision = check_soc($file);
	if (!$revision) {
		printf("WARNING: unknown revision for %s\n", $file);
	}
	check_file($revision, $file);
}
#5 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

Quoted 48 lines · Tony Lindgren
Quoted 29 lines · Joachim Eastwood
Quoted 28 lines · Tony Lindgren
Quoted 26 lines · Joachim Eastwood

Add support for VAR-SOM-OM44[1] SODIMM system on module from Variscite. SoM features a OMAP4460, 1GB RAM, Gigabit Ethernet (LAN7500) and optional WLAN/BT.

Also add support for VAR-STK-OM44 development board from Variscite. This kit features a VAR-SOM-OM44 and the carrier board VAR-OM44CustomBoard[2]. The VAR-STK-OM44 is the same as VAR-DVK-OM44 but without the LCD display.

omap4-var-stk-om44.dts replace the old and very limited omap4-var-som.dts.

[1] http://www.variscite.com/products/system-on-module-som/cortex-a9/var-som-om44-cpu-ti-omap-4-omap4460
[2] http://www.variscite.com/products/single-board-computers/var-om44customboard

---
 .../devicetree/bindings/arm/omap/omap.txt          |   3 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   2 +-
 arch/arm/boot/dts/omap4-var-om44customboard.dtsi   | 235 ++++++++++++++
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          | 343 +++++++++++++++++++++
 arch/arm/boot/dts/omap4-var-som.dts                |  96 ------
 arch/arm/boot/dts/omap4-var-stk-om44.dts           |  16 +
 7 files changed, 599 insertions(+), 97 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4-var-om44customboard.dtsi
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44.dtsi
 delete mode 100644 arch/arm/boot/dts/omap4-var-som.dts
 create mode 100644 arch/arm/boot/dts/omap4-var-stk-om44.dts
Quoted 7 lines
Quoted 2 lines

Hmm don't you still need to keep omap4-var-som.dts to build just the core SoC module without any add-on boards?

Since VAR-SOM-OM44 is a SODIMM module it is not possible to use without a carrier board. Variscite's carrier board is called OM44CustomBoard and I am in process of creating my own application specific one so the omap4-var-som-om44 should be a dtsi-file.

OK, thanks for clarifying that.

Quoted 7 lines
Quoted 4 lines

Also, you might want to use the OMAP4_CORE_IOPAD and OMAP4_WKUP_IOPAD macros in include/dt-bindings/pinctrl/omap.h to be able to check the registers against the TRM easier as you can use the physical register offset listed in the TRM.

I don't see any other OMAP4 using these macros. Is there a plan for a mass conversion?

Quoted 8 lines

Makes sense to do while doing other clean-up to avoid extra churn, but no mass conversion planned so far.

Quoted 2 lines

It's really a job for an automated script. But the macro are indeed nice. That offset has bothered me more than once.

Yeah and we can also add some range checking to the OMAP_IOPAD_OFFSET macro eventually :)

I see.

Quoted 4 lines

I did a check script when we split omap3 pinctrl core instance into two separate instance to deal with the large hole in the register space. Some parts of that might be usable for a generic conversion script too. The script I used is below for reference.

I hacked up a short awk-script for the job. So I'll change to IOPAD macro's in the next version.

My script for reference :)
#!/bin/gawk -f
/omap4_pmx_core/ { pmx = "CORE" }
/omap4_pmx_wkup/ { pmx = "WKUP" }
/0x[0-9a-f]{1,3} \(PIN/ {
offset = sprintf("OMAP4_%s_IOPAD(0x%03x, ", pmx, strtonum($1) + 64) sub(/0x[0-9a-f]{1,3} \(/, offset, $0)
print $0
next
}
{ print $0 }

I'll wait a bit with v2 to see if there are any other comments. Would be nice to get clarification on the display bindings also.

regards
Joachim Eastwood

maintainer
#6 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

Quoted 9 lines · Joachim Eastwood
Quoted 5 lines

I did a check script when we split omap3 pinctrl core instance into two separate instance to deal with the large hole in the register space. Some parts of that might be usable for a generic conversion script too. The script I used is below for reference.

I hacked up a short awk-script for the job. So I'll change to IOPAD macro's in the next version.

Quoted 11 lines

My script for reference :)
#!/bin/gawk -f
/omap4_pmx_core/ { pmx = "CORE" }
/omap4_pmx_wkup/ { pmx = "WKUP" }
/0x[0-9a-f]{1,3} \(PIN/ {
offset = sprintf("OMAP4_%s_IOPAD(0x%03x, ", pmx, strtonum($1) + 64) sub(/0x[0-9a-f]{1,3} \(/, offset, $0)
print $0
next
}
{ print $0 }

Cool script :)

Tony

#7 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

In reply to Joachim Eastwood
Quoted 7 lines · Joachim Eastwood

Add support for VAR-SOM-OM44[1] SODIMM system on module from Variscite. SoM features a OMAP4460, 1GB RAM, Gigabit Ethernet (LAN7500) and optional WLAN/BT.

Also add support for VAR-STK-OM44 development board from Variscite. This kit features a VAR-SOM-OM44 and the carrier board VAR-OM44CustomBoard[2]. The VAR-STK-OM44 is the same as VAR-DVK-OM44 but without the LCD display.

Quoted 7 lines

omap4-var-stk-om44.dts replace the old and very limited omap4-var-som.dts.

[1] http://www.variscite.com/products/system-on-module-som/cortex-a9/var-som-om44-cpu-ti-omap-4-omap4460
[2] http://www.variscite.com/products/single-board-computers/var-om44customboard

---

Tomi,

Do you plan to push the patch that add hpd-gpios to the "hdmi-connector" for 3.16? (nodes for my board below)
https://patchwork.kernel.org/patch/4006021/

Also in the patch set I am using your DT bindings for "panel-dpi". See patch [2 of 4] for nodes.
https://patchwork.kernel.org/patch/4047241/

Will this patch be upstream in 3.16?

As I am about to send out a new version of this patch set it would be nice to know if I need to split out the display stuff, for later inclusion, or if it can go in as it is.

regards
Joachim Eastwood

Quoted 16 lines
arch/arm/boot/dts/omap4-var-om44customboard.dtsi new file +16 -0
+       hdmi0: connector at 0 {
+               compatible = "hdmi-connector";
+               pinctrl-names = "default";
+               pinctrl-0 = <&hdmi_hpd_pins>;
+               label = "hdmi";
+               type = "a";
+
+               hpd-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>; /* gpio_63 */
+
+               port {
+                       hdmi_connector_in: endpoint {
+                               remote-endpoint = <&hdmi_out>;
+                       };
+               };
+       };
+};
#8 lore raw

PATCH 1/4 ARM: dts: Add support for OMAP4 Variscite OM44 family

Quoted 9 lines · Joachim Eastwood

Do you plan to push the patch that add hpd-gpios to the "hdmi-connector" for 3.16? (nodes for my board below)
https://patchwork.kernel.org/patch/4006021/

Also in the patch set I am using your DT bindings for "panel-dpi". See patch [2 of 4] for nodes.
https://patchwork.kernel.org/patch/4047241/

Will this patch be upstream in 3.16?

Yes, they are both planned to be in 3.16. The patches are still under work, though.

Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140430/bbd25bfc/attachment.sig>

#9 lore raw

PATCH 2/4 ARM: dts: Add support for OMAP4 VAR-DVK-OM44

In reply to Joachim Eastwood
---
 .../devicetree/bindings/arm/omap/omap.txt          |  3 +
 arch/arm/boot/dts/Makefile                         |  1 +
 arch/arm/boot/dts/omap4-var-dvk-om44.dts           | 70 ++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 arch/arm/boot/dts/omap4-var-dvk-om44.dts
Documentation/devicetree/bindings/arm/omap/omap.txt +3 -0
index 7db69ac46188..62df0244114e 100644
@@ -105,6 +105,9 @@ Boards:
 - OMAP4 VAR-STK-OM44 : Commercial dev kit with VAR-OM44CustomBoard and VAR-SOM-OM44 w/WLAN
   compatible = "variscite,var-stk-om44", "variscite,var-som-om44", "ti,omap4430", "ti,omap4";
 
+- OMAP4 VAR-DVK-OM44 : Commercial dev kit with VAR-OM44CustomBoard, VAR-SOM-OM44 w/WLAN and LCD touchscreen
+  compatible = "variscite,var-dvk-om44", "variscite,var-som-om44", "ti,omap4430", "ti,omap4";
+
 - OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x
   compatible = "ti,omap3-evm", "ti,omap3"
 
arch/arm/boot/dts/Makefile +1 -0
index f443ade8ae3c..2cc120cf6bbf 100644
@@ -273,6 +273,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap4-panda.dtb \
 	omap4-panda-a4.dtb \
 	omap4-panda-es.dtb \
+	omap4-var-dvk-om44.dtb \
 	omap4-var-stk-om44.dtb \
 	omap4-sdp.dtb \
 	omap4-sdp-es23plus.dtb \
arch/arm/boot/dts/omap4-var-dvk-om44.dts new file +70 -0

70 lines not on this page · raw message

Signature · 1 line
1.8.0
#10 lore raw

PATCH 3/4 ARM: dts: Add VAR-SOM-OM44 WLAN nodes

In reply to Joachim Eastwood

Both the VAR-STK-OM44 and VAR-DVK-OM44 boards comes with the WLAN/BT version of the system on module VAR-SOM-OM44.

---
 arch/arm/boot/dts/omap4-var-dvk-om44.dts       |  1 +
 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 68 ++++++++++++++++++++++++++
 arch/arm/boot/dts/omap4-var-stk-om44.dts       |  1 +
 3 files changed, 70 insertions(+)
 create mode 100644 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
arch/arm/boot/dts/omap4-var-dvk-om44.dts +1 -0
index 9471bbd8cb33..4ac91e693205 100644
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "omap4-var-som-om44.dtsi"
+#include "omap4-var-som-om44-wlan.dtsi"
 #include "omap4-var-om44customboard.dtsi"
 
 / {
arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi new file +68 -0

68 lines not on this page · raw message

arch/arm/boot/dts/omap4-var-stk-om44.dts +1 -0
index 35e2364374f7..140349bea8dd 100644
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "omap4-var-som-om44.dtsi"
+#include "omap4-var-som-om44-wlan.dtsi"
 #include "omap4-var-om44customboard.dtsi"
 
 / {
Signature · 1 line
1.8.0
#11 lore raw

PATCH 4/4 ARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44

In reply to Joachim Eastwood
---
 arch/arm/mach-omap2/pdata-quirks.c | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/mach-omap2/pdata-quirks.c +7 -0
index c3b73351cb7a..ab94f3a87c32 100644
@@ -254,6 +254,11 @@ static void __init omap4_panda_legacy_init(void)
 {
 	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 53);
 }
+
+static void __init var_som_om44_legacy_init(void)
+{
+	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 41);
+}
 #endif
 
 #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
@@ -364,6 +369,8 @@ static struct pdata_init pdata_quirks[] __initdata = {
 #ifdef CONFIG_ARCH_OMAP4
 	{ "ti,omap4-sdp", omap4_sdp_legacy_init, },
 	{ "ti,omap4-panda", omap4_panda_legacy_init, },
+	{ "variscite,var-dvk-om44", var_som_om44_legacy_init, },
+	{ "variscite,var-stk-om44", var_som_om44_legacy_init, },
 #endif
 #ifdef CONFIG_SOC_AM33XX
 	{ "ti,am335x-evmsk", am335x_evmsk_legacy_init, },
Signature · 1 line
1.8.0