few more fixes, this time for a83t SoC devices
This commit is contained in:
parent
53c3d27d79
commit
f9b692a09e
@ -1,19 +1,23 @@
|
||||
From 5322208dbdf97b2d618364fced3420d209a8dba0 Mon Sep 17 00:00:00 2001
|
||||
From 4f26cacd28d71fd7d051b560f550863679a5f04b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Wed, 10 Feb 2021 11:01:01 +0000
|
||||
Date: Wed, 10 Feb 2021 13:58:20 +0000
|
||||
Subject: [PATCH] arm: dts: allwinner: sync from linux for RGMII RX/TX delay
|
||||
fixes
|
||||
|
||||
Sync over a subset of the AllWinner dts changes from Linux 5.11
|
||||
for the RGMII RX/TX delay network fixes.
|
||||
|
||||
This pulls other bits in needed to sync the whole files, the bits
|
||||
are other minor fixes, or pieces of DT that don't affect U-Boot.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm/dts/axp81x.dtsi | 9 +
|
||||
arch/arm/dts/sun50i-a64-bananapi-m64.dts | 10 +-
|
||||
arch/arm/dts/sun50i-a64-orangepi-win.dts | 10 +-
|
||||
arch/arm/dts/sun50i-a64-pine64-plus.dts | 2 +-
|
||||
arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 10 +-
|
||||
arch/arm/dts/sun50i-a64.dtsi | 34 ++-
|
||||
arch/arm/dts/sun50i-a64.dtsi | 34 +-
|
||||
.../dts/sun50i-h5-bananapi-m2-plus-v1.2.dts | 1 +
|
||||
.../arm/dts/sun50i-h5-libretech-all-h5-cc.dts | 2 +-
|
||||
arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 2 +-
|
||||
@ -33,25 +37,51 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
arch/arm/dts/sun7i-a20-m3.dts | 12 +-
|
||||
arch/arm/dts/sun7i-a20-olimex-som-evb.dts | 12 +-
|
||||
arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 24 +-
|
||||
arch/arm/dts/sun7i-a20-olinuxino-lime.dts | 30 +--
|
||||
arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 44 ++--
|
||||
arch/arm/dts/sun7i-a20-olinuxino-micro.dts | 30 +--
|
||||
arch/arm/dts/sun7i-a20-olinuxino-lime.dts | 30 +-
|
||||
arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 44 +--
|
||||
arch/arm/dts/sun7i-a20-olinuxino-micro.dts | 30 +-
|
||||
arch/arm/dts/sun7i-a20-orangepi-mini.dts | 24 +-
|
||||
arch/arm/dts/sun7i-a20-orangepi.dts | 24 +-
|
||||
arch/arm/dts/sun7i-a20-pcduino3-nano.dts | 28 +--
|
||||
arch/arm/dts/sun7i-a20-pcduino3-nano.dts | 28 +-
|
||||
arch/arm/dts/sun7i-a20-pcduino3.dts | 24 +-
|
||||
arch/arm/dts/sun7i-a20-wexler-tab7200.dts | 12 +-
|
||||
arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts | 24 +-
|
||||
arch/arm/dts/sun7i-a20.dtsi | 218 +++++++++++++++++-
|
||||
arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 53 ++++-
|
||||
arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 71 +++++-
|
||||
arch/arm/dts/sun7i-a20.dtsi | 218 +++++++++++-
|
||||
arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 53 ++-
|
||||
arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 71 +++-
|
||||
arch/arm/dts/sun8i-a83t.dtsi | 310 ++++++++++++++++--
|
||||
arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 5 -
|
||||
arch/arm/dts/sun8i-h3-orangepi-plus2e.dts | 2 +-
|
||||
arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts | 38 +++
|
||||
arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 12 +-
|
||||
arch/arm/dts/sunxi-bananapi-m2-plus.dtsi | 2 +-
|
||||
41 files changed, 661 insertions(+), 318 deletions(-)
|
||||
43 files changed, 947 insertions(+), 351 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/dts/axp81x.dtsi b/arch/arm/dts/axp81x.dtsi
|
||||
index 043c717dce..1dfeeceabf 100644
|
||||
--- a/arch/arm/dts/axp81x.dtsi
|
||||
+++ b/arch/arm/dts/axp81x.dtsi
|
||||
@@ -48,6 +48,11 @@
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <1>;
|
||||
|
||||
+ ac_power_supply: ac-power-supply {
|
||||
+ compatible = "x-powers,axp813-ac-power-supply";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
axp_adc: adc {
|
||||
compatible = "x-powers,axp813-adc";
|
||||
#io-channel-cells = <1>;
|
||||
@@ -166,4 +171,8 @@
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
+
|
||||
+ usb_power_supply: usb-power-supply {
|
||||
+ compatible = "x-powers,axp813-usb-power-supply";
|
||||
+ };
|
||||
};
|
||||
diff --git a/arch/arm/dts/sun50i-a64-bananapi-m64.dts b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
||||
index 883f217efb..e5e840b9fb 100644
|
||||
--- a/arch/arm/dts/sun50i-a64-bananapi-m64.dts
|
||||
@ -2247,6 +2277,559 @@ index 5dba4fc310..d8326a5c68 100644
|
||||
usb1_vbus-supply = <®_usb1_vbus>;
|
||||
usb2_vbus-supply = <®_usb2_vbus>;
|
||||
status = "okay";
|
||||
diff --git a/arch/arm/dts/sun8i-a83t.dtsi b/arch/arm/dts/sun8i-a83t.dtsi
|
||||
index 2be23d6009..c010b27fdb 100644
|
||||
--- a/arch/arm/dts/sun8i-a83t.dtsi
|
||||
+++ b/arch/arm/dts/sun8i-a83t.dtsi
|
||||
@@ -50,6 +50,7 @@
|
||||
#include <dt-bindings/reset/sun8i-a83t-ccu.h>
|
||||
#include <dt-bindings/reset/sun8i-de2.h>
|
||||
#include <dt-bindings/reset/sun8i-r-ccu.h>
|
||||
+#include <dt-bindings/thermal/thermal.h>
|
||||
|
||||
/ {
|
||||
interrupt-parent = <&gic>;
|
||||
@@ -61,79 +62,91 @@
|
||||
#size-cells = <0>;
|
||||
|
||||
cpu0: cpu@0 {
|
||||
- clocks = <&ccu CLK_C0CPUX>;
|
||||
- clock-names = "cpu";
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C0CPUX>;
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
cci-control-port = <&cci_control0>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <0>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
- cpu@1 {
|
||||
+ cpu1: cpu@1 {
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C0CPUX>;
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
cci-control-port = <&cci_control0>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <1>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
- cpu@2 {
|
||||
+ cpu2: cpu@2 {
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C0CPUX>;
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
cci-control-port = <&cci_control0>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <2>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
- cpu@3 {
|
||||
+ cpu3: cpu@3 {
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C0CPUX>;
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
cci-control-port = <&cci_control0>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <3>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
cpu100: cpu@100 {
|
||||
- clocks = <&ccu CLK_C1CPUX>;
|
||||
- clock-names = "cpu";
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C1CPUX>;
|
||||
operating-points-v2 = <&cpu1_opp_table>;
|
||||
cci-control-port = <&cci_control1>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <0x100>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
- cpu@101 {
|
||||
+ cpu101: cpu@101 {
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C1CPUX>;
|
||||
operating-points-v2 = <&cpu1_opp_table>;
|
||||
cci-control-port = <&cci_control1>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <0x101>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
- cpu@102 {
|
||||
+ cpu102: cpu@102 {
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C1CPUX>;
|
||||
operating-points-v2 = <&cpu1_opp_table>;
|
||||
cci-control-port = <&cci_control1>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <0x102>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
- cpu@103 {
|
||||
+ cpu103: cpu@103 {
|
||||
compatible = "arm,cortex-a7";
|
||||
device_type = "cpu";
|
||||
+ clocks = <&ccu CLK_C1CPUX>;
|
||||
operating-points-v2 = <&cpu1_opp_table>;
|
||||
cci-control-port = <&cci_control1>;
|
||||
enable-method = "allwinner,sun8i-a83t-smp";
|
||||
reg = <0x103>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -187,11 +200,6 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
- memory {
|
||||
- reg = <0x40000000 0x80000000>;
|
||||
- device_type = "memory";
|
||||
- };
|
||||
-
|
||||
cpu0_opp_table: opp_table0 {
|
||||
compatible = "operating-points-v2";
|
||||
opp-shared;
|
||||
@@ -306,16 +314,27 @@
|
||||
|
||||
display_clocks: clock@1000000 {
|
||||
compatible = "allwinner,sun8i-a83t-de2-clk";
|
||||
- reg = <0x01000000 0x100000>;
|
||||
- clocks = <&ccu CLK_PLL_DE>,
|
||||
- <&ccu CLK_BUS_DE>;
|
||||
- clock-names = "mod",
|
||||
- "bus";
|
||||
+ reg = <0x01000000 0x10000>;
|
||||
+ clocks = <&ccu CLK_BUS_DE>,
|
||||
+ <&ccu CLK_PLL_DE>;
|
||||
+ clock-names = "bus",
|
||||
+ "mod";
|
||||
resets = <&ccu RST_BUS_DE>;
|
||||
#clock-cells = <1>;
|
||||
#reset-cells = <1>;
|
||||
};
|
||||
|
||||
+ rotate: rotate@1020000 {
|
||||
+ compatible = "allwinner,sun8i-a83t-de2-rotate";
|
||||
+ reg = <0x1020000 0x10000>;
|
||||
+ interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&display_clocks CLK_BUS_ROT>,
|
||||
+ <&display_clocks CLK_ROT>;
|
||||
+ clock-names = "bus",
|
||||
+ "mod";
|
||||
+ resets = <&display_clocks RST_ROT>;
|
||||
+ };
|
||||
+
|
||||
mixer0: mixer@1100000 {
|
||||
compatible = "allwinner,sun8i-a83t-de2-mixer-0";
|
||||
reg = <0x01100000 0x100000>;
|
||||
@@ -338,6 +357,11 @@
|
||||
reg = <0>;
|
||||
remote-endpoint = <&tcon0_in_mixer0>;
|
||||
};
|
||||
+
|
||||
+ mixer0_out_tcon1: endpoint@1 {
|
||||
+ reg = <1>;
|
||||
+ remote-endpoint = <&tcon1_in_mixer0>;
|
||||
+ };
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -356,9 +380,17 @@
|
||||
#size-cells = <0>;
|
||||
|
||||
mixer1_out: port@1 {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
reg = <1>;
|
||||
|
||||
- mixer1_out_tcon1: endpoint {
|
||||
+ mixer1_out_tcon0: endpoint@0 {
|
||||
+ reg = <0>;
|
||||
+ remote-endpoint = <&tcon0_in_mixer1>;
|
||||
+ };
|
||||
+
|
||||
+ mixer1_out_tcon1: endpoint@1 {
|
||||
+ reg = <1>;
|
||||
remote-endpoint = <&tcon1_in_mixer1>;
|
||||
};
|
||||
};
|
||||
@@ -425,6 +457,7 @@
|
||||
clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_TCON0>;
|
||||
clock-names = "ahb", "tcon-ch0";
|
||||
clock-output-names = "tcon-pixel-clock";
|
||||
+ #clock-cells = <0>;
|
||||
resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>;
|
||||
reset-names = "lcd", "lvds";
|
||||
|
||||
@@ -441,11 +474,14 @@
|
||||
reg = <0>;
|
||||
remote-endpoint = <&mixer0_out_tcon0>;
|
||||
};
|
||||
+
|
||||
+ tcon0_in_mixer1: endpoint@1 {
|
||||
+ reg = <1>;
|
||||
+ remote-endpoint = <&mixer1_out_tcon0>;
|
||||
+ };
|
||||
};
|
||||
|
||||
tcon0_out: port@1 {
|
||||
- #address-cells = <1>;
|
||||
- #size-cells = <0>;
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
@@ -465,9 +501,17 @@
|
||||
#size-cells = <0>;
|
||||
|
||||
tcon1_in: port@0 {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
reg = <0>;
|
||||
|
||||
- tcon1_in_mixer1: endpoint {
|
||||
+ tcon1_in_mixer0: endpoint@0 {
|
||||
+ reg = <0>;
|
||||
+ remote-endpoint = <&mixer0_out_tcon1>;
|
||||
+ };
|
||||
+
|
||||
+ tcon1_in_mixer1: endpoint@1 {
|
||||
+ reg = <1>;
|
||||
remote-endpoint = <&mixer1_out_tcon1>;
|
||||
};
|
||||
};
|
||||
@@ -549,6 +593,31 @@
|
||||
sid: eeprom@1c14000 {
|
||||
compatible = "allwinner,sun8i-a83t-sid";
|
||||
reg = <0x1c14000 0x400>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ ths_calibration: thermal-sensor-calibration@34 {
|
||||
+ reg = <0x34 8>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ crypto: crypto@1c15000 {
|
||||
+ compatible = "allwinner,sun8i-a83t-crypto";
|
||||
+ reg = <0x01c15000 0x1000>;
|
||||
+ interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ resets = <&ccu RST_BUS_SS>;
|
||||
+ clocks = <&ccu CLK_BUS_SS>, <&ccu CLK_SS>;
|
||||
+ clock-names = "bus", "mod";
|
||||
+ };
|
||||
+
|
||||
+ msgbox: mailbox@1c17000 {
|
||||
+ compatible = "allwinner,sun8i-a83t-msgbox",
|
||||
+ "allwinner,sun6i-a31-msgbox";
|
||||
+ reg = <0x01c17000 0x1000>;
|
||||
+ clocks = <&ccu CLK_BUS_MSGBOX>;
|
||||
+ resets = <&ccu RST_BUS_MSGBOX>;
|
||||
+ interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ #mbox-cells = <1>;
|
||||
};
|
||||
|
||||
usb_otg: usb@1c19000 {
|
||||
@@ -562,6 +631,7 @@
|
||||
phys = <&usbphy 0>;
|
||||
phy-names = "usb";
|
||||
extcon = <&usbphy 0>;
|
||||
+ dr_mode = "otg";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -649,6 +719,20 @@
|
||||
#interrupt-cells = <3>;
|
||||
#gpio-cells = <3>;
|
||||
|
||||
+ /omit-if-no-ref/
|
||||
+ csi_8bit_parallel_pins: csi-8bit-parallel-pins {
|
||||
+ pins = "PE0", "PE2", "PE3", "PE6", "PE7",
|
||||
+ "PE8", "PE9", "PE10", "PE11",
|
||||
+ "PE12", "PE13";
|
||||
+ function = "csi";
|
||||
+ };
|
||||
+
|
||||
+ /omit-if-no-ref/
|
||||
+ csi_mclk_pin: csi-mclk-pin {
|
||||
+ pins = "PE1";
|
||||
+ function = "csi";
|
||||
+ };
|
||||
+
|
||||
emac_rgmii_pins: emac-rgmii-pins {
|
||||
pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
|
||||
"PD11", "PD12", "PD13", "PD14", "PD18",
|
||||
@@ -676,6 +760,12 @@
|
||||
function = "i2c1";
|
||||
};
|
||||
|
||||
+ /omit-if-no-ref/
|
||||
+ i2c2_pe_pins: i2c2-pe-pins {
|
||||
+ pins = "PE14", "PE15";
|
||||
+ function = "i2c2";
|
||||
+ };
|
||||
+
|
||||
i2c2_ph_pins: i2c2-ph-pins {
|
||||
pins = "PH4", "PH5";
|
||||
function = "i2c2";
|
||||
@@ -747,10 +837,16 @@
|
||||
pins = "PG8", "PG9";
|
||||
function = "uart1";
|
||||
};
|
||||
+
|
||||
+ /omit-if-no-ref/
|
||||
+ uart2_pb_pins: uart2-pb-pins {
|
||||
+ pins = "PB0", "PB1";
|
||||
+ function = "uart2";
|
||||
+ };
|
||||
};
|
||||
|
||||
timer@1c20c00 {
|
||||
- compatible = "allwinner,sun4i-a10-timer";
|
||||
+ compatible = "allwinner,sun8i-a23-timer";
|
||||
reg = <0x01c20c00 0xa0>;
|
||||
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@@ -852,6 +948,39 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
+ uart2: serial@1c28800 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c28800 0x400>;
|
||||
+ interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART2>;
|
||||
+ resets = <&ccu RST_BUS_UART2>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ uart3: serial@1c28c00 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c28c00 0x400>;
|
||||
+ interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART3>;
|
||||
+ resets = <&ccu RST_BUS_UART3>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ uart4: serial@1c29000 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c29000 0x400>;
|
||||
+ interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART4>;
|
||||
+ resets = <&ccu RST_BUS_UART4>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
i2c0: i2c@1c2ac00 {
|
||||
compatible = "allwinner,sun8i-a83t-i2c",
|
||||
"allwinner,sun6i-a31-i2c";
|
||||
@@ -898,12 +1027,10 @@
|
||||
reg = <0x01c30000 0x104>;
|
||||
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "macirq";
|
||||
- resets = <&ccu 13>;
|
||||
- reset-names = "stmmaceth";
|
||||
- clocks = <&ccu 27>;
|
||||
+ clocks = <&ccu CLK_BUS_EMAC>;
|
||||
clock-names = "stmmaceth";
|
||||
- #address-cells = <1>;
|
||||
- #size-cells = <0>;
|
||||
+ resets = <&ccu RST_BUS_EMAC>;
|
||||
+ reset-names = "stmmaceth";
|
||||
status = "disabled";
|
||||
|
||||
mdio: mdio {
|
||||
@@ -914,7 +1041,7 @@
|
||||
};
|
||||
|
||||
gic: interrupt-controller@1c81000 {
|
||||
- compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
|
||||
+ compatible = "arm,gic-400";
|
||||
reg = <0x01c81000 0x1000>,
|
||||
<0x01c82000 0x2000>,
|
||||
<0x01c84000 0x2000>,
|
||||
@@ -924,6 +1051,21 @@
|
||||
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;
|
||||
};
|
||||
|
||||
+ csi: camera@1cb0000 {
|
||||
+ compatible = "allwinner,sun8i-a83t-csi";
|
||||
+ reg = <0x01cb0000 0x1000>;
|
||||
+ interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_CSI>,
|
||||
+ <&ccu CLK_CSI_SCLK>,
|
||||
+ <&ccu CLK_DRAM_CSI>;
|
||||
+ clock-names = "bus", "mod", "ram";
|
||||
+ resets = <&ccu RST_BUS_CSI>;
|
||||
+ status = "disabled";
|
||||
+
|
||||
+ csi_in: port {
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
hdmi: hdmi@1ee0000 {
|
||||
compatible = "allwinner,sun8i-a83t-dw-hdmi";
|
||||
reg = <0x01ee0000 0x10000>;
|
||||
@@ -935,7 +1077,7 @@
|
||||
resets = <&ccu RST_BUS_HDMI1>;
|
||||
reset-names = "ctrl";
|
||||
phys = <&hdmi_phy>;
|
||||
- phy-names = "hdmi-phy";
|
||||
+ phy-names = "phy";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&hdmi_pins>;
|
||||
status = "disabled";
|
||||
@@ -981,7 +1123,7 @@
|
||||
compatible = "allwinner,sun8i-a83t-r-ccu";
|
||||
reg = <0x01f01400 0x400>;
|
||||
clocks = <&osc24M>, <&osc16Md512>, <&osc16M>,
|
||||
- <&ccu 6>;
|
||||
+ <&ccu CLK_PLL_PERIPH>;
|
||||
clock-names = "hosc", "losc", "iosc", "pll-periph";
|
||||
#clock-cells = <1>;
|
||||
#reset-cells = <1>;
|
||||
@@ -992,6 +1134,26 @@
|
||||
reg = <0x1f01c00 0x400>;
|
||||
};
|
||||
|
||||
+ r_cir: ir@1f02000 {
|
||||
+ compatible = "allwinner,sun8i-a83t-ir",
|
||||
+ "allwinner,sun6i-a31-ir";
|
||||
+ clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>;
|
||||
+ clock-names = "apb", "ir";
|
||||
+ resets = <&r_ccu RST_APB0_IR>;
|
||||
+ interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg = <0x01f02000 0x400>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&r_cir_pin>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ r_lradc: lradc@1f03c00 {
|
||||
+ compatible = "allwinner,sun8i-a83t-r-lradc";
|
||||
+ reg = <0x01f03c00 0x100>;
|
||||
+ interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
r_pio: pinctrl@1f02c00 {
|
||||
compatible = "allwinner,sun8i-a83t-r-pinctrl";
|
||||
reg = <0x01f02c00 0x400>;
|
||||
@@ -1004,6 +1166,11 @@
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <3>;
|
||||
|
||||
+ r_cir_pin: r-cir-pin {
|
||||
+ pins = "PL12";
|
||||
+ function = "s_cir_rx";
|
||||
+ };
|
||||
+
|
||||
r_rsb_pins: r-rsb-pins {
|
||||
pins = "PL0", "PL1";
|
||||
function = "s_rsb";
|
||||
@@ -1026,5 +1193,82 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
};
|
||||
+
|
||||
+ ths: thermal-sensor@1f04000 {
|
||||
+ compatible = "allwinner,sun8i-a83t-ths";
|
||||
+ reg = <0x01f04000 0x100>;
|
||||
+ interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ nvmem-cells = <&ths_calibration>;
|
||||
+ nvmem-cell-names = "calibration";
|
||||
+ #thermal-sensor-cells = <1>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ thermal-zones {
|
||||
+ cpu0_thermal: cpu0-thermal {
|
||||
+ polling-delay-passive = <0>;
|
||||
+ polling-delay = <0>;
|
||||
+ thermal-sensors = <&ths 0>;
|
||||
+
|
||||
+ trips {
|
||||
+ cpu0_hot: cpu-hot {
|
||||
+ temperature = <80000>;
|
||||
+ hysteresis = <2000>;
|
||||
+ type = "passive";
|
||||
+ };
|
||||
+
|
||||
+ cpu0_very_hot: cpu-very-hot {
|
||||
+ temperature = <100000>;
|
||||
+ hysteresis = <0>;
|
||||
+ type = "critical";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ cooling-maps {
|
||||
+ cpu-hot-limit {
|
||||
+ trip = <&cpu0_hot>;
|
||||
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ cpu1_thermal: cpu1-thermal {
|
||||
+ polling-delay-passive = <0>;
|
||||
+ polling-delay = <0>;
|
||||
+ thermal-sensors = <&ths 1>;
|
||||
+
|
||||
+ trips {
|
||||
+ cpu1_hot: cpu-hot {
|
||||
+ temperature = <80000>;
|
||||
+ hysteresis = <2000>;
|
||||
+ type = "passive";
|
||||
+ };
|
||||
+
|
||||
+ cpu1_very_hot: cpu-very-hot {
|
||||
+ temperature = <100000>;
|
||||
+ hysteresis = <0>;
|
||||
+ type = "critical";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ cooling-maps {
|
||||
+ cpu-hot-limit {
|
||||
+ trip = <&cpu1_hot>;
|
||||
+ cooling-device = <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
+ <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
+ <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
|
||||
+ <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ gpu_thermal: gpu-thermal {
|
||||
+ polling-delay-passive = <0>;
|
||||
+ polling-delay = <0>;
|
||||
+ thermal-sensors = <&ths 2>;
|
||||
+ };
|
||||
};
|
||||
};
|
||||
diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts
|
||||
index 71fb732089..babf4cf1b2 100644
|
||||
--- a/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts
|
||||
|
Loading…
Reference in New Issue
Block a user