Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be09c745 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.18' into msm-3.18 



Linux 3.18.18

Resolve trivial context conflicts as part of the merge.

Conflicts:
	drivers/usb/dwc3/gadget.c

Change-Id: Id01a97938e743d4e6b53b9e1a156e31db8097f1d
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 1949272a 866cebe2

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+1 −1
Original line number Diff line number Diff line 
* Marvell Armada 370 / Armada XP Ethernet Controller (NETA)



Required properties:

- compatible: should be "marvell,armada-370-neta".

- compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta".

- reg: address and length of the register set for the device.

- interrupts: interrupt for the device

- phy: See ethernet.txt file in the same directory.

Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt

+2 −2
Original line number Diff line number Diff line
@@ -92,5 +92,5 @@ mpp61 61 gpo, dev(wen1), uart1(txd), audio(rclk) 
mpp62         62       gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),

                       audio(mclk), uart0(cts)

mpp63         63       gpo, spi0(sck), tclk

mpp64         64       gpio, spi0(miso), spi0-1(cs1)

mpp65         65       gpio, spi0(mosi), spi0-1(cs2)
 
mpp64         64       gpio, spi0(miso), spi0(cs1)

mpp65         65       gpio, spi0(mosi), spi0(cs2)

Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ mpp5 5 gpio, dev(ad7), spi0(cs2), spi1(cs2) 
mpp6          6        gpio, dev(ad0), led(p1), audio(rclk)

mpp7          7        gpio, dev(ad1), ptp(clk), led(p2), audio(extclk)

mpp8          8        gpio, dev (bootcs), spi0(cs0), spi1(cs0)

mpp9          9        gpio, nf(wen), spi0(sck), spi1(sck)

mpp10        10        gpio, nf(ren), dram(vttctrl), led(c1)

mpp9          9        gpio, spi0(sck), spi1(sck), nand(we)

mpp10        10        gpio, dram(vttctrl), led(c1), nand(re)

mpp11        11        gpio, dev(a0), led(c2), audio(sdo)

mpp12        12        gpio, dev(a1), audio(bclk)

mpp13        13        gpio, dev(readyn), pcie0(rstoutn), pcie1(rstoutn)

Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt

+19 −19
Original line number Diff line number Diff line
@@ -27,15 +27,15 @@ mpp8 8 gpio, ge0(txd1), dev(ad10) 
mpp9          9        gpio, ge0(txd2), dev(ad11)

mpp10         10       gpio, ge0(txd3), dev(ad12)

mpp11         11       gpio, ge0(txctl), dev(ad13)

mpp12         12       gpio, ge0(rxd0), pcie0(rstout), pcie1(rstout) [1], spi0(cs1), dev(ad14)

mpp13         13       gpio, ge0(rxd1), pcie0(clkreq), pcie1(clkreq) [1], spi0(cs2), dev(ad15)

mpp14         14       gpio, ge0(rxd2), ptp(clk), m(vtt_ctrl), spi0(cs3), dev(wen1)

mpp15         15       gpio, ge0(rxd3), ge(mdc slave), pcie0(rstout), spi0(mosi), pcie1(rstout) [1]

mpp16         16       gpio, ge0(rxctl), ge(mdio slave), m(decc_err), spi0(miso), pcie0(clkreq)

mpp12         12       gpio, ge0(rxd0), pcie0(rstout), spi0(cs1), dev(ad14), pcie3(clkreq)

mpp13         13       gpio, ge0(rxd1), pcie0(clkreq), pcie1(clkreq) [1], spi0(cs2), dev(ad15), pcie2(clkreq)

mpp14         14       gpio, ge0(rxd2), ptp(clk), m(vtt_ctrl), spi0(cs3), dev(wen1), pcie3(clkreq)

mpp15         15       gpio, ge0(rxd3), ge(mdc slave), pcie0(rstout), spi0(mosi)

mpp16         16       gpio, ge0(rxctl), ge(mdio slave), m(decc_err), spi0(miso), pcie0(clkreq), pcie1(clkreq) [1]

mpp17         17       gpio, ge0(rxclk), ptp(clk), ua1(rxd), spi0(sck), sata1(prsnt)

mpp18         18       gpio, ge0(rxerr), ptp(trig_gen), ua1(txd), spi0(cs0), pcie1(rstout) [1]

mpp19         19       gpio, ge0(col), ptp(event_req), pcie0(clkreq), sata1(prsnt), ua0(cts)

mpp20         20       gpio, ge0(txclk), ptp(clk), pcie1(rstout) [1], sata0(prsnt), ua0(rts)

mpp18         18       gpio, ge0(rxerr), ptp(trig_gen), ua1(txd), spi0(cs0)

