diff --git a/packages/graphics/mali-rockchip/package.mk b/packages/graphics/mali-rockchip/package.mk index 4558992354..687964afaa 100644 --- a/packages/graphics/mali-rockchip/package.mk +++ b/packages/graphics/mali-rockchip/package.mk @@ -43,7 +43,9 @@ else PKG_MALI_SUFFIX="-gbm" fi -if [ "$MALI_FAMILY" = "t760" ]; then +if [ "$MALI_FAMILY" = "t760" -a "$MALI_REVISION" = "r1p0" ]; then + PKG_MALI_FILE="libmali-midgard-t76x-r14p0-r1p0$PKG_MALI_SUFFIX.so" +elif [ "$MALI_FAMILY" = "t760" ]; then PKG_MALI_FILE="libmali-midgard-t76x-r14p0-r0p0$PKG_MALI_SUFFIX.so" elif [ "$MALI_FAMILY" = "t860" ]; then PKG_MALI_FILE="libmali-midgard-t86x-r14p0$PKG_MALI_SUFFIX.so" diff --git a/projects/Rockchip/README.md b/projects/Rockchip/README.md index cb38d03ec2..e052be5210 100644 --- a/projects/Rockchip/README.md +++ b/projects/Rockchip/README.md @@ -6,6 +6,7 @@ This project is for Rockchip SoC devices * [ASUS Tinker Board](devices/TinkerBoard) * [PINE64 ROCK64](devices/ROCK64) +* [mqmaker MiQi](devices/MiQi) **My single-board computer is not listed, will it be added in the future?**
If your single-board computer uses a current generation SoC listed on http://opensource.rock-chips.com/wiki_Main_Page the odds are in your favor. diff --git a/projects/Rockchip/devices/MiQi/options b/projects/Rockchip/devices/MiQi/options new file mode 100644 index 0000000000..f4034c41fa --- /dev/null +++ b/projects/Rockchip/devices/MiQi/options @@ -0,0 +1,33 @@ +################################################################################ +# setup device defaults +################################################################################ + + # The TARGET_CPU variable controls which processor should be targeted for + # generated code. + case $TARGET_ARCH in + arm) + TARGET_FLOAT="hard" + TARGET_CPU="cortex-a17" + TARGET_FPU="neon-vfpv4" + TARGET_FEATURES="32bit neon" + ;; + esac + + # Configuration for u-boot + UBOOT_SYSTEM="rk3288" + + # Kernel target + KERNEL_TARGET="zImage" + + # Additional kernel make parameters (for example to specify the u-boot loadaddress) + KERNEL_MAKE_EXTRACMD="rk3288-miqi.dtb" + + # Mali GPU family + MALI_FAMILY="t760" + MALI_REVISION="r1p0" + + # kernel image name + KERNEL_NAME="zImage" + + # kernel serial console + EXTRA_CMDLINE="console=uart8250,mmio32,0xff690000 console=tty0" diff --git a/projects/Rockchip/devices/MiQi/patches/linux/rockchip-4.4/linux-0001-miqi.patch b/projects/Rockchip/devices/MiQi/patches/linux/rockchip-4.4/linux-0001-miqi.patch new file mode 100644 index 0000000000..3378353bf6 --- /dev/null +++ b/projects/Rockchip/devices/MiQi/patches/linux/rockchip-4.4/linux-0001-miqi.patch @@ -0,0 +1,101 @@ +From fd70e1ff1377e0d575ab2c685cf9e42c02b53565 Mon Sep 17 00:00:00 2001 +From: Jonas Karlman +Date: Thu, 2 Nov 2017 23:17:46 +0100 +Subject: [PATCH] arm: dts: rk3288-miqi: update dts + +--- + arch/arm/boot/dts/rk3288-miqi.dts | 51 +++++++++++++++++++++++---------------- + 1 file changed, 30 insertions(+), 21 deletions(-) + +diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts +index b90b0e5969ec..121d1f2f4f03 100644 +--- a/arch/arm/boot/dts/rk3288-miqi.dts ++++ b/arch/arm/boot/dts/rk3288-miqi.dts +@@ -55,29 +55,14 @@ + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; +- simple-audio-card,name = "DW-HDMI"; ++ simple-audio-card,name = "HDMI"; + simple-audio-card,mclk-fs = <512>; +- +- simple-audio-card,dai-link@0 { /* I2S - S/PDIF */ +- format = "i2s"; +- cpu { +- sound-dai = <&i2s>; +- }; +- codec { +- sound-dai = <&hdmi>; +- }; ++ simple-audio-card,cpu { ++ sound-dai = <&i2s>; ++ }; ++ simple-audio-card,codec { ++ sound-dai = <&hdmi>; + }; +- +- /* +- * If you want to support more cards, +- * you can add more dai-link node, +- * such as +- * +- * simple-audio-card,dai-link@1 { +- * ...... +- * } +- */ +- + }; + + ext_gmac: external-gmac-clock { +@@ -181,6 +166,19 @@ + cpu0-supply = <&vdd_cpu>; + }; + ++&cpu0_opp_table { ++ opp-1704000000 { ++ opp-hz = /bits/ 64 <1704000000>; ++ opp-microvolt = <1350000>; ++ clock-latency-ns = <40000>; ++ }; ++ opp-1800000000 { ++ opp-hz = /bits/ 64 <1800000000>; ++ opp-microvolt = <1400000>; ++ clock-latency-ns = <40000>; ++ }; ++}; ++ + &gpu { + status = "okay"; + mali-supply = <&vdd_gpu>; +@@ -203,6 +201,12 @@ + #size-cells = <0>; + #sound-dai-cells = <0>; + status = "okay"; ++ /* Don't use vopl for HDMI */ ++ ports { ++ hdmi_in: port { ++ /delete-node/ endpoint@1; ++ }; ++ }; + }; + + &hevc_service { +@@ -413,6 +417,7 @@ I2C + + &i2s { + #sound-dai-cells = <0>; ++ rockchip,bclk-fs = <128>; + status = "okay"; + }; + +@@ -471,6 +476,10 @@ I2C + + &vopl { + status = "okay"; ++ /* Don't use vopl for HDMI */ ++ vopl_out: port { ++ /delete-node/ endpoint@0; ++ }; + }; + + &vopl_mmu { diff --git a/scripts/uboot_helper b/scripts/uboot_helper index abe1acd0d6..42976209bc 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -10,6 +10,7 @@ devices = { }, 'Rockchip' : { + 'MiQi' : { 'rk3288' : { 'dtb' : 'rk3288-miqi.dtb', 'config' : 'miqi-rk3288_config' }, }, 'ROCK64' : { 'rk3328' : { 'dtb' : 'rk3328-rock64.dtb', 'config' : 'evb-rk3328_defconfig' }, }, 'TinkerBoard' : { 'rk3288' : { 'dtb' : 'rk3288-miniarm.dtb', 'config' : 'tinker-rk3288_config' }, }, },