Sync up with Linus

Documentation/cgroups/unified-hierarchy.txt

@@ -404,8 +404,8 @@ supported and the interface files "release_agent" and
  be understood as an underflow into the highest possible value, -2 or
  -10M etc. do not work, so it's not consistent.
 
- memory.low, memory.high, and memory.max will use the string
- "infinity" to indicate and set the highest possible value.
+ memory.low, memory.high, and memory.max will use the string "max" to
+ indicate and set the highest possible value.
 
 5. Planned Changes
 

Documentation/filesystems/dlmfs.txt

@@ -5,8 +5,8 @@ system.
 
 dlmfs is built with OCFS2 as it requires most of its infrastructure.
 
-Project web page: http://oss.oracle.com/projects/ocfs2
-Tools web page: http://oss.oracle.com/projects/ocfs2-tools
+Project web page: http://ocfs2.wiki.kernel.org
+Tools web page: https://github.com/markfasheh/ocfs2-tools
 OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
 
 All code copyright 2005 Oracle except when otherwise noted.

Documentation/filesystems/ocfs2.txt

@@ -8,8 +8,8 @@ also make it attractive for non-clustered use.
 You'll want to install the ocfs2-tools package in order to at least
 get "mount.ocfs2" and "ocfs2_hb_ctl".
 
-Project web page: http://oss.oracle.com/projects/ocfs2
-Tools web page: http://oss.oracle.com/projects/ocfs2-tools
+Project web page: http://ocfs2.wiki.kernel.org
+Tools git tree: https://github.com/markfasheh/ocfs2-tools
 OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
 
 All code copyright 2005 Oracle except when otherwise noted.

MAINTAINERS

@@ -7213,8 +7213,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 M: Mark Fasheh <mfasheh@suse.com>
 M: Joel Becker <jlbec@evilplan.org>
 L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
-W: http://oss.oracle.com/projects/ocfs2/
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
+W: http://ocfs2.wiki.kernel.org
 S: Supported
 F: Documentation/filesystems/ocfs2.txt
 F: Documentation/filesystems/dlmfs.txt

arch/arm/boot/dts/am335x-bone-common.dtsi

@@ -195,6 +195,7 @@
 
 &usb0 {
  status = "okay";
+ dr_mode = "peripheral";
 };
 
 &usb1 {

arch/arm/boot/dts/am437x-idk-evm.dts

@@ -133,20 +133,6 @@
  >;
  };
 
