diff --git a/recipes-ti/beagleboard/gadget-init.bb b/recipes-ti/beagleboard/gadget-init.bb
index d016c099..150ff8eb 100644
--- a/recipes-ti/beagleboard/gadget-init.bb
+++ b/recipes-ti/beagleboard/gadget-init.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Units to initialize usb gadgets"
 
-PR = "r13"
+PR = "r16"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
@@ -12,8 +12,6 @@ SRC_URI = "file://storage-gadget-init.service \
            file://network-gadget-init.service \
            file://udhcpd.service \
            file://udhcpd.conf \
-           file://99-hokey-pokey.rules \
-           file://hokey-pokey.sh \
            file://bone-gmass-eject.rules \
            file://udhcpd.rules \
            file://g-storage-reinsert.sh \
@@ -37,12 +35,14 @@ do_install() {
 
 	install -d ${D}${bindir}
 	install -m 0755 ${WORKDIR}/*.sh ${D}${bindir}
+
+	install -d ${D}${sysconfdir}/tmpfiles.d
+	echo "w    /sys/class/pwm/ehrpwm.1:0/polarity -    -    -    -   1" > ${D}${sysconfdir}/tmpfiles.d/lcd7.conf
 }
 
 PACKAGES =+ "${PN}-storage ${PN}-network ${PN}-udhcpd"
 
-FILES_${PN} = "${sysconfdir}/udev/rules.d/99-hokey-pokey.rules \
-               ${bindir}/hokey-pokey.sh \"
+FILES_${PN} = "${sysconfdir}/tmpfiles.d"
 
 FILES_${PN}-storage = "${base_libdir}/systemd/system/storage-gadget-init.service \
                        ${base_libdir}/systemd/system/basic.target.wants/storage-gadget-init.service \
diff --git a/recipes-ti/beagleboard/gadget-init/99-hokey-pokey.rules b/recipes-ti/beagleboard/gadget-init/99-hokey-pokey.rules
deleted file mode 100644
index bb3c8d34..00000000
--- a/recipes-ti/beagleboard/gadget-init/99-hokey-pokey.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="remove", DEVPATH=="/devices/platform/omap/ti81xx-usbss/musb-hdrc.1/usb1/1-1",  RUN+="/usr/bin/hokey-pokey.sh"
-
diff --git a/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh b/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh
index 076a5fe8..6e73b155 100755
--- a/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh
+++ b/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-if [ -a /sys/devices/platform/omap/ti81xx-usbss/musb-hdrc.0/gadget/lun0/file ]
+if [ -a /sys/devices/platform/omap/musb-ti81xx/musb-hdrc.0/gadget/lun0/file ]
 then
-	x=$(cat /sys/devices/platform/omap/ti81xx-usbss/musb-hdrc.0/gadget/lun0/file)
+	x=$(cat /sys/devices/platform/omap/musb-ti81xx/musb-hdrc.0/gadget/lun0/file)
 	if [ -z "$x" ]
 	then
 		/bin/systemctl stop storage-gadget-init.service
diff --git a/recipes-ti/beagleboard/gadget-init/hokey-pokey.sh b/recipes-ti/beagleboard/gadget-init/hokey-pokey.sh
deleted file mode 100755
index 2139eb02..00000000
--- a/recipes-ti/beagleboard/gadget-init/hokey-pokey.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-sleep 1
-echo F > /proc/driver/musb_hdrc.1
-sleep 1
-echo F > /proc/driver/musb_hdrc.1
-