diff --git a/config/sources/s5p6818.conf b/config/sources/s5p6818.conf
index 9b1b4313ba..2530d46fc7 100644
--- a/config/sources/s5p6818.conf
+++ b/config/sources/s5p6818.conf
@@ -22,7 +22,7 @@ CAN_BUILD_STRETCH=no
 
 HAS_UUID_SUPPORT=yes
 
-GOVERNOR=interactive
+GOVERNOR=ondemand
 
 write_uboot_platform()
 {
@@ -55,4 +55,4 @@ family_tweaks()
 {
 	echo "#Serial console allow root" >> $SDCARD/etc/securetty
 	echo "ttySAC0" >> $SDCARD/etc/securetty
-}
\ No newline at end of file
+}
diff --git a/packages/bsp/common/etc/init.d/armhwinfo b/packages/bsp/common/etc/init.d/armhwinfo
index 45c9a7da49..e315dc6beb 100755
--- a/packages/bsp/common/etc/init.d/armhwinfo
+++ b/packages/bsp/common/etc/init.d/armhwinfo
@@ -252,6 +252,20 @@ prepare_board() {
 					echo 32768 >/proc/sys/net/core/rps_sock_flow_entries
 					echo 32768 >/sys/class/net/eth0/queues/rx-0/rps_flow_cnt
 					;;
+				nanopim3) # dw-mci on cpu1, USB OTG on cpu2, GbE on cpu3, USB2 on cpu4, video-codec on cpu5
+					for i in $(awk -F':' '/dw-mci/{print $1}' </proc/interrupts | sed 's/\ //g'); do
+						echo 2 >/proc/irq/$i/smp_affinity
+					done
+					echo 4 >/proc/irq/$(awk -F":" "/usb1/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
+					echo 8 >/proc/irq/$(awk -F":" "/eth0/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
+					echo 16 >/proc/irq/$(awk -F":" "/usb3/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
+					for i in $(awk -F':' '/c0080000.video-codec/{print $1}' </proc/interrupts | sed 's/\ //g'); do
+						echo 32 >/proc/irq/$i/smp_affinity
+					done
+					echo 7 >/sys/class/net/eth0/queues/rx-0/rps_cpus
+					echo 32768 >/proc/sys/net/core/rps_sock_flow_entries
+					echo 32768 >/sys/class/net/eth0/queues/rx-0/rps_flow_cnt
+					;;
 			esac
 			;;
 	esac