diff --git a/patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patc.disabled b/patch/u-boot/u-boot-sunxi/add-a64-orangepiwinplus-emmc-support.patch similarity index 61% rename from patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patc.disabled rename to patch/u-boot/u-boot-sunxi/add-a64-orangepiwinplus-emmc-support.patch index 5bc7896704..d5f6542cf6 100644 --- a/patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patc.disabled +++ b/patch/u-boot/u-boot-sunxi/add-a64-orangepiwinplus-emmc-support.patch @@ -1,19 +1,9 @@ diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-a64-orangepi-win.dts -old mode 100644 -new mode 100755 index 2c39d10..819fd97 --- a/arch/arm/dts/sun50i-a64-orangepi-win.dts +++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts -@@ -52,6 +52,7 @@ - - aliases { - serial0 = &uart0; -+ serial1 = &uart1; +@@ -151,6 +151,16 @@ }; - - chosen { -@@ -63,11 +63,43 @@ - status = "okay"; }; +&i2c1 { @@ -22,7 +12,6 @@ index 2c39d10..819fd97 + status = "okay"; +}; + -+ +&i2c1_pins { + bias-pull-up; +}; @@ -30,45 +19,23 @@ index 2c39d10..819fd97 &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; - vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; -+ disable-wp; -+ bus-width = <4>; -+ status = "okay"; -+}; -+ -+&mmc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc1_pins>; -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+}; -+ +@@ -172,6 +182,16 @@ + status = "okay"; + }; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; -+ vmmc-supply = <®_vcc3v3>; ++ vmmc-supply = <®_dcdc1>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; - status = "okay"; - }; - -@@ -109,6 +142,12 @@ - status = "okay"; - }; - -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; -+ status = "okay"; ++ status = "okay"; +}; + - &usbphy { - usb1_vbus-supply = <®_usb1_vbus>; + &ohci0 { status = "okay"; + }; diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig index ab889ea..6f16cc0 100644 --- a/configs/orangepi_win_defconfig