Skip to content

Commit

Permalink
Merged rockpi-s dev info rockchip64-dev and moved to 5.6.y (#1874)
Browse files Browse the repository at this point in the history
Added all patches from @ashthespy repository
  • Loading branch information
igorpecovnik committed Apr 6, 2020
1 parent 113f574 commit 5e251dc
Show file tree
Hide file tree
Showing 34 changed files with 14,113 additions and 168 deletions.
120 changes: 101 additions & 19 deletions config/kernel/linux-rockchip64-dev.config

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/sources/families/include/rockchip64_common.inc
Expand Up @@ -51,7 +51,7 @@ case $BRANCH in
dev)

KERNELPATCHDIR='rockchip64-'$BRANCH
KERNELBRANCH="branch:linux-5.5.y"
KERNELBRANCH="branch:linux-5.6.y"
LINUXFAMILY=rockchip64
LINUXCONFIG='linux-rockchip64-'$BRANCH

Expand Down
21 changes: 4 additions & 17 deletions config/sources/families/rockpis.conf
Expand Up @@ -19,24 +19,11 @@ case $BRANCH in

;;

current)
KERNELBRANCH="branch:linux-5.5.y"
current|dev)

# 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'
KERNELBRANCH='branch:linux-5.6.y'
LINUXFAMILY=rockchip64
#LINUXCONFIG='linux-rockchip64-dev'

;;

Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/rockchip64-dev/add-rk3328-usb3-phy-driver.patch 100755 → 100644
Expand Up @@ -1381,7 +1381,7 @@ index 31cc1541f1f5..072e988ad655 100644
+ };
+ };
+
sdmmc: dwmmc@ff500000 {
sdmmc: mmc@ff500000 {
compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff500000 0x0 0x4000>;
@@ -936,6 +977,37 @@
Expand Down
Expand Up @@ -8,10 +8,10 @@ Change-Id: Ib3899f684188aa1ed1545717af004bba53fe0e07
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
index cdab3089046c..0db9de46ff16 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -249,7 +249,7 @@
snps,reset-active-low;
snps,reset-delays-us = <0 10000 50000>;
Expand Down

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions patch/kernel/rockchip64-dev/fix-rockpro64-emmc.patch
@@ -1,7 +1,7 @@
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
index 714616618..b1fb824f3 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -15,6 +15,7 @@
compatible = "pine64,rockpro64", "rockchip,rk3399";

Expand Down
4 changes: 2 additions & 2 deletions patch/kernel/rockchip64-dev/fix-spi1-flash-speed.patch
@@ -1,7 +1,7 @@
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
index 49050de8c..714616618 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -646,7 +646,7 @@
flash@0 {
compatible = "jedec,spi-nor";
Expand Down
Expand Up @@ -4,8 +4,8 @@ index 6a33eff..60fc91a 100644
+++ b/arch/arm64/boot/dts/rockchip/Makefile
@@ -17,3 +17,5 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
+
+subdir-y := $(dts-dirs) overlay
diff --git a/arch/arm64/boot/dts/rockchip/overlay/Makefile b/arch/arm64/boot/dts/rockchip/overlay/Makefile
Expand Down
@@ -1,11 +1,7 @@
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>
From 4c09666816df62c1b8ab13410b8d0cc9234c608f Mon Sep 17 00:00:00 2001
From: ashthespy <ashthespy@gmail.com>
Date: Wed, 15 Jan 2020 14:54:14 +0100
Subject: [PATCH 01/23] arm64: dts: rockchip: add ROCK Pi S DTS support

ROCK Pi S is RK3308 based SBC from radxa.com. ROCK Pi S has a,
- 256MB/512MB DDR3 RAM
Expand All @@ -23,13 +19,11 @@ This patch enables
- 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
Expand All @@ -40,23 +34,12 @@ Changes for v3
.../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
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../boot/dts/rockchip/rk3308-rock-pi-s.dts | 221 ++++++++++++++++++
2 files changed, 222 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
Expand Down Expand Up @@ -296,3 +279,6 @@ index 000000000000..4fccae43f008
+ pinctrl-0 = <&uart4_xfer &uart4_rts &uart4_cts>;
+ status = "okay";
+};
--
2.25.1

@@ -1,7 +1,7 @@
From a7a6d6f06de8b629537ddada1bda5beef88ecea3 Mon Sep 17 00:00:00 2001
From: ashthespy <ashthespy@users.noreply.github.com>
From: ashthespy <ashthespy@gmail.com>
Date: Wed, 15 Jan 2020 15:14:16 +0100
Subject: [PATCH] Fixes for rk3308-rock-pi-s dts
Subject: [PATCH 02/23] Fixes for rk3308-rock-pi-s dts

---
.../boot/dts/rockchip/rk3308-rock-pi-s.dts | 24 ++++++++++---------
Expand All @@ -11,9 +11,9 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot
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 @@
@@ -121,13 +121,15 @@ &cpu0 {
};

&emmc {
- bus-width = <4>;
+ bus-width = <4>; // Confirm if right value - <8>
Expand All @@ -31,9 +31,9 @@ index 4fccae43f008..f06ff0c6e028 100644
vin-supply = <&vcc_io>;
status = "okay";
};
@@ -137,15 +139,15 @@
@@ -137,15 +139,15 @@ &i2c1 {
};

&sdmmc {
- bus-width = <4>;
+ /* bus-width = <4>; */
Expand All @@ -51,8 +51,8 @@ index 4fccae43f008..f06ff0c6e028 100644
+ card-detect-delay = <800>; // Confirm if right value - <200>
status = "okay";
};

@@ -198,11 +200,11 @@
@@ -198,11 +200,11 @@ &saradc {
&sdio {
#address-cells = <1>;
#size-cells = <0>;
Expand All @@ -66,5 +66,6 @@ index 4fccae43f008..f06ff0c6e028 100644
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;
--
2.20.1
--
2.25.1

@@ -0,0 +1,59 @@
From 44f753e6f7be183e49c408d4db8a2c7530e7f057 Mon Sep 17 00:00:00 2001
From: ashthespy <ashthespy@gmail.com>
Date: Wed, 15 Jan 2020 20:03:48 +0100
Subject: [PATCH 03/23] WIP: Wireless support

---
.../boot/dts/rockchip/rk3308-rock-pi-s.dts | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)

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 f06ff0c6e028..88468a6065cf 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -39,6 +39,12 @@ sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
pinctrl-0 = <&wifi_enable_h>;
+ /*
+ * On the module itself this is one of these (depending
+ * on the actual card populated):
+ * - SDIO_RESET_L_WL_REG_ON
+ * - PDN (power down when low)
+ */
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
};

@@ -114,6 +120,19 @@ vcc5v0_otg: vcc5v0-otg {
pinctrl-0 = <&otg_vbus_drv>;
vin-supply = <&vcc5v0_sys>;
};
+
+ wireless-wlan {
+ compatible = "wlan-platdata";
+ rockchip,grf = <&grf>;
+ clocks = <&cru SCLK_WIFI>;
+ clock-names = "clk_wifi";
+ ref-clock-frequency = <24000000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_host_wake>;
+ wifi_chip_type = "rtl8723ds";
+ WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+ };
};

&cpu0 {
@@ -180,7 +199,9 @@ sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
+ };

+ wireless-wlan {
wifi_host_wake: wifi-host-wake {
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
};
--
2.25.1

0 comments on commit 5e251dc

Please sign in to comment.