armbian · igorpecovnik · Nov 22, 2018 · Apr 29, 2018 · Apr 29, 2018 · Apr 29, 2018
diff --git a/config/boards/xt-q8l-v10.csc b/config/boards/xt-q8l-v10.csc
@@ -0,0 +1,20 @@
+# RK3288 TVBox quad core 2GB eMMC SoC GBE WiFi
+BOARD_NAME="xt-q8l-v10"
+BOARDFAMILY="rockchip"
+BOOTCONFIG="xt-q8l-v10-rk3288_defconfig"
+#
+MODULES="hci_uart rfcomm hidp"
+MODULES_NEXT=""
+#
+KERNEL_TARGET="default,next,dev"
+CLI_TARGET="stretch:default,next"
+DESKTOP_TARGET="bionic:default,next"
+
+CLI_BETA_TARGET=""
+DESKTOP_BETA_TARGET=""
+#
+BOARDRATING=""
+CHIP="https://en.wikipedia.org/wiki/Rockchip_RK3288"
+HARDWARE=""
+FORUMS="https://forum.armbian.com/topic/7141-armbian-for-rk3288-xt-q8l-v10-q8-boards/"
+BUY=""
diff --git a/config/kernel/linux-rockchip-default.config b/config/kernel/linux-rockchip-default.config
@@ -1856,8 +1856,14 @@ CONFIG_WCN36XX=m
 CONFIG_RTL8188EU=m
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
+CONFIG_BRCMUTIL=m
 # CONFIG_BRCMSMAC is not set
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_USB is not set
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=y
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -2108,7 +2114,8 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_VTL_CT36X is not set
 # CONFIG_TOUCHSCREEN_GT1X is not set
-# CONFIG_ROCKCHIP_REMOTECTL is not set
+CONFIG_ROCKCHIP_REMOTECTL=y
+CONFIG_ROCKCHIP_REMOTECTL_PWM=y
 
 #
 # handle all sensors

diff --git a/config/kernel/linux-rockchip-dev.config b/config/kernel/linux-rockchip-dev.config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.18.16 Kernel Configuration
+# Linux/arm 4.18.17 Kernel Configuration
 #
 
 #
-# Compiler: arm-linux-gnueabihf-gcc (Linaro GCC 7.2-2017.11) 7.2.1 20171011
+# Compiler: arm-linux-gnueabihf-gcc (Linaro GCC 6.4-2017.11) 6.4.1 20171012
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -25,7 +25,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=70201
+CONFIG_GCC_VERSION=60401
 CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -1928,8 +1928,14 @@ CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
+CONFIG_BRCMUTIL=m
 # CONFIG_BRCMSMAC is not set
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_USB is not set
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
@@ -2897,7 +2903,7 @@ CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
 CONFIG_RC_CORE=y
 CONFIG_RC_MAP=y
-# CONFIG_LIRC is not set
+CONFIG_LIRC=y
 CONFIG_RC_DECODERS=y
 CONFIG_IR_NEC_DECODER=y
 CONFIG_IR_RC5_DECODER=y
@@ -2909,7 +2915,24 @@ CONFIG_IR_SHARP_DECODER=y
 CONFIG_IR_MCE_KBD_DECODER=y
 CONFIG_IR_XMP_DECODER=y
 CONFIG_IR_IMON_DECODER=m
-# CONFIG_RC_DEVICES is not set
+CONFIG_RC_DEVICES=y
+# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_IMON_RAW is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_SPI is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_IGORPLUGUSB is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_TTUSBIR is not set
+# CONFIG_RC_LOOPBACK is not set
+CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_GPIO_TX is not set
+# CONFIG_IR_PWM_TX is not set
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SIR is not set
 CONFIG_MEDIA_SUPPORT=y
 
 #

diff --git a/config/kernel/linux-rockchip-next.config b/config/kernel/linux-rockchip-next.config
@@ -1959,8 +1959,14 @@ CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
+CONFIG_BRCMUTIL=m
 # CONFIG_BRCMSMAC is not set
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_SDIO=y
+# CONFIG_BRCMFMAC_USB is not set
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
@@ -2925,7 +2931,8 @@ CONFIG_REGULATOR_TPS6586X=y
 CONFIG_RC_CORE=y
 CONFIG_RC_MAP=y
 CONFIG_RC_DECODERS=y
-# CONFIG_LIRC is not set
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=y
 CONFIG_IR_RC5_DECODER=y
 CONFIG_IR_RC6_DECODER=y
@@ -2935,7 +2942,23 @@ CONFIG_IR_SANYO_DECODER=y
 CONFIG_IR_SHARP_DECODER=y
 CONFIG_IR_MCE_KBD_DECODER=y
 CONFIG_IR_XMP_DECODER=y
