Updated the beaglebone cape patch files

diff --git a/patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-wl1835-cape-support.patch b/patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1835.patch
similarity index 86%
rename from patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-wl1835-cape-support.patch
rename to patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1835.patch
index 3a20eee26be72c043305a75832fc4084beb32cc6..173ea2048db99375e742f2ee72d6d6b87b62325b 100644 (file)
--- a/patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-wl1835-cape-support.patch
+++ b/patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1835.patch
@@ -1,25 +1,20 @@
-From 497cd2f737cd3454705bd62cee0649c6b3000358 Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Mon, 2 Nov 2015 12:05:46 +0200
-Subject: [PATCH] ARCH:arm:am335x-boneblack: add wl1835 cape support
+From 814d6ecabf1f5754326d7ceebe3081b3430f7612 Mon Sep 17 00:00:00 2001
+From: Saurabh Narang <saurabhlocal@ULA0876477>
+Date: Tue, 13 Dec 2016 10:57:47 -0600
+Subject: [PATCH] Enable TI WiFi Bluetooth am335x boneblack WL1835
 
-* enable mmc2 used for wlan and uart4 used for bluetooth
-* configure the gpios used for wlan and bluetooth controls
-* add fixed voltage regulator used for wlan power control
-
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
 ---
- arch/arm/boot/dts/am335x-bone-bb-wl1835.dtsi |  128 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-bb-wl1835.dtsi |  124 ++++++++++++++++++++++++++
  arch/arm/boot/dts/am335x-boneblack.dts       |    3 +
- 2 files changed, 131 insertions(+)
+ 2 files changed, 127 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-bone-bb-wl1835.dtsi
 
 diff --git a/arch/arm/boot/dts/am335x-bone-bb-wl1835.dtsi b/arch/arm/boot/dts/am335x-bone-bb-wl1835.dtsi
 new file mode 100644
-index 0000000..501151b
+index 0000000..2433b81
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-bb-wl1835.dtsi
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,124 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -42,17 +37,13 @@ index 0000000..501151b
 +              enable-active-high;
 +      };
 +
-+      kim {
-+              compatible = "kim";
++      tibt {
++              compatible = "tibt";
 +              nshutdown_gpio = <44>; /* Bank1, pin12 */
-+              dev_name = "/dev/ttyO4";
++              dev_name = "/dev/ttyS4";
 +              flow_cntrl = <1>;
 +              baud_rate = <3000000>;
 +      };
-+
-+      btwilink {
-+              compatible = "btwilink";
-+      };
 +};
 +
 +&am33xx_pinmux {
@@ -149,11 +140,11 @@ index 0000000..501151b
 +      };
 +};
 diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 369f34d..c2386f5 100644
+index 3d993ae..03f8c56 100644
 --- a/arch/arm/boot/dts/am335x-boneblack.dts
 +++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -147,3 +147,6 @@
-               clock-names = "mclk";
+@@ -172,3 +172,6 @@
+               };
        };
  };
 +

diff --git a/patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-su-wl1837-audio-cape-s.patch b/patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1837-Aud.patch
similarity index 82%
rename from patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-su-wl1837-audio-cape-s.patch
rename to patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1837-Aud.patch
index 219c1d4bf50cdd98770fc8de623ea71e6d19dc54..caabe4fcb85cdb0c09137693bf0a1297f927e938 100644 (file)
--- a/patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-su-wl1837-audio-cape-s.patch
+++ b/patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1837-Aud.patch
@@ -1,27 +1,20 @@
-From c60c7e3ff205a813dfe071f6a1e8818c02eb6b3c Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Mon, 2 Nov 2015 12:27:39 +0200
-Subject: [PATCH] ARCH:arm:am335x-boneblack: add su wl1837 audio cape support
+From ed936002e91ef22a395c78205f89586041b615a8 Mon Sep 17 00:00:00 2001
+From: Saurabh Narang <saurabhlocal@ULA0876477>
+Date: Tue, 14 Mar 2017 09:38:41 -0500
+Subject: [PATCH] Enable TI WiFi Bluetooth am335x boneblack WL1837 Audio
 
