[meta-raspberrypi][PATCH 0/5] Various upgrade/fixes from Technux

[meta-raspberrypi][PATCH 0/5] Various upgrade/fixes from Technux

[Petter Mabäcker]

Various fixes from Technux, with focus on PiTFT support.

Petter Mabäcker (5):
  .gitignore: Ignore .swp files
  linux-raspberrypi: Update 4.1 recipe to 4.1.15
  rpi-config: I2C support
  pitft: Add basic support for PiTFT
  pitft: Add PiTFT22 support

 .gitignore                                         |   1 +
 README                                             |  43 ++++++--
 conf/machine/include/rpi-base.inc                  |   1 +
 recipes-bsp/bootfiles/rpi-config_git.bb            |  26 +++++
 .../rpi/xorg.conf.d/99-pitft.conf                  |   5 +
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |   1 +
 recipes-kernel/linux/linux-raspberrypi.inc         |   1 +
 ...dts-add-overlay-for-pitft22-in-linux-3.18.patch | 110 +++++++++++++++++++++
 .../0001-dts-add-overlay-for-pitft22.patch         | 110 +++++++++++++++++++++
 recipes-kernel/linux/linux-raspberrypi_3.18.bb     |   5 +-
 recipes-kernel/linux/linux-raspberrypi_4.1.bb      |   8 +-
 11 files changed, 298 insertions(+), 13 deletions(-)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
 create mode 100644 recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22-in-linux-3.18.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22.patch

-- 
1.9.1

[meta-raspberrypi][PATCH 1/5] .gitignore: Ignore .swp files

[Petter Mabäcker]

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1677b58..f235765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 build*
 *~
+.*.swp
-- 
1.9.1

[meta-raspberrypi][PATCH 2/5] linux-raspberrypi: Update 4.1 recipe to 4.1.15

[Petter Mabäcker]

