Merge branch 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel...
authorVishal Mahaveer <vishalm@ti.com>
Wed, 6 May 2015 21:48:23 +0000 (16:48 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Wed, 6 May 2015 21:48:23 +0000 (16:48 -0500)
* 'ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel: (218 commits)
  Linux 3.14.41
  nosave: consolidate __nosave_{begin,end} in <asm/sections.h>
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  driver core: bus: Goto appropriate labels on failure in bus_add_device
  memstick: mspro_block: add missing curly braces
  C6x: time: Ensure consistency in __init
  crypto: omap-aes - Fix support for unequal lengths
  wl18xx: show rx_frames_per_rates as an array as it really is
  lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR
  e1000: add dummy allocator to fix race condition between mtu change and netpoll
  ksoftirqd: Enable IRQs and call cond_resched() before poking RCU
  RCU pathwalk breakage when running into a symlink overmounting something
  drm/i915: cope with large i2c transfers
  drm/radeon: fix doublescan modes (v2)
  i2c: core: Export bus recovery functions
  IB/mlx4: Fix WQE LSO segment calculation
  IB/core: don't disallow registering region starting at 0x0
  IB/core: disallow registering 0-sized memory region
  stk1160: Make sure current buffer is released
  mvsas: fix panic on expander attached SATA devices
  ...

Change-Id: I0155e17495c9013dfcc57ca6d6401b3b648c1efe
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
1  2 
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra72-evm.dts
ti_config_fragments/connectivity.cfg

index 0120eee4bc3883d09aa177d367a49f2bebb0dbc4,745e856b1aa307d3cd9f912d4c069c481d02715b..46503feafec65416ecf2864a9099d08996b29d9f
                        reusable;
                        status = "okay";
                };
 +
 +              /* Required by cmem driver used by radio */
 +              cmem_radio: cmem@95400000 {
 +                      reg = <0x95400000 0x400000>;
 +                      no-map;
 +                      status = "okay";
 +              };
        };
  
-       extcon1: dra7x_usbid_extcon1 {
-               compatible = "linux,extcon-gpio";
-               gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_LOW>;
-               cable-name = "USB-HOST";
+       extcon_usb1: extcon_usb1 {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
        };
  
-       extcon2: dra7x_usbid_extcon2 {
-               compatible = "linux,extcon-gpio";
-               gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_LOW>;
-               cable-name = "USB-HOST";
+       extcon_usb2: extcon_usb2 {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
        };
  
        evm_3v3_sd: fixedregulator-sd {
Simple merge
index 8df717398f2381c845ac91e85c280576c0c2f496,4fc0642a694fe4ac71571d1646e60d7126af7132..dbf2981382043af3157a4f6acb70a9de9878f851
                        reusable;
                        status = "okay";
                };
 +
 +              /* Required by cmem driver used by radio */
 +              cmem_radio: cmem@95400000 {
 +                      reg = <0x95400000 0x400000>;
 +                      no-map;
 +                      status = "okay";
 +              };
        };
  
-       extcon1: dra7x_usbid_extcon1 {
-               compatible = "linux,extcon-gpio";
-               gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_LOW>;
-               cable-name = "USB-HOST";
+       extcon_usb1: extcon_usb1 {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
        };
  
-       extcon2: dra7x_usbid_extcon2 {
-               compatible = "linux,extcon-gpio";
-               gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_LOW>;
-               cable-name = "USB-HOST";
+       extcon_usb2: extcon_usb2 {
+               compatible = "linux,extcon-usb-gpio";
+               id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
        };
  
        evm_3v3_sd: fixedregulator-sd {
        >;
  };
  
 +&mcasp6 {
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&mcasp6_pins>;
 +
 +      fck_parent = "atl_clkin1_ck";
 +
 +      status = "okay";
 +
 +      op-mode = <0>;  /* MCASP_IIS_MODE */
 +      tdm-slots = <8>;
 +      /* 4 serializer */
 +      serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
 +              1 2 0 0
 +      >;
 +      tx-num-evt = <8>;
 +      rx-num-evt = <8>;
 +};
 +
 +&mcasp7 {
 +      #sound-dai-cells = <0>;
 +      pinctrl-names = "default", "sleep";
 +      pinctrl-0 = <&mcasp7_pins>;
 +      pinctrl-1 = <&mcasp7_sleep_pins>;
 +
 +      status = "okay";
 +
 +      op-mode = <0>;  /* MCASP_IIS_MODE */
 +      tdm-slots = <4>;
 +      /* 4 serializer */
 +      serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
 +              2 1 0 0
 +      >;
 +      tx-num-evt = <8>;
 +      rx-num-evt = <8>;
 +};
 +
  &omap_dwc3_1 {
-       extcon = <&extcon1>;
+       extcon = <&extcon_usb1>;
  };
  
  &omap_dwc3_2 {
index 7ccad190a9d66508d7b28ac07afa1b6e12a7ddc6,ae2615b151ecc73519e8d9506bc1f22f00a97556..90368eac505a36fce6f90d10b843d0bad7f1ce61
@@@ -155,26 -157,16 +158,26 @@@ CONFIG_SPI_TI_QSPI=
  CONFIG_MTD_M25P80=m
  
  #EXTCON
- CONFIG_EXTCON_GPIO=y
+ CONFIG_EXTCON_USB_GPIO=y
  
  # Networking
 -CONFIG_NF_CONNTRACK=m
 -CONFIG_NF_CONNTRACK_IPV4=m
 -CONFIG_IP_NF_IPTABLES=m
 -CONFIG_IP_NF_FILTER=m
 -CONFIG_NF_NAT_IPV4=m
 -CONFIG_IP_NF_TARGET_MASQUERADE=m
 -CONFIG_BRIDGE=m
 +CONFIG_NF_CONNTRACK=y
 +CONFIG_NF_CONNTRACK_IPV4=y
 +CONFIG_IP_NF_IPTABLES=y
 +CONFIG_IP_NF_FILTER=y
 +CONFIG_NF_NAT_IPV4=y
 +CONFIG_IP_NF_TARGET_MASQUERADE=y
 +CONFIG_BRIDGE=y
 +
 +#VLAN
 +CONFIG_VLAN_8021Q=y
 +CONFIG_VLAN_8021Q_GVRP=y
 +
 +#DCAN
 +CONFIG_CAN=y
 +CONFIG_CAN_RAW=y
 +CONFIG_CAN_C_CAN=y
 +CONFIG_CAN_C_CAN_PLATFORM=y
  
  # Fan
  CONFIG_SENSORS_GPIO_FAN=y