summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schultz <d.schultz@phytec.de>2015-09-24 15:31:31 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-09-28 09:36:51 +0200
commit71de622dcaba25213789ef7ec1f9f273ff21382f (patch)
tree83fa6e6024ab8ce91a539d6b40998c4be0db6da1
parentc3c39f308b5177d9e29b2426753c7c5291897f8f (diff)
downloadmeta-phytec-71de622dcaba25213789ef7ec1f9f273ff21382f.tar.bz2
meta-phytec-71de622dcaba25213789ef7ec1f9f273ff21382f.zip
barebox: phytec: Add touchscreen support
This patch supports the LCD-018 resistive touchscreen for: - phyboard-maia-am335x-1 - phyboard-wega-am335x-2 - phycore-am335x-1 and will change for each machine with res touchscreen: - Adds the 'touchscreen' feature in the machine file. - Enables Device Tree nodes in the barebox init script. - Default config-expansions entrys. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/phyboard-maia-am335x-1.conf1
-rw-r--r--conf/machine/phyboard-wega-am335x-2.conf1
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-maia-am335x/boardenv/config-expansions4
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-wega-am335x-2/machineenv/config-expansions5
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy1/phycore-am335x/boardenv/config-expansions4
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pba-c-01-res6
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pcm-953-res6
-rw-r--r--recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-peb-av-02-res6
8 files changed, 33 insertions, 0 deletions
diff --git a/conf/machine/phyboard-maia-am335x-1.conf b/conf/machine/phyboard-maia-am335x-1.conf
index fbff0b7..b00744c 100644
--- a/conf/machine/phyboard-maia-am335x-1.conf
+++ b/conf/machine/phyboard-maia-am335x-1.conf
@@ -14,3 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-512mb.img"
MACHINE_FEATURES += "wlan"
+MACHINE_FEATURES += "touchscreen"
diff --git a/conf/machine/phyboard-wega-am335x-2.conf b/conf/machine/phyboard-wega-am335x-2.conf
index 3b9845b..d04fad0 100644
--- a/conf/machine/phyboard-wega-am335x-2.conf
+++ b/conf/machine/phyboard-wega-am335x-2.conf
@@ -14,3 +14,4 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-no-spi.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-mlo-256mb.img"
MACHINE_FEATURES += "wlan"
+MACHINE_FEATURES += "touchscreen"
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-maia-am335x/boardenv/config-expansions b/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-maia-am335x/boardenv/config-expansions
index 9a0ee83..67fc606 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-maia-am335x/boardenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-maia-am335x/boardenv/config-expansions
@@ -1,6 +1,10 @@
#!/bin/sh
+#use this expansion when a capacitive touchscreen is connected
. /env/expansions/am335x-phytec-lcd-018-pba-c-01
+#use this expansion when a resisitive touchscreen is connected
+#. /env/expansions/am335x-phytec-lcd-018-pba-c-01-res
+
#7" display
#of_display_timings -S /panel/display-timings/ETM0700G0DH6
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-wega-am335x-2/machineenv/config-expansions b/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-wega-am335x-2/machineenv/config-expansions
index 7bf6390..1979baa 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-wega-am335x-2/machineenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.09.0-phy1/phyboard-wega-am335x-2/machineenv/config-expansions
@@ -1,5 +1,10 @@
#!/bin/sh
+#use this expansion when a capacitive touchscreen is connected
. /env/expansions/am335x-phytec-lcd-018-peb-av-02
+
+#use this expansion when a resisitive touchscreen is connected
+#. /env/expansions/am335x-phytec-lcd-018-peb-av-02-res
+
. /env/expansions/am335x-wega-peb-eval-01
#7" display
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy1/phycore-am335x/boardenv/config-expansions b/recipes-bsp/barebox/env-2015.09.0-phy1/phycore-am335x/boardenv/config-expansions
index a1781aa..472c342 100644
--- a/recipes-bsp/barebox/env-2015.09.0-phy1/phycore-am335x/boardenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.09.0-phy1/phycore-am335x/boardenv/config-expansions
@@ -1,6 +1,10 @@
#!/bin/sh
+#use this expansion when a capacitive touchscreen is connected
. /env/expansions/am335x-phytec-lcd-018-pcm-953
+#use this expansion when a resisitive touchscreen is connected
+#. /env/expansions/am335x-phytec-lcd-018-pcm-953-res
+
#7" display
#of_display_timings -S /panel/display-timings/ETM0700G0DH6
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pba-c-01-res b/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pba-c-01-res
new file mode 100644
index 0000000..9bf1615
--- /dev/null
+++ b/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pba-c-01-res
@@ -0,0 +1,6 @@
+of_enable_node /panel
+of_enable_node /backlight
+of_enable_node /ocp/lcdc@0x4830e000/
+of_enable_node /ocp/epwmss@48300000/
+of_enable_node /ocp/epwmss@48300000/ecap@48300100/
+of_enable_node /ocp/tscadc@44e0d000/
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pcm-953-res b/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pcm-953-res
new file mode 100644
index 0000000..9bf1615
--- /dev/null
+++ b/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-pcm-953-res
@@ -0,0 +1,6 @@
+of_enable_node /panel
+of_enable_node /backlight
+of_enable_node /ocp/lcdc@0x4830e000/
+of_enable_node /ocp/epwmss@48300000/
+of_enable_node /ocp/epwmss@48300000/ecap@48300100/
+of_enable_node /ocp/tscadc@44e0d000/
diff --git a/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-peb-av-02-res b/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-peb-av-02-res
new file mode 100644
index 0000000..a865bb5
--- /dev/null
+++ b/recipes-bsp/barebox/env-2015.09.0-phy1/ti33x/commonenv/expansions/am335x-phytec-lcd-018-peb-av-02-res
@@ -0,0 +1,6 @@
+of_enable_node /panel
+of_enable_node /backlight
+of_enable_node /ocp/lcdc@0x4830e000/
+of_enable_node /ocp/epwmss@48304000/
+of_enable_node /ocp/epwmss@48304000/ecap@48304100/
+of_enable_node /ocp/tscadc@44e0d000/