- i2c1_pins_default: i2c1_pins_default {
- pinctrl-single,pins = <
- 0x15c (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE2) /* spi0_cs0.i2c1_scl */
- 0x158 (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE2) /* spi0_d1.i2c1_sda */
- >;
- };
-
- i2c1_pins_sleep: i2c1_pins_sleep {
- pinctrl-single,pins = <
- 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_cs0.i2c1_scl */
- 0x158 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_d1.i2c1_sda */
- >;
- };
-
  mmc1_pins_default: pinmux_mmc1_pins_default {
  pinctrl-single,pins = <
  0x100 (PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */
@@ -254,25 +240,18 @@
  status = "okay";
  pinctrl-names = "default", "sleep";
  pinctrl-0 = <&i2c0_pins_default>;
- pinctrl-1 = <&i2c0_pins_default>;
+ pinctrl-1 = <&i2c0_pins_sleep>;
  clock-frequency = <400000>;
 
  at24@50 {
  compatible = "at24,24c256";
  pagesize = <64>;
  reg = <0x50>;
  };
-};
-
-&i2c1 {
- status = "okay";
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&i2c1_pins_default>;
- pinctrl-1 = <&i2c1_pins_default>;
- clock-frequency = <400000>;
 
  tps: tps62362@60 {
  compatible = "ti,tps62362";
+ reg = <0x60>;
  regulator-name = "VDD_MPU";
  regulator-min-microvolt = <950000>;
  regulator-max-microvolt = <1330000>;

arch/arm/boot/dts/am57xx-beagle-x15.dts

@@ -549,14 +549,6 @@
  pinctrl-0 = <&usb1_pins>;
 };
 
-&omap_dwc3_1 {
- extcon = <&extcon_usb1>;
-};
-
-&omap_dwc3_2 {
- extcon = <&extcon_usb2>;
-};
-
 &usb2 {
  dr_mode = "peripheral";
 };

arch/arm/boot/dts/dm8168-evm.dts

@@ -35,6 +35,18 @@
  DM816X_IOPAD(0x0aac, PIN_INPUT | MUX_MODE0) /* SPI_D1 */
  >;
  };
+
+ usb0_pins: pinmux_usb0_pins {
+ pinctrl-single,pins = <
+ DM816X_IOPAD(0x0d00, MUX_MODE0) /* USB0_DRVVBUS */
+ >;
+ };
+
+ usb1_pins: pinmux_usb0_pins {
+ pinctrl-single,pins = <
+ DM816X_IOPAD(0x0d04, MUX_MODE0) /* USB1_DRVVBUS */
+ >;
+ };
 };
 
 &i2c1 {
@@ -127,3 +139,16 @@
 &mmc1 {
  vmmc-supply = <&vmmcsd_fixed>;
 };
+
+/* At least dm8168-evm rev c won't support multipoint, later may */
+&usb0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&usb0_pins>;
+ mentor,multipoint = <0>;
+};
+
+&usb1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&usb1_pins>;
+ mentor,multipoint = <0>;
+};

arch/arm/boot/dts/dm816x.dtsi

@@ -97,10 +97,31 @@
 
  /* Device Configuration Registers */
  scm_conf: syscon@600 {
- compatible = "syscon";
+ compatible = "syscon", "simple-bus";
  reg = <0x600 0x110>;
  #address-cells = <1>;
  #size-cells = <1>;
+ ranges = <0 0x600 0x110>;
+
+ usb_phy0: usb-phy@20 {
+ compatible = "ti,dm8168-usb-phy";
+ reg = <0x20 0x8>;
+ reg-names = "phy";
+ clocks = <&main_fapll 6>;
+ clock-names = "refclk";
+ #phy-cells = <0>;
+ syscon = <&scm_conf>;
+ };
+
+ usb_phy1: usb-phy@28 {
+ compatible = "ti,dm8168-usb-phy";
+ reg = <0x28 0x8>;
+ reg-names = "phy";
+ clocks = <&main_fapll 6>;
+ clock-names = "refclk";
+ #phy-cells = <0>;
+ syscon = <&scm_conf>;
+ };
  };
 
  scrm_clocks: clocks {
@@ -357,7 +378,10 @@
  reg-names = "mc", "control";
  interrupts = <18>;
  interrupt-names = "mc";
- dr_mode = "otg";
+ dr_mode = "host";
+ interface-type = <0>;
+ phys = <&usb_phy0>;
+ phy-names = "usb2-phy";
  mentor,multipoint = <1>;
  mentor,num-eps = <16>;
  mentor,ram-bits = <12>;
@@ -366,13 +390,15 @@
 
  usb1: usb@47401800 {
  compatible = "ti,musb-am33xx";
- status = "disabled";
  reg = <0x47401c00 0x400
  0x47401800 0x200>;
  reg-names = "mc", "control";
  interrupts = <19>;
  interrupt-names = "mc";
- dr_mode = "otg";
+ dr_mode = "host";
+ interface-type = <0>;
+ phys = <&usb_phy1>;
+ phy-names = "usb2-phy";
  mentor,multipoint = <1>;
  mentor,num-eps = <16>;
  mentor,ram-bits = <12>;

arch/arm/boot/dts/dra7-evm.dts

@@ -543,14 +543,6 @@
  };
 };
 
