Raspberry Pi touchscreen setup

I recently bought 2 touch screens for the raspberry pi:

OS Installation

Follow the raspbian installation instructions: Setup Raspberry PI with Raspbian

Configure for the 3.5" Touch Screen

Download drivers from:

Extract the data:

tar xvzf SKU237648\ SKU237464\ SKU180414\ SKU187173\ LCD-show-151020.tar.gz
cp LCD-show/waveshare35a-overlay.dtb /boot/overlays

vi /boot/cmdline.txt

dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait fbcon=map:10 fbcon=font:ProFont6x11 logo.nologo

vi /boot/config.txt

dtparam=spi=on
dtoverlay=waveshare35a
dtparam=i2c_arm=on
dtoverlay=w1-gpio-pullup,gpiopin=4,extpullup=1

vi /usr/share/X11/xorg.conf.d/99-fbturbo.conf

Section "Device"
        Identifier      "Allwinner A10/A13 FBDEV"
        Driver          "fbturbo"
        Option          "fbdev" "/dev/fb1"

        Option          "SwapbuffersWait" "true"
EndSection

vi /etc/X11/xorg.conf.d/99-calibration.conf

Section "InputClass"
        Identifier      "calibration"
        MatchProduct    "ADS7846 Touchscreen"
        Option  "Calibration"   "3932 300 294 3801"
        Option  "SwapAxes"      "1"
EndSection

Configuration for the 5" Touch Screen

sudo vi /boot/config.txt

hdmi_group=2
hdmi_mode=87
hdmi_cvt=800 480 60 6 0 0 0

Never got the touch part to work, with the latest rasbian image...