From 98314135300a20c700ee1124d3be738802a30c88 Mon Sep 17 00:00:00 2001 From: Qubot <1445788683@qq.com> Date: Sun, 22 Oct 2023 23:48:49 +0800 Subject: [PATCH] restore --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/sun50i-h616.dtsi | 29 ++++++++--------------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 90799bfd..9dea8c9c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -646,7 +646,7 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \ sun50i-h6-pine-h64-model-b.dtb \ sun50i-h6-tanix-tx6.dtb dtb-$(CONFIG_MACH_SUN50I_H616) += \ - sun50i-h616-orangepi-zero3.dtb + sun50i-h618-bananapi-m4b.dtb dtb-$(CONFIG_MACH_SUN50I) += \ sun50i-a64-amarula-relic.dtb \ sun50i-a64-bananapi-m64.dtb \ diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi index e94304b2..55ee76c4 100644 --- a/arch/arm/dts/sun50i-h616.dtsi +++ b/arch/arm/dts/sun50i-h616.dtsi @@ -184,7 +184,7 @@ }; mmc2_pins: mmc2-pins { - pins = "PC0", "PC1", "PC5", "PC6", + pins = "PC1", "PC5", "PC6", "PC8", "PC9", "PC10", "PC11", "PC13", "PC14", "PC15", "PC16"; function = "mmc2"; @@ -192,9 +192,11 @@ bias-pull-up; }; - spi0_pins: spi0-pins { - pins = "PC0", "PC2", "PC3", "PC4"; - function = "spi0"; + mmc2_ds_pin: mmc2-ds-pin { + pins = "PC0"; + function = "mmc2"; + drive-strength = <30>; + bias-pull-up; }; spi1_pins: spi1-pins { @@ -288,10 +290,10 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; status = "disabled"; + max-frequency = <150000000>; cap-sd-highspeed; cap-mmc-highspeed; mmc-ddr-3_3v; - mmc-ddr-1_8v; cap-sdio-irq; #address-cells = <1>; #size-cells = <0>; @@ -425,21 +427,6 @@ #size-cells = <0>; }; - spi0: spi@5010000 { - compatible = "allwinner,sun50i-h616-spi", - "allwinner,sun8i-h3-spi"; - reg = <0x05010000 0x1000>; - interrupts = ; - clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>; - clock-names = "ahb", "mod"; - resets = <&ccu RST_BUS_SPI0>; - pinctrl-names = "default"; - pinctrl-0 = <&spi0_pins>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; - }; - spi1: spi@5011000 { compatible = "allwinner,sun50i-h616-spi", "allwinner,sun8i-h3-spi"; @@ -735,4 +722,4 @@ #size-cells = <0>; }; }; -}; \ No newline at end of file +};