[Support #69]

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 recipes-kernel/linux/linux-raspberrypi_4.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-raspberrypi_4.1.bb b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
index 3a3cf40..cae459a 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.1.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
@@ -1,6 +1,6 @@
-LINUX_VERSION ?= "4.1.10"
+LINUX_VERSION ?= "4.1.15"
 
-SRCREV = "b74df9228c27f55361c065bc5dbfba88861cc771"
+SRCREV = "02a8ee530e32b08e5df44f10e24d5fd82bb960e3"
 SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y"
 
 require linux-raspberrypi.inc
-- 
1.9.1

[meta-raspberrypi][PATCH 3/5] rpi-config: I2C support

[Petter Mabäcker]

With newer kernels (>=3.18) that supports device-trees I2C
should be enabled with device-trees.

This is now support by adding:
ENABLE_I2C = "1"
in local.conf

This will enable the dtparams:
i2c1
i2c_arm

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 README                                  | 21 +++++++++++++--------
 recipes-bsp/bootfiles/rpi-config_git.bb |  6 ++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/README b/README
index a168692..8ef4e7a 100644
--- a/README
+++ b/README
@@ -21,10 +21,11 @@ Contents:
     2.G. Optional - Enable offline compositing support
     2.H. Optional - Enable kgdb over console support
     2.I. Optional - Enable SPI bus
-    2.J. Images
-    2.K. Boot to U-Boot
-    2.L. Image with Initramfs
-    2.M. Device tree support
+    2.J. Optional - Enable I2C
+    2.K. Images
+    2.L. Boot to U-Boot
+    2.M. Image with Initramfs
+    2.N. Device tree support
 3. Extra apps
     3.A. omxplayer
 4. Source code and mirrors
@@ -151,8 +152,12 @@ ENABLE_KGDB = "1"
 When using device tree kernels, set this variable to enable the SPI bus
 ENABLE_SPI_BUS = "1"
 
+2.J. Optional - Enable I2C
+==========================
+When using device tree kernels, set this variable to enable I2C
+ENABLE_I2C = "1"
 
-2.J. Images
+2.K. Images
 ===========
 * rpi-hwup-image
     Hardware up image
@@ -162,7 +167,7 @@ ENABLE_SPI_BUS = "1"
     Image based on rpi-basic-image which includes most of the packages in this
     layer and some media samples.
 
-2.K. Boot to U-Boot
+2.L. Boot to U-Boot
 ===================
 To have u-boot load kernel image, set in your local.conf
 KERNEL_IMAGETYPE = "uImage"
@@ -170,7 +175,7 @@ KERNEL_IMAGETYPE = "uImage"
 This will make kernel.img be u-boot image which will load uImage.
 By default, kernel.img is the actual kernel image (ex. Image).
 
-2.L. Image with Initramfs
+2.M. Image with Initramfs
 =========================
 To build an initramfs image :
     * Set this 3 kernel variables (in linux-raspberrypi.inc for example)
@@ -183,7 +188,7 @@ To build an initramfs image :
     * Set the meta-rasberrypi variable (in raspberrypi.conf for example)
         - KERNEL_INITRAMFS = "-initramfs"
 
-2.M. Device tree support
+2.N. Device tree support
 =========================
 Device tree for RPi is only supported when using linux-raspberrypi 3.18+
 kernels.
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index aa11b25..ccb9b7f 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -72,6 +72,12 @@ do_deploy() {
         echo "# Enable SPI bus" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "dtparam=spi=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     fi
+
+    if [ -n "${ENABLE_I2C}" ]; then
+        echo "# Enable I2C" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtparam=i2c1=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtparam=i2c_arm=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
 }
 
 addtask deploy before do_package after do_install
-- 
1.9.1

[meta-raspberrypi][PATCH 4/5] pitft: Add basic support for PiTFT

[Petter Mabäcker]

Add basic support for PiTFT display by using device-trees.

In order get it working below configurations must be active in
local.conf:

MACHINEOVERRIDES .= ":pitft"
 - This will enable SPI bus and i2c device-trees, it will also setup
   framebuffer for console and x server on PiTFT.

[Support #70]

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 README                                             | 29 ++++++++++++++++------
 recipes-bsp/bootfiles/rpi-config_git.bb            | 14 +++++++++++
 .../rpi/xorg.conf.d/99-pitft.conf                  |  5 ++++
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |  1 +
 recipes-kernel/linux/linux-raspberrypi.inc         |  1 +
 5 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf

diff --git a/README b/README
index 8ef4e7a..791038f 100644
--- a/README
+++ b/README
@@ -22,10 +22,11 @@ Contents:
     2.H. Optional - Enable kgdb over console support
     2.I. Optional - Enable SPI bus
     2.J. Optional - Enable I2C
-    2.K. Images
-    2.L. Boot to U-Boot
-    2.M. Image with Initramfs
-    2.N. Device tree support
+    2.K. Optional - Enable PiTFT support
+    2.L. Images
+    2.M. Boot to U-Boot
+    2.N. Image with Initramfs
+    2.O. Device tree support
 3. Extra apps
     3.A. omxplayer
 4. Source code and mirrors
@@ -157,7 +158,19 @@ ENABLE_SPI_BUS = "1"
 When using device tree kernels, set this variable to enable I2C
 ENABLE_I2C = "1"
 
-2.K. Images
+2.K. Optional - Enable PiTFT support
+====================================
+Basic support for using PiTFT screens can be enabled by adding
+below in local.conf:
+
+MACHINEOVERRIDES .= ":pitft"
+  - This will enable SPI bus and i2c device-trees, it will also setup
+    framebuffer for console and x server on PiTFT.
+
+NOTE: To get this working the overlay for the PiTFT model must be build,
+      added and specified as well (dtoverlay=<driver> in config.txt)
+
+2.L. Images
 ===========
 * rpi-hwup-image
     Hardware up image
@@ -167,7 +180,7 @@ ENABLE_I2C = "1"
     Image based on rpi-basic-image which includes most of the packages in this
     layer and some media samples.
 
-2.L. Boot to U-Boot
+2.M. Boot to U-Boot
 ===================
 To have u-boot load kernel image, set in your local.conf
 KERNEL_IMAGETYPE = "uImage"
@@ -175,7 +188,7 @@ KERNEL_IMAGETYPE = "uImage"
 This will make kernel.img be u-boot image which will load uImage.
 By default, kernel.img is the actual kernel image (ex. Image).
 
-2.M. Image with Initramfs
+2.N. Image with Initramfs
 =========================
 To build an initramfs image :
     * Set this 3 kernel variables (in linux-raspberrypi.inc for example)
@@ -188,7 +201,7 @@ To build an initramfs image :
     * Set the meta-rasberrypi variable (in raspberrypi.conf for example)
         - KERNEL_INITRAMFS = "-initramfs"
 
-2.N. Device tree support
+2.O. Device tree support
 =========================
 Device tree for RPi is only supported when using linux-raspberrypi 3.18+
 kernels.
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index ccb9b7f..9f20352 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -80,6 +80,20 @@ do_deploy() {
     fi
 }
 
+do_deploy_append_pitft() {
+    # Add SPI BUS and I2C support if needed
+    if [ -z "${ENABLE_SPI_BUS}" ]; then
+        echo "# Enable SPI bus" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtparam=spi=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
+
+    if [ -z "${ENABLE_I2C}" ]; then
+        echo "# Enable I2C" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtparam=i2c1=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "dtparam=i2c_arm=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
+}
+
 addtask deploy before do_package after do_install
 do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
 
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
new file mode 100644
index 0000000..0d2b36b
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
@@ -0,0 +1,5 @@
+Section "Device"
+    Identifier "Adafruit PiTFT"
+    Driver "fbdev"
+    Option "fbdev" "/dev/fb1"
+EndSection
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 2cf40f8..db8e4c1 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,6 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf "
+SRC_URI_append_pitft = " file://xorg.conf.d/99-pitft.conf "
 
 do_install_append_rpi () {
 	install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 70e8bfe..420346a 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -24,6 +24,7 @@ CMDLINE = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootf
 
 # Add the kernel debugger over console kernel command line option if enabled
 CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=ttyAMA0,115200", "", d)}'
+CMDLINE_append_pitft = "fbcon=map:10 fbcon=font:VGA8x8"
 
 UDEV_GE_141 ?= "1"
 
-- 
1.9.1

[meta-raspberrypi][PATCH 5/5] pitft: Add PiTFT22 support

[Petter Mabäcker]

- Add support to build overlays for PiTFT22 in the kernel.
- Setup a basic configuration for the driver

The PiTFT22 support is optional and can be enabled by adding below in
local.conf:

MACHINEOVERRIDES .= ":pitft:pitft22"

[Support #70]

Signed-off-by: Petter Mabäcker <petter@technux.se>
---
 README                                             |   9 ++
 conf/machine/include/rpi-base.inc                  |   1 +
 recipes-bsp/bootfiles/rpi-config_git.bb            |   6 ++
 ...dts-add-overlay-for-pitft22-in-linux-3.18.patch | 110 +++++++++++++++++++++
 .../0001-dts-add-overlay-for-pitft22.patch         | 110 +++++++++++++++++++++
 recipes-kernel/linux/linux-raspberrypi_3.18.bb     |   5 +-
 recipes-kernel/linux/linux-raspberrypi_4.1.bb      |   4 +-
 7 files changed, 242 insertions(+), 3 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22-in-linux-3.18.patch
 create mode 100644 recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22.patch

diff --git a/README b/README
index 791038f..d08d925 100644
--- a/README
+++ b/README
@@ -170,6 +170,15 @@ MACHINEOVERRIDES .= ":pitft"
 NOTE: To get this working the overlay for the PiTFT model must be build,
       added and specified as well (dtoverlay=<driver> in config.txt)
 
+Below is a list of currently supported PiTFT models in meta-raspberrypi,
+the modelname should be appended with MACHINEOVERRIDES in local.conf like below:
+
+   - MACHINEOVERRIDES .= ":pitft:<modelname>"
+
+List of currently supported models
+-----------------------------------
+pitft22
+
 2.L. Images
 ===========
 * rpi-hwup-image
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index e097702..44cc7de 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -31,6 +31,7 @@ KERNEL_DEVICETREE ?= " \
     overlays/iqaudio-dac-overlay.dtb \
     overlays/iqaudio-dacplus-overlay.dtb \
     overlays/lirc-rpi-overlay.dtb \
+    overlays/pitft22-overlay.dtb \
     overlays/pps-gpio-overlay.dtb \
     overlays/w1-gpio-overlay.dtb \
     overlays/w1-gpio-pullup-overlay.dtb \
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index 9f20352..5d1539f 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -94,6 +94,12 @@ do_deploy_append_pitft() {
     fi
 }
 
+do_deploy_append_pitft22() {
+    # Add support for PiTFT22 display
+    echo "# Enable PITFT22 display" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    echo "dtoverlay=pitft22,rotate=270,speed=32000000,txbuflen=32768" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+}
+
 addtask deploy before do_package after do_install
 do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
 
diff --git a/recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22-in-linux-3.18.patch b/recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22-in-linux-3.18.patch
new file mode 100644
index 0000000..fa73599
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22-in-linux-3.18.patch
@@ -0,0 +1,110 @@
+From 2f44861e2a2d651a9aa62a75343a032fee33e93b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
+Date: Fri, 8 Jan 2016 09:02:44 +0100
+Subject: [PATCH] dts: add overlay for pitft22 in linux 3.18
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo:
+https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic
+
+Signed-off-by: Petter Mabäcker <petter@technux.se>
+---
+ arch/arm/boot/dts/overlays/Makefile            |  1 +
+ arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69 ++++++++++++++++++++++++++
+ 2 files changed, 70 insertions(+)
+ create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts
+
+diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
+index c766616..1eaaf81 100644
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -27,6 +27,7 @@ dtb-$(RPI_DT_OVERLAYS) += mcp2515-can0-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb
++dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += rpi-dac-overlay.dtb
+diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
+new file mode 100755
+index 0000000..894ba22
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
+@@ -0,0 +1,69 @@
++/*
++ * Device Tree overlay for pitft by Adafruit
++ *
++ */
++
++/dts-v1/;
++/plugin/;
++
++/ {
++        compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
++
++        fragment@0 {
++                target = <&spi0>;
++                __overlay__ {
++                        status = "okay";
++
++                        spidev@0{
++                                status = "disabled";
++                        };
++
++                        spidev@1{
++                                status = "disabled";
++                        };
++                };
++        };
++
++        fragment@1 {
++                target = <&gpio>;
++                __overlay__ {
++                        pitft_pins: pitft_pins {
++                                brcm,pins = <25>;
++                                brcm,function = <1>; /* out */
++                                brcm,pull = <0>; /* none */
++                        };
++                };
++        };
++
++        fragment@2 {
++                target = <&spi0>;
++                __overlay__ {
++                        /* needed to avoid dtc warning */
++                        #address-cells = <1>;
++                        #size-cells = <0>;
++
++                        pitft: pitft@0{
++                                compatible = "ilitek,ili9340";
++                                reg = <0>;
++                                pinctrl-names = "default";
++                                pinctrl-0 = <&pitft_pins>;
++
++                                spi-max-frequency = <32000000>;
++                                rotate = <90>;
++                                fps = <25>;
++                                bgr;
++                                buswidth = <8>;
++                                dc-gpios = <&gpio 25 0>;
++                                debug = <0>;
++                        };
++
++                };
++        };
++
++        __overrides__ {
++                speed =   <&pitft>,"spi-max-frequency:0";
++                rotate =  <&pitft>,"rotate:0";
++                fps =     <&pitft>,"fps:0";
++                debug =   <&pitft>,"debug:0";
++        };
++};
+-- 
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22.patch b/recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22.patch
new file mode 100644
index 0000000..e6e0a84
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22.patch
@@ -0,0 +1,110 @@
+From a28bd410022b32a64e208f04b45add6326990332 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
+Date: Fri, 8 Jan 2016 09:02:44 +0100
+Subject: [PATCH] dts: add overlay for pitft22
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo:
+https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic
+
+Signed-off-by: Petter Mabäcker <petter@technux.se>
+---
+ arch/arm/boot/dts/overlays/Makefile            |  1 +
+ arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69 ++++++++++++++++++++++++++
+ 2 files changed, 70 insertions(+)
+ create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts
+
+diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
+index 1a60e9c..a2535a2 100644
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -37,6 +37,7 @@ dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += piscreen2r-overlay.dtb
++dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += pitft28-capacitive-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb
+ dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
+diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
+new file mode 100755
+index 0000000..894ba22
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
+@@ -0,0 +1,69 @@
++/*
++ * Device Tree overlay for pitft by Adafruit
++ *
++ */
++
++/dts-v1/;
++/plugin/;
++
++/ {
++        compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
++
++        fragment@0 {
++                target = <&spi0>;
++                __overlay__ {
++                        status = "okay";
++
++                        spidev@0{
++                                status = "disabled";
++                        };
++
++                        spidev@1{
++                                status = "disabled";
++                        };
++                };
++        };
++
++        fragment@1 {
++                target = <&gpio>;
++                __overlay__ {
++                        pitft_pins: pitft_pins {
++                                brcm,pins = <25>;
++                                brcm,function = <1>; /* out */
++                                brcm,pull = <0>; /* none */
++                        };
++                };
++        };
++
++        fragment@2 {
++                target = <&spi0>;
++                __overlay__ {
++                        /* needed to avoid dtc warning */
++                        #address-cells = <1>;
++                        #size-cells = <0>;
++
++                        pitft: pitft@0{
++                                compatible = "ilitek,ili9340";
++                                reg = <0>;
++                                pinctrl-names = "default";
++                                pinctrl-0 = <&pitft_pins>;
++
++                                spi-max-frequency = <32000000>;
++                                rotate = <90>;
++                                fps = <25>;
++                                bgr;
++                                buswidth = <8>;
++                                dc-gpios = <&gpio 25 0>;
++                                debug = <0>;
++                        };
++
++                };
++        };
++
++        __overrides__ {
++                speed =   <&pitft>,"spi-max-frequency:0";
++                rotate =  <&pitft>,"rotate:0";
++                fps =     <&pitft>,"fps:0";
++                debug =   <&pitft>,"debug:0";
++        };
++};
+-- 
+1.9.1
+
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
index a1fe6b4..9234f70 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
@@ -1,8 +1,9 @@
 LINUX_VERSION ?= "3.18.16"
 
 SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y"
-
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
+           file://0001-dts-add-overlay-for-pitft22-in-linux-3.18.patch \
+          "
 require linux-raspberrypi.inc
 
 # Create missing out of tree 'overlays' directory prior to install step
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.1.bb b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
index cae459a..7e78693 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.1.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
@@ -1,6 +1,8 @@
 LINUX_VERSION ?= "4.1.15"
 
 SRCREV = "02a8ee530e32b08e5df44f10e24d5fd82bb960e3"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y"
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y \
+           file://0001-dts-add-overlay-for-pitft22.patch \
+          "
 
 require linux-raspberrypi.inc
-- 
1.9.1

Re: [meta-raspberrypi][PATCH 4/5] pitft: Add basic support for PiTFT

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 6315 bytes --]


> On Jan 11, 2016, at 8:49 AM, Petter Mabäcker <petter@technux.se> wrote:
> 
> Add basic support for PiTFT display by using device-trees.
> 
> In order get it working below configurations must be active in
> local.conf:
> 
> MACHINEOVERRIDES .= ":pitft”

Using MACHINE_FEATURES will be more appropriate term. Effects are same.

> - This will enable SPI bus and i2c device-trees, it will also setup
>   framebuffer for console and x server on PiTFT.
> 
> [Support #70]
> 
> Signed-off-by: Petter Mabäcker <petter@technux.se>
> ---
> README                                             | 29 ++++++++++++++++------
> recipes-bsp/bootfiles/rpi-config_git.bb            | 14 +++++++++++
> .../rpi/xorg.conf.d/99-pitft.conf                  |  5 ++++
> .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |  1 +
> recipes-kernel/linux/linux-raspberrypi.inc         |  1 +
> 5 files changed, 42 insertions(+), 8 deletions(-)
> create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> 
> diff --git a/README b/README
> index 8ef4e7a..791038f 100644
> --- a/README
> +++ b/README
> @@ -22,10 +22,11 @@ Contents:
>     2.H. Optional - Enable kgdb over console support
>     2.I. Optional - Enable SPI bus
>     2.J. Optional - Enable I2C
> -    2.K. Images
> -    2.L. Boot to U-Boot
> -    2.M. Image with Initramfs
> -    2.N. Device tree support
> +    2.K. Optional - Enable PiTFT support
> +    2.L. Images
> +    2.M. Boot to U-Boot
> +    2.N. Image with Initramfs
> +    2.O. Device tree support
> 3. Extra apps
>     3.A. omxplayer
> 4. Source code and mirrors
> @@ -157,7 +158,19 @@ ENABLE_SPI_BUS = "1"
> When using device tree kernels, set this variable to enable I2C
> ENABLE_I2C = "1"
> 
> -2.K. Images
> +2.K. Optional - Enable PiTFT support
> +====================================
> +Basic support for using PiTFT screens can be enabled by adding
> +below in local.conf:
> +
> +MACHINEOVERRIDES .= ":pitft"
> +  - This will enable SPI bus and i2c device-trees, it will also setup
> +    framebuffer for console and x server on PiTFT.
> +
> +NOTE: To get this working the overlay for the PiTFT model must be build,
> +      added and specified as well (dtoverlay=<driver> in config.txt)
> +
> +2.L. Images
> ===========
> * rpi-hwup-image
>     Hardware up image
> @@ -167,7 +180,7 @@ ENABLE_I2C = "1"
>     Image based on rpi-basic-image which includes most of the packages in this
>     layer and some media samples.
> 
> -2.L. Boot to U-Boot
> +2.M. Boot to U-Boot
> ===================
> To have u-boot load kernel image, set in your local.conf
> KERNEL_IMAGETYPE = "uImage"
> @@ -175,7 +188,7 @@ KERNEL_IMAGETYPE = "uImage"
> This will make kernel.img be u-boot image which will load uImage.
> By default, kernel.img is the actual kernel image (ex. Image).
> 
> -2.M. Image with Initramfs
> +2.N. Image with Initramfs
> =========================
> To build an initramfs image :
>     * Set this 3 kernel variables (in linux-raspberrypi.inc for example)
> @@ -188,7 +201,7 @@ To build an initramfs image :
>     * Set the meta-rasberrypi variable (in raspberrypi.conf for example)
>         - KERNEL_INITRAMFS = "-initramfs"
> 
> -2.N. Device tree support
> +2.O. Device tree support
> =========================
> Device tree for RPi is only supported when using linux-raspberrypi 3.18+
> kernels.
> diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
> index ccb9b7f..9f20352 100644
> --- a/recipes-bsp/bootfiles/rpi-config_git.bb
> +++ b/recipes-bsp/bootfiles/rpi-config_git.bb
> @@ -80,6 +80,20 @@ do_deploy() {
>     fi
> }
> 
> +do_deploy_append_pitft() {
> +    # Add SPI BUS and I2C support if needed
> +    if [ -z "${ENABLE_SPI_BUS}" ]; then
> +        echo "# Enable SPI bus" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> +        echo "dtparam=spi=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> +    fi
> +
> +    if [ -z "${ENABLE_I2C}" ]; then
> +        echo "# Enable I2C" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> +        echo "dtparam=i2c1=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> +        echo "dtparam=i2c_arm=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
> +    fi
> +}
> +
> addtask deploy before do_package after do_install
> do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
> 
> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> new file mode 100644
> index 0000000..0d2b36b
> --- /dev/null
> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
> @@ -0,0 +1,5 @@
> +Section "Device"
> +    Identifier "Adafruit PiTFT"
> +    Driver "fbdev"
> +    Option "fbdev" "/dev/fb1"
> +EndSection
> diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> index 2cf40f8..db8e4c1 100644
> --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> 
> SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf "
> +SRC_URI_append_pitft = " file://xorg.conf.d/99-pitft.conf "
> 
> do_install_append_rpi () {
> 	install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
> index 70e8bfe..420346a 100644
> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> @@ -24,6 +24,7 @@ CMDLINE = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootf
> 
> # Add the kernel debugger over console kernel command line option if enabled
> CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=ttyAMA0,115200", "", d)}'
> +CMDLINE_append_pitft = "fbcon=map:10 fbcon=font:VGA8x8"
> 
> UDEV_GE_141 ?= "1"
> 
> --
> 1.9.1
> 
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [meta-raspberrypi][PATCH 0/5] Various upgrade/fixes from Technux

[Petter Mabäcker]

[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]

 

Just realized that I missed one minor patch that fixes some typo in
the README.. Will add that one in a v2 of this serie. 

BR Petter


Petter Mabäcker

Technux
<petter@technux.se>
www.technux.se

2016-01-11 17:49 skrev Petter
Mabäcker: 

> Various fixes from Technux, with focus on PiTFT support.
>

> Petter Mabäcker (5):
> .gitignore: Ignore .swp files
>
linux-raspberrypi: Update 4.1 recipe to 4.1.15
> rpi-config: I2C
support
> pitft: Add basic support for PiTFT
> pitft: Add PiTFT22
support
> 
> .gitignore | 1 +
> README | 43 ++++++--
>
conf/machine/include/rpi-base.inc | 1 +
>
recipes-bsp/bootfiles/rpi-config_git.bb | 26 +++++
>
.../rpi/xorg.conf.d/99-pitft.conf | 5 +
>
.../xorg-xserver/xserver-xf86-config_0.1.bbappend | 1 +
>
recipes-kernel/linux/linux-raspberrypi.inc | 1 +
>
...dts-add-overlay-for-pitft22-in-linux-3.18.patch | 110
+++++++++++++++++++++
> .../0001-dts-add-overlay-for-pitft22.patch | 110
+++++++++++++++++++++
> recipes-kernel/linux/linux-raspberrypi_3.18.bb |
5 +-
> recipes-kernel/linux/linux-raspberrypi_4.1.bb | 8 +-
> 11 files
changed, 298 insertions(+), 13 deletions(-)
> create mode 100644
recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-pitft.conf
>
create mode 100644
recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22-in-linux-3.18.patch
>
create mode 100644
recipes-kernel/linux/linux-raspberrypi/0001-dts-add-overlay-for-pitft22.patch


[-- Attachment #2: Type: text/html, Size: 2021 bytes --]

Re: [meta-raspberrypi][PATCH 4/5] pitft: Add basic support for PiTFT

[Andrei Gherzan]

On Mon, Jan 11, 2016 at 09:55:43AM -0800, Khem Raj wrote:
>
> > On Jan 11, 2016, at 8:49 AM, Petter Mabäcker <petter@technux.se> wrote:
> >
> > Add basic support for PiTFT display by using device-trees.
> >
> > In order get it working below configurations must be active in
> > local.conf:
> >
> > MACHINEOVERRIDES .= ":pitft”
>
> Using MACHINE_FEATURES will be more appropriate term. Effects are same.
>

Indeed. I support MACHINE_FEATURE usage here.

--
Andrei Gherzan

Re: [meta-raspberrypi][PATCH 4/5] pitft: Add basic support for PiTFT

[Petter Mabäcker]

[-- Attachment #1: Type: text/plain, Size: 1799 bytes --]

 

2016-01-11 21:32 skrev Andrei Gherzan: 

> On Mon, Jan 11, 2016 at
09:55:43AM -0800, Khem Raj wrote:
> 
>>> On Jan 11, 2016, at 8:49 AM,
Petter Mabäcker <petter@technux.se> wrote: Add basic support for PiTFT
display by using device-trees. In order get it working below
configurations must be active in local.conf: MACHINEOVERRIDES .=
":pitft"
>> Using MACHINE_FEATURES will be more appropriate term.
Effects are same.
> 
> Indeed. I support MACHINE_FEATURE usage here.

I
agree that the term MACHINE_FEATURES is better. However since
MACHINE_FEATURES isn't included in the OVERRIDES variable I will not be
able to use the task pre/appends that was the reason I used
MACHINEOVERRIDES in the first place. The reason I want to use overrides
in this case is since I think it makes the code easier to read and
understand for the user (in this particular case at least). I can of
course change to just using variables (like in many other optional
features in meta-raspberrypi) or change to MACHINE_FEATURES. But I'm not
sure how I can solve for example the below part in a effective and nice
way: 

xserver-xf86-config_0.1.bbappend 

FILESEXTRAPATHS_prepend :=
"${THISDIR}/${PN}:"

SRC_URI_append_rpi = "
file://xorg.conf.d/10-evdev.conf "
SRC_URI_append_pitft = "
file://xorg.conf.d/99-pitft.conf " <---------------- My
change....

do_install_append_rpi () {
 install -d
${D}/${sysconfdir}/X11/xorg.conf.d/
 install -m 0644
${WORKDIR}/xorg.conf.d/*
${D}/${sysconfdir}/X11/xorg.conf.d/
}

FILES_${PN}_rpi +=
"${sysconfdir}/X11/xorg.conf
${sysconfdir}/X11/xorg.conf.d/*"
------------------- end
----------------------- 

But if you have any good suggestions about how
to solve this, please enlighten me =) 

BR Petter 

> -- Andrei Gherzan


[-- Attachment #2: Type: text/html, Size: 2656 bytes --]

Re: [meta-raspberrypi][PATCH 4/5] pitft: Add basic support for PiTFT

[Khem Raj]

On Mon, Jan 11, 2016 at 10:51 PM, Petter Mabäcker <petter@technux.se> wrote:
> 2016-01-11 21:32 skrev Andrei Gherzan:
>
> On Mon, Jan 11, 2016 at 09:55:43AM -0800, Khem Raj wrote:
>
> On Jan 11, 2016, at 8:49 AM, Petter Mabäcker <petter@technux.se> wrote: Add
> basic support for PiTFT display by using device-trees. In order get it
> working below configurations must be active in local.conf: MACHINEOVERRIDES
> .= ":pitft”
>
> Using MACHINE_FEATURES will be more appropriate term. Effects are same.
>
> Indeed. I support MACHINE_FEATURE usage here.
>
> I agree that the term MACHINE_FEATURES is better. However since
> MACHINE_FEATURES isn't included in the OVERRIDES variable I will not be able
> to use the task pre/appends that was the reason I used MACHINEOVERRIDES in
> the first place. The reason I want to use overrides in this case is since I
> think it makes the code easier to read and understand for the user (in this
> particular case at least). I can of course change to just using variables
> (like in many other optional features in meta-raspberrypi) or change to
> MACHINE_FEATURES. But I'm not sure how I can solve for example the below
> part in a effective and nice way:

it really doesnt need to have override, you can enquire
MACHINE_FEATURES in python or shell.

>
> xserver-xf86-config_0.1.bbappend
>
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> SRC_URI_append_rpi = " file://xorg.conf.d/10-evdev.conf "
> SRC_URI_append_pitft = " file://xorg.conf.d/99-pitft.conf "
> <---------------- My change....
>
> do_install_append_rpi () {
>     install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
>     install -m 0644 ${WORKDIR}/xorg.conf.d/*
> ${D}/${sysconfdir}/X11/xorg.conf.d/
> }
>
> FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf
> ${sysconfdir}/X11/xorg.conf.d/*"
> ------------------- end -----------------------
>
>
>
> But if you have any good suggestions about how to solve this, please
> enlighten me =)
>
> BR Petter
>
> -- Andrei Gherzan

Re: [meta-raspberrypi][PATCH 4/5] pitft: Add basic support for PiTFT

[Petter Mabäcker]

[-- Attachment #1: Type: text/plain, Size: 2751 bytes --]

 

2016-01-12 09:45 skrev Khem Raj: 

> On Mon, Jan 11, 2016 at 10:51
PM, Petter Mabäcker <petter@technux.se> wrote:
> 
>> 2016-01-11 21:32
skrev Andrei Gherzan: On Mon, Jan 11, 2016 at 09:55:43AM -0800, Khem Raj
wrote: On Jan 11, 2016, at 8:49 AM, Petter Mabäcker <petter@technux.se>
wrote: Add basic support for PiTFT display by using device-trees. In
order get it working below configurations must be active in local.conf:
MACHINEOVERRIDES .= ":pitft" Using MACHINE_FEATURES will be more
appropriate term. Effects are same. Indeed. I support MACHINE_FEATURE
usage here. I agree that the term MACHINE_FEATURES is better. However
since MACHINE_FEATURES isn't included in the OVERRIDES variable I will
not be able to use the task pre/appends that was the reason I used
MACHINEOVERRIDES in the first place. The reason I want to use overrides
in this case is since I think it makes the code easier to read and
understand for the user (in this particular case at least). I can of
course change to just using variables (like in many other optional
features in meta-raspberrypi) or change to MACHINE_FEATURES. But I'm not
sure how I can solve for example the below part in a effective and nice
way:
> 
> it really doesnt need to have override, you can enquire
>
MACHINE_FEATURES in python or shell.

Yes, I'm aware of that I can use
it that way. It was just my personal opinion that the code looks better
with overrides in this particular case. On the other hand I can agree
that the end-user will be more comfortable with using MACHINE_FEATURES
instead of MACHINEOVERRIDES. Also since both you and Andrei push for
MACHINE_FEATURES I will bend for your will =) 

Start using
MACHINE_FEATURES from local.conf when using meta-raspberrypi will
require a minor change i rpi-base.inc as well, since it otherwise will
override MACHINE_FEATURES added in local.conf. I will send up a fix for
that in v2 of this series as well. 

Thanks for your feedback. 

BR
Petter 

>> xserver-xf86-config_0.1.bbappend FILESEXTRAPATHS_prepend :=
"${THISDIR}/${PN}:" SRC_URI_append_rpi = "
file://xorg.conf.d/10-evdev.conf [1] " SRC_URI_append_pitft = "
file://xorg.conf.d/99-pitft.conf [2] " <---------------- My change....
do_install_append_rpi () { install -d
${D}/${sysconfdir}/X11/xorg.conf.d/ install -m 0644
${WORKDIR}/xorg.conf.d/* ${D}/${sysconfdir}/X11/xorg.conf.d/ }
FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf
${sysconfdir}/X11/xorg.conf.d/*" ------------------- end
----------------------- But if you have any good suggestions about how
to solve this, please enlighten me =) BR Petter -- Andrei Gherzan



Links:
------
[1] file://xorg.conf.d/10-evdev.conf
[2]
file://xorg.conf.d/99-pitft.conf

[-- Attachment #2: Type: text/html, Size: 3524 bytes --]