[ROCK Pi S] Mainline 5.5.y (dev) target (#1773)
* [ROCK Pi S] WIP mainline (dev) target * [ROCK Pi S] Disable `rockchip64-dev` patches for now * [ROCK Pi S] Add rtl8723ds wifi drivers * [ROCK Pi S] Enable onboard audio (`rk3308-acodec`,`rk3308-i2s-tdm`) Switch kernelsource to 5.5.y * [ROCK Pi S] WIP: Use mainline 5.5.y kernel Add a new `current` branch that tracks mainline * [ROCK Pi S] Use updated u-boot board dt name `rk3308-rock-pi-s` Removing the need for a special bootenv for n * Temporally disable current Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
This commit is contained in:
Ash
GitHub
parent
32626ae2d7
commit
d3b6800611
@ -2,5 +2,4 @@
|
||||
BOARD_NAME="ROCK Pi S"
|
||||
BOARDFAMILY="rockpis"
|
||||
BOOTCONFIG="rockpi-s-rk3308_defconfig"
|
||||
KERNEL_TARGET="legacy"
|
||||
|
||||
KERNEL_TARGET="legacy,dev"
|
||||
|
||||
7545
config/kernel/linux-rockpis-dev.config
Normal file
7545
config/kernel/linux-rockpis-dev.config
Normal file
File diff suppressed because it is too large
Load Diff
@ -4,21 +4,41 @@ ATFPATCHDIR='atf-rockchip64'
|
||||
BOOTSOURCE='https://github.com/piter75/rockchip-u-boot.git'
|
||||
BOOTDIR='u-boot-rockchip64'
|
||||
BOOTBRANCH='branch:rockpis-next-dev'
|
||||
BOOTPATCHDIR="u-boot-rockchip64-dev"
|
||||
BOOTPATCHDIR="u-boot-rockchip64"
|
||||
BOOTSCRIPT='boot-rockpis.cmd:boot.cmd'
|
||||
BOOTENV_FILE='rockpis.txt'
|
||||
KERNELDIR='linux-rockchip64'
|
||||
|
||||
case $BRANCH in
|
||||
|
||||
legacy)
|
||||
|
||||
BOOTPATCHDIR="u-boot-rockchip64"
|
||||
KERNELSOURCE='https://github.com/piter75/rockchip-kernel'
|
||||
KERNELBRANCH='branch:rockpis-develop-4.4'
|
||||
KERNELDIR='linux-rockchip64'
|
||||
|
||||
;;
|
||||
|
||||
current)
|
||||
KERNELBRANCH="branch:linux-5.5.y"
|
||||
|
||||
# Use rockchip64-dev for now,
|
||||
# until patches from `ashthespy/linux-rockchip` are prepared
|
||||
KERNELPATCHDIR=rockchip64-dev
|
||||
LINUXCONFIG='linux-rockpis-dev'
|
||||
|
||||
;;
|
||||
|
||||
dev)
|
||||
|
||||
KERNELSOURCE="https://github.com/ashthespy/linux-rockchip"
|
||||
KERNELBRANCH="branch:5.5.y"
|
||||
|
||||
# Disable rockchip64-dev patches for now
|
||||
KERNELPATCHDIR="no"
|
||||
LINUXCONFIG='linux-rockpis-dev'
|
||||
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
uboot_custom_postprocess()
|
||||
|
||||
@ -305,4 +305,33 @@ compilation_prepare()
|
||||
|
||||
fi
|
||||
|
||||
# Wireless drivers for Realtek 8723DS chipsets
|
||||
|
||||
if linux-version compare $version ge 3.14 && [ "$EXTRAWIFI" == yes ]; then
|
||||
|
||||
# attach to specifics tag or branch
|
||||
local rtl8723dsver="branch:master"
|
||||
|
||||
display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info"
|
||||
|
||||
fetch_from_repo "https://github.com/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes"
|
||||
cd ${SRC}/cache/sources/${LINUXSOURCEDIR}
|
||||
rm -rf ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds
|
||||
mkdir -p ${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/
|
||||
cp -R ${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/{core,hal,include,os_dep,platform} \
|
||||
${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds
|
||||
|
||||
# Makefile
|
||||
cp ${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Makefile \
|
||||
${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/Makefile
|
||||
cp ${SRC}/cache/sources/rtl8723ds/${rtl8723dsver#*:}/Kconfig \
|
||||
${SRC}/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/rtl8723ds/Kconfig
|
||||
|
||||
# Add to section Makefile
|
||||
echo "obj-\$(CONFIG_RTL8723DS) += rtl8723ds/" >> $SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Makefile
|
||||
sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8723ds\/Kconfig"' \
|
||||
$SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig
|
||||
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,298 @@
|
||||
From patchwork Mon Dec 30 14:49:32 2019
|
||||
X-Patchwork-Submitter: Akash Gajjar <akash@openedev.com>
|
||||
X-Patchwork-Id: 11313305
|
||||
From: Akash Gajjar <akash@openedev.com>
|
||||
To: heiko@sntech.de
|
||||
Subject: [PATCH V3, 1/1] arm64: dts: rockchip: add ROCK Pi S DTS support
|
||||
Date: Mon, 30 Dec 2019 20:19:32 +0530
|
||||
Message-Id: <20191230145008.5899-1-akash@openedev.com>
|
||||
|
||||
ROCK Pi S is RK3308 based SBC from radxa.com. ROCK Pi S has a,
|
||||
- 256MB/512MB DDR3 RAM
|
||||
- SD, NAND flash (optional on board 1/2/4/8Gb)
|
||||
- 100MB ethernet, PoE (optional)
|
||||
- Onboard 802.11 b/g/n wifi + Bluetooth 4.0 Module
|
||||
- USB2.0 Type-A HOST x1
|
||||
- USB3.0 Type-C OTG x1
|
||||
- 26-pin expansion header
|
||||
- USB Type-C DC 5V Power Supply
|
||||
|
||||
This patch enables
|
||||
- Console
|
||||
- NAND Flash
|
||||
- SD Card
|
||||
|
||||
Signed-off-by: Akash Gajjar <akash@openedev.com>
|
||||
Reviewed-by: Rob Herring <robh@kernel.org>
|
||||
Reviewed-by: Rob Herring <robh at kernel.org>
|
||||
---
|
||||
Changes for v2
|
||||
- Use pwm-supply for vdd_core node instead of vi-supply
|
||||
- Add USB2.0 node support
|
||||
|
||||
Changes for v3
|
||||
- Use small S on dts file name
|
||||
- Add missing semicolon
|
||||
- Remove USB2.0 node support
|
||||
|
||||
.../devicetree/bindings/arm/rockchip.yaml | 5 +
|
||||
arch/arm64/boot/dts/rockchip/Makefile | 1 +
|
||||
.../boot/dts/rockchip/rk3308-rock-pi-s.dts | 221 ++++++++++++++++++
|
||||
3 files changed, 227 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
|
||||
index d9847b306b83..48d40c928d45 100644
|
||||
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
|
||||
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
|
||||
@@ -422,6 +422,11 @@ properties:
|
||||
- const: radxa,rockpi4
|
||||
- const: rockchip,rk3399
|
||||
|
||||
+ - description: Radxa ROCK Pi S
|
||||
+ items:
|
||||
+ - const: radxa,rockpis
|
||||
+ - const: rockchip,rk3308
|
||||
+
|
||||
- description: Radxa Rock2 Square
|
||||
items:
|
||||
- const: radxa,rock2-square
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
index 48fb631d5451..e56a5527bab4 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += px30-evb.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-evb.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-roc-cc.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3308-rock-pi-s.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||||
new file mode 100644
|
||||
index 000000000000..4fccae43f008
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||||
@@ -0,0 +1,221 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright (c) 2019 Akash Gajjar <akash@openedev.com>
|
||||
+ * Copyright (c) 2019 Jagan Teki <jagan@openedev.com>
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "rk3308.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Radxa ROCK Pi S";
|
||||
+ compatible = "radxa,rockpis", "rockchip,rk3308";
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = "serial0:1500000n8";
|
||||
+ };
|
||||
+
|
||||
+ leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>;
|
||||
+
|
||||
+ green-led {
|
||||
+ label = "rockpis:green:power";
|
||||
+ gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
|
||||
+ linux,default-trigger = "default-on";
|
||||
+ default-state = "on";
|
||||
+ };
|
||||
+
|
||||
+ blue-led {
|
||||
+ label = "rockpis:blue:user";
|
||||
+ gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
|
||||
+ default-state = "on";
|
||||
+ linux,default-trigger = "heartbeat";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ sdio_pwrseq: sdio-pwrseq {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&wifi_enable_h>;
|
||||
+ reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ vcc5v0_sys: vcc5v0-sys {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vcc5v0_sys";
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ regulator-min-microvolt = <5000000>;
|
||||
+ regulator-max-microvolt = <5000000>;
|
||||
+ };
|
||||
+
|
||||
+ vdd_core: vdd-core {
|
||||
+ compatible = "pwm-regulator";
|
||||
+ pwms = <&pwm0 0 5000 1>;
|
||||
+ regulator-name = "vdd_core";
|
||||
+ regulator-min-microvolt = <827000>;
|
||||
+ regulator-max-microvolt = <1340000>;
|
||||
+ regulator-init-microvolt = <1015000>;
|
||||
+ regulator-settling-time-up-us = <250>;
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ pwm-supply = <&vcc5v0_sys>;
|
||||
+ };
|
||||
+
|
||||
+ vdd_log: vdd-log {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vdd_log";
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ regulator-min-microvolt = <1050000>;
|
||||
+ regulator-max-microvolt = <1050000>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
+ };
|
||||
+
|
||||
+ vcc_ddr: vcc-ddr {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vcc_ddr";
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ regulator-min-microvolt = <1500000>;
|
||||
+ regulator-max-microvolt = <1500000>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
+ };
|
||||
+
|
||||
+ vcc_1v8: vcc-1v8 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vcc_1v8";
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ regulator-min-microvolt = <1800000>;
|
||||
+ regulator-max-microvolt = <1800000>;
|
||||
+ vin-supply = <&vcc_io>;
|
||||
+ };
|
||||
+
|
||||
+ vcc_io: vcc-io {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vcc_io";
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
+ };
|
||||
+
|
||||
+ vcc5v0_otg: vcc5v0-otg {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vcc5v0_otg";
|
||||
+ regulator-always-on;
|
||||
+ gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
|
||||
+ enable-active-high;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&otg_vbus_drv>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&cpu0 {
|
||||
+ cpu-supply = <&vdd_core>;
|
||||
+};
|
||||
+
|
||||
+&emmc {
|
||||
+ bus-width = <4>;
|
||||
+ cap-mmc-highspeed;
|
||||
+ mmc-hs200-1_8v;
|
||||
+ supports-sd;
|
||||
+ disable-wp;
|
||||
+ non-removable;
|
||||
+ num-slots = <1>;
|
||||
+ vin-supply = <&vcc_io>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&i2c1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&sdmmc {
|
||||
+ bus-width = <4>;
|
||||
+ cap-mmc-highspeed;
|
||||
+ cap-sd-highspeed;
|
||||
+ max-frequeency = <150000000>;
|
||||
+ supports-sd;
|
||||
+ disable-wp;
|
||||
+ num-slots = <1>;
|
||||
+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>;
|
||||
+ card-detect-delay = <800>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&spi2 {
|
||||
+ status = "okay";
|
||||
+ max-freq = <10000000>;
|
||||
+};
|
||||
+
|
||||
+&pinctrl {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&rtc_32k>;
|
||||
+
|
||||
+ leds {
|
||||
+ green_led_gio: green-led-gpio {
|
||||
+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ heartbeat_led_gpio: heartbeat-led-gpio {
|
||||
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ usb {
|
||||
+ otg_vbus_drv: otg-vbus-drv {
|
||||
+ rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ sdio-pwrseq {
|
||||
+ wifi_enable_h: wifi-enable-h {
|
||||
+ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ wifi_host_wake: wifi-host-wake {
|
||||
+ rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&pwm0 {
|
||||
+ status = "okay";
|
||||
+ pinctrl-0 = <&pwm0_pin_pull_down>;
|
||||
+};
|
||||
+
|
||||
+&saradc {
|
||||
+ vref-supply = <&vcc_1v8>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&sdio {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ bus-width = <4>;
|
||||
+ max-frequency = <1000000>;
|
||||
+ cap-sd-highspeed;
|
||||
+ cap-sdio-irq;
|
||||
+ supports-sdio;
|
||||
+ keep-power-in-suspend;
|
||||
+ mmc-pwrseq = <&sdio_pwrseq>;
|
||||
+ non-removable;
|
||||
+ sd-uhs-sdr104;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&uart4 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart4_xfer &uart4_rts &uart4_cts>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
@ -0,0 +1,70 @@
|
||||
From a7a6d6f06de8b629537ddada1bda5beef88ecea3 Mon Sep 17 00:00:00 2001
|
||||
From: ashthespy <ashthespy@users.noreply.github.com>
|
||||
Date: Wed, 15 Jan 2020 15:14:16 +0100
|
||||
Subject: [PATCH] Fixes for rk3308-rock-pi-s dts
|
||||
|
||||
---
|
||||
.../boot/dts/rockchip/rk3308-rock-pi-s.dts | 24 ++++++++++---------
|
||||
1 file changed, 13 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||||
index 4fccae43f008..f06ff0c6e028 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
|
||||
@@ -121,13 +121,15 @@
|
||||
};
|
||||
|
||||
&emmc {
|
||||
- bus-width = <4>;
|
||||
+ bus-width = <4>; // Confirm if right value - <8>
|
||||
cap-mmc-highspeed;
|
||||
mmc-hs200-1_8v;
|
||||
- supports-sd;
|
||||
- disable-wp;
|
||||
+ /* supports-sd; */
|
||||
+ /* disable-wp; */
|
||||
non-removable;
|
||||
- num-slots = <1>;
|
||||
+ /* num-slots = <1>; */
|
||||
+ /* please provide actual vmmc and vqmmc supplies
|
||||
+ vin is not a valid supply for emmcs */
|
||||
vin-supply = <&vcc_io>;
|
||||
status = "okay";
|
||||
};
|
||||
@@ -137,15 +139,15 @@
|
||||
};
|
||||
|
||||
&sdmmc {
|
||||
- bus-width = <4>;
|
||||
+ /* bus-width = <4>; */
|
||||
cap-mmc-highspeed;
|
||||
cap-sd-highspeed;
|
||||
- max-frequeency = <150000000>;
|
||||
- supports-sd;
|
||||
+ /* max-frequency = <150000000>; */
|
||||
+ /* supports-sd; */
|
||||
disable-wp;
|
||||
- num-slots = <1>;
|
||||
+ /* num-slots = <1>; */
|
||||
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>;
|
||||
- card-detect-delay = <800>;
|
||||
+ card-detect-delay = <800>; // Confirm if right value - <200>
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -198,11 +200,11 @@
|
||||
&sdio {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
- bus-width = <4>;
|
||||
+ /* bus-width = <4>; */
|
||||
max-frequency = <1000000>;
|
||||
cap-sd-highspeed;
|
||||
cap-sdio-irq;
|
||||
- supports-sdio;
|
||||
+ /* supports-sdio; */
|
||||
keep-power-in-suspend;
|
||||
mmc-pwrseq = <&sdio_pwrseq>;
|
||||
non-removable;
|
||||
--
|
||||
2.20.1
|
||||
Loading…
x
Reference in New Issue
Block a user