mpp19         19       gpio, ge0(col), ptp(event_req), ge0(txerr), sata1(prsnt), ua0(cts)

mpp20         20       gpio, ge0(txclk), ptp(clk), sata0(prsnt), ua0(rts)

mpp21         21       gpio, spi0(cs1), ge1(rxd0), sata0(prsnt), sd0(cmd), dev(bootcs)

mpp22         22       gpio, spi0(mosi), dev(ad0)

mpp23         23       gpio, spi0(sck), dev(ad2)
@@ -58,23 +58,23 @@ mpp39 39 gpio, i2c1(sck), ge1(rxd2), ua0(cts), sd0(d1), dev(a2) 
mpp40         40       gpio, i2c1(sda), ge1(rxd3), ua0(rts), sd0(d2), dev(ad6)

mpp41         41       gpio, ua1(rxd), ge1(rxctl), ua0(cts), spi1(cs3), dev(burst/last)

mpp42         42       gpio, ua1(txd), ua0(rts), dev(ad7)

mpp43         43       gpio, pcie0(clkreq), m(vtt_ctrl), m(decc_err), pcie0(rstout), dev(clkout)

mpp44         44       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [3], pcie0(rstout)

mpp45         45       gpio, ref(clk_out0), pcie0(rstout), pcie1(rstout) [1], pcie2(rstout), pcie3(rstout)

mpp46         46       gpio, ref(clk_out1), pcie0(rstout), pcie1(rstout) [1], pcie2(rstout), pcie3(rstout)

mpp47         47       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], spi1(cs2), sata3(prsnt) [2]

mpp48         48       gpio, sata0(prsnt), m(vtt_ctrl), tdm2c(pclk), audio(mclk), sd0(d4)

mpp49         49       gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm2c(fsync), audio(lrclk), sd0(d5)

mpp50         50       gpio, pcie0(rstout), pcie1(rstout) [1], tdm2c(drx), audio(extclk), sd0(cmd)

mpp43         43       gpio, pcie0(clkreq), m(vtt_ctrl), m(decc_err), spi1(cs2), dev(clkout)

mpp44         44       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [3]

mpp45         45       gpio, ref(clk_out0), pcie0(rstout)

mpp46         46       gpio, ref(clk_out1), pcie0(rstout)

mpp47         47       gpio, sata0(prsnt), sata1(prsnt), sata2(prsnt) [2], sata3(prsnt) [2]

mpp48         48       gpio, sata0(prsnt), m(vtt_ctrl), tdm2c(pclk), audio(mclk), sd0(d4), pcie0(clkreq)

mpp49         49       gpio, sata2(prsnt) [2], sata3(prsnt) [2], tdm2c(fsync), audio(lrclk), sd0(d5), pcie1(clkreq)

mpp50         50       gpio, pcie0(rstout), tdm2c(drx), audio(extclk), sd0(cmd)

mpp51         51       gpio, tdm2c(dtx), audio(sdo), m(decc_err)

mpp52         52       gpio, pcie0(rstout), pcie1(rstout) [1], tdm2c(intn), audio(sdi), sd0(d6)

mpp52         52       gpio, pcie0(rstout), tdm2c(intn), audio(sdi), sd0(d6)

mpp53         53       gpio, sata1(prsnt), sata0(prsnt), tdm2c(rstn), audio(bclk), sd0(d7)

mpp54         54       gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), pcie1(rstout) [1], sd0(d3)

mpp54         54       gpio, sata0(prsnt), sata1(prsnt), pcie0(rstout), ge0(txerr), sd0(d3)

mpp55         55       gpio, ua1(cts), ge(mdio), pcie1(clkreq) [1], spi1(cs1), sd0(d0)

mpp56         56       gpio, ua1(rts), ge(mdc), m(decc_err), spi1(mosi)

mpp57         57       gpio, spi1(sck), sd0(clk)

mpp58         58       gpio, pcie1(clkreq) [1], i2c1(sck), pcie2(clkreq), spi1(miso), sd0(d1)

mpp59         59       gpio, pcie0(rstout), i2c1(sda), pcie1(rstout) [1], spi1(cs0), sd0(d2)

mpp59         59       gpio, pcie0(rstout), i2c1(sda), spi1(cs0), sd0(d2)



[1]: only available on 88F6820 and 88F6828

[2]: only available on 88F6828

Documentation/devicetree/bindings/pinctrl/marvell,armada-xp-pinctrl.txt

+13 −19
Original line number Diff line number Diff line
@@ -42,15 +42,15 @@ mpp20 20 gpio, ge0(rxd4), ge1(rxd2), lcd(d20), ptp(clk) 
mpp21         21       gpio, ge0(rxd5), ge1(rxd3), lcd(d21), mem(bat)