-* enable mmc2 used for wlan and uart1 used for bluetooth
-* configure the gpios used for wlan and bluetooth controls
-* add fixed voltage regulator used for wlan power control
-* enable i2c1 used for mfi control
-* enable audio support
-
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
 ---
- arch/arm/boot/dts/am335x-bone-su-wl1837.dtsi |  263 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone-su-wl1837.dtsi |  304 ++++++++++++++++++++++++++
  arch/arm/boot/dts/am335x-boneblack.dts       |    3 +
- 2 files changed, 266 insertions(+)
+ 2 files changed, 307 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-bone-su-wl1837.dtsi
 
 diff --git a/arch/arm/boot/dts/am335x-bone-su-wl1837.dtsi b/arch/arm/boot/dts/am335x-bone-su-wl1837.dtsi
 new file mode 100644
-index 0000000..40cee07
+index 0000000..7248f1a
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-su-wl1837.dtsi
-@@ -0,0 +1,263 @@
+@@ -0,0 +1,304 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -44,6 +37,14 @@ index 0000000..40cee07
 +              enable-active-high;
 +      };
 +
++      tibt {
++              compatible = "tibt";
++              nshutdown_gpio = <44>; /* Bank1, pin12 */
++              dev_name = "/dev/ttyS4";
++              flow_cntrl = <1>;
++              baud_rate = <3000000>;
++      };
++
 +      audio {
 +              compatible = "sue,am33xx-generic-audio";
 +              pinctrl-names = "default";
@@ -98,6 +99,32 @@ index 0000000..40cee07
 +      pinctrl-0 = <&wlan_pins_default>;
 +      pinctrl-1 = <&wlan_pins_sleep>;
 +
++
++
++        uart4_pins_default: pinmux_uart4_pins_default {
++                pinctrl-single,pins = <
++                        0xD0 (PIN_INPUT | MUX_MODE6)            /* lcd_data12.uart4_cts */
++                        0xD4 (PIN_OUTPUT_PULLDOWN | MUX_MODE6)  /* lcd_data13.uart4_rts */
++                        0x70 (PIN_INPUT_PULLUP | MUX_MODE6)     /* gpmc_wait0.uart4_rxd */
++                        0x74 (PIN_OUTPUT_PULLDOWN | MUX_MODE6)  /* gpmc_wpn.uart4_txd */
++                >;
++        };
++
++        uart4_pins_sleep: pinmux_uart4_pins_sleep {
++                pinctrl-single,pins = <
++                        0xD0 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* lcd_data12.uart4_cts */
++                        0xD4 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* lcd_data13.uart4_rts */
++                        0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_wait0.uart4_rxd */
++                        0x74 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_wpn.uart4_txd */
++                >;
++        };
++
++
++
++
++
++
++
 +      uart1_pins_default: pinmux_uart1_pins_default {
 +              pinctrl-single,pins = <
 +                      0x180 ( PIN_INPUT  | MUX_MODE0 ) /* (D16) uart1_rxd.uart1_rxd */
@@ -198,6 +225,13 @@ index 0000000..40cee07
 +      status = "okay";
 +};
 +
++&uart4 {
++        pinctrl-names = "default","sleep";
++        pinctrl-0 = <&uart4_pins_default>;
++        pinctrl-1 = <&uart4_pins_sleep>;
++        status = "okay";
++};
++
 +&i2c1 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&i2c1_pins>;
@@ -286,11 +320,11 @@ index 0000000..40cee07
 +      ti,timer-alwon;
 +};
 diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 369f34d..cf703bb 100644
+index 3d993ae..e2c4256 100644
 --- a/arch/arm/boot/dts/am335x-boneblack.dts
 +++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -147,3 +147,6 @@