-# CONFIG_RC_DEVICES is not set
+CONFIG_RC_DEVICES=y
+# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_SPI is not set
+# CONFIG_IR_STREAMZAP is not set
+# CONFIG_IR_IGORPLUGUSB is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_TTUSBIR is not set
+# CONFIG_RC_LOOPBACK is not set
+CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_GPIO_TX is not set
+# CONFIG_IR_PWM_TX is not set
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SIR is not set
 CONFIG_MEDIA_SUPPORT=y
 
 #

diff --git a/config/sources/rockchip.conf b/config/sources/rockchip.conf
@@ -57,8 +57,21 @@ write_uboot_platform()
 
 uboot_custom_postprocess()
 {
-	tools/mkimage -n rk3288 -T rksd -d spl/u-boot-spl-dtb.bin u-boot-rockchip-with-spl.bin
-	cat u-boot-dtb.bin >> u-boot-rockchip-with-spl.bin
+
+	# xt-q8l-v10 requires the original DDR init blob because u-boot does not support LPDDR2 initialization
+	# for rk3288 SoC (binary is in sources/rkbin-tools/rk32 path). U-boot is configured to produce a TPL
+	# which is thrown away. SPL does some more initial configurations, expecially pinmux for power hold, 
+	# so reset works more reliably. U-boot image is set to be at sector 0x200 on the eMMC/SD, 
+	# so we burn it 0x200-0x40 because of the rockchip 0x40 sectors offset.
+	if [[ $BOARD == xt-q8l-v10 ]]; then
+		tools/mkimage -n rk3288 -T rksd -d $SRC/cache/sources/rkbin-tools/rk32/rk3288_ddr_400MHz_v1.03.bin u-boot-rockchip-with-spl.bin
+		cat spl/u-boot-spl-dtb.bin >> u-boot-rockchip-with-spl.bin
+		dd if=u-boot-dtb.img of=u-boot-rockchip-with-spl.bin seek=$((0x200 - 0x40)) conv=notrunc
+	else
+		tools/mkimage -n rk3288 -T rksd -d spl/u-boot-spl-dtb.bin u-boot-rockchip-with-spl.bin
+		cat u-boot-dtb.bin >> u-boot-rockchip-with-spl.bin
+	fi
+
 }
 
 family_tweaks()
@@ -67,6 +80,13 @@ family_tweaks()
 		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable tinker-bluetooth.service >/dev/null 2>&1"
 		sed -i -e "/#load-module module-alsa-sink/r $SRC/packages/bsp/rockchip/pulseaudio.txt" $SDCARD/etc/pulse/default.pa >/dev/null 2>&1
 	fi
+
+	if [[ $BOARD == xt-q8l-v10 ]]; then
+		echo "fdtfile=rk3288-xt-q8l-v10.dtb" >> $SDCARD/boot/armbianEnv.txt
+                mkdir -p $SDCARD/etc/firmware/
+		ln -sf /lib/firmware/brcm/BCM4330B1.hcd $SDCARD/etc/firmware
+                chroot $SDCARD /bin/bash -c "systemctl --no-reload enable ap6330-bluetooth.service >/dev/null 2>&1"
+	fi
 }
 
 family_tweaks_bsp()
@@ -96,4 +116,7 @@ family_tweaks_bsp()
 		cp $SRC/packages/bsp/rockchip/asound.conf $destination/etc/
 		cp $SRC/packages/bsp/rockchip/89-pulseaudio-usb.rules $destination/etc/udev/rules.d
 
+		# ap6330 bluetooth (required for xt-q8l-v10)
+                cp $SRC/packages/bsp/rockchip/ap6330-bluetooth.service $destination/lib/systemd/system/
+
 }
