mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
23604e8a0d
* Introducing Rockchip rk322x SoC support Main features: - Legacy kernel flavour based upon stable v2.x rk3288 Rockchip branch (https://github.com/rockchip-linux/kernel/tree/stable-4.4-rk3288-linux-v2.x) - Current kernel flavour based on mainline 5.6.y kernel - Mainline u-boot (v2020.04) - Single generic tv box target (rk322x-box) which boots on all the known tv boxes - Hardware devices (eMMC/NAND, led wiring configuration, SoC variant selection) modulation done by user at runtime via device tree overlays - a script (rk322x-config) is provided for autodetection and simple configuration by inexperienced users; - Bits added to armbian-hardware-optimization to set affinity for irq handlers - rk322x-box targets already added to targets.conf for automatic image creation * Removed disabled patches * Restored mysteriously removed comment character
307 lines
7.1 KiB
Diff
307 lines
7.1 KiB
Diff
diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile
|
|
new file mode 100644
|
|
index 000000000..f024e8db0
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/Makefile
|
|
@@ -0,0 +1,20 @@
|
|
+# SPDX-License-Identifier: GPL-2.0
|
|
+dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
|
|
+ rk322x-emmc.dtbo \
|
|
+ rk322x-nand.dtbo \
|
|
+ rk322x-emmc-nand.dtbo \
|
|
+ rk322x-led-conf1.dtbo \
|
|
+ rk322x-led-conf2.dtbo \
|
|
+ rk322x-cpu-hs.dtbo
|
|
+
|
|
+scr-$(CONFIG_ARCH_ROCKCHIP) += \
|
|
+ rk322x-fixup.scr
|
|
+
|
|
+dtbotxt-$(CONFIG_ARCH_ROCKCHIP) += \
|
|
+ README.rk322x-overlays
|
|
+
|
|
+targets += $(dtbo-y) $(scr-y) $(dtbotxt-y)
|
|
+
|
|
+always := $(dtbo-y) $(scr-y) $(dtbotxt-y)
|
|
+clean-files := *.dtbo *.scr
|
|
+
|
|
diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
|
new file mode 100644
|
|
index 000000000..d5bc7f3d5
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays
|
|
@@ -0,0 +1,51 @@
|
|
+This document describes overlays provided in the kernel packages
|
|
+For generic Armbian overlays documentation please see
|
|
+https://docs.armbian.com/User-Guide_Allwinner_overlays/
|
|
+
|
|
+### Platform:
|
|
+
|
|
+rk322x (Rockchip)
|
|
+
|
|
+### Provided overlays:
|
|
+
|
|
+- rk322x-cpu-hs
|
|
+- rk322x-emmc
|
|
+- rk322x-nand
|
|
+- rk322x-emmc-nand
|
|
+- rk322x-led1-low
|
|
+- rk322x-led1-high
|
|
+- rk322x-led2-low
|
|
+- rk322x-led2-high
|
|
+
|
|
+### Overlay details:
|
|
+
|
|
+### rk322x-cpu-hs
|
|
+
|
|
+Activates higher CPU speed (up to 1.4ghz) for rk3228b/rk3229 boxes
|
|
+
|
|
+### emmc
|
|
+
|
|
+Activates onboard emmc device node and deactivates the nand controller.
|
|
+Also sets up the pin controller default pull up/down configuration
|
|
+
|
|
+### nand
|
|
+
|
|
+Activates onboard nand device node and deactivates the emmc controller.
|
|
+Also sets up the pin controller default pull up/down configuration
|
|
+
|
|
+### emmc-nand
|
|
+
|
|
+Activates onboard nand and emmc devices. Usually they are alternative
|
|
+because manufacturers share the same pads so emmc and nand cannot be
|
|
+mixed together. Usually this works because the emmc and nand drivers
|
|
+can automatically guess what's in the pads, but may bring instabilities
|
|
+or misdetections. Also does not set up the pin controller default
|
|
+configuration, which in turn can be detrimental of stability and
|
|
+performance
|
|
+
|
|
+### rk322x-led-conf*
|
|
+
|
|
+Each device tree of this kind provides a different known wiring configuration
|
|
+(ie: gpio and active low/high) of the onboard leds. Each board manufacturer
|
|
+usually choose a different GPIO for the auxiliary led, but the main "working"
|
|
+led is always wired to the same gpio (although it may be active high or low)
|
|
diff --git a/arch/arm/boot/dts/overlay/rk322x-cpu-hs.dts b/arch/arm/boot/dts/overlay/rk322x-cpu-hs.dts
|
|
new file mode 100644
|
|
index 000000000..1c2fc79e1
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/rk322x-cpu-hs.dts
|
|
@@ -0,0 +1,28 @@
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+
|
|
+ fragment@0 {
|
|
+ target = <&cpu0_opp_table>;
|
|
+ __overlay__ {
|
|
+
|
|
+ opp-1296000000 {
|
|
+ opp-hz = /bits/ 64 <1296000000>;
|
|
+ opp-microvolt = <1325000 1325000 1400000>;
|
|
+ };
|
|
+ opp-1392000000 {
|
|
+ opp-hz = /bits/ 64 <1392000000>;
|
|
+ opp-microvolt = <1350000 1350000 1400000>;
|
|
+ };
|
|
+ /*
|
|
+ opp-1464000000 {
|
|
+ opp-hz = /bits/ 64 <1464000000>;
|
|
+ opp-microvolt = <1400000 1400000 1400000>;
|
|
+ };
|
|
+ */
|
|
+
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/overlay/rk322x-emmc-nand.dts b/arch/arm/boot/dts/overlay/rk322x-emmc-nand.dts
|
|
new file mode 100644
|
|
index 000000000..b451da657
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/rk322x-emmc-nand.dts
|
|
@@ -0,0 +1,22 @@
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+
|
|
+ fragment@0 {
|
|
+ target = <&emmc>;
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ mmc-ddr-1_8v;
|
|
+ rockchip,default-sample-phase = <180>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target = <&nandc>;
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/overlay/rk322x-emmc.dts b/arch/arm/boot/dts/overlay/rk322x-emmc.dts
|
|
new file mode 100644
|
|
index 000000000..f3b262ef7
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/rk322x-emmc.dts
|
|
@@ -0,0 +1,24 @@
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+
|
|
+ fragment@0 {
|
|
+ target = <&emmc>;
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8 &emmc_pwr &emmc_rst>;
|
|
+ mmc-ddr-1_8v;
|
|
+ rockchip,default-sample-phase = <180>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target = <&nandc>;
|
|
+ __overlay__ {
|
|
+ status = "disabled";
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/overlay/rk322x-fixup.scr-cmd b/arch/arm/boot/dts/overlay/rk322x-fixup.scr-cmd
|
|
new file mode 100644
|
|
index 000000000..d4c39e20a
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/rk322x-fixup.scr-cmd
|
|
@@ -0,0 +1,4 @@
|
|
+# overlays fixup script
|
|
+# implements (or rather substitutes) overlay arguments functionality
|
|
+# using u-boot scripting, environment variables and "fdt" command
|
|
+
|
|
diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf1.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf1.dts
|
|
new file mode 100644
|
|
index 000000000..053947ce8
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/rk322x-led-conf1.dts
|
|
@@ -0,0 +1,41 @@
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+#include <dt-bindings/gpio/gpio.h>
|
|
+#include <dt-bindings/pinctrl/rockchip.h>
|
|
+
|
|
+/ {
|
|
+
|
|
+ fragment@0 {
|
|
+ target-path = "/gpio-leds";
|
|
+ __overlay__ {
|
|
+
|
|
+ working {
|
|
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
|
|
+ linux,default-trigger = "none";
|
|
+ };
|
|
+
|
|
+ auxiliary {
|
|
+ gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
|
|
+ label = "auxiliary";
|
|
+ linux,default-trigger = "mmc2";
|
|
+ default-state = "off";
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&gpio_led_aux>;
|
|
+ };
|
|
+
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target-path = "/pinctrl/gpio";
|
|
+ __overlay__ {
|
|
+
|
|
+ gpio_led_aux: gpio-led-aux {
|
|
+ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
+ };
|
|
+
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf2.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf2.dts
|
|
new file mode 100644
|
|
index 000000000..a3b0bfcee
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/rk322x-led-conf2.dts
|
|
@@ -0,0 +1,41 @@
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+#include <dt-bindings/gpio/gpio.h>
|
|
+#include <dt-bindings/pinctrl/rockchip.h>
|
|
+
|
|
+/ {
|
|
+
|
|
+ fragment@0 {
|
|
+ target-path = "/gpio-leds";
|
|
+ __overlay__ {
|
|
+
|
|
+ working {
|
|
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_LOW>;
|
|
+ linux,default-trigger = "none";
|
|
+ };
|
|
+
|
|
+ auxiliary {
|
|
+ gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_LOW>;
|
|
+ label = "auxiliary";
|
|
+ linux,default-trigger = "mmc2";
|
|
+ default-state = "off";
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&gpio_led_aux>;
|
|
+ };
|
|
+
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target-path = "/pinctrl/gpio";
|
|
+ __overlay__ {
|
|
+
|
|
+ gpio_led_aux: gpio-led-aux {
|
|
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
+ };
|
|
+
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts
|
|
new file mode 100644
|
|
index 000000000..5675f5b3d
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlay/rk322x-nand.dts
|
|
@@ -0,0 +1,22 @@
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+
|
|
+ fragment@0 {
|
|
+ target = <&nandc>;
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ pinctrl-0 = <&flash_cs0 &flash_cs1 &flash_cs2 &flash_cs3 &flash_rdy &flash_ale &flash_cle &flash_wrn &flash_bus8 &flash_dqs &flash_wp>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target = <&emmc>;
|
|
+ __overlay__ {
|
|
+ status = "disabled";
|
|
+ };
|
|
+ };
|
|
+
|
|
+};
|