-               clock-names = "mclk";
+@@ -172,3 +172,6 @@
+               };
        };
  };
 +

diff --git a/patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-e14-wl1837-cape-suppor.patch b/patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1837.patch
similarity index 86%
rename from patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-e14-wl1837-cape-suppor.patch
rename to patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1837.patch
index 0e28b584bf705008b8211fdafede01d34047a4be..5d082ed49be2f3cef0e761b20a8f6ad86ca71b54 100644 (file)
--- a/patches/kernel_patches/beaglebone-wilink8-capes/0001-ARCH-arm-am335x-boneblack-add-e14-wl1837-cape-suppor.patch
+++ b/patches/kernel_patches/beaglebone-wilink8-capes/Enable-TI-WiFi-Bluetooth-am335x-boneblack-WL1837.patch
@@ -1,26 +1,20 @@
-From 57cf1aad225bc6961e2e4b49b091ad7d0f0f5a86 Mon Sep 17 00:00:00 2001
-From: Eyal Reizer <eyalr@ti.com>
-Date: Mon, 2 Nov 2015 12:15:53 +0200
-Subject: [PATCH] ARCH:arm:am335x-boneblack: add e14 wl1837 cape support
+From 5e454b707f5c4e89091351bdbbd533331296713c Mon Sep 17 00:00:00 2001
+From: Saurabh Narang <saurabhlocal@ULA0876477>
+Date: Sun, 11 Dec 2016 23:45:47 -0600
+Subject: [PATCH 2/2] Enable TI Bluetooth am335x-boneblack WL1837
 
-* enable mmc2 used for wlan and uart1 used for bluetooth
-* configure the gpios used for wlan and bluetooth controls
-* add fixed voltage regulator used for wlan power control
-* enable i2c1 used for mfi control
-
-Signed-off-by: Eyal Reizer <eyalr@ti.com>
 ---
- arch/arm/boot/dts/am335x-bone-e14-wl1837.dtsi |  156 +++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-boneblack.dts        |    3 +
- 2 files changed, 159 insertions(+)
+ arch/arm/boot/dts/am335x-bone-e14-wl1837.dtsi |  153 +++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-boneblack.dts        |    4 +
+ 2 files changed, 157 insertions(+)
  create mode 100644 arch/arm/boot/dts/am335x-bone-e14-wl1837.dtsi
 
 diff --git a/arch/arm/boot/dts/am335x-bone-e14-wl1837.dtsi b/arch/arm/boot/dts/am335x-bone-e14-wl1837.dtsi
 new file mode 100644
-index 0000000..2772216
+index 0000000..315f96f
 --- /dev/null
 +++ b/arch/arm/boot/dts/am335x-bone-e14-wl1837.dtsi
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,153 @@
 +/*
 + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
 + *
@@ -43,17 +37,14 @@ index 0000000..2772216
 +              enable-active-high;
 +      };
 +
-+      kim {
-+              compatible = "kim";
++      tibt {
++              compatible = "tibt";
 +              nshutdown_gpio = <3>; /* Bank0, pin3 */
-+              dev_name = "/dev/ttyO1";
++              dev_name = "/dev/ttyS1";
 +              flow_cntrl = <1>;
 +              baud_rate = <3000000>;
 +      };
 +
-+      btwilink {
-+              compatible = "btwilink";
-+      };
 +};
 +
 +&am33xx_pinmux {
@@ -178,12 +169,14 @@ index 0000000..2772216
 +      };
 +};
 diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 369f34d..b40d168 100644
+index 3d993ae..bf755b2c 100644
 --- a/arch/arm/boot/dts/am335x-boneblack.dts
 +++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -147,3 +147,6 @@
-               clock-names = "mclk";
+@@ -171,4 +171,8 @@
+                       sound-dai = <&tda19988>;
+               };
        };
++
  };
 +
 +/* Overlay the wilink8 based cape support */