-&omap_dwc3_1 {
- extcon = <&extcon_usb1>;
-};
-
-&omap_dwc3_2 {
- extcon = <&extcon_usb2>;
-};
-
 &usb1 {
  dr_mode = "peripheral";
  pinctrl-names = "default";

arch/arm/boot/dts/dra7.dtsi

@@ -249,8 +249,8 @@
  <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
  <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
  #dma-cells = <1>;
- #dma-channels = <32>;
- #dma-requests = <127>;
+ dma-channels = <32>;
+ dma-requests = <127>;
  };
 
  gpio1: gpio@4ae10000 {
@@ -1090,8 +1090,8 @@
  <0x4A096800 0x40>; /* pll_ctrl */
  reg-names = "phy_rx", "phy_tx", "pll_ctrl";
  ctrl-module = <&omap_control_sata>;
- clocks = <&sys_clkin1>;
- clock-names = "sysclk";
+ clocks = <&sys_clkin1>, <&sata_ref_clk>;
+ clock-names = "sysclk", "refclk";
  #phy-cells = <0>;
  };
 

arch/arm/boot/dts/dra72-evm.dts

@@ -380,14 +380,6 @@
  phy-supply = <&ldo4_reg>;
 };
 
-&omap_dwc3_1 {
- extcon = <&extcon_usb1>;
-};
-
-&omap_dwc3_2 {
- extcon = <&extcon_usb2>;
-};
-
 &usb1 {
  dr_mode = "peripheral";
  pinctrl-names = "default";

arch/arm/boot/dts/omap2.dtsi

@@ -87,8 +87,8 @@
  <14>,
  <15>;
  #dma-cells = <1>;
- #dma-channels = <32>;
- #dma-requests = <64>;
+ dma-channels = <32>;
+ dma-requests = <64>;
  };
 
  i2c1: i2c@48070000 {

arch/arm/boot/dts/omap3-n900.dts

@@ -16,6 +16,13 @@
  model = "Nokia N900";
  compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
 
+ aliases {
+ i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ };
+
  cpus {
  cpu@0 {
  cpu0-supply = <&vcc>;
@@ -704,7 +711,7 @@
  compatible = "smsc,lan91c94";
  interrupt-parent = <&gpio2>;
  interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
- reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */
+ reg = <1 0 0xf>; /* 16 byte IO range */
  bank-width = <2>;
  pinctrl-names = "default";
  pinctrl-0 = <&ethernet_pins>;

arch/arm/boot/dts/omap3.dtsi

@@ -155,8 +155,8 @@
  <14>,
  <15>;
  #dma-cells = <1>;
- #dma-channels = <32>;
- #dma-requests = <96>;
+ dma-channels = <32>;
+ dma-requests = <96>;
  };
 
  omap3_pmx_core: pinmux@48002030 {

arch/arm/boot/dts/omap4.dtsi

@@ -223,8 +223,8 @@
  <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
  <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
  #dma-cells = <1>;
- #dma-channels = <32>;
- #dma-requests = <127>;
+ dma-channels = <32>;
+ dma-requests = <127>;
  };
 
  gpio1: gpio@4a310000 {

arch/arm/boot/dts/omap5.dtsi

@@ -238,8 +238,8 @@
  <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
  <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
  #dma-cells = <1>;
- #dma-channels = <32>;
- #dma-requests = <127>;
+ dma-channels = <32>;
+ dma-requests = <127>;
  };
 
  gpio1: gpio@4ae10000 {
@@ -929,8 +929,8 @@
  <0x4A096800 0x40>; /* pll_ctrl */
  reg-names = "phy_rx", "phy_tx", "pll_ctrl";
  ctrl-module = <&omap_control_sata>;
- clocks = <&sys_clkin>;
- clock-names = "sysclk";
+ clocks = <&sys_clkin>, <&sata_ref_clk>;
+ clock-names = "sysclk", "refclk";
  #phy-cells = <0>;
  };
  };