150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
33 lines
925 B
Diff
33 lines
925 B
Diff
diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts
|
|
index 2249c08d..5fe27ff9 100644
|
|
--- a/arch/arm/boot/dts/rk3288-miniarm.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-miniarm.dts
|
|
@@ -63,18 +63,6 @@
|
|
reg = <0x0 0x0 0x0 0x80000000>;
|
|
};
|
|
|
|
- wireless-bluetooth {
|
|
- compatible = "bluetooth-platdata";
|
|
- uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
|
|
- pinctrl-names = "default","rts_gpio";
|
|
- pinctrl-0 = <&uart0_rts>;
|
|
- pinctrl-1 = <&uart0_gpios>;
|
|
- BT,reset_gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;
|
|
- BT,wake_gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>;
|
|
- BT,wake_host_irq = <&gpio4 31 GPIO_ACTIVE_HIGH>;
|
|
- status = "okay";
|
|
- };
|
|
-
|
|
wireless-wlan {
|
|
compatible = "wlan-platdata";
|
|
rockchip,grf = <&grf>;
|
|
@@ -673,7 +661,7 @@
|
|
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
- pinctrl-0 = <&uart0_xfer>, <&uart0_cts>;
|
|
+ pinctrl-0 = <&uart0_xfer>, <&uart0_cts>, <&uart0_rts>;
|
|
status = "okay";
|
|
};
|
|
|