diff --git a/packages/bsp/rockchip/ap6330-bluetooth.service b/packages/bsp/rockchip/ap6330-bluetooth.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=AP6330 bluetooth support
+Before=bluetooth.service
+
+[Service]
+Type=forking
+RemainAfterExit=Yes
+ExecStart=/usr/bin/hciattach /dev/ttyS0 bcm43xx 1500000
+
+[Install]
+WantedBy=multi-user.target
diff --git a/patch/kernel/rockchip-default/1-2-regulator-act8865-add-restart-handler-for-act8846.patch b/patch/kernel/rockchip-default/1-2-regulator-act8865-add-restart-handler-for-act8846.patch
@@ -0,0 +1,74 @@
+Patches act8846 regulator providing the proper reset handle and exploit
+the SIPC bit in GLB_POWER_OFF register. Mainly used to reset some rockchip
+boards.
+
+Origin: <https://patchwork.kernel.org/patch/6409521/>
+
+diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
+index 2ff73d7..836d10b 100644
+--- a/drivers/regulator/act8865-regulator.c
++++ b/drivers/regulator/act8865-regulator.c
+@@ -27,6 +27,7 @@
+ #include <linux/of_device.h>
+ #include <linux/regulator/of_regulator.h>
+ #include <linux/regmap.h>
++#include <linux/reboot.h>
+
+ /*
+  * ACT8600 Global Register Map.
+@@ -133,6 +134,8 @@
+ #define	ACT8865_VOLTAGE_NUM	64
+ #define ACT8600_SUDCDC_VOLTAGE_NUM	255
+
++#define ACT8846_SIPC_MASK 0x01
++
+ struct act8865 {
+ 	struct regmap *regmap;
+ 	int off_reg;
+@@ -402,6 +405,22 @@ static void act8865_power_off(void)
+ 	while (1);
+ }
+
++static int act8846_power_cycle(struct notifier_block *this,
++	unsigned long code, void *unused)
++{
++	struct act8865 *act8846;
++
++	act8846 = i2c_get_clientdata(act8865_i2c_client);
++	regmap_write(act8846->regmap, ACT8846_GLB_OFF_CTRL, ACT8846_SIPC_MASK);
++
++	return NOTIFY_DONE;
++}
++
++static struct notifier_block act8846_restart_handler = {
++	.notifier_call = act8846_power_cycle,
++	.priority = 129,
++};
++
+ static int act8865_pmic_probe(struct i2c_client *client,
+ 			      const struct i2c_device_id *i2c_id)
+ {
+@@ -484,6 +503,8 @@ static int act8865_pmic_probe(struct i2c_client *client,
+ 	}
+
+ 	if (of_device_is_system_power_controller(dev->of_node)) {
++		int ret;
++
+ 		if (!pm_power_off && (off_reg > 0)) {
+ 			act8865_i2c_client = client;
+ 			act8865->off_reg = off_reg;
+@@ -492,6 +513,14 @@ static int act8865_pmic_probe(struct i2c_client *client,
+ 		} else {
+ 			dev_err(dev, "Failed to set poweroff capability, already defined\n");
+ 		}
++
++		if (type == ACT8846) {
++			act8865_i2c_client = client;
++			ret = register_restart_handler(&act8846_restart_handler);
++			if (ret)
++				pr_err("%s: cannot register restart handler, %d\n",
++					__func__, ret);
++		}
+ 	}
+
+ 	/* Finally register devices */
diff --git a/patch/kernel/rockchip-default/brcmfmac-add-ap6330-firmware.patch b/patch/kernel/rockchip-default/brcmfmac-add-ap6330-firmware.patch
@@ -0,0 +1,36 @@
+diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+index b4d9b475..c8d659ff 100644
+--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+@@ -626,6 +626,12 @@ static const struct sdiod_drive_str sdiod_drvstr_tab2_3v3[] = {
+ #define BCM4354_FIRMWARE_NAME		"brcm/brcmfmac4354-sdio.bin"
+ #define BCM4354_NVRAM_NAME		"brcm/brcmfmac4354-sdio.txt"
+
++/*
++ * AMPAK
++ */
++#define AP6330_FIRMWARE_NAME		"brcm/brcmfmac-ap6330-sdio.bin"
++#define AP6330_NVRAM_NAME		"brcm/brcmfmac-ap6330-sdio.txt"
++
+ MODULE_FIRMWARE(BCM43143_FIRMWARE_NAME);
+ MODULE_FIRMWARE(BCM43143_NVRAM_NAME);
+ MODULE_FIRMWARE(BCM43241B0_FIRMWARE_NAME);
+@@ -654,6 +660,8 @@ MODULE_FIRMWARE(BCM43455_FIRMWARE_NAME);
+ MODULE_FIRMWARE(BCM43455_NVRAM_NAME);
+ MODULE_FIRMWARE(BCM4354_FIRMWARE_NAME);
+ MODULE_FIRMWARE(BCM4354_NVRAM_NAME);
++MODULE_FIRMWARE(AP6330_FIRMWARE_NAME);
++MODULE_FIRMWARE(AP6330_NVRAM_NAME);
+
+ struct brcmf_firmware_names {
+ 	u32 chipid;
+@@ -676,7 +684,8 @@ static const struct brcmf_firmware_names brcmf_fwname_data[] = {
+ 	{ BRCM_CC_43241_CHIP_ID, 0x00000020, BRCMF_FIRMWARE_NVRAM(BCM43241B4) },
+ 	{ BRCM_CC_43241_CHIP_ID, 0xFFFFFFC0, BRCMF_FIRMWARE_NVRAM(BCM43241B5) },
+ 	{ BRCM_CC_4329_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4329) },
+-	{ BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4330) },
++	{ BRCM_CC_4330_CHIP_ID, 0xFFFFFFEF, BRCMF_FIRMWARE_NVRAM(BCM4330) },
++	{ BRCM_CC_4330_CHIP_ID, 0x10, BRCMF_FIRMWARE_NVRAM(AP6330) },
+ 	{ BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4334) },
+ 	{ BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM43340) },
+ 	{ BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) },