mpp22         22       gpio, ge0(rxd6), ge1(rxctl), lcd(d22), sata0(prsnt)

mpp23         23       gpio, ge0(rxd7), ge1(rxclk), lcd(d23), sata1(prsnt)

mpp24         24       gpio, lcd(hsync), sata1(prsnt), nf(bootcs-re), tdm(rst)

mpp25         25       gpio, lcd(vsync), sata0(prsnt), nf(bootcs-we), tdm(pclk)

mpp26         26       gpio, lcd(clk), tdm(fsync), vdd(cpu1-pd)

mpp24         24       gpio, lcd(hsync), sata1(prsnt), tdm(rst)

mpp25         25       gpio, lcd(vsync), sata0(prsnt), tdm(pclk)

mpp26         26       gpio, lcd(clk), tdm(fsync)

mpp27         27       gpio, lcd(e), tdm(dtx), ptp(trig)

mpp28         28       gpio, lcd(pwm), tdm(drx), ptp(evreq)

mpp29         29       gpio, lcd(ref-clk), tdm(int0), ptp(clk), vdd(cpu0-pd)

mpp29         29       gpio, lcd(ref-clk), tdm(int0), ptp(clk)

mpp30         30       gpio, tdm(int1), sd0(clk)

mpp31         31       gpio, tdm(int2), sd0(cmd), vdd(cpu0-pd)

mpp32         32       gpio, tdm(int3), sd0(d0), vdd(cpu1-pd)

mpp31         31       gpio, tdm(int2), sd0(cmd)

mpp32         32       gpio, tdm(int3), sd0(d0)

mpp33         33       gpio, tdm(int4), sd0(d1), mem(bat)

mpp34         34       gpio, tdm(int5), sd0(d2), sata0(prsnt)

mpp35         35       gpio, tdm(int6), sd0(d3), sata1(prsnt)
@@ -58,21 +58,18 @@ mpp36 36 gpio, spi(mosi) 
mpp37         37       gpio, spi(miso)

mpp38         38       gpio, spi(sck)

mpp39         39       gpio, spi(cs0)

mpp40         40       gpio, spi(cs1), uart2(cts), lcd(vga-hsync), vdd(cpu1-pd),

                       pcie(clkreq0)

mpp40         40       gpio, spi(cs1), uart2(cts), lcd(vga-hsync), pcie(clkreq0)

mpp41         41       gpio, spi(cs2), uart2(rts), lcd(vga-vsync), sata1(prsnt),

                       pcie(clkreq1)

mpp42         42       gpio, uart2(rxd), uart0(cts), tdm(int7), tdm-1(timer),

                       vdd(cpu0-pd)

mpp43         43       gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout),

                       vdd(cpu2-3-pd){1}

mpp42         42       gpio, uart2(rxd), uart0(cts), tdm(int7), tdm-1(timer)

mpp43         43       gpio, uart2(txd), uart0(rts), spi(cs3), pcie(rstout)

mpp44         44       gpio, uart2(cts), uart3(rxd), spi(cs4), pcie(clkreq2),

                       mem(bat)

mpp45         45       gpio, uart2(rts), uart3(txd), spi(cs5), sata1(prsnt)

mpp46         46       gpio, uart3(rts), uart1(rts), spi(cs6), sata0(prsnt)

mpp47         47       gpio, uart3(cts), uart1(cts), spi(cs7), pcie(clkreq3),

                       ref(clkout)

mpp48         48       gpio, tclk, dev(burst/last)

mpp48         48       gpio, dev(clkout), dev(burst/last)



* Marvell Armada XP (mv78260 and mv78460 only)
@@ -84,9 +81,9 @@ mpp51 51 gpio, dev(ad16) 
mpp52         52       gpio, dev(ad17)

mpp53         53       gpio, dev(ad18)

mpp54         54       gpio, dev(ad19)

mpp55         55       gpio, dev(ad20), vdd(cpu0-pd)

mpp56         56       gpio, dev(ad21), vdd(cpu1-pd)

mpp57         57       gpio, dev(ad22), vdd(cpu2-3-pd){1}

mpp55         55       gpio, dev(ad20)

mpp56         56       gpio, dev(ad21)

mpp57         57       gpio, dev(ad22)

mpp58         58       gpio, dev(ad23)

mpp59         59       gpio, dev(ad24)

mpp60         60       gpio, dev(ad25)
@@ -96,6 +93,3 @@ mpp63 63 gpio, dev(ad28) 
mpp64         64       gpio, dev(ad29)

mpp65         65       gpio, dev(ad30)

mpp66         66       gpio, dev(ad31)
 


Notes:

* {1} vdd(cpu2-3-pd) only available on mv78460.