Guest User

Untitled

a guest
Feb 1st, 2020
167
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts
  2. index d5041c2c41ac..bde427195d90 100644
  3. --- a/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts
  4. +++ b/arch/arm64/boot/dts/rockchip/overlays-rockpis/rk3308-uart2-overlay.dts
  5. @@ -15,6 +15,8 @@
  6.         target = <&uart2>;
  7.         __overlay__ {
  8.             status = "okay";
  9. +           pinctrl-names = "default";
  10. +           pinctrl-0 = <&uart2_xfer>;
  11.         };
  12.     };
  13.  };
  14. diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
  15. index 6910db35eca0..8410358cd980 100644
  16. --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
  17. +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
  18. @@ -478,7 +478,7 @@
  19.         dmas = <&dmac0 6>, <&dmac0 7>;
  20.         dma-names = "tx", "rx";
  21.         pinctrl-names = "default";
  22. -       pinctrl-0 = <&uart1_xfer &uart1_cts &uart1_rts>;
  23. +       pinctrl-0 = <&uart1_xfer>;
  24.         status = "disabled";
  25.     };
  26.  
  27. @@ -493,7 +493,7 @@
  28.         dmas = <&dmac0 8>, <&dmac0 9>;
  29.         dma-names = "tx", "rx";
  30.         pinctrl-names = "default";
  31. -       pinctrl-0 = <&uart2m0_xfer>;
  32. +       pinctrl-0 = <&uart2_xfer>;
  33.         status = "disabled";
  34.     };
  35.  
  36. @@ -1864,6 +1864,7 @@
  37.                     <1 RK_PD0 1 &pcfg_pull_up>;
  38.             };
  39.  
  40. +/*
  41.             uart1_cts: uart1-cts {
  42.                 rockchip,pins =
  43.                     <1 RK_PC6 1 &pcfg_pull_none>;
  44. @@ -1873,10 +1874,11 @@
  45.                 rockchip,pins =
  46.                     <1 RK_PC7 1 &pcfg_pull_none>;
  47.             };
  48. +*/
  49.         };
  50.  
  51. -       uart2-m0 {
  52. -           uart2m0_xfer: uart2m0-xfer {
  53. +       uart2 {
  54. +           uart2_xfer: uart2-xfer {
  55.                 rockchip,pins =
  56.                     <1 RK_PC7 2 &pcfg_pull_up>,
  57.                     <1 RK_PC6 2 &pcfg_pull_up>;
  58. diff --git a/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts b/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
  59. index 183811ba9b0e..b3e81c7f798d 100644
  60. --- a/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
  61. +++ b/arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts
  62. @@ -142,7 +142,7 @@
  63.         pinctrl-0 = <&otg_vbus_drv>;
  64.         regulator-name = "vcc_otg_vbus";
  65.     };
  66. -
  67. +/*
  68.     wireless-bluetooth {
  69.         compatible = "bluetooth-platdata";
  70.         uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
  71. @@ -166,6 +166,7 @@
  72.         WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
  73.         status = "okay";
  74.     };
  75. +*/
  76.  
  77.     gpio-leds {
  78.         compatible = "gpio-leds";
RAW Paste Data