summaryrefslogtreecommitdiffstats
path: root/dts/src
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2021-05-03 14:34:20 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2021-05-03 14:34:20 +0200
commitfd4a573649a34e1da02a82875df67e0373bf6e32 (patch)
tree9e16253cf0e97a9c9cb0e18c8c7962fed1372886 /dts/src
parent02b7eaf6ab6b7c5c5f83b8742f3e43991e4cff1d (diff)
downloadbarebox-fd4a573649a34e1da02a82875df67e0373bf6e32.tar.gz
barebox-fd4a573649a34e1da02a82875df67e0373bf6e32.tar.xz
dts: update to v5.12-rc8
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src')
-rw-r--r--dts/src/arm/omap3.dtsi3
-rw-r--r--dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts4
-rw-r--r--dts/src/arm64/allwinner/sun50i-a64-sopine.dtsi2
-rw-r--r--dts/src/arm64/allwinner/sun50i-h6-beelink-gs1.dts4
-rw-r--r--dts/src/arm64/allwinner/sun50i-h6.dtsi4
5 files changed, 10 insertions, 7 deletions
diff --git a/dts/src/arm/omap3.dtsi b/dts/src/arm/omap3.dtsi
index 9dcae1f2bc..c5b9da0d7e 100644
--- a/dts/src/arm/omap3.dtsi
+++ b/dts/src/arm/omap3.dtsi
@@ -24,6 +24,9 @@
i2c0 = &i2c1;
i2c1 = &i2c2;
i2c2 = &i2c3;
+ mmc0 = &mmc1;
+ mmc1 = &mmc2;
+ mmc2 = &mmc3;
serial0 = &uart1;
serial1 = &uart2;
serial2 = &uart3;
diff --git a/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts b/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts
index 437ffe3628..e79ce49e7e 100644
--- a/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts
+++ b/dts/src/arm64/allwinner/sun50i-a64-pine64-lts.dts
@@ -19,3 +19,7 @@
};
};
};
+
+&mmc0 {
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */
+};
diff --git a/dts/src/arm64/allwinner/sun50i-a64-sopine.dtsi b/dts/src/arm64/allwinner/sun50i-a64-sopine.dtsi
index 3402cec870..df62044ff7 100644
--- a/dts/src/arm64/allwinner/sun50i-a64-sopine.dtsi
+++ b/dts/src/arm64/allwinner/sun50i-a64-sopine.dtsi
@@ -34,7 +34,7 @@
vmmc-supply = <&reg_dcdc1>;
disable-wp;
bus-width = <4>;
- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */
status = "okay";
};
diff --git a/dts/src/arm64/allwinner/sun50i-h6-beelink-gs1.dts b/dts/src/arm64/allwinner/sun50i-h6-beelink-gs1.dts
index 4f4755152f..b5808047d6 100644
--- a/dts/src/arm64/allwinner/sun50i-h6-beelink-gs1.dts
+++ b/dts/src/arm64/allwinner/sun50i-h6-beelink-gs1.dts
@@ -289,10 +289,6 @@
vcc-pm-supply = <&reg_aldo1>;
};
-&rtc {
- clocks = <&ext_osc32k>;
-};
-
&spdif {
status = "okay";
};
diff --git a/dts/src/arm64/allwinner/sun50i-h6.dtsi b/dts/src/arm64/allwinner/sun50i-h6.dtsi
index 49e9797940..af8b7d0ef7 100644
--- a/dts/src/arm64/allwinner/sun50i-h6.dtsi
+++ b/dts/src/arm64/allwinner/sun50i-h6.dtsi
@@ -995,9 +995,9 @@
compatible = "allwinner,sun8i-a23-rsb";
reg = <0x07083000 0x400>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&r_ccu 13>;
+ clocks = <&r_ccu CLK_R_APB2_RSB>;
clock-frequency = <3000000>;
- resets = <&r_ccu 7>;
+ resets = <&r_ccu RST_R_APB2_RSB>;
pinctrl-names = "default";
pinctrl-0 = <&r_rsb_pins>;
status = "disabled";