mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-27 15:06:29 +00:00
Cleanup Tinker Board patches (#846)
* Remove rk3288-xt-q8l-v10.dts related patches We only support ASUS Tinker Board, so no need for those patches. * Remove unnecessary patches and rebase some for Tinker Board S Some patches only apply to the Tinker Board device tree. Rebase them to apply to the dtsi file so they apply for both boards, the Tinker Board and the Tinker Board S board.
This commit is contained in:
Stefan Agner
GitHub
parent
f892334077
commit
0ae67991d1
@ -1,7 +1,8 @@
|
|||||||
From 2c2e60256f2cbb2fce50a6317f85b1500efd1a6c Mon Sep 17 00:00:00 2001
|
From 2ae3821fd824560ef2db3c87cfbec985177911f6 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599249626.git.stefan@agner.ch>
|
||||||
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
||||||
Date: Mon, 5 Nov 2018 22:03:26 +0100
|
Date: Mon, 5 Nov 2018 22:03:26 +0100
|
||||||
Subject: [PATCH] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins
|
Subject: [PATCH 1/2] ARM: DTS: rk3288-tinker: Setup the Bluetooth UART pins
|
||||||
|
|
||||||
The most essential being the RTS pin, which is clearly needed to
|
The most essential being the RTS pin, which is clearly needed to
|
||||||
upload the initial configuration into the Realtek Bluetooth
|
upload the initial configuration into the Realtek Bluetooth
|
||||||
@ -39,24 +40,25 @@ echo 1 > value &&
|
|||||||
sleep 1
|
sleep 1
|
||||||
|
|
||||||
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
||||||
|
[move change to rk3288-tinker.dtsi]
|
||||||
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||||
---
|
---
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 6 ++++++
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 2 ++
|
||||||
1 file changed, 6 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
index d4df13bed..b92e59c1e 100644
|
index acfaa12ec239..284e7982925d 100644
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
@@ -73,3 +73,9 @@
|
@@ -492,6 +492,8 @@ &tsadc {
|
||||||
status = "okay";
|
|
||||||
supports-sdio;
|
|
||||||
};
|
};
|
||||||
+
|
|
||||||
+&uart0 {
|
&uart0 {
|
||||||
+ pinctrl-names = "default";
|
+ pinctrl-names = "default";
|
||||||
+ pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
|
+ pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
|
||||||
+};
|
status = "okay";
|
||||||
+
|
};
|
||||||
--
|
|
||||||
2.16.4
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
From fc25c993bf2feb6e66d55bf03eb725ec688e47eb Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <fc25c993bf2feb6e66d55bf03eb725ec688e47eb.1599250914.git.stefan@agner.ch>
|
||||||
|
In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
||||||
|
Date: Mon, 5 Nov 2018 22:15:14 +0100
|
||||||
|
Subject: [PATCH 2/3] ARM: DTS: rk3288-tinker: Defining the SPI interface
|
||||||
|
|
||||||
|
Taken from, and tested by @TonyMac32 .
|
||||||
|
|
||||||
|
Well, the original one was tested by him but I had to adapt the
|
||||||
|
registers definitions to the new 64-bits LPAE-compliant syntax.
|
||||||
|
|
||||||
|
Therefore that *might* break, along with a few other patches.
|
||||||
|
|
||||||
|
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
||||||
|
[move change to rk3288-tinker.dtsi]
|
||||||
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 19 +++++++++++++++++++
|
||||||
|
1 file changed, 19 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
index 284e7982925d..d6cc66ab5bb1 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
@@ -485,6 +485,25 @@ &sdio0 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&spi2 {
|
||||||
|
+ max-freq = <50000000>;
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ spidev@0 {
|
||||||
|
+ compatible = "rockchip,spi_tinker";
|
||||||
|
+ reg = <0x0 0>;
|
||||||
|
+ spi-max-frequency = <50000000>;
|
||||||
|
+ spi-cpha = <1>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ spidev@1 {
|
||||||
|
+ compatible = "rockchip,spi_tinker";
|
||||||
|
+ reg = <0x1>;
|
||||||
|
+ spi-max-frequency = <50000000>;
|
||||||
|
+ spi-cpha = <1>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&tsadc {
|
||||||
|
rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
|
||||||
|
rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
From 3a9d71847ae869ffdb2b0818aa86a36d57d96331 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <3a9d71847ae869ffdb2b0818aa86a36d57d96331.1599250914.git.stefan@agner.ch>
|
||||||
|
In-Reply-To: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
References: <2ae3821fd824560ef2db3c87cfbec985177911f6.1599250914.git.stefan@agner.ch>
|
||||||
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
|
Date: Fri, 4 Sep 2020 21:57:55 +0200
|
||||||
|
Subject: [PATCH 3/3] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker
|
||||||
|
|
||||||
|
Enable I2C devices which are accessible via 40-pin header.
|
||||||
|
|
||||||
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
index d6cc66ab5bb1..7af5818ac77c 100644
|
||||||
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
||||||
|
@@ -344,10 +344,18 @@ regulator-state-mem {
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
+&i2c1 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&i2c2 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
+&i2c4 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
&i2c5 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
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/regulator/of_regulator.h>
|
|
||||||
#include <linux/regmap.h>
|
|
||||||
#include <dt-bindings/regulator/active-semi,8865-regulator.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 */
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From 604ea7fc311af2b3a41e7fe3b4fbde0ee03dfb9c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 19 Oct 2017 21:09:50 +0200
|
|
||||||
Subject: [PATCH 04/28] dts: rk3288: miqi: Enabling the Mali GPU node
|
|
||||||
|
|
||||||
Why is the MiQi the only one left without a working mali GPU node ?
|
|
||||||
|
|
||||||
Seriously, is there a rk3288 chipset WITHOUT a mali GPU ? Couldn't
|
|
||||||
they enable it once in the DTSI, instead of defining it as "disabled"
|
|
||||||
and enabling it in every DTS file ?
|
|
||||||
|
|
||||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index 4d923aa6..3cd60674 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -149,6 +149,11 @@
|
|
||||||
status = "ok";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&gpu {
|
|
||||||
+ mali-supply = <&vdd_gpu>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&hdmi {
|
|
||||||
ddc-i2c-bus = <&i2c5>;
|
|
||||||
status = "okay";
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
From 89e5763110ca77d68a4be00cd97a638adc2401d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Willy Tarreau <w@1wt.eu>
|
|
||||||
Date: Tue, 2 Aug 2016 08:31:00 +0200
|
|
||||||
Subject: [PATCH 05/28] ARM: dts: rockchip: fix the regulator's voltage range
|
|
||||||
on MiQi board
|
|
||||||
|
|
||||||
The board declared too narrow a voltage range for the CPU and GPU
|
|
||||||
regulators, preventing it from using the full CPU frequency range.
|
|
||||||
The regulators support 712500 to 1500000 microvolts.
|
|
||||||
|
|
||||||
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
||||||
(cherry picked from commit 95330e63a9295a2632cee8cce5db80677f01857a)
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index 3cd60674..a1c3cdaa 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -168,8 +168,8 @@
|
|
||||||
fcs,suspend-voltage-selector = <1>;
|
|
||||||
reg = <0x40>;
|
|
||||||
regulator-name = "vdd_cpu";
|
|
||||||
- regulator-min-microvolt = <850000>;
|
|
||||||
- regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1500000>;
|
|
||||||
regulator-always-on;
|
|
||||||
regulator-boot-on;
|
|
||||||
regulator-enable-ramp-delay = <300>;
|
|
||||||
@@ -182,8 +182,8 @@
|
|
||||||
fcs,suspend-voltage-selector = <1>;
|
|
||||||
reg = <0x41>;
|
|
||||||
regulator-name = "vdd_gpu";
|
|
||||||
- regulator-min-microvolt = <850000>;
|
|
||||||
- regulator-max-microvolt = <1350000>;
|
|
||||||
+ regulator-min-microvolt = <712500>;
|
|
||||||
+ regulator-max-microvolt = <1500000>;
|
|
||||||
regulator-always-on;
|
|
||||||
vin-supply = <&vcc_sys>;
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
From c27e445527e949f3ef46d5326066196969c17d23 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Myy <myy@miouyouyou.fr>
|
|
||||||
Date: Sun, 12 Mar 2017 19:43:15 +0000
|
|
||||||
Subject: [PATCH 06/28] ARM: dts: rockchip: add the MiQi board's fan definition
|
|
||||||
|
|
||||||
The MiQi board is sold with an enclosure in which a fan is connected
|
|
||||||
to the second LED output, and configured by default in "heartbeat"
|
|
||||||
mode so that it rotates slowly and increases when the CPU load
|
|
||||||
increases, ensuring appropriate cooling by default. This LED output
|
|
||||||
is called "Fan" in the original kernel and connected to GPIO18
|
|
||||||
(gpiochip 0, pin 18). Here we called it "miqi:green:fan" to stay
|
|
||||||
consistent with the kernel's naming conventions.
|
|
||||||
|
|
||||||
It's worth noting that without this patch the fan doesn't work at
|
|
||||||
all, risking to make the board overheat.
|
|
||||||
|
|
||||||
Fixes: 162718c (v4.7)
|
|
||||||
Cc: Heiko Stuebner <heiko@sntech.de>
|
|
||||||
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
||||||
|
|
||||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-miqi.dts | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
index a1c3cdaa..0e383595 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
||||||
@@ -67,6 +67,13 @@
|
|
||||||
leds {
|
|
||||||
compatible = "gpio-leds";
|
|
||||||
|
|
||||||
+ fan {
|
|
||||||
+ gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ label = "miqi:green:fan";
|
|
||||||
+ linux,default-trigger = "heartbeat";
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+
|
|
||||||
work {
|
|
||||||
gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
|
|
||||||
label = "miqi:green:user";
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
||||||
@ -1,98 +0,0 @@
|
|||||||
From d5d5c53173c484a13cda62a537cbf75a5df4b0e4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 5 Nov 2018 21:58:56 +0100
|
|
||||||
Subject: [PATCH] ARM: DTS: rk3288-tinker: Enabling SDIO and Wifi
|
|
||||||
|
|
||||||
Adding the appropriate nodes in order to exploit the WiFi capabilities
|
|
||||||
of the board.
|
|
||||||
Since these capabilities are provided through SDIO, and the SDIO
|
|
||||||
nodes were not defined, these were added too.
|
|
||||||
|
|
||||||
These seems to depend on each other so they are added in one big
|
|
||||||
patch.
|
|
||||||
|
|
||||||
Split if necessary.
|
|
||||||
|
|
||||||
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 62 +++++++++++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 62 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 1e43527aa..d4df13bed 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -6,8 +6,70 @@
|
|
||||||
/dts-v1/;
|
|
||||||
|
|
||||||
#include "rk3288-tinker.dtsi"
|
|
||||||
+#include <dt-bindings/clock/rockchip,rk808.h>
|
|
||||||
|
|
||||||
/ {
|
|
||||||
model = "Rockchip RK3288 Asus Tinker Board";
|
|
||||||
compatible = "asus,rk3288-tinker", "rockchip,rk3288";
|
|
||||||
+
|
|
||||||
+ /* This is essential to get SDIO devices working.
|
|
||||||
+ The Wifi depends on SDIO ! */
|
|
||||||
+ sdio_pwrseq: sdio-pwrseq {
|
|
||||||
+ compatible = "mmc-pwrseq-simple";
|
|
||||||
+ clocks = <&rk808 RK808_CLKOUT1>;
|
|
||||||
+ clock-names = "ext_clock";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&chip_enable_h>, <&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 = <&gpio4 28 GPIO_ACTIVE_LOW>, <&gpio4 27 GPIO_ACTIVE_LOW>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ wireless-wlan {
|
|
||||||
+ compatible = "wlan-platdata";
|
|
||||||
+ rockchip,grf = <&grf>;
|
|
||||||
+ sdio_vref = <1800>;
|
|
||||||
+ status = "okay";
|
|
||||||
+ wifi_chip_type = "8723bs";
|
|
||||||
+ WIFI,host_wake_irq = <&gpio4 30 GPIO_ACTIVE_HIGH>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&io_domains {
|
|
||||||
+ wifi-supply = <&vcc_18>;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&pinctrl {
|
|
||||||
+ sdio-pwrseq {
|
|
||||||
+ wifi_enable_h: wifienable-h {
|
|
||||||
+ rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ chip_enable_h: chip-enable-h {
|
|
||||||
+ rockchip,pins = <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&sdio0 {
|
|
||||||
+ bus-width = <4>;
|
|
||||||
+ cap-sd-highspeed;
|
|
||||||
+ cap-sdio-irq;
|
|
||||||
+ clock-frequency = <50000000>;
|
|
||||||
+ clock-freq-min-max = <200000 50000000>;
|
|
||||||
+ disable-wp;
|
|
||||||
+ keep-power-in-suspend;
|
|
||||||
+ mmc-pwrseq = <&sdio_pwrseq>;
|
|
||||||
+ non-removable;
|
|
||||||
+ num-slots = <1>;
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
|
|
||||||
+ sd-uhs-sdr104;
|
|
||||||
+ status = "okay";
|
|
||||||
+ supports-sdio;
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.16.4
|
|
||||||
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
From a72e0749acad92df7b854e38e97e1dc7b4799abe Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 5 Nov 2018 22:11:24 +0100
|
|
||||||
Subject: [PATCH] ARM: DTS: rk3288-tinker: Defined the I2C interfaces
|
|
||||||
|
|
||||||
And all the hardware behind.
|
|
||||||
|
|
||||||
Taken from @TonyMac32, Butchered by @Miouyouyou .
|
|
||||||
|
|
||||||
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 25 +++++++++++++++++++++++++
|
|
||||||
1 file changed, 25 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index b92e59c1e..96d05fc6b 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -40,6 +40,31 @@
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
+&i2c1 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c2 {
|
|
||||||
+ afc0:af-controller@0 {
|
|
||||||
+ status = "okay";
|
|
||||||
+ compatible = "silicon touch,vm149C-v4l2-i2c-subdev";
|
|
||||||
+ reg = <0x0 0x0c>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ eeprom:m24c08@50 {
|
|
||||||
+ compatible = "at,24c08";
|
|
||||||
+ reg = <0x50>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c3 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+&i2c4 {
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&io_domains {
|
|
||||||
wifi-supply = <&vcc_18>;
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.16.4
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From b24b8f83e150811ad54ee2a4843e44cd1421fafa Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
|
||||||
Date: Mon, 5 Nov 2018 22:15:14 +0100
|
|
||||||
Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface
|
|
||||||
|
|
||||||
Taken from, and tested by @TonyMac32 .
|
|
||||||
|
|
||||||
Well, the original one was tested by him but I had to adapt the
|
|
||||||
registers definitions to the new 64-bits LPAE-compliant syntax.
|
|
||||||
|
|
||||||
Therefore that *might* break, along with a few other patches.
|
|
||||||
|
|
||||||
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-tinker.dts | 19 +++++++++++++++++++
|
|
||||||
1 file changed, 19 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
index 96d05fc6b..17bfea298 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-tinker.dts
|
|
||||||
@@ -99,6 +99,25 @@
|
|
||||||
supports-sdio;
|
|
||||||
};
|
|
||||||
|
|
||||||
+&spi2 {
|
|
||||||
+ max-freq = <50000000>;
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ spidev@0 {
|
|
||||||
+ compatible = "rockchip,spi_tinker";
|
|
||||||
+ reg = <0x0 0>;
|
|
||||||
+ spi-max-frequency = <50000000>;
|
|
||||||
+ spi-cpha = <1>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ spidev@1 {
|
|
||||||
+ compatible = "rockchip,spi_tinker";
|
|
||||||
+ reg = <0x1>;
|
|
||||||
+ spi-max-frequency = <50000000>;
|
|
||||||
+ spi-cpha = <1>;
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&uart0 {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
|
|
||||||
--
|
|
||||||
2.16.4
|
|
||||||
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
From 9177b30ab083dbda2bede3b3d61ef71ad4b1ffe0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Miouyouyou (Myy)" <myy@miouyouyou.fr>
|
|
||||||
Date: Thu, 1 Nov 2018 21:31:26 +0100
|
|
||||||
Subject: [PATCH 2/2] arm: dts: veyron: Added a flag to disable cache flush
|
|
||||||
during reset
|
|
||||||
|
|
||||||
Flushing the MMC cache of ASUS Chromebooks during initialization or
|
|
||||||
"recovery" generates 10 minutes hangup, according to @SolidHal.
|
|
||||||
|
|
||||||
This is an adaptation of @SolidHal, in order to pinpoint the fix to
|
|
||||||
Veyron Chromebooks, and avoiding issues other RK3288 boards.
|
|
||||||
|
|
||||||
Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/rk3288-veyron.dtsi | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
|
|
||||||
index 2075120cf..fa4951fd7 100644
|
|
||||||
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
|
|
||||||
@@ -123,6 +123,7 @@
|
|
||||||
mmc-hs200-1_8v;
|
|
||||||
mmc-pwrseq = <&emmc_pwrseq>;
|
|
||||||
non-removable;
|
|
||||||
+ no-recovery-cache-flush;
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
|
|
||||||
};
|
|
||||||
--
|
|
||||||
2.16.4
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,13 +0,0 @@
|
|||||||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
|
||||||
index 37a3de760..6bcfceede 100644
|
|
||||||
--- a/arch/arm/boot/dts/Makefile
|
|
||||||
+++ b/arch/arm/boot/dts/Makefile
|
|
||||||
@@ -832,6 +832,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
|
|
||||||
rk3188-radxarock.dtb \
|
|
||||||
rk3228-evb.dtb \
|
|
||||||
rk3229-evb.dtb \
|
|
||||||
+ rk3288-xt-q8l-v10.dtb \
|
|
||||||
rk3229-xms6.dtb \
|
|
||||||
rk3288-evb-act8846.dtb \
|
|
||||||
rk3288-evb-rk808.dtb \
|
|
||||||
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
diff --git a/drivers/media/rc/keymaps/rc-xt-q8l-v10.c b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
|
|
||||||
index e69de29..19c7d9e 100644
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/media/rc/keymaps/rc-xt-q8l-v10.c
|
|
||||||
@@ -0,0 +1,76 @@
|
|
||||||
+// SPDX-License-Identifier: GPL-2.0+
|
|
||||||
+// rc-xt-q8l-v10.c - Keytable for xt-q8l-v10 tv box remote controller
|
|
||||||
+//
|
|
||||||
+// keymap imported from ir-keymaps.c
|
|
||||||
+//
|
|
||||||
+// Copyright (c) 2018 Paolo Sabatino
|
|
||||||
+
|
|
||||||
+#include <media/rc-map.h>
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+
|
|
||||||
+*/
|
|
||||||
+
|
|
||||||
+static struct rc_map_table xt_q8l_v10[] = {
|
|
||||||
+
|
|
||||||
+ { 0xcc1d11, KEY_ENTER },
|
|
||||||
+ { 0xcc1d00, KEY_POWER },
|
|
||||||
+ { 0xcc1d15, KEY_PLAYPAUSE },
|
|
||||||
+ { 0xcc1d16, KEY_STOP },
|
|
||||||
+ { 0xcc1d06, KEY_PREVIOUSSONG },
|
|
||||||
+ { 0xcc1d0a, KEY_NEXTSONG },
|
|
||||||
+ { 0xcc1d41, KEY_1 },
|
|
||||||
+ { 0xcc1d45, KEY_2 },
|
|
||||||
+ { 0xcc1d4d, KEY_3 },
|
|
||||||
+ { 0xcc1d42, KEY_4 },
|
|
||||||
+ { 0xcc1d46, KEY_5 },
|
|
||||||
+ { 0xcc1d4e, KEY_6 },
|
|
||||||
+ { 0xcc1d43, KEY_7 },
|
|
||||||
+ { 0xcc1d47, KEY_8 },
|
|
||||||
+ { 0xcc1d4f, KEY_9 },
|
|
||||||
+ { 0xcc1d49, KEY_0 },
|
|
||||||
+ { 0xcc1d4a, KEY_BACKSPACE },
|
|
||||||
+ { 0xcc1d48, KEY_F6 },
|
|
||||||
+ { 0xcc1d03, KEY_HOME },
|
|
||||||
+ { 0xcc1d0f, KEY_BACK },
|
|
||||||
+ { 0xcc1d40, KEY_MENU },
|
|
||||||
+ { 0xcc1d4c, KEY_TEXT },
|
|
||||||
+ { 0xcc1d10, KEY_LEFT },
|
|
||||||
+ { 0xcc1d12, KEY_RIGHT },
|
|
||||||
+ { 0xcc1d44, KEY_DOWN },
|
|
||||||
+ { 0xcc1d07, KEY_UP },
|
|
||||||
+ { 0xcc1d02, KEY_VOLUMEDOWN },
|
|
||||||
+ { 0xcc1d0c, KEY_MUTE },
|
|
||||||
+ { 0xcc1d0e, KEY_VOLUMEUP },
|
|
||||||
+ { 0xcc1d01, KEY_F1 },
|
|
||||||
+ { 0xcc1d05, KEY_F2 },
|
|
||||||
+ { 0xcc1d09, KEY_F3 },
|
|
||||||
+ { 0xcc1d0d, KEY_F4 },
|
|
||||||
+
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static struct rc_map_list xt_q8l_v10_map = {
|
|
||||||
+ .map = {
|
|
||||||
+ .scan = xt_q8l_v10,
|
|
||||||
+ .size = ARRAY_SIZE(xt_q8l_v10),
|
|
||||||
+ .rc_proto = RC_PROTO_NEC, /* Legacy IR type */
|
|
||||||
+ .name = RC_MAP_XT_Q8L_V10,
|
|
||||||
+ }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int __init init_rc_map_xt_q8l_v10(void)
|
|
||||||
+{
|
|
||||||
+ return rc_map_register(&xt_q8l_v10_map);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void __exit exit_rc_map_xt_q8l_v10(void)
|
|
||||||
+{
|
|
||||||
+ rc_map_unregister(&xt_q8l_v10_map);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+module_init(init_rc_map_xt_q8l_v10)
|
|
||||||
+module_exit(exit_rc_map_xt_q8l_v10)
|
|
||||||
+
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+MODULE_AUTHOR("Paolo Sabatino");
|
|
||||||
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
|
|
||||||
index d621acadf..ad7abdb97 100644
|
|
||||||
--- a/include/media/rc-map.h
|
|
||||||
+++ b/include/media/rc-map.h
|
|
||||||
@@ -278,6 +278,7 @@ struct rc_map *rc_map_get(const char *name);
|
|
||||||
#define RC_MAP_WINFAST_USBII_DELUXE "rc-winfast-usbii-deluxe"
|
|
||||||
#define RC_MAP_SU3000 "rc-su3000"
|
|
||||||
#define RC_MAP_XBOX_DVD "rc-xbox-dvd"
|
|
||||||
+#define RC_MAP_XT_Q8L_V10 "rc-xt-q8l-v10"
|
|
||||||
#define RC_MAP_X96MAX "rc-x96max"
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
|
|
||||||
index 5b1399af6..ec9ce1206 100644
|
|
||||||
--- a/drivers/media/rc/keymaps/Makefile
|
|
||||||
+++ b/drivers/media/rc/keymaps/Makefile
|
|
||||||
@@ -117,4 +117,5 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
|
|
||||||
rc-winfast-usbii-deluxe.o \
|
|
||||||
rc-su3000.o \
|
|
||||||
rc-xbox-dvd.o \
|
|
||||||
+ rc-xt-q8l-v10.o \
|
|
||||||
rc-x96max.o \
|
|
||||||
Loading…
x
Reference in New Issue
Block a user