* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-08-27 8:13 Stephen Rothwell
2013-08-27 8:54 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 45+ messages in thread
From: Stephen Rothwell @ 2013-08-27 8:13 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Sebastian Andrzej Siewior,
Felipe Balbi, Greg KH
[-- Attachment #1: Type: text/plain, Size: 4772 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am335x-bone.dts between commit 97238b35d5bb ("usb:
musb: dsps: use proper child nodes") from the tree and commit
63f6b2550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus and device
nodes") from the arm-soc tree.
I fixed it up (probably incorrectly - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/am335x-bone.dts
index a8907b5,d99be03..0000000
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@@ -24,132 -24,6 +24,24 @@@
reg = <0x80000000 0x10000000>; /* 256 MB */
};
- am33xx_pinmux: pinmux@44e10800 {
- pinctrl-names = "default";
- pinctrl-0 = <&clkout2_pin>;
-
- user_leds_s0: user_leds_s0 {
- pinctrl-single,pins = <
- 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
- 0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */
- 0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */
- 0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */
- >;
- };
-
- i2c0_pins: pinmux_i2c0_pins {
- pinctrl-single,pins = <
- 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
- 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
- >;
- };
-
- uart0_pins: pinmux_uart0_pins {
- pinctrl-single,pins = <
- 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
- 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
- >;
- };
-
- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
- >;
- };
-
- cpsw_default: cpsw_default {
- pinctrl-single,pins = <
- /* Slave 1 */
- 0x110 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxerr.mii1_rxerr */
- 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */
- 0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxdv.mii1_rxdv */
- 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */
- 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */
- 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */
- 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */
- 0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_txclk.mii1_txclk */
- 0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxclk.mii1_rxclk */
- 0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd3.mii1_rxd3 */
- 0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd2.mii1_rxd2 */
- 0x13c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd1.mii1_rxd1 */
- 0x140 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd0.mii1_rxd0 */
- >;
- };
-
- cpsw_sleep: cpsw_sleep {
- pinctrl-single,pins = <
- /* Slave 1 reset value */
- 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
-
- davinci_mdio_default: davinci_mdio_default {
- pinctrl-single,pins = <
- /* MDIO */
- 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
- 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
- >;
- };
-
- davinci_mdio_sleep: davinci_mdio_sleep {
- pinctrl-single,pins = <
- /* MDIO reset value */
- 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
- };
-
+ ocp {
- uart0: serial@44e09000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins>;
-
- status = "okay";
- };
-
+ musb: usb@47400000 {
+ status = "okay";
+
+ control@44e10000 {
+ status = "okay";
+ };
+
+ phy@47401300 {
+ status = "okay";
+ };
+
+ usb@47401000 {
+ status = "okay";
+ };
+ };
-
- i2c0: i2c@44e0b000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
-
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@24 {
- reg = <0x24>;
- };
-
- };
+ };
+
leds {
pinctrl-names = "default";
pinctrl-0 = <&user_leds_s0>;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 8:13 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
@ 2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 13:02 ` Javier Martinez Canillas
0 siblings, 1 reply; 45+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-08-27 8:54 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Felipe Balbi
On 08/27/2013 10:13 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/am335x-bone.dts between commit 97238b35d5bb
> ("usb: musb: dsps: use proper child nodes") from the tree and
> commit 63f6b2550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus and
> device nodes") from the arm-soc tree.
>
> I fixed it up (probably incorrectly - see below) and can carry the
> fix as necessary (no action is required).
You added the OCP node back and the USB nodes as I had them which
should be fine.
How do we solve the conflict for the merge window? Is it possible for
the ARM-SOC tree to create a topic branch for this commit?
Greg: I do have a pending pull / patches [0] which also change the dts
nodes according to the latest feedback + enabling an additional USB
port in bone.
If you take this in I could update the nodes later (with the topic
branch merged) accordingly to the way it has been done in the ARM-SOC
tree - unless you have other preferences.
[0] http://www.spinics.net/lists/linux-usb/msg92595.html
Sebastian
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 8:54 ` Sebastian Andrzej Siewior
@ 2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:24 ` Benoit Cousson
0 siblings, 1 reply; 45+ messages in thread
From: Javier Martinez Canillas @ 2013-08-27 13:02 UTC (permalink / raw)
To: Sebastian Andrzej Siewior, bcousson
Cc: Stephen Rothwell, Greg KH, Arnd Bergmann, linux-kernel,
Felipe Balbi, linux-next, Olof Johansson, linux-arm-kernel
[cc'ing Benoit Cousson (OMAP DT maintainer)]
On Tue, Aug 27, 2013 at 10:54 AM, Sebastian Andrzej Siewior
<bigeasy@linutronix.de> wrote:
> On 08/27/2013 10:13 AM, Stephen Rothwell wrote:
>
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/boot/dts/am335x-bone.dts between commit 97238b35d5bb
>> ("usb: musb: dsps: use proper child nodes") from the tree and
>> commit 63f6b2550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus and
>> device nodes") from the arm-soc tree.
>>
>> I fixed it up (probably incorrectly - see below) and can carry the
>> fix as necessary (no action is required).
>
> You added the OCP node back and the USB nodes as I had them which
> should be fine.
>
> How do we solve the conflict for the merge window? Is it possible for
> the ARM-SOC tree to create a topic branch for this commit?
>
> Greg: I do have a pending pull / patches [0] which also change the dts
> nodes according to the latest feedback + enabling an additional USB
> port in bone.
> If you take this in I could update the nodes later (with the topic
> branch merged) accordingly to the way it has been done in the ARM-SOC
> tree - unless you have other preferences.
>
I think that the proper way to handle this is to split the patch-set
in two and merge all the OMAP DT related changes
(arch/arm/boot/dts/am*) through Benoit's tree and the USB changes
(drivers/usb/*) through Greg tree to prevent these kind of merge
conflicts.
Thanks a lot and best regards,
Javier
> [0] http://www.spinics.net/lists/linux-usb/msg92595.html
>
> Sebastian
>
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 13:02 ` Javier Martinez Canillas
@ 2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:53 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 45+ messages in thread
From: Benoit Cousson @ 2013-08-27 13:24 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Javier Martinez Canillas, Stephen Rothwell, Greg KH,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel
Hi Sebatian,
On 27/08/2013 15:02, Javier Martinez Canillas wrote:
> [cc'ing Benoit Cousson (OMAP DT maintainer)]
>
> On Tue, Aug 27, 2013 at 10:54 AM, Sebastian Andrzej Siewior
> <bigeasy@linutronix.de> wrote:
>> On 08/27/2013 10:13 AM, Stephen Rothwell wrote:
>>
>>> Today's linux-next merge of the arm-soc tree got a conflict in
>>> arch/arm/boot/dts/am335x-bone.dts between commit 97238b35d5bb
>>> ("usb: musb: dsps: use proper child nodes") from the tree and
>>> commit 63f6b2550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus and
>>> device nodes") from the arm-soc tree.
>>>
>>> I fixed it up (probably incorrectly - see below) and can carry the
>>> fix as necessary (no action is required).
>>
>> You added the OCP node back and the USB nodes as I had them which
>> should be fine.
>>
>> How do we solve the conflict for the merge window? Is it possible for
>> the ARM-SOC tree to create a topic branch for this commit?
>>
>> Greg: I do have a pending pull / patches [0] which also change the dts
>> nodes according to the latest feedback + enabling an additional USB
>> port in bone.
>> If you take this in I could update the nodes later (with the topic
>> branch merged) accordingly to the way it has been done in the ARM-SOC
>> tree - unless you have other preferences.
>>
>
> I think that the proper way to handle this is to split the patch-set
> in two and merge all the OMAP DT related changes
> (arch/arm/boot/dts/am*) through Benoit's tree and the USB changes
> (drivers/usb/*) through Greg tree to prevent these kind of merge
> conflicts.
Yes. DT patches are an endless source of merge conflicts if they are
merge throught different trees.
What was discussed with Olof and Arnd during Connect is that we should
avoid merging DT patches outside arm-soc tree to avoid that kind of
situation.
Regards,
Benoit
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 13:24 ` Benoit Cousson
@ 2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:57 ` Benoit Cousson
0 siblings, 1 reply; 45+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-08-27 13:53 UTC (permalink / raw)
To: Benoit Cousson
Cc: Javier Martinez Canillas, Stephen Rothwell, Greg KH,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel
On 08/27/2013 03:24 PM, Benoit Cousson wrote:
> Hi Sebatian,
Hi Benoit,
> Yes. DT patches are an endless source of merge conflicts if they are
> merge throught different trees.
Usually there are small conflicts because two people added / changed a
node nearby. This patch turned the .dts file almost upside down.
> What was discussed with Olof and Arnd during Connect is that we should
> avoid merging DT patches outside arm-soc tree to avoid that kind of
> situation.
I am aware of this now. However these changes belonged together because
a) they belonged together and b) would break the driver until the .dts
changes and driver code is in-sync.
In future I am going to ask you for a topic branch so I can get my
changes in one piece without breaking stuff in the middle.
What do we do now?
> Regards,
> Benoit
Sebastian
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 13:53 ` Sebastian Andrzej Siewior
@ 2013-08-27 13:57 ` Benoit Cousson
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 15:01 ` Kevin Hilman
0 siblings, 2 replies; 45+ messages in thread
From: Benoit Cousson @ 2013-08-27 13:57 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Javier Martinez Canillas, Stephen Rothwell, Greg KH,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel, khilman
+ Kevin,
On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
> On 08/27/2013 03:24 PM, Benoit Cousson wrote:
>> Hi Sebatian,
>
> Hi Benoit,
>
>> Yes. DT patches are an endless source of merge conflicts if they are
>> merge throught different trees.
>
> Usually there are small conflicts because two people added / changed a
> node nearby. This patch turned the .dts file almost upside down.
Yes, that's true.
>> What was discussed with Olof and Arnd during Connect is that we should
>> avoid merging DT patches outside arm-soc tree to avoid that kind of
>> situation.
>
> I am aware of this now. However these changes belonged together because
> a) they belonged together and b) would break the driver until the .dts
> changes and driver code is in-sync.
> In future I am going to ask you for a topic branch so I can get my
> changes in one piece without breaking stuff in the middle.
>
> What do we do now?
Cannot you just merge the stable arm-soc/dt branch into your branch
before applying your patches?
Regards
Benoit
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 13:57 ` Benoit Cousson
@ 2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 15:01 ` Kevin Hilman
1 sibling, 1 reply; 45+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-08-27 14:02 UTC (permalink / raw)
To: Benoit Cousson
Cc: Javier Martinez Canillas, Stephen Rothwell, Greg KH,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel, khilman
On 08/27/2013 03:57 PM, Benoit Cousson wrote:
> + Kevin,
>
> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>> What do we do now?
>
> Cannot you just merge the stable arm-soc/dt branch into your branch
> before applying your patches?
That is up to Greg. This changes sat in his usb-next tree for a while
now. And before they hit Greg they were in Felipe's tree for a while.
To be exact, last .dts change via USB was:
Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
AuthorDate: Thu Jun 20 12:13:04 2013 +0200
Commit: Felipe Balbi <balbi@ti.com>
CommitDate: Fri Aug 9 17:40:16 2013 +0300
usb: musb dma: add cppi41 dma driver
> Regards
> Benoit
Sebastian
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 14:02 ` Sebastian Andrzej Siewior
@ 2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:13 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 45+ messages in thread
From: Benoit Cousson @ 2013-08-27 14:05 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Javier Martinez Canillas, Stephen Rothwell, Greg KH,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel, khilman
On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
>> + Kevin,
>>
>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>>> What do we do now?
>>
>> Cannot you just merge the stable arm-soc/dt branch into your branch
>> before applying your patches?
>
> That is up to Greg. This changes sat in his usb-next tree for a while
> now. And before they hit Greg they were in Felipe's tree for a while.
>
> To be exact, last .dts change via USB was:
>
> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> Commit: Felipe Balbi <balbi@ti.com>
> CommitDate: Fri Aug 9 17:40:16 2013 +0300
>
> usb: musb dma: add cppi41 dma driver
Mmm, if that branch is supposed to be stable, I'm not sure it will be
doable...
Maybe we should do the other way around? And merge usb-next into arm-soc/dt.
Kevin, Olof?
Regards,
Benoit
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 14:05 ` Benoit Cousson
@ 2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 17:37 ` Greg KH
0 siblings, 1 reply; 45+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-08-27 14:13 UTC (permalink / raw)
To: Benoit Cousson
Cc: Javier Martinez Canillas, Stephen Rothwell, Greg KH,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel, khilman
On 08/27/2013 04:05 PM, Benoit Cousson wrote:
> On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
>> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
>>> + Kevin,
>>>
>>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>>>> What do we do now?
>>>
>>> Cannot you just merge the stable arm-soc/dt branch into your branch
>>> before applying your patches?
>>
>> That is up to Greg. This changes sat in his usb-next tree for a while
>> now. And before they hit Greg they were in Felipe's tree for a while.
>>
>> To be exact, last .dts change via USB was:
>>
>> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
>> Commit: Felipe Balbi <balbi@ti.com>
>> CommitDate: Fri Aug 9 17:40:16 2013 +0300
>>
>> usb: musb dma: add cppi41 dma driver
>
> Mmm, if that branch is supposed to be stable, I'm not sure it will be
> doable...
>
> Maybe we should do the other way around? And merge usb-next into
> arm-soc/dt.
>
> Kevin, Olof?
Please be aware that I have no response so far regarding [0] from Greg.
[0] http://www.spinics.net/lists/linux-usb/msg92595.html
> Regards,
> Benoit
Sebastian
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 14:13 ` Sebastian Andrzej Siewior
@ 2013-08-27 17:37 ` Greg KH
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 19:23 ` Sebastian Andrzej Siewior
0 siblings, 2 replies; 45+ messages in thread
From: Greg KH @ 2013-08-27 17:37 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Benoit Cousson, Javier Martinez Canillas, Stephen Rothwell,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel, khilman
On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote:
> On 08/27/2013 04:05 PM, Benoit Cousson wrote:
> > On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
> >> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
> >>> + Kevin,
> >>>
> >>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
> >>>> What do we do now?
> >>>
> >>> Cannot you just merge the stable arm-soc/dt branch into your branch
> >>> before applying your patches?
> >>
> >> That is up to Greg. This changes sat in his usb-next tree for a while
> >> now. And before they hit Greg they were in Felipe's tree for a while.
> >>
> >> To be exact, last .dts change via USB was:
> >>
> >> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> >> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> >> Commit: Felipe Balbi <balbi@ti.com>
> >> CommitDate: Fri Aug 9 17:40:16 2013 +0300
> >>
> >> usb: musb dma: add cppi41 dma driver
> >
> > Mmm, if that branch is supposed to be stable, I'm not sure it will be
> > doable...
> >
> > Maybe we should do the other way around? And merge usb-next into
> > arm-soc/dt.
> >
> > Kevin, Olof?
>
> Please be aware that I have no response so far regarding [0] from Greg.
>
> [0] http://www.spinics.net/lists/linux-usb/msg92595.html
Nor will you, given that I am not the one to take these patches, Felipe
is. I noticed now that you said "please route around Felipe", but
sorry, no, I'm not going to do that unless there's a really good reason.
Felipe seems to be around at the moment, please work with him on this.
sorry,
greg k-h
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 17:37 ` Greg KH
@ 2013-08-27 18:37 ` Felipe Balbi
2013-08-27 19:30 ` Greg KH
2013-08-27 19:23 ` Sebastian Andrzej Siewior
1 sibling, 1 reply; 45+ messages in thread
From: Felipe Balbi @ 2013-08-27 18:37 UTC (permalink / raw)
To: Greg KH
Cc: Sebastian Andrzej Siewior, Benoit Cousson,
Javier Martinez Canillas, Stephen Rothwell, Arnd Bergmann,
linux-kernel, Felipe Balbi, linux-next, Olof Johansson,
linux-arm-kernel, khilman
[-- Attachment #1: Type: text/plain, Size: 1942 bytes --]
Hi,
On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote:
> On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote:
> > On 08/27/2013 04:05 PM, Benoit Cousson wrote:
> > > On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
> > >> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
> > >>> + Kevin,
> > >>>
> > >>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
> > >>>> What do we do now?
> > >>>
> > >>> Cannot you just merge the stable arm-soc/dt branch into your branch
> > >>> before applying your patches?
> > >>
> > >> That is up to Greg. This changes sat in his usb-next tree for a while
> > >> now. And before they hit Greg they were in Felipe's tree for a while.
> > >>
> > >> To be exact, last .dts change via USB was:
> > >>
> > >> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> > >> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> > >> Commit: Felipe Balbi <balbi@ti.com>
> > >> CommitDate: Fri Aug 9 17:40:16 2013 +0300
> > >>
> > >> usb: musb dma: add cppi41 dma driver
> > >
> > > Mmm, if that branch is supposed to be stable, I'm not sure it will be
> > > doable...
> > >
> > > Maybe we should do the other way around? And merge usb-next into
> > > arm-soc/dt.
> > >
> > > Kevin, Olof?
> >
> > Please be aware that I have no response so far regarding [0] from Greg.
> >
> > [0] http://www.spinics.net/lists/linux-usb/msg92595.html
>
> Nor will you, given that I am not the one to take these patches, Felipe
> is. I noticed now that you said "please route around Felipe", but
> sorry, no, I'm not going to do that unless there's a really good reason.
> Felipe seems to be around at the moment, please work with him on this.
If you will still take a 'part2' pull request from me, I can send you
urgent bugfixes by friday. If I have some time left, I can even try to
get that sorted out by tomorrow.
cheers
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 18:37 ` Felipe Balbi
@ 2013-08-27 19:30 ` Greg KH
2013-08-27 19:56 ` Felipe Balbi
0 siblings, 1 reply; 45+ messages in thread
From: Greg KH @ 2013-08-27 19:30 UTC (permalink / raw)
To: Felipe Balbi
Cc: Sebastian Andrzej Siewior, Benoit Cousson,
Javier Martinez Canillas, Stephen Rothwell, Arnd Bergmann,
linux-kernel, linux-next, Olof Johansson, linux-arm-kernel,
khilman
On Tue, Aug 27, 2013 at 01:37:32PM -0500, Felipe Balbi wrote:
> Hi,
>
> On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote:
> > On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote:
> > > On 08/27/2013 04:05 PM, Benoit Cousson wrote:
> > > > On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
> > > >> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
> > > >>> + Kevin,
> > > >>>
> > > >>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
> > > >>>> What do we do now?
> > > >>>
> > > >>> Cannot you just merge the stable arm-soc/dt branch into your branch
> > > >>> before applying your patches?
> > > >>
> > > >> That is up to Greg. This changes sat in his usb-next tree for a while
> > > >> now. And before they hit Greg they were in Felipe's tree for a while.
> > > >>
> > > >> To be exact, last .dts change via USB was:
> > > >>
> > > >> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> > > >> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> > > >> Commit: Felipe Balbi <balbi@ti.com>
> > > >> CommitDate: Fri Aug 9 17:40:16 2013 +0300
> > > >>
> > > >> usb: musb dma: add cppi41 dma driver
> > > >
> > > > Mmm, if that branch is supposed to be stable, I'm not sure it will be
> > > > doable...
> > > >
> > > > Maybe we should do the other way around? And merge usb-next into
> > > > arm-soc/dt.
> > > >
> > > > Kevin, Olof?
> > >
> > > Please be aware that I have no response so far regarding [0] from Greg.
> > >
> > > [0] http://www.spinics.net/lists/linux-usb/msg92595.html
> >
> > Nor will you, given that I am not the one to take these patches, Felipe
> > is. I noticed now that you said "please route around Felipe", but
> > sorry, no, I'm not going to do that unless there's a really good reason.
> > Felipe seems to be around at the moment, please work with him on this.
>
> If you will still take a 'part2' pull request from me, I can send you
> urgent bugfixes by friday. If I have some time left, I can even try to
> get that sorted out by tomorrow.
For 3.12 stuff, like "fixes", sure, I can take them this week, that
should give us a week or so for linux-next testing, right?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 19:30 ` Greg KH
@ 2013-08-27 19:56 ` Felipe Balbi
2013-08-29 10:06 ` Benoit Cousson
0 siblings, 1 reply; 45+ messages in thread
From: Felipe Balbi @ 2013-08-27 19:56 UTC (permalink / raw)
To: Greg KH
Cc: Felipe Balbi, Sebastian Andrzej Siewior, Benoit Cousson,
Javier Martinez Canillas, Stephen Rothwell, Arnd Bergmann,
linux-kernel, linux-next, Olof Johansson, linux-arm-kernel,
khilman
[-- Attachment #1: Type: text/plain, Size: 2587 bytes --]
Hi,
On Tue, Aug 27, 2013 at 12:30:21PM -0700, Greg KH wrote:
> On Tue, Aug 27, 2013 at 01:37:32PM -0500, Felipe Balbi wrote:
> > Hi,
> >
> > On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote:
> > > On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote:
> > > > On 08/27/2013 04:05 PM, Benoit Cousson wrote:
> > > > > On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
> > > > >> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
> > > > >>> + Kevin,
> > > > >>>
> > > > >>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
> > > > >>>> What do we do now?
> > > > >>>
> > > > >>> Cannot you just merge the stable arm-soc/dt branch into your branch
> > > > >>> before applying your patches?
> > > > >>
> > > > >> That is up to Greg. This changes sat in his usb-next tree for a while
> > > > >> now. And before they hit Greg they were in Felipe's tree for a while.
> > > > >>
> > > > >> To be exact, last .dts change via USB was:
> > > > >>
> > > > >> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> > > > >> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> > > > >> Commit: Felipe Balbi <balbi@ti.com>
> > > > >> CommitDate: Fri Aug 9 17:40:16 2013 +0300
> > > > >>
> > > > >> usb: musb dma: add cppi41 dma driver
> > > > >
> > > > > Mmm, if that branch is supposed to be stable, I'm not sure it will be
> > > > > doable...
> > > > >
> > > > > Maybe we should do the other way around? And merge usb-next into
> > > > > arm-soc/dt.
> > > > >
> > > > > Kevin, Olof?
> > > >
> > > > Please be aware that I have no response so far regarding [0] from Greg.
> > > >
> > > > [0] http://www.spinics.net/lists/linux-usb/msg92595.html
> > >
> > > Nor will you, given that I am not the one to take these patches, Felipe
> > > is. I noticed now that you said "please route around Felipe", but
> > > sorry, no, I'm not going to do that unless there's a really good reason.
> > > Felipe seems to be around at the moment, please work with him on this.
> >
> > If you will still take a 'part2' pull request from me, I can send you
> > urgent bugfixes by friday. If I have some time left, I can even try to
> > get that sorted out by tomorrow.
>
> For 3.12 stuff, like "fixes", sure, I can take them this week, that
> should give us a week or so for linux-next testing, right?
that's correct. I have most of them already queued up, let me just go
over my linux-usb maildir again and make sure I got all the important
stuff in.
cheers, thanks for opening this 'window'.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 19:56 ` Felipe Balbi
@ 2013-08-29 10:06 ` Benoit Cousson
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 14:23 ` Felipe Balbi
0 siblings, 2 replies; 45+ messages in thread
From: Benoit Cousson @ 2013-08-29 10:06 UTC (permalink / raw)
To: balbi
Cc: Greg KH, Sebastian Andrzej Siewior, Javier Martinez Canillas,
Stephen Rothwell, Arnd Bergmann, linux-kernel, linux-next,
Olof Johansson, linux-arm-kernel, khilman
Hi Felipe
On 27/08/2013 21:56, Felipe Balbi wrote:
> Hi,
>
> On Tue, Aug 27, 2013 at 12:30:21PM -0700, Greg KH wrote:
>> On Tue, Aug 27, 2013 at 01:37:32PM -0500, Felipe Balbi wrote:
>>> Hi,
>>>
>>> On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote:
>>>> On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote:
>>>>> On 08/27/2013 04:05 PM, Benoit Cousson wrote:
>>>>>> On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
>>>>>>> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
>>>>>>>> + Kevin,
>>>>>>>>
>>>>>>>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>>>>>>>>> What do we do now?
>>>>>>>>
>>>>>>>> Cannot you just merge the stable arm-soc/dt branch into your branch
>>>>>>>> before applying your patches?
>>>>>>>
>>>>>>> That is up to Greg. This changes sat in his usb-next tree for a while
>>>>>>> now. And before they hit Greg they were in Felipe's tree for a while.
>>>>>>>
>>>>>>> To be exact, last .dts change via USB was:
>>>>>>>
>>>>>>> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>>>>>>> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
>>>>>>> Commit: Felipe Balbi <balbi@ti.com>
>>>>>>> CommitDate: Fri Aug 9 17:40:16 2013 +0300
>>>>>>>
>>>>>>> usb: musb dma: add cppi41 dma driver
>>>>>>
>>>>>> Mmm, if that branch is supposed to be stable, I'm not sure it will be
>>>>>> doable...
>>>>>>
>>>>>> Maybe we should do the other way around? And merge usb-next into
>>>>>> arm-soc/dt.
>>>>>>
>>>>>> Kevin, Olof?
>>>>>
>>>>> Please be aware that I have no response so far regarding [0] from Greg.
>>>>>
>>>>> [0] http://www.spinics.net/lists/linux-usb/msg92595.html
>>>>
>>>> Nor will you, given that I am not the one to take these patches, Felipe
>>>> is. I noticed now that you said "please route around Felipe", but
>>>> sorry, no, I'm not going to do that unless there's a really good reason.
>>>> Felipe seems to be around at the moment, please work with him on this.
>>>
>>> If you will still take a 'part2' pull request from me, I can send you
>>> urgent bugfixes by friday. If I have some time left, I can even try to
>>> get that sorted out by tomorrow.
>>
>> For 3.12 stuff, like "fixes", sure, I can take them this week, that
>> should give us a week or so for linux-next testing, right?
>
> that's correct. I have most of them already queued up, let me just go
> over my linux-usb maildir again and make sure I got all the important
> stuff in.
>
> cheers, thanks for opening this 'window'.
There are two patches in my DTS tree that conflict with the usb-next.
I will remove that one (ARM: dts: AM33XX: don't redefine OCP bus and
device nodes) , as suggested by Olof, since it is the biggest source of
conflict from my tree.
The second one is easily fixable, and Stephen already did it, but it
will be even better it you could take it in your tree.
This is the patch you did that I just slightly renamed (ARM: OMAP5: dts:
fix reg property size).
Regards,
Benoit
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-29 10:06 ` Benoit Cousson
@ 2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 14:23 ` Felipe Balbi
1 sibling, 0 replies; 45+ messages in thread
From: Javier Martinez Canillas @ 2013-08-29 13:44 UTC (permalink / raw)
To: Benoit Cousson
Cc: Felipe Balbi, Greg KH, Sebastian Andrzej Siewior,
Stephen Rothwell, Arnd Bergmann, linux-kernel, linux-next,
Olof Johansson, linux-arm-kernel, khilman
On Thu, Aug 29, 2013 at 12:06 PM, Benoit Cousson <bcousson@baylibre.com> wrote:
> Hi Felipe
>
>
> On 27/08/2013 21:56, Felipe Balbi wrote:
>>
>> Hi,
>>
>> On Tue, Aug 27, 2013 at 12:30:21PM -0700, Greg KH wrote:
>>>
>>> On Tue, Aug 27, 2013 at 01:37:32PM -0500, Felipe Balbi wrote:
>>>>
>>>> Hi,
>>>>
>>>> On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote:
>>>>>
>>>>> On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior
>>>>> wrote:
>>>>>>
>>>>>> On 08/27/2013 04:05 PM, Benoit Cousson wrote:
>>>>>>>
>>>>>>> On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
>>>>>>>>
>>>>>>>> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
>>>>>>>>>
>>>>>>>>> + Kevin,
>>>>>>>>>
>>>>>>>>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>>>>>>>>>>
>>>>>>>>>> What do we do now?
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> Cannot you just merge the stable arm-soc/dt branch into your branch
>>>>>>>>> before applying your patches?
>>>>>>>>
>>>>>>>>
>>>>>>>> That is up to Greg. This changes sat in his usb-next tree for a
>>>>>>>> while
>>>>>>>> now. And before they hit Greg they were in Felipe's tree for a
>>>>>>>> while.
>>>>>>>>
>>>>>>>> To be exact, last .dts change via USB was:
>>>>>>>>
>>>>>>>> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>>>>>>>> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
>>>>>>>> Commit: Felipe Balbi <balbi@ti.com>
>>>>>>>> CommitDate: Fri Aug 9 17:40:16 2013 +0300
>>>>>>>>
>>>>>>>> usb: musb dma: add cppi41 dma driver
>>>>>>>
>>>>>>>
>>>>>>> Mmm, if that branch is supposed to be stable, I'm not sure it will be
>>>>>>> doable...
>>>>>>>
>>>>>>> Maybe we should do the other way around? And merge usb-next into
>>>>>>> arm-soc/dt.
>>>>>>>
>>>>>>> Kevin, Olof?
>>>>>>
>>>>>>
>>>>>> Please be aware that I have no response so far regarding [0] from
>>>>>> Greg.
>>>>>>
>>>>>> [0] http://www.spinics.net/lists/linux-usb/msg92595.html
>>>>>
>>>>>
>>>>> Nor will you, given that I am not the one to take these patches, Felipe
>>>>> is. I noticed now that you said "please route around Felipe", but
>>>>> sorry, no, I'm not going to do that unless there's a really good
>>>>> reason.
>>>>> Felipe seems to be around at the moment, please work with him on this.
>>>>
>>>>
>>>> If you will still take a 'part2' pull request from me, I can send you
>>>> urgent bugfixes by friday. If I have some time left, I can even try to
>>>> get that sorted out by tomorrow.
>>>
>>>
>>> For 3.12 stuff, like "fixes", sure, I can take them this week, that
>>> should give us a week or so for linux-next testing, right?
>>
>>
>> that's correct. I have most of them already queued up, let me just go
>> over my linux-usb maildir again and make sure I got all the important
>> stuff in.
>>
>> cheers, thanks for opening this 'window'.
>
>
> There are two patches in my DTS tree that conflict with the usb-next.
>
> I will remove that one (ARM: dts: AM33XX: don't redefine OCP bus and device
> nodes) , as suggested by Olof, since it is the biggest source of conflict
> from my tree.
>
Hi Benoit,
Should I re-post this patch for 3.13 or do you think that the clean-up
is not worth it due the high probability to lead to a merge conflict?
I know is an intrusive change but a needed cleanup IMHO. People keep
doing copy & paste with current am33xx DT and keep duplicating device
nodes already existing in the included .dtsi file. I reviewed at least
2 new DTS that had the same issue.
Also, this shouldn't had happened if all the OMAP DT patches went
through your tree...
> The second one is easily fixable, and Stephen already did it, but it will be
> even better it you could take it in your tree.
> This is the patch you did that I just slightly renamed (ARM: OMAP5: dts: fix
> reg property size).
>
> Regards,
> Benoit
>
Best regards,
Javier
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 13:44 ` Javier Martinez Canillas
@ 2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:47 ` Benoit Cousson
1 sibling, 1 reply; 45+ messages in thread
From: Felipe Balbi @ 2013-08-29 14:23 UTC (permalink / raw)
To: Benoit Cousson
Cc: balbi, Greg KH, Sebastian Andrzej Siewior,
Javier Martinez Canillas, Stephen Rothwell, Arnd Bergmann,
linux-kernel, linux-next, Olof Johansson, linux-arm-kernel,
khilman
[-- Attachment #1: Type: text/plain, Size: 3324 bytes --]
On Thu, Aug 29, 2013 at 12:06:32PM +0200, Benoit Cousson wrote:
> Hi Felipe
>
> On 27/08/2013 21:56, Felipe Balbi wrote:
> >Hi,
> >
> >On Tue, Aug 27, 2013 at 12:30:21PM -0700, Greg KH wrote:
> >>On Tue, Aug 27, 2013 at 01:37:32PM -0500, Felipe Balbi wrote:
> >>>Hi,
> >>>
> >>>On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote:
> >>>>On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote:
> >>>>>On 08/27/2013 04:05 PM, Benoit Cousson wrote:
> >>>>>>On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
> >>>>>>>On 08/27/2013 03:57 PM, Benoit Cousson wrote:
> >>>>>>>>+ Kevin,
> >>>>>>>>
> >>>>>>>>On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
> >>>>>>>>>What do we do now?
> >>>>>>>>
> >>>>>>>>Cannot you just merge the stable arm-soc/dt branch into your branch
> >>>>>>>>before applying your patches?
> >>>>>>>
> >>>>>>>That is up to Greg. This changes sat in his usb-next tree for a while
> >>>>>>>now. And before they hit Greg they were in Felipe's tree for a while.
> >>>>>>>
> >>>>>>>To be exact, last .dts change via USB was:
> >>>>>>>
> >>>>>>>Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> >>>>>>>AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> >>>>>>>Commit: Felipe Balbi <balbi@ti.com>
> >>>>>>>CommitDate: Fri Aug 9 17:40:16 2013 +0300
> >>>>>>>
> >>>>>>> usb: musb dma: add cppi41 dma driver
> >>>>>>
> >>>>>>Mmm, if that branch is supposed to be stable, I'm not sure it will be
> >>>>>>doable...
> >>>>>>
> >>>>>>Maybe we should do the other way around? And merge usb-next into
> >>>>>>arm-soc/dt.
> >>>>>>
> >>>>>>Kevin, Olof?
> >>>>>
> >>>>>Please be aware that I have no response so far regarding [0] from Greg.
> >>>>>
> >>>>>[0] http://www.spinics.net/lists/linux-usb/msg92595.html
> >>>>
> >>>>Nor will you, given that I am not the one to take these patches, Felipe
> >>>>is. I noticed now that you said "please route around Felipe", but
> >>>>sorry, no, I'm not going to do that unless there's a really good reason.
> >>>>Felipe seems to be around at the moment, please work with him on this.
> >>>
> >>>If you will still take a 'part2' pull request from me, I can send you
> >>>urgent bugfixes by friday. If I have some time left, I can even try to
> >>>get that sorted out by tomorrow.
> >>
> >>For 3.12 stuff, like "fixes", sure, I can take them this week, that
> >>should give us a week or so for linux-next testing, right?
> >
> >that's correct. I have most of them already queued up, let me just go
> >over my linux-usb maildir again and make sure I got all the important
> >stuff in.
> >
> >cheers, thanks for opening this 'window'.
>
> There are two patches in my DTS tree that conflict with the usb-next.
>
> I will remove that one (ARM: dts: AM33XX: don't redefine OCP bus and
> device nodes) , as suggested by Olof, since it is the biggest source
> of conflict from my tree.
>
> The second one is easily fixable, and Stephen already did it, but it
> will be even better it you could take it in your tree.
> This is the patch you did that I just slightly renamed (ARM: OMAP5:
> dts: fix reg property size).
I'm done with Pull requests for Greg. If the conflict is easy to solve,
what's the problem in having the conflict to start with ?
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-29 14:23 ` Felipe Balbi
@ 2013-08-29 14:47 ` Benoit Cousson
0 siblings, 0 replies; 45+ messages in thread
From: Benoit Cousson @ 2013-08-29 14:47 UTC (permalink / raw)
To: balbi
Cc: Greg KH, Sebastian Andrzej Siewior, Javier Martinez Canillas,
Stephen Rothwell, Arnd Bergmann, linux-kernel, linux-next,
Olof Johansson, linux-arm-kernel, khilman
On 29/08/2013 16:23, Felipe Balbi wrote:
> On Thu, Aug 29, 2013 at 12:06:32PM +0200, Benoit Cousson wrote:
>> Hi Felipe
>>
>> On 27/08/2013 21:56, Felipe Balbi wrote:
>>> Hi,
>>>
>>> On Tue, Aug 27, 2013 at 12:30:21PM -0700, Greg KH wrote:
>>>> On Tue, Aug 27, 2013 at 01:37:32PM -0500, Felipe Balbi wrote:
>>>>> Hi,
>>>>>
>>>>> On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote:
>>>>>> On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote:
>>>>>>> On 08/27/2013 04:05 PM, Benoit Cousson wrote:
>>>>>>>> On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
>>>>>>>>> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
>>>>>>>>>> + Kevin,
>>>>>>>>>>
>>>>>>>>>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>>>>>>>>>>> What do we do now?
>>>>>>>>>>
>>>>>>>>>> Cannot you just merge the stable arm-soc/dt branch into your branch
>>>>>>>>>> before applying your patches?
>>>>>>>>>
>>>>>>>>> That is up to Greg. This changes sat in his usb-next tree for a while
>>>>>>>>> now. And before they hit Greg they were in Felipe's tree for a while.
>>>>>>>>>
>>>>>>>>> To be exact, last .dts change via USB was:
>>>>>>>>>
>>>>>>>>> Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>>>>>>>>> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
>>>>>>>>> Commit: Felipe Balbi <balbi@ti.com>
>>>>>>>>> CommitDate: Fri Aug 9 17:40:16 2013 +0300
>>>>>>>>>
>>>>>>>>> usb: musb dma: add cppi41 dma driver
>>>>>>>>
>>>>>>>> Mmm, if that branch is supposed to be stable, I'm not sure it will be
>>>>>>>> doable...
>>>>>>>>
>>>>>>>> Maybe we should do the other way around? And merge usb-next into
>>>>>>>> arm-soc/dt.
>>>>>>>>
>>>>>>>> Kevin, Olof?
>>>>>>>
>>>>>>> Please be aware that I have no response so far regarding [0] from Greg.
>>>>>>>
>>>>>>> [0] http://www.spinics.net/lists/linux-usb/msg92595.html
>>>>>>
>>>>>> Nor will you, given that I am not the one to take these patches, Felipe
>>>>>> is. I noticed now that you said "please route around Felipe", but
>>>>>> sorry, no, I'm not going to do that unless there's a really good reason.
>>>>>> Felipe seems to be around at the moment, please work with him on this.
>>>>>
>>>>> If you will still take a 'part2' pull request from me, I can send you
>>>>> urgent bugfixes by friday. If I have some time left, I can even try to
>>>>> get that sorted out by tomorrow.
>>>>
>>>> For 3.12 stuff, like "fixes", sure, I can take them this week, that
>>>> should give us a week or so for linux-next testing, right?
>>>
>>> that's correct. I have most of them already queued up, let me just go
>>> over my linux-usb maildir again and make sure I got all the important
>>> stuff in.
>>>
>>> cheers, thanks for opening this 'window'.
>>
>> There are two patches in my DTS tree that conflict with the usb-next.
>>
>> I will remove that one (ARM: dts: AM33XX: don't redefine OCP bus and
>> device nodes) , as suggested by Olof, since it is the biggest source
>> of conflict from my tree.
>>
>> The second one is easily fixable, and Stephen already did it, but it
>> will be even better it you could take it in your tree.
>> This is the patch you did that I just slightly renamed (ARM: OMAP5:
>> dts: fix reg property size).
>
> I'm done with Pull requests for Greg. If the conflict is easy to solve,
> what's the problem in having the conflict to start with ?
Well, it is mainly the other one that is a pain to fix. Since I was
about to send another pull-request, I was wondering if you'll be OK to
take it.
Regards,
Benoit
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 17:37 ` Greg KH
2013-08-27 18:37 ` Felipe Balbi
@ 2013-08-27 19:23 ` Sebastian Andrzej Siewior
1 sibling, 0 replies; 45+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-08-27 19:23 UTC (permalink / raw)
To: Greg KH
Cc: Benoit Cousson, Javier Martinez Canillas, Stephen Rothwell,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel, khilman
On 08/27/2013 07:37 PM, Greg KH wrote:
> Nor will you, given that I am not the one to take these patches, Felipe
> is. I noticed now that you said "please route around Felipe", but
> sorry, no, I'm not going to do that unless there's a really good reason.
> Felipe seems to be around at the moment, please work with him on this.
I said that if you prefer to leave this up to Felipe once he gets back,
then it is okay, too. Letting me know would be nice. By the time of
writting I did not know when he gets back but knew that I won't be
around once -rc1 is out to re-ping if necessary.
Now that he is back, I can work with him.
>
> sorry,
>
> greg k-h
Sebastian
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 14:02 ` Sebastian Andrzej Siewior
@ 2013-08-27 15:01 ` Kevin Hilman
2013-08-27 15:25 ` Sebastian Andrzej Siewior
1 sibling, 1 reply; 45+ messages in thread
From: Kevin Hilman @ 2013-08-27 15:01 UTC (permalink / raw)
To: Benoit Cousson
Cc: Sebastian Andrzej Siewior, Javier Martinez Canillas,
Stephen Rothwell, Greg KH, Arnd Bergmann, linux-kernel,
Felipe Balbi, linux-next, Olof Johansson, linux-arm-kernel
Benoit Cousson <bcousson@baylibre.com> writes:
> + Kevin,
>
> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>> On 08/27/2013 03:24 PM, Benoit Cousson wrote:
>>> Hi Sebatian,
>>
>> Hi Benoit,
>>
>>> Yes. DT patches are an endless source of merge conflicts if they are
>>> merge throught different trees.
>>
>> Usually there are small conflicts because two people added / changed a
>> node nearby. This patch turned the .dts file almost upside down.
>
> Yes, that's true.
>
>>> What was discussed with Olof and Arnd during Connect is that we should
>>> avoid merging DT patches outside arm-soc tree to avoid that kind of
>>> situation.
>>
>> I am aware of this now. However these changes belonged together because
>> a) they belonged together and b) would break the driver until the .dts
>> changes and driver code is in-sync.
>> In future I am going to ask you for a topic branch so I can get my
>> changes in one piece without breaking stuff in the middle.
>>
>> What do we do now?
>
> Cannot you just merge the stable arm-soc/dt branch into your branch
> before applying your patches?
Unfortunately, the next/dt branch of arm-soc is not necessarily stable
so should *not* be merged. In fact none of the arm-soc branches should
be considered stable.
As was already mentioned, this should be split up into driver changes
and DTS changes through arm-soc. They'll both merge for v3.12.
BTW, how did this patch get merged without a signoff/ack from the OMAP
DT maintainer in the first place? Hmm, looks like Benoit was not copied
nor was linux-omap or linux-arm-kernel copied in the original mails.
Kevin
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 15:01 ` Kevin Hilman
@ 2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:20 ` Kevin Hilman
0 siblings, 2 replies; 45+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-08-27 15:25 UTC (permalink / raw)
To: Kevin Hilman
Cc: Benoit Cousson, Javier Martinez Canillas, Stephen Rothwell,
Greg KH, Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel
On 08/27/2013 05:01 PM, Kevin Hilman wrote:
>>> What do we do now?
>>
>> Cannot you just merge the stable arm-soc/dt branch into your branch
>> before applying your patches?
>
> Unfortunately, the next/dt branch of arm-soc is not necessarily stable
> so should *not* be merged. In fact none of the arm-soc branches should
> be considered stable.
>
> As was already mentioned, this should be split up into driver changes
> and DTS changes through arm-soc. They'll both merge for v3.12.
But splitting will break the driver until .dts & code is in sync again.
> BTW, how did this patch get merged without a signoff/ack from the OMAP
> DT maintainer in the first place? Hmm, looks like Benoit was not copied
> nor was linux-omap or linux-arm-kernel copied in the original mails.
Hmm. I had Benoit's okay [0] to do the change "as long as Felipe is
fine with it". I indeed forgot to Cc Benoit on the dts changes.
For the phy-rename Felipe pinged you and we did the topic-branch, here
I forgot.
>
> Kevin
[0] http://www.spinics.net/lists/linux-usb/msg88423.html
Sebastian
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 15:25 ` Sebastian Andrzej Siewior
@ 2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-28 13:01 ` Benoit Cousson
2013-08-27 16:20 ` Kevin Hilman
1 sibling, 2 replies; 45+ messages in thread
From: Olof Johansson @ 2013-08-27 16:12 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Kevin Hilman, Benoit Cousson, Javier Martinez Canillas,
Stephen Rothwell, Greg KH, Arnd Bergmann, linux-kernel,
Felipe Balbi, linux-next, linux-arm-kernel
On Tue, Aug 27, 2013 at 05:25:23PM +0200, Sebastian Andrzej Siewior wrote:
> On 08/27/2013 05:01 PM, Kevin Hilman wrote:
> >>> What do we do now?
> >>
> >> Cannot you just merge the stable arm-soc/dt branch into your branch
> >> before applying your patches?
> >
> > Unfortunately, the next/dt branch of arm-soc is not necessarily stable
> > so should *not* be merged. In fact none of the arm-soc branches should
> > be considered stable.
> >
> > As was already mentioned, this should be split up into driver changes
> > and DTS changes through arm-soc. They'll both merge for v3.12.
>
> But splitting will break the driver until .dts & code is in sync again.
>
> > BTW, how did this patch get merged without a signoff/ack from the OMAP
> > DT maintainer in the first place? Hmm, looks like Benoit was not copied
> > nor was linux-omap or linux-arm-kernel copied in the original mails.
>
> Hmm. I had Benoit's okay [0] to do the change "as long as Felipe is
> fine with it". I indeed forgot to Cc Benoit on the dts changes.
> For the phy-rename Felipe pinged you and we did the topic-branch, here
> I forgot.
No. Read that email again. What Benoit said was that if Felipe was fine
with the change _HE_ would take it. Huge difference, and one that would have
avoided this situation.
The only way to solve these things in the future is to make the driver handle
both the new and the old binding. Bindings are not supposed to change in
incompatible ways any more, unless for special circumstances and/or when the
old binding was completely broken.
The only way forward here, since Greg runs a stable tree that he doesn't
rebase, is for us to rebuild without the OMAP DT branch, and ask Benoit to take
out the conflicting changes.
Benoit, I know this is none of your fault, but would you mind preparing a new
copy of the DT branch without the conflicting patches, and hold those to 3.13?
I haven't looked to see how many those were.
-Olof
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 16:12 ` Olof Johansson
@ 2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-28 13:01 ` Benoit Cousson
1 sibling, 0 replies; 45+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-08-27 16:30 UTC (permalink / raw)
To: Olof Johansson
Cc: Kevin Hilman, Benoit Cousson, Javier Martinez Canillas,
Stephen Rothwell, Greg KH, Arnd Bergmann, linux-kernel,
Felipe Balbi, linux-next, linux-arm-kernel
On 08/27/2013 06:12 PM, Olof Johansson wrote:
> No. Read that email again. What Benoit said was that if Felipe was fine
> with the change _HE_ would take it. Huge difference, and one that would have
> avoided this situation.
Yes, I'm sorry.
> The only way to solve these things in the future is to make the driver handle
> both the new and the old binding. Bindings are not supposed to change in
> incompatible ways any more, unless for special circumstances and/or when the
> old binding was completely broken.
The old bindings were completly broken.
> -Olof
Sebastian
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:30 ` Sebastian Andrzej Siewior
@ 2013-08-28 13:01 ` Benoit Cousson
1 sibling, 0 replies; 45+ messages in thread
From: Benoit Cousson @ 2013-08-28 13:01 UTC (permalink / raw)
To: Olof Johansson
Cc: Sebastian Andrzej Siewior, Kevin Hilman,
Javier Martinez Canillas, Stephen Rothwell, Greg KH,
Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
linux-arm-kernel
Hi Olof,
On 27/08/2013 18:12, Olof Johansson wrote:
> On Tue, Aug 27, 2013 at 05:25:23PM +0200, Sebastian Andrzej Siewior wrote:
>> On 08/27/2013 05:01 PM, Kevin Hilman wrote:
>>>>> What do we do now?
>>>>
>>>> Cannot you just merge the stable arm-soc/dt branch into your branch
>>>> before applying your patches?
>>>
>>> Unfortunately, the next/dt branch of arm-soc is not necessarily stable
>>> so should *not* be merged. In fact none of the arm-soc branches should
>>> be considered stable.
>>>
>>> As was already mentioned, this should be split up into driver changes
>>> and DTS changes through arm-soc. They'll both merge for v3.12.
>>
>> But splitting will break the driver until .dts & code is in sync again.
>>
>>> BTW, how did this patch get merged without a signoff/ack from the OMAP
>>> DT maintainer in the first place? Hmm, looks like Benoit was not copied
>>> nor was linux-omap or linux-arm-kernel copied in the original mails.
>>
>> Hmm. I had Benoit's okay [0] to do the change "as long as Felipe is
>> fine with it". I indeed forgot to Cc Benoit on the dts changes.
>> For the phy-rename Felipe pinged you and we did the topic-branch, here
>> I forgot.
>
> No. Read that email again. What Benoit said was that if Felipe was fine
> with the change _HE_ would take it. Huge difference, and one that would have
> avoided this situation.
>
> The only way to solve these things in the future is to make the driver handle
> both the new and the old binding. Bindings are not supposed to change in
> incompatible ways any more, unless for special circumstances and/or when the
> old binding was completely broken.
>
>
> The only way forward here, since Greg runs a stable tree that he doesn't
> rebase, is for us to rebuild without the OMAP DT branch, and ask Benoit to take
> out the conflicting changes.
>
> Benoit, I know this is none of your fault, but would you mind preparing a new
> copy of the DT branch without the conflicting patches, and hold those to 3.13?
> I haven't looked to see how many those were.
OK, I'll do that ASAP and check how many should be removed to avoid a
conflict with usb-next.
Regards,
Benoit
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 16:12 ` Olof Johansson
@ 2013-08-27 16:20 ` Kevin Hilman
1 sibling, 0 replies; 45+ messages in thread
From: Kevin Hilman @ 2013-08-27 16:20 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: Benoit Cousson, Javier Martinez Canillas, Stephen Rothwell,
Greg KH, Arnd Bergmann, linux-kernel, Felipe Balbi, linux-next,
Olof Johansson, linux-arm-kernel
Sebastian Andrzej Siewior <bigeasy@linutronix.de> writes:
> On 08/27/2013 05:01 PM, Kevin Hilman wrote:
>>>> What do we do now?
>>>
>>> Cannot you just merge the stable arm-soc/dt branch into your branch
>>> before applying your patches?
>>
>> Unfortunately, the next/dt branch of arm-soc is not necessarily stable
>> so should *not* be merged. In fact none of the arm-soc branches should
>> be considered stable.
>>
>> As was already mentioned, this should be split up into driver changes
>> and DTS changes through arm-soc. They'll both merge for v3.12.
>
> But splitting will break the driver until .dts & code is in sync again.
I wouldn't lose any sleep about breaking the driver since this was not
merged properly for various reasons (as Olof has pointed out.)
Unfortunately, since it's already in Greg's stable tree, we're now left
to clean up the mess in arm-soc land [grmbl]
Kevin
^ permalink raw reply [flat|nested] 45+ messages in thread
* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-08-28 6:45 Stephen Rothwell
2013-08-28 17:26 ` Greg KH
0 siblings, 1 reply; 45+ messages in thread
From: Stephen Rothwell @ 2013-08-28 6:45 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, avier Martinez Canillas,
Benoit Cousson, Sebastian Andrzej Siewior, Felipe Balbi, Greg KH
[-- Attachment #1: Type: text/plain, Size: 21985 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/boot/dts/am335x-bone.dts, arch/arm/boot/dts/am335x-evm.dts and
arch/arm/boot/dts/am335x-evmsk.dts between commit c031a7d41934 ("usb:
usb: dsps: update code according to the binding document") from the usb
tree and commits 63f6b2550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus
and device nodes"), 781f17983015 ("usb: musb: am335x-evm: Do not remove
the session bit HOST-only mode") and 2ae847a1b10f ("usb: musb: am335x:
add second port to beagle bone") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/am335x-bone.dts
index d318987,d99be03..0000000
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@@ -24,145 -24,6 +24,37 @@@
reg = <0x80000000 0x10000000>; /* 256 MB */
};
- am33xx_pinmux: pinmux@44e10800 {
- pinctrl-names = "default";
- pinctrl-0 = <&clkout2_pin>;
-
- user_leds_s0: user_leds_s0 {
- pinctrl-single,pins = <
- 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
- 0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */
- 0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */
- 0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */
- >;
- };
-
- i2c0_pins: pinmux_i2c0_pins {
- pinctrl-single,pins = <
- 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
- 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
- >;
- };
-
- uart0_pins: pinmux_uart0_pins {
- pinctrl-single,pins = <
- 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
- 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
- >;
- };
-
- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
- >;
- };
-
- cpsw_default: cpsw_default {
- pinctrl-single,pins = <
- /* Slave 1 */
- 0x110 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxerr.mii1_rxerr */
- 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */
- 0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxdv.mii1_rxdv */
- 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */
- 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */
- 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */
- 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */
- 0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_txclk.mii1_txclk */
- 0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxclk.mii1_rxclk */
- 0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd3.mii1_rxd3 */
- 0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd2.mii1_rxd2 */
- 0x13c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd1.mii1_rxd1 */
- 0x140 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd0.mii1_rxd0 */
- >;
- };
-
- cpsw_sleep: cpsw_sleep {
- pinctrl-single,pins = <
- /* Slave 1 reset value */
- 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
-
- davinci_mdio_default: davinci_mdio_default {
- pinctrl-single,pins = <
- /* MDIO */
- 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
- 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
- >;
- };
-
- davinci_mdio_sleep: davinci_mdio_sleep {
- pinctrl-single,pins = <
- /* MDIO reset value */
- 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
- };
-
+ ocp {
- uart0: serial@44e09000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins>;
-
- status = "okay";
- };
-
+ musb: usb@47400000 {
+ status = "okay";
+
+ control@44e10000 {
+ status = "okay";
+ };
+
+ usb-phy@47401300 {
+ status = "okay";
+ };
+
+ usb-phy@47401b00 {
+ status = "okay";
+ };
+
+ usb@47401000 {
+ status = "okay";
+ };
+
+ usb@47401800 {
+ status = "okay";
+ dr_mode = "host";
+ };
+
+ dma-controller@07402000 {
+ status = "okay";
+ };
+ };
-
- i2c0: i2c@44e0b000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
-
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@24 {
- reg = <0x24>;
- };
-
- };
+ };
+
leds {
pinctrl-names = "default";
pinctrl-0 = <&user_leds_s0>;
diff --cc arch/arm/boot/dts/am335x-evm.dts
index e8ec875,1a0f33e..0000000
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@@ -24,324 -24,6 +24,37 @@@
reg = <0x80000000 0x10000000>; /* 256 MB */
};
- am33xx_pinmux: pinmux@44e10800 {
- pinctrl-names = "default";
- pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;
-
- matrix_keypad_s0: matrix_keypad_s0 {
- pinctrl-single,pins = <
- 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
- 0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a6.gpio1_22 */
- 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a9.gpio1_25 */
- 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a10.gpio1_26 */
- 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.gpio1_27 */
- >;
- };
-
- volume_keys_s0: volume_keys_s0 {
- pinctrl-single,pins = <
- 0x150 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_sclk.gpio0_2 */
- 0x154 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_d0.gpio0_3 */
- >;
- };
-
- i2c0_pins: pinmux_i2c0_pins {
- pinctrl-single,pins = <
- 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
- 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
- >;
- };
-
- i2c1_pins: pinmux_i2c1_pins {
- pinctrl-single,pins = <
- 0x158 (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_d1.i2c1_sda */
- 0x15c (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_cs0.i2c1_scl */
- >;
- };
-
- uart0_pins: pinmux_uart0_pins {
- pinctrl-single,pins = <
- 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
- 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
- >;
- };
-
- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
- >;
- };
-
- nandflash_pins_s0: nandflash_pins_s0 {
- pinctrl-single,pins = <
- 0x0 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad0.gpmc_ad0 */
- 0x4 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad1.gpmc_ad1 */
- 0x8 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad2.gpmc_ad2 */
- 0xc (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad3.gpmc_ad3 */
- 0x10 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad4.gpmc_ad4 */
- 0x14 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad5.gpmc_ad5 */
- 0x18 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad6.gpmc_ad6 */
- 0x1c (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad7.gpmc_ad7 */
- 0x70 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_wait0.gpmc_wait0 */
- 0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_30 */
- 0x7c (PIN_OUTPUT | MUX_MODE0) /* gpmc_csn0.gpmc_csn0 */
- 0x90 (PIN_OUTPUT | MUX_MODE0) /* gpmc_advn_ale.gpmc_advn_ale */
- 0x94 (PIN_OUTPUT | MUX_MODE0) /* gpmc_oen_ren.gpmc_oen_ren */
- 0x98 (PIN_OUTPUT | MUX_MODE0) /* gpmc_wen.gpmc_wen */
- 0x9c (PIN_OUTPUT | MUX_MODE0) /* gpmc_be0n_cle.gpmc_be0n_cle */
- >;
- };
-
- ecap0_pins: backlight_pins {
- pinctrl-single,pins = <
- 0x164 0x0 /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
- >;
- };
-
- cpsw_default: cpsw_default {
- pinctrl-single,pins = <
- /* Slave 1 */
- 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
- 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
- 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
- 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
- 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
- 0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
- >;
- };
-
- cpsw_sleep: cpsw_sleep {
- pinctrl-single,pins = <
- /* Slave 1 reset value */
- 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
-
- davinci_mdio_default: davinci_mdio_default {
- pinctrl-single,pins = <
- /* MDIO */
- 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
- 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
- >;
- };
-
- davinci_mdio_sleep: davinci_mdio_sleep {
- pinctrl-single,pins = <
- /* MDIO reset value */
- 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
- };
-
+ ocp {
- uart0: serial@44e09000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins>;
-
- status = "okay";
- };
-
- i2c0: i2c@44e0b000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
-
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@2d {
- reg = <0x2d>;
- };
- };
-
+ musb: usb@47400000 {
+ status = "okay";
+
+ control@44e10000 {
+ status = "okay";
+ };
+
+ usb-phy@47401300 {
+ status = "okay";
+ };
+
+ usb-phy@47401b00 {
+ status = "okay";
+ };
+
+ usb@47401000 {
+ status = "okay";
+ };
+
+ usb@47401800 {
+ status = "okay";
+ dr_mode = "host";
+ };
+
+ dma-controller@07402000 {
+ status = "okay";
+ };
+ };
-
- i2c1: i2c@4802a000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
-
- status = "okay";
- clock-frequency = <100000>;
-
- lis331dlh: lis331dlh@18 {
- compatible = "st,lis331dlh", "st,lis3lv02d";
- reg = <0x18>;
- Vdd-supply = <&lis3_reg>;
- Vdd_IO-supply = <&lis3_reg>;
-
- st,click-single-x;
- st,click-single-y;
- st,click-single-z;
- st,click-thresh-x = <10>;
- st,click-thresh-y = <10>;
- st,click-thresh-z = <10>;
- st,irq1-click;
- st,irq2-click;
- st,wakeup-x-lo;
- st,wakeup-x-hi;
- st,wakeup-y-lo;
- st,wakeup-y-hi;
- st,wakeup-z-lo;
- st,wakeup-z-hi;
- st,min-limit-x = <120>;
- st,min-limit-y = <120>;
- st,min-limit-z = <140>;
- st,max-limit-x = <550>;
- st,max-limit-y = <550>;
- st,max-limit-z = <750>;
- };
-
- tsl2550: tsl2550@39 {
- compatible = "taos,tsl2550";
- reg = <0x39>;
- };
-
- tmp275: tmp275@48 {
- compatible = "ti,tmp275";
- reg = <0x48>;
- };
- };
-
- elm: elm@48080000 {
- status = "okay";
- };
-
- epwmss0: epwmss@48300000 {
- status = "okay";
-
- ecap0: ecap@48300100 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&ecap0_pins>;
- };
- };
-
- gpmc: gpmc@50000000 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&nandflash_pins_s0>;
- ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */
- nand@0,0 {
- reg = <0 0 0>; /* CS0, offset 0 */
- nand-bus-width = <8>;
- ti,nand-ecc-opt = "bch8";
- gpmc,device-nand = "true";
- gpmc,device-width = <1>;
- gpmc,sync-clk-ps = <0>;
- gpmc,cs-on-ns = <0>;
- gpmc,cs-rd-off-ns = <44>;
- gpmc,cs-wr-off-ns = <44>;
- gpmc,adv-on-ns = <6>;
- gpmc,adv-rd-off-ns = <34>;
- gpmc,adv-wr-off-ns = <44>;
- gpmc,we-on-ns = <0>;
- gpmc,we-off-ns = <40>;
- gpmc,oe-on-ns = <0>;
- gpmc,oe-off-ns = <54>;
- gpmc,access-ns = <64>;
- gpmc,rd-cycle-ns = <82>;
- gpmc,wr-cycle-ns = <82>;
- gpmc,wait-on-read = "true";
- gpmc,wait-on-write = "true";
- gpmc,bus-turnaround-ns = <0>;
- gpmc,cycle2cycle-delay-ns = <0>;
- gpmc,clk-activation-ns = <0>;
- gpmc,wait-monitoring-ns = <0>;
- gpmc,wr-access-ns = <40>;
- gpmc,wr-data-mux-bus-ns = <0>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- elm_id = <&elm>;
-
- /* MTD partition table */
- partition@0 {
- label = "SPL1";
- reg = <0x00000000 0x000020000>;
- };
-
- partition@1 {
- label = "SPL2";
- reg = <0x00020000 0x00020000>;
- };
-
- partition@2 {
- label = "SPL3";
- reg = <0x00040000 0x00020000>;
- };
-
- partition@3 {
- label = "SPL4";
- reg = <0x00060000 0x00020000>;
- };
-
- partition@4 {
- label = "U-boot";
- reg = <0x00080000 0x001e0000>;
- };
-
- partition@5 {
- label = "environment";
- reg = <0x00260000 0x00020000>;
- };
-
- partition@6 {
- label = "Kernel";
- reg = <0x00280000 0x00500000>;
- };
-
- partition@7 {
- label = "File-System";
- reg = <0x00780000 0x0F880000>;
- };
- };
- };
+ };
+
vbat: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "vbat";
diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index a6c5033,8e7279b..0000000
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -30,210 -30,6 +30,24 @@@
reg = <0x80000000 0x10000000>; /* 256 MB */
};
- am33xx_pinmux: pinmux@44e10800 {
- pinctrl-names = "default";
- pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
-
- user_leds_s0: user_leds_s0 {
- pinctrl-single,pins = <
- 0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad4.gpio1_4 */
- 0x14 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad5.gpio1_5 */
- 0x18 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad6.gpio1_6 */
- 0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad7.gpio1_7 */
- >;
- };
-
- gpio_keys_s0: gpio_keys_s0 {
- pinctrl-single,pins = <
- 0x94 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_oen_ren.gpio2_3 */
- 0x90 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_advn_ale.gpio2_2 */
- 0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_wait0.gpio0_30 */
- 0x9c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ben0_cle.gpio2_5 */
- >;
- };
-
- i2c0_pins: pinmux_i2c0_pins {
- pinctrl-single,pins = <
- 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
- 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
- >;
- };
-
- uart0_pins: pinmux_uart0_pins {
- pinctrl-single,pins = <
- 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
- 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
- >;
- };
-
- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
- >;
- };
-
- ecap2_pins: backlight_pins {
- pinctrl-single,pins = <
- 0x19c 0x4 /* mcasp0_ahclkr.ecap2_in_pwm2_out MODE4 */
- >;
- };
-
- cpsw_default: cpsw_default {
- pinctrl-single,pins = <
- /* Slave 1 */
- 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
- 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
- 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
- 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
- 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
- 0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
-
- /* Slave 2 */
- 0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a0.rgmii2_tctl */
- 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a1.rgmii2_rctl */
- 0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a2.rgmii2_td3 */
- 0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a3.rgmii2_td2 */
- 0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a4.rgmii2_td1 */
- 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a5.rgmii2_td0 */
- 0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a6.rgmii2_tclk */
- 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a7.rgmii2_rclk */
- 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a8.rgmii2_rd3 */
- 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a9.rgmii2_rd2 */
- 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a10.rgmii2_rd1 */
- 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a11.rgmii2_rd0 */
- >;
- };
-
- cpsw_sleep: cpsw_sleep {
- pinctrl-single,pins = <
- /* Slave 1 reset value */
- 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-
- /* Slave 2 reset value*/
- 0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
-
- davinci_mdio_default: davinci_mdio_default {
- pinctrl-single,pins = <
- /* MDIO */
- 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
- 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
- >;
- };
-
- davinci_mdio_sleep: davinci_mdio_sleep {
- pinctrl-single,pins = <
- /* MDIO reset value */
- 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
- };
-
+ ocp {
- uart0: serial@44e09000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins>;
-
- status = "okay";
- };
-
- i2c0: i2c@44e0b000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
-
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@2d {
- reg = <0x2d>;
- };
-
- lis331dlh: lis331dlh@18 {
- compatible = "st,lis331dlh", "st,lis3lv02d";
- reg = <0x18>;
- Vdd-supply = <&lis3_reg>;
- Vdd_IO-supply = <&lis3_reg>;
-
- st,click-single-x;
- st,click-single-y;
- st,click-single-z;
- st,click-thresh-x = <10>;
- st,click-thresh-y = <10>;
- st,click-thresh-z = <10>;
- st,irq1-click;
- st,irq2-click;
- st,wakeup-x-lo;
- st,wakeup-x-hi;
- st,wakeup-y-lo;
- st,wakeup-y-hi;
- st,wakeup-z-lo;
- st,wakeup-z-hi;
- st,min-limit-x = <120>;
- st,min-limit-y = <120>;
- st,min-limit-z = <140>;
- st,max-limit-x = <550>;
- st,max-limit-y = <550>;
- st,max-limit-z = <750>;
- };
- };
-
+ musb: usb@47400000 {
+ status = "okay";
+
+ control@44e10000 {
+ status = "okay";
+ };
+
+ usb-phy@47401300 {
+ status = "okay";
+ };
+
+ usb@47401000 {
+ status = "okay";
+ };
+ };
-
- epwmss2: epwmss@48304000 {
- status = "okay";
-
- ecap2: ecap@48304100 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&ecap2_pins>;
- };
- };
+ };
+
vbat: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "vbat";
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-08-28 6:45 Stephen Rothwell
@ 2013-08-28 17:26 ` Greg KH
0 siblings, 0 replies; 45+ messages in thread
From: Greg KH @ 2013-08-28 17:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, avier Martinez Canillas, Benoit Cousson,
Sebastian Andrzej Siewior, Felipe Balbi
On Wed, Aug 28, 2013 at 04:45:06PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got conflicts in
> arch/arm/boot/dts/am335x-bone.dts, arch/arm/boot/dts/am335x-evm.dts and
> arch/arm/boot/dts/am335x-evmsk.dts between commit c031a7d41934 ("usb:
> usb: dsps: update code according to the binding document") from the usb
> tree and commits 63f6b2550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus
> and device nodes"), 781f17983015 ("usb: musb: am335x-evm: Do not remove
> the session bit HOST-only mode") and 2ae847a1b10f ("usb: musb: am335x:
> add second port to beagle bone") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks, that looks good.
greg k-h
^ permalink raw reply [flat|nested] 45+ messages in thread
* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-08-27 8:24 Stephen Rothwell
0 siblings, 0 replies; 45+ messages in thread
From: Stephen Rothwell @ 2013-08-27 8:24 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Felipe Balbi, Greg KH, Benoit Cousson,
Kishon Vijay Abraham I
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/omap5.dtsi between commit 22a5aa170c52 ("usb: dwc3:
core: switch to snps,dwc3") from the usb tree and commit ec0a71838da2
("ARM: OMAP5: dts: fix reg property size") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/omap5.dtsi
index 07be2cd,4fc0912..0000000
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@@ -644,8 -644,8 +644,8 @@@
utmi-mode = <2>;
ranges;
dwc3@4a030000 {
- compatible = "synopsys,dwc3";
+ compatible = "snps,dwc3";
- reg = <0x4a030000 0x1000>;
+ reg = <0x4a030000 0x10000>;
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
usb-phy = <&usb2_phy>, <&usb3_phy>;
tx-fifo-resize;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-08-27 8:21 Stephen Rothwell
0 siblings, 0 replies; 45+ messages in thread
From: Stephen Rothwell @ 2013-08-27 8:21 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Sebastian Andrzej Siewior,
Felipe Balbi, Greg KH, Javier Martinez Canillas, Benoit Cousson
[-- Attachment #1: Type: text/plain, Size: 7635 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am335x-evmsk.dts between commit 97238b35d5bb ("usb:
musb: dsps: use proper child nodes") from the usb tree and commit
63f6b2550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus and device
nodes") from the arm-soc tree.
I fixed it up (probably incorrectly - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/am335x-evmsk.dts
index e92446c,8e7279b..0000000
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@@ -30,210 -30,6 +30,24 @@@
reg = <0x80000000 0x10000000>; /* 256 MB */
};
- am33xx_pinmux: pinmux@44e10800 {
- pinctrl-names = "default";
- pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
-
- user_leds_s0: user_leds_s0 {
- pinctrl-single,pins = <
- 0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad4.gpio1_4 */
- 0x14 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad5.gpio1_5 */
- 0x18 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad6.gpio1_6 */
- 0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad7.gpio1_7 */
- >;
- };
-
- gpio_keys_s0: gpio_keys_s0 {
- pinctrl-single,pins = <
- 0x94 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_oen_ren.gpio2_3 */
- 0x90 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_advn_ale.gpio2_2 */
- 0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_wait0.gpio0_30 */
- 0x9c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ben0_cle.gpio2_5 */
- >;
- };
-
- i2c0_pins: pinmux_i2c0_pins {
- pinctrl-single,pins = <
- 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
- 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
- >;
- };
-
- uart0_pins: pinmux_uart0_pins {
- pinctrl-single,pins = <
- 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
- 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
- >;
- };
-
- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
- >;
- };
-
- ecap2_pins: backlight_pins {
- pinctrl-single,pins = <
- 0x19c 0x4 /* mcasp0_ahclkr.ecap2_in_pwm2_out MODE4 */
- >;
- };
-
- cpsw_default: cpsw_default {
- pinctrl-single,pins = <
- /* Slave 1 */
- 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
- 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
- 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
- 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
- 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
- 0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
-
- /* Slave 2 */
- 0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a0.rgmii2_tctl */
- 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a1.rgmii2_rctl */
- 0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a2.rgmii2_td3 */
- 0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a3.rgmii2_td2 */
- 0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a4.rgmii2_td1 */
- 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a5.rgmii2_td0 */
- 0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a6.rgmii2_tclk */
- 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a7.rgmii2_rclk */
- 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a8.rgmii2_rd3 */
- 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a9.rgmii2_rd2 */
- 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a10.rgmii2_rd1 */
- 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a11.rgmii2_rd0 */
- >;
- };
-
- cpsw_sleep: cpsw_sleep {
- pinctrl-single,pins = <
- /* Slave 1 reset value */
- 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-
- /* Slave 2 reset value*/
- 0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
-
- davinci_mdio_default: davinci_mdio_default {
- pinctrl-single,pins = <
- /* MDIO */
- 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
- 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
- >;
- };
-
- davinci_mdio_sleep: davinci_mdio_sleep {
- pinctrl-single,pins = <
- /* MDIO reset value */
- 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
- };
-
+ ocp {
- uart0: serial@44e09000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins>;
-
- status = "okay";
- };
-
- i2c0: i2c@44e0b000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
-
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@2d {
- reg = <0x2d>;
- };
-
- lis331dlh: lis331dlh@18 {
- compatible = "st,lis331dlh", "st,lis3lv02d";
- reg = <0x18>;
- Vdd-supply = <&lis3_reg>;
- Vdd_IO-supply = <&lis3_reg>;
-
- st,click-single-x;
- st,click-single-y;
- st,click-single-z;
- st,click-thresh-x = <10>;
- st,click-thresh-y = <10>;
- st,click-thresh-z = <10>;
- st,irq1-click;
- st,irq2-click;
- st,wakeup-x-lo;
- st,wakeup-x-hi;
- st,wakeup-y-lo;
- st,wakeup-y-hi;
- st,wakeup-z-lo;
- st,wakeup-z-hi;
- st,min-limit-x = <120>;
- st,min-limit-y = <120>;
- st,min-limit-z = <140>;
- st,max-limit-x = <550>;
- st,max-limit-y = <550>;
- st,max-limit-z = <750>;
- };
- };
-
+ musb: usb@47400000 {
+ status = "okay";
+
+ control@44e10000 {
+ status = "okay";
+ };
+
+ phy@47401300 {
+ status = "okay";
+ };
+
+ usb@47401000 {
+ status = "okay";
+ };
+ };
-
- epwmss2: epwmss@48304000 {
- status = "okay";
-
- ecap2: ecap@48304100 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&ecap2_pins>;
- };
- };
+ };
+
vbat: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "vbat";
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-08-27 8:18 Stephen Rothwell
0 siblings, 0 replies; 45+ messages in thread
From: Stephen Rothwell @ 2013-08-27 8:18 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Sebastian Andrzej Siewior,
Felipe Balbi, Greg KH, Javier Martinez Canillas
[-- Attachment #1: Type: text/plain, Size: 10138 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/am335x-evm.dts between commits 97238b35d5bb ("usb:
musb: dsps: use proper child nodes") and 9b3452d1fa3c ("usb: musb dma:
add cppi41 dma driver") from the usb tree and commit 63f6b2550aa0 ("ARM:
dts: AM33XX: don't redefine OCP bus and device nodes") from the arm-soc
tree.
I fixed it up (probably incorrectly - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/am335x-evm.dts
index c26c16c,1a0f33e..0000000
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@@ -24,323 -24,6 +24,36 @@@
reg = <0x80000000 0x10000000>; /* 256 MB */
};
- am33xx_pinmux: pinmux@44e10800 {
- pinctrl-names = "default";
- pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;
-
- matrix_keypad_s0: matrix_keypad_s0 {
- pinctrl-single,pins = <
- 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
- 0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a6.gpio1_22 */
- 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a9.gpio1_25 */
- 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a10.gpio1_26 */
- 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.gpio1_27 */
- >;
- };
-
- volume_keys_s0: volume_keys_s0 {
- pinctrl-single,pins = <
- 0x150 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_sclk.gpio0_2 */
- 0x154 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_d0.gpio0_3 */
- >;
- };
-
- i2c0_pins: pinmux_i2c0_pins {
- pinctrl-single,pins = <
- 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
- 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
- >;
- };
-
- i2c1_pins: pinmux_i2c1_pins {
- pinctrl-single,pins = <
- 0x158 (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_d1.i2c1_sda */
- 0x15c (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_cs0.i2c1_scl */
- >;
- };
-
- uart0_pins: pinmux_uart0_pins {
- pinctrl-single,pins = <
- 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
- 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
- >;
- };
-
- clkout2_pin: pinmux_clkout2_pin {
- pinctrl-single,pins = <
- 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
- >;
- };
-
- nandflash_pins_s0: nandflash_pins_s0 {
- pinctrl-single,pins = <
- 0x0 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad0.gpmc_ad0 */
- 0x4 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad1.gpmc_ad1 */
- 0x8 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad2.gpmc_ad2 */
- 0xc (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad3.gpmc_ad3 */
- 0x10 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad4.gpmc_ad4 */
- 0x14 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad5.gpmc_ad5 */
- 0x18 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad6.gpmc_ad6 */
- 0x1c (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad7.gpmc_ad7 */
- 0x70 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_wait0.gpmc_wait0 */
- 0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_30 */
- 0x7c (PIN_OUTPUT | MUX_MODE0) /* gpmc_csn0.gpmc_csn0 */
- 0x90 (PIN_OUTPUT | MUX_MODE0) /* gpmc_advn_ale.gpmc_advn_ale */
- 0x94 (PIN_OUTPUT | MUX_MODE0) /* gpmc_oen_ren.gpmc_oen_ren */
- 0x98 (PIN_OUTPUT | MUX_MODE0) /* gpmc_wen.gpmc_wen */
- 0x9c (PIN_OUTPUT | MUX_MODE0) /* gpmc_be0n_cle.gpmc_be0n_cle */
- >;
- };
-
- ecap0_pins: backlight_pins {
- pinctrl-single,pins = <
- 0x164 0x0 /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */
- >;
- };
-
- cpsw_default: cpsw_default {
- pinctrl-single,pins = <
- /* Slave 1 */
- 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
- 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
- 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
- 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
- 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
- 0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
- >;
- };
-
- cpsw_sleep: cpsw_sleep {
- pinctrl-single,pins = <
- /* Slave 1 reset value */
- 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
-
- davinci_mdio_default: davinci_mdio_default {
- pinctrl-single,pins = <
- /* MDIO */
- 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
- 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
- >;
- };
-
- davinci_mdio_sleep: davinci_mdio_sleep {
- pinctrl-single,pins = <
- /* MDIO reset value */
- 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
- 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
- >;
- };
- };
-
+ ocp {
- uart0: serial@44e09000 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins>;
-
- status = "okay";
- };
-
- i2c0: i2c@44e0b000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins>;
-
- status = "okay";
- clock-frequency = <400000>;
-
- tps: tps@2d {
- reg = <0x2d>;
- };
- };
-
+ musb: usb@47400000 {
+ status = "okay";
+
+ control@44e10000 {
+ status = "okay";
+ };
+
+ phy@47401300 {
+ status = "okay";
+ };
+
+ phy@47401b00 {
+ status = "okay";
+ };
+
+ usb@47401000 {
+ status = "okay";
+ };
+
+ usb@47401800 {
+ status = "okay";
+ };
+
+ dma@07402000 {
+ status = "okay";
+ };
+ };
-
- i2c1: i2c@4802a000 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>;
-
- status = "okay";
- clock-frequency = <100000>;
-
- lis331dlh: lis331dlh@18 {
- compatible = "st,lis331dlh", "st,lis3lv02d";
- reg = <0x18>;
- Vdd-supply = <&lis3_reg>;
- Vdd_IO-supply = <&lis3_reg>;
-
- st,click-single-x;
- st,click-single-y;
- st,click-single-z;
- st,click-thresh-x = <10>;
- st,click-thresh-y = <10>;
- st,click-thresh-z = <10>;
- st,irq1-click;
- st,irq2-click;
- st,wakeup-x-lo;
- st,wakeup-x-hi;
- st,wakeup-y-lo;
- st,wakeup-y-hi;
- st,wakeup-z-lo;
- st,wakeup-z-hi;
- st,min-limit-x = <120>;
- st,min-limit-y = <120>;
- st,min-limit-z = <140>;
- st,max-limit-x = <550>;
- st,max-limit-y = <550>;
- st,max-limit-z = <750>;
- };
-
- tsl2550: tsl2550@39 {
- compatible = "taos,tsl2550";
- reg = <0x39>;
- };
-
- tmp275: tmp275@48 {
- compatible = "ti,tmp275";
- reg = <0x48>;
- };
- };
-
- elm: elm@48080000 {
- status = "okay";
- };
-
- epwmss0: epwmss@48300000 {
- status = "okay";
-
- ecap0: ecap@48300100 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&ecap0_pins>;
- };
- };
-
- gpmc: gpmc@50000000 {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&nandflash_pins_s0>;
- ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */
- nand@0,0 {
- reg = <0 0 0>; /* CS0, offset 0 */
- nand-bus-width = <8>;
- ti,nand-ecc-opt = "bch8";
- gpmc,device-nand = "true";
- gpmc,device-width = <1>;
- gpmc,sync-clk-ps = <0>;
- gpmc,cs-on-ns = <0>;
- gpmc,cs-rd-off-ns = <44>;
- gpmc,cs-wr-off-ns = <44>;
- gpmc,adv-on-ns = <6>;
- gpmc,adv-rd-off-ns = <34>;
- gpmc,adv-wr-off-ns = <44>;
- gpmc,we-on-ns = <0>;
- gpmc,we-off-ns = <40>;
- gpmc,oe-on-ns = <0>;
- gpmc,oe-off-ns = <54>;
- gpmc,access-ns = <64>;
- gpmc,rd-cycle-ns = <82>;
- gpmc,wr-cycle-ns = <82>;
- gpmc,wait-on-read = "true";
- gpmc,wait-on-write = "true";
- gpmc,bus-turnaround-ns = <0>;
- gpmc,cycle2cycle-delay-ns = <0>;
- gpmc,clk-activation-ns = <0>;
- gpmc,wait-monitoring-ns = <0>;
- gpmc,wr-access-ns = <40>;
- gpmc,wr-data-mux-bus-ns = <0>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- elm_id = <&elm>;
-
- /* MTD partition table */
- partition@0 {
- label = "SPL1";
- reg = <0x00000000 0x000020000>;
- };
-
- partition@1 {
- label = "SPL2";
- reg = <0x00020000 0x00020000>;
- };
-
- partition@2 {
- label = "SPL3";
- reg = <0x00040000 0x00020000>;
- };
-
- partition@3 {
- label = "SPL4";
- reg = <0x00060000 0x00020000>;
- };
-
- partition@4 {
- label = "U-boot";
- reg = <0x00080000 0x001e0000>;
- };
-
- partition@5 {
- label = "environment";
- reg = <0x00260000 0x00020000>;
- };
-
- partition@6 {
- label = "Kernel";
- reg = <0x00280000 0x00500000>;
- };
-
- partition@7 {
- label = "File-System";
- reg = <0x00780000 0x0F880000>;
- };
- };
- };
+ };
+
vbat: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "vbat";
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-06-18 6:12 Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
0 siblings, 2 replies; 45+ messages in thread
From: Stephen Rothwell @ 2013-06-18 6:12 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tushar Behera, Greg KH, Sergei Shtylyov
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/usb/phy/phy-rcar-usb.c between commit 56a9a6de2a87 ("usb: phy:
rcar-usb: Fix comment w.r.t. devm_ioremap_resource") from the usb tree
and commit 725bf9dcafe1 ("phy-rcar-usb: correct base address") from the
arm-soc tree.
I fixed it up (The latter removed the comment corrected by the former)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-06-18 6:12 Stephen Rothwell
@ 2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
1 sibling, 0 replies; 45+ messages in thread
From: Sergei Shtylyov @ 2013-06-18 12:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Tushar Behera, Greg KH
Hello.
On 18-06-2013 10:12, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/usb/phy/phy-rcar-usb.c between commit 56a9a6de2a87 ("usb: phy:
> rcar-usb: Fix comment w.r.t. devm_ioremap_resource") from the usb tree
> and commit 725bf9dcafe1 ("phy-rcar-usb: correct base address") from the
> arm-soc tree.
Darn, and I forewarned not to apply the former commit.
WBR, Sergei
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2013-06-18 6:12 Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov
@ 2013-06-18 16:03 ` Greg KH
1 sibling, 0 replies; 45+ messages in thread
From: Greg KH @ 2013-06-18 16:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Tushar Behera, Sergei Shtylyov
On Tue, Jun 18, 2013 at 04:12:39PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/usb/phy/phy-rcar-usb.c between commit 56a9a6de2a87 ("usb: phy:
> rcar-usb: Fix comment w.r.t. devm_ioremap_resource") from the usb tree
> and commit 725bf9dcafe1 ("phy-rcar-usb: correct base address") from the
> arm-soc tree.
>
> I fixed it up (The latter removed the comment corrected by the former)
> and can carry the fix as necessary (no action is required).
That sounds fine to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 45+ messages in thread
* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-02-12 3:59 Stephen Rothwell
0 siblings, 0 replies; 45+ messages in thread
From: Stephen Rothwell @ 2013-02-12 3:59 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Greg KH, Kishon Vijay Abraham I,
Peter Ujfalusi
[-- Attachment #1: Type: text/plain, Size: 978 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-zoom-peripherals.c between commit 51482be9dcfd
("ARM: OMAP: USB: Add phy binding information") from the usb tree and
commit c5913935657f ("ARM: OMAP: zoom: Audio support via the common
omap-twl4030 machine driver") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-zoom-peripherals.c
index dc5498b,0745bd9..0000000
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@@ -20,7 -20,7 +20,8 @@@
#include <linux/wl12xx.h>
#include <linux/mmc/host.h>
#include <linux/platform_data/gpio-omap.h>
+ #include <linux/platform_data/omap-twl4030.h>
+#include <linux/usb/phy.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-02-11 6:06 Stephen Rothwell
0 siblings, 0 replies; 45+ messages in thread
From: Stephen Rothwell @ 2013-02-11 6:06 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Peter Ujfalusi, Kishon Vijay Abraham I,
Greg KH
[-- Attachment #1: Type: text/plain, Size: 949 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-3430sdp.c between commit 51482be9dcfd ("ARM:
OMAP: USB: Add phy binding information") from the usb tree and commit
77f86144984e ("ARM: OMAP: sdp3430: Audio support via the common
omap-twl4030 machine driver") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 2a739b2,4f17339..0000000
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -25,7 -25,7 +25,8 @@@
#include <linux/gpio.h>
#include <linux/mmc/host.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
+ #include <linux/platform_data/omap-twl4030.h>
+#include <linux/usb/phy.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2013-02-11 6:05 Stephen Rothwell
0 siblings, 0 replies; 45+ messages in thread
From: Stephen Rothwell @ 2013-02-11 6:05 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: Peter Ujfalusi, Greg KH, linux-next, linux-kernel,
Kishon Vijay Abraham I
[-- Attachment #1.1: Type: text/plain, Size: 974 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/board-zoom-peripherals.c between commit 51482be9dcfd ("ARM: OMAP: USB: Add phy binding information") from the usb tree and commit c5913935657f ("ARM: OMAP: zoom: Audio support via the common omap-twl4030 machine driver") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-zoom-peripherals.c
index dc5498b,0745bd9..0000000
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@@ -20,7 -20,7 +20,8 @@@
#include <linux/wl12xx.h>
#include <linux/mmc/host.h>
#include <linux/platform_data/gpio-omap.h>
+ #include <linux/platform_data/omap-twl4030.h>
+#include <linux/usb/phy.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 45+ messages in thread* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2012-11-27 4:57 Stephen Rothwell
2012-11-27 8:37 ` Arnd Bergmann
0 siblings, 1 reply; 45+ messages in thread
From: Stephen Rothwell @ 2012-11-27 4:57 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Andrew Lunn, Jason Cooper,
Bill Pemberton, Greg KH
[-- Attachment #1: Type: text/plain, Size: 991 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/usb/host/ehci-orion.c between commit 41ac7b3ab7fe ("usb: remove use of __devinit") from the usb tree and commit 77dae54ab385 ("ARM: Kirkwood: ehci-orion: Add device tree binding") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/host/ehci-orion.c
index f74794c,e7e8275..0000000
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@@ -167,7 -184,9 +170,9 @@@ ehci_orion_conf_mbus_windows(struct usb
}
}
+ static u64 ehci_orion_dma_mask = DMA_BIT_MASK(32);
+
-static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
+static int ehci_orion_drv_probe(struct platform_device *pdev)
{
struct orion_ehci_data *pd = pdev->dev.platform_data;
const struct mbus_dram_target_info *dram;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2012-11-27 4:57 Stephen Rothwell
@ 2012-11-27 8:37 ` Arnd Bergmann
0 siblings, 0 replies; 45+ messages in thread
From: Arnd Bergmann @ 2012-11-27 8:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, linux-arm-kernel, linux-next, linux-kernel,
Andrew Lunn, Jason Cooper, Bill Pemberton, Greg KH
On Tuesday 27 November 2012, Stephen Rothwell wrote:
> @@@ -167,7 -184,9 +170,9 @@@ ehci_orion_conf_mbus_windows(struct usb
> }
> }
>
> + static u64 ehci_orion_dma_mask = DMA_BIT_MASK(32);
> +
> -static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
> +static int ehci_orion_drv_probe(struct platform_device *pdev)
> {
> struct orion_ehci_data *pd = pdev->dev.platform_data;
> const struct mbus_dram_target_info *dram;
Looks good, thanks!
Arnd
^ permalink raw reply [flat|nested] 45+ messages in thread
* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2012-11-13 4:20 Stephen Rothwell
2012-11-13 8:48 ` Nicolas Ferre
0 siblings, 1 reply; 45+ messages in thread
From: Stephen Rothwell @ 2012-11-13 4:20 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Michal Nazarewicz, Felipe Balbi,
Greg KH, Jean-Christophe PLAGNIOL-VILLARD
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/configs/stamp9g20_defconfig between commit 77614e025061 ("arch: Change defconfigs to point to g_mass_storage") from the usb tree and commit 2484575268e2 ("arm: at91: drop machine defconfig") from the arm-soc tree.
The latter deleted the file so I did that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2012-11-13 4:20 Stephen Rothwell
@ 2012-11-13 8:48 ` Nicolas Ferre
0 siblings, 0 replies; 45+ messages in thread
From: Nicolas Ferre @ 2012-11-13 8:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, Greg KH,
linux-kernel, Felipe Balbi, linux-next, Michal Nazarewicz,
Jean-Christophe PLAGNIOL-VILLARD
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 11/13/2012 05:20 AM, Stephen Rothwell :
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/configs/stamp9g20_defconfig between commit 77614e025061
> ("arch: Change defconfigs to point to g_mass_storage") from the usb
> tree and commit 2484575268e2 ("arm: at91: drop machine defconfig")
> from the arm-soc tree.
>
> The latter deleted the file so I did that and can carry the fix as
> necessary (no action is required).
Yes. Thanks a lot Stephen.
Best regards,
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/
iQEcBAEBAgAGBQJQogldAAoJEAf03oE53VmQqTgIAKUtqhwnXt8Rm1x+ERPiPLno
VhFc1ZPgiPUepSecHMFPCcWtgwLBg6HUFXg4muM7kpf1hvMtAB6CmpasjceV8g0N
KMFC4GrRi6y0dp59DpBUa1gB87i4gpliqmroO3YGu8iGDHGowDBV8HsfmNpLmGTJ
WmdjDzpWE3hfLjNl5F0qnkI1cqDAyWrQwE9cNIFpzY93GfKkVTjdxiKIf6PprJl8
SIicUbeHV/lrNyusEZw0CcNa89qtKCovdBN7Yk64xwyyTnLprxq/Sr30WaFx4npf
A6vdUeCsKL3glD67rD7MUYXZ5KS0pLOuxIVJvvlugbOCwrNDPrZd6NZhqFkgMh8=
=Fpq2
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 45+ messages in thread
* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2012-11-13 4:06 Stephen Rothwell
2012-11-13 8:47 ` Nicolas Ferre
0 siblings, 1 reply; 45+ messages in thread
From: Stephen Rothwell @ 2012-11-13 4:06 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Michal Nazarewicz, Felipe Balbi,
Greg KH, Jean-Christophe PLAGNIOL-VILLARD
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/configs/afeb9260_defconfig between commit 77614e025061 ("arch:
Change defconfigs to point to g_mass_storage") from the usb tree and
commit 2484575268e2 ("arm: at91: drop machine defconfig") from the
arm-soc tree.
The latter deletes the file, so I did that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2012-11-13 4:06 Stephen Rothwell
@ 2012-11-13 8:47 ` Nicolas Ferre
0 siblings, 0 replies; 45+ messages in thread
From: Nicolas Ferre @ 2012-11-13 8:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, Greg KH,
linux-kernel, Felipe Balbi, linux-next, Michal Nazarewicz,
Jean-Christophe PLAGNIOL-VILLARD
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 11/13/2012 05:06 AM, Stephen Rothwell :
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/configs/afeb9260_defconfig between commit 77614e025061 ("arch:
> Change defconfigs to point to g_mass_storage") from the usb tree and
> commit 2484575268e2 ("arm: at91: drop machine defconfig") from the
> arm-soc tree.
>
> The latter deletes the file, so I did that and can carry the fix as
> necessary (no action is required).
Absolutely, thanks Stephen.
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/
iQEcBAEBAgAGBQJQogkxAAoJEAf03oE53VmQtxgH/1YpP1OvRv2A8kMAK5zanKHO
J/AanooWZIFrnceRCC5SddeCV667wPoiLiucOuAFQpz5CC0XgSUNRWLEfOQ+x859
y0FXw/Nrbl1OvvFScH4Nm9JeXtoMRpX6t2opTZTjZXy+QeGL6GlNUZx1MvBFOWE7
EbIlWNuf/zNmmxAg5+Wd9du0KIm0xYo5zLYG1isHYA3pEpWVq5bf99V+ym6xg9sL
xFQRxqxyYSJMEhbszIrMszp38ZzE3oDCqWQAFABzQpiTab8+7ykJlP7Rq5RXTfL+
mvd1AtyJjMTbp5Szpa06EDOpNTPaiAuzHEAfwTCHGzxxeo2M4hiOy7nXej1qhCo=
=RVPo
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 45+ messages in thread
* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2012-09-25 6:56 Stephen Rothwell
2012-09-25 7:22 ` Tony Prisk
0 siblings, 1 reply; 45+ messages in thread
From: Stephen Rothwell @ 2012-09-25 6:56 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tony Prisk, Greg KH
[-- Attachment #1: Type: text/plain, Size: 671 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-vt8500/bv07.c, arch/arm/mach-vt8500/devices-vt8500.c,
arch/arm/mach-vt8500/devices-wm8505.c, arch/arm/mach-vt8500/devices.c,
arch/arm/mach-vt8500/devices.h and arch/arm/mach-vt8500/wm8505_7in.c
between commit 100d45970327 ("ARM: vt8500: Add support for UHCI companion
controller") from the usb tree and commit e9a91de7602a ("arm: vt8500: Update
arch-vt8500 to devicetree support") from the arm-soc tree.
I just removed the files and can carry the fix as necessary (there may be
more work required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2012-09-25 6:56 Stephen Rothwell
@ 2012-09-25 7:22 ` Tony Prisk
0 siblings, 0 replies; 45+ messages in thread
From: Tony Prisk @ 2012-09-25 7:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Greg KH
On Tue, 2012-09-25 at 16:56 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got conflicts in
> arch/arm/mach-vt8500/bv07.c, arch/arm/mach-vt8500/devices-vt8500.c,
> arch/arm/mach-vt8500/devices-wm8505.c, arch/arm/mach-vt8500/devices.c,
> arch/arm/mach-vt8500/devices.h and arch/arm/mach-vt8500/wm8505_7in.c
> between commit 100d45970327 ("ARM: vt8500: Add support for UHCI companion
> controller") from the usb tree and commit e9a91de7602a ("arm: vt8500: Update
> arch-vt8500 to devicetree support") from the arm-soc tree.
>
> I just removed the files and can carry the fix as necessary (there may be
> more work required).
>
Removing the files is the correct solution. Shouldn't be any other work
required if the rest of commit e9a91de7602a changes went in.
I'll pull down -next and check it.
Regards
Tony P
^ permalink raw reply [flat|nested] 45+ messages in thread
* linux-next: manual merge of the arm-soc tree with the usb tree
@ 2012-09-06 5:42 Stephen Rothwell
2012-09-06 9:32 ` Roland Stigge
0 siblings, 1 reply; 45+ messages in thread
From: Stephen Rothwell @ 2012-09-06 5:42 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Roland Stigge, Greg KH
[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/usb/host/Kconfig between commit 952230d774bb ("usb: ohci: Fix
Kconfig dependency on USB_ISP1301") from the usb tree and commit
d684f05f2d55 ("ARM: mach-pnx4008: Remove architecture") from the arm-soc
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/host/Kconfig
index 13cd6d5,276add2..0000000
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -292,7 -292,7 +292,7 @@@ config USB_OHCI_HC
depends on USB && USB_ARCH_HAS_OHCI
select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
select USB_OTG_UTILS if ARCH_OMAP
- depends on USB_ISP1301 || !(ARCH_LPC32XX || ARCH_PNX4008)
- select USB_ISP1301 if ARCH_LPC32XX
++ depends on USB_ISP1301 || !ARCH_LPC32XX
---help---
The Open Host Controller Interface (OHCI) is a standard for accessing
USB 1.1 host controller hardware. It does more in hardware than Intel's
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: linux-next: manual merge of the arm-soc tree with the usb tree
2012-09-06 5:42 Stephen Rothwell
@ 2012-09-06 9:32 ` Roland Stigge
0 siblings, 0 replies; 45+ messages in thread
From: Roland Stigge @ 2012-09-06 9:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
linux-kernel, Greg KH
On 09/06/2012 07:42 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/usb/host/Kconfig between commit 952230d774bb ("usb: ohci:
> Fix Kconfig dependency on USB_ISP1301") from the usb tree and
> commit d684f05f2d55 ("ARM: mach-pnx4008: Remove architecture") from
> the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no
> action required).
Thanks - this little conflict was expected when merging pnx4008
removal and the isp1301 deoendency fix.
And the fixup is correct.
Roland
^ permalink raw reply [flat|nested] 45+ messages in thread
end of thread, other threads:[~2013-08-29 14:47 UTC | newest]
Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-27 8:13 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 17:37 ` Greg KH
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 19:30 ` Greg KH
2013-08-27 19:56 ` Felipe Balbi
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:47 ` Benoit Cousson
2013-08-27 19:23 ` Sebastian Andrzej Siewior
2013-08-27 15:01 ` Kevin Hilman
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-28 13:01 ` Benoit Cousson
2013-08-27 16:20 ` Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 6:45 Stephen Rothwell
2013-08-28 17:26 ` Greg KH
2013-08-27 8:24 Stephen Rothwell
2013-08-27 8:21 Stephen Rothwell
2013-08-27 8:18 Stephen Rothwell
2013-06-18 6:12 Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
2013-02-12 3:59 Stephen Rothwell
2013-02-11 6:06 Stephen Rothwell
2013-02-11 6:05 Stephen Rothwell
2012-11-27 4:57 Stephen Rothwell
2012-11-27 8:37 ` Arnd Bergmann
2012-11-13 4:20 Stephen Rothwell
2012-11-13 8:48 ` Nicolas Ferre
2012-11-13 4:06 Stephen Rothwell
2012-11-13 8:47 ` Nicolas Ferre
2012-09-25 6:56 Stephen Rothwell
2012-09-25 7:22 ` Tony Prisk
2012-09-06 5:42 Stephen Rothwell
2012-09-06 9:32 ` Roland Stigge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).