* [PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator
@ 2012-12-15 0:52 Javier Martinez Canillas
2012-12-19 9:31 ` Javier Martinez Canillas
0 siblings, 1 reply; 4+ messages in thread
From: Javier Martinez Canillas @ 2012-12-15 0:52 UTC (permalink / raw)
To: linux-arm-kernel
commit 5a8095e9 ARM: dts: Add omap3-beagle.dts
moved the VSIM regulator definition to the twl4030.dtsi to avoid
duplication. A definition for the VSIM regulator was also present
on omap3-igep.dtsi which leads to the following build error:
DTC arch/arm/boot/dts/omap3-igep0020.dtb
DTC arch/arm/boot/dts/omap3-igep0030.dtb
ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
ERROR: Input tree has errors, aborting (use -f to force output)
ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
ERROR: Input tree has errors, aborting (use -f to force output)
make[1]: *** [arch/arm/boot/dts/omap3-igep0020.dtb] Error 2
make[1]: *** Waiting for unfinished jobs....
make[1]: *** [arch/arm/boot/dts/omap3-igep0030.dtb] Error 2
make: *** [dtbs] Error 2
Since IGEP devices uses the same PMIC as Beagle boards, the VSIM
definition from twl4030.dtsi can be used.
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
---
arch/arm/boot/dts/omap3-igep.dtsi | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index 125fe00..de708ca 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -43,12 +43,6 @@
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
interrupt-parent = <&intc>;
- vsim: regulator at 10 {
- compatible = "ti,twl4030-vsim";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3000000>;
- };
-
twl_audio: audio {
compatible = "ti,twl4030-audio";
codec {
--
1.7.7.6
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator
2012-12-15 0:52 [PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator Javier Martinez Canillas
@ 2012-12-19 9:31 ` Javier Martinez Canillas
2012-12-19 12:36 ` Benoit Cousson
0 siblings, 1 reply; 4+ messages in thread
From: Javier Martinez Canillas @ 2012-12-19 9:31 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Dec 15, 2012 at 1:52 AM, Javier Martinez Canillas
<javier.martinez@collabora.co.uk> wrote:
> commit 5a8095e9 ARM: dts: Add omap3-beagle.dts
>
> moved the VSIM regulator definition to the twl4030.dtsi to avoid
> duplication. A definition for the VSIM regulator was also present
> on omap3-igep.dtsi which leads to the following build error:
>
> DTC arch/arm/boot/dts/omap3-igep0020.dtb
> DTC arch/arm/boot/dts/omap3-igep0030.dtb
> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
> ERROR: Input tree has errors, aborting (use -f to force output)
> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[1]: *** [arch/arm/boot/dts/omap3-igep0020.dtb] Error 2
> make[1]: *** Waiting for unfinished jobs....
> make[1]: *** [arch/arm/boot/dts/omap3-igep0030.dtb] Error 2
> make: *** [dtbs] Error 2
>
> Since IGEP devices uses the same PMIC as Beagle boards, the VSIM
> definition from twl4030.dtsi can be used.
>
> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
> ---
> arch/arm/boot/dts/omap3-igep.dtsi | 6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
> index 125fe00..de708ca 100644
> --- a/arch/arm/boot/dts/omap3-igep.dtsi
> +++ b/arch/arm/boot/dts/omap3-igep.dtsi
> @@ -43,12 +43,6 @@
> interrupts = <7>; /* SYS_NIRQ cascaded to intc */
> interrupt-parent = <&intc>;
>
> - vsim: regulator at 10 {
> - compatible = "ti,twl4030-vsim";
> - regulator-min-microvolt = <1800000>;
> - regulator-max-microvolt = <3000000>;
> - };
> -
> twl_audio: audio {
> compatible = "ti,twl4030-audio";
> codec {
Hi Benoit,
It is ok for you that I send delta patches for the IGEP DT initial
support [1] such as this patch and the MMC device node mux pins setup
[2] or should I merge these changes and resend a new patch-set?
Thanks a lot and best regards,
Javier
[1]: https://lkml.org/lkml/2012/12/3/142
[2]: https://patchwork.kernel.org/patch/1882991/
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator
2012-12-19 9:31 ` Javier Martinez Canillas
@ 2012-12-19 12:36 ` Benoit Cousson
2012-12-19 12:53 ` Javier Martinez Canillas
0 siblings, 1 reply; 4+ messages in thread
From: Benoit Cousson @ 2012-12-19 12:36 UTC (permalink / raw)
To: linux-arm-kernel
Hi Javier,
On 12/19/2012 10:31 AM, Javier Martinez Canillas wrote:
> On Sat, Dec 15, 2012 at 1:52 AM, Javier Martinez Canillas
> <javier.martinez@collabora.co.uk> wrote:
>> commit 5a8095e9 ARM: dts: Add omap3-beagle.dts
>>
>> moved the VSIM regulator definition to the twl4030.dtsi to avoid
>> duplication. A definition for the VSIM regulator was also present
>> on omap3-igep.dtsi which leads to the following build error:
>>
>> DTC arch/arm/boot/dts/omap3-igep0020.dtb
>> DTC arch/arm/boot/dts/omap3-igep0030.dtb
>> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
>> ERROR: Input tree has errors, aborting (use -f to force output)
>> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
>> ERROR: Input tree has errors, aborting (use -f to force output)
>> make[1]: *** [arch/arm/boot/dts/omap3-igep0020.dtb] Error 2
>> make[1]: *** Waiting for unfinished jobs....
>> make[1]: *** [arch/arm/boot/dts/omap3-igep0030.dtb] Error 2
>> make: *** [dtbs] Error 2
>>
>> Since IGEP devices uses the same PMIC as Beagle boards, the VSIM
>> definition from twl4030.dtsi can be used.
>>
>> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>> ---
>> arch/arm/boot/dts/omap3-igep.dtsi | 6 ------
>> 1 files changed, 0 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
>> index 125fe00..de708ca 100644
>> --- a/arch/arm/boot/dts/omap3-igep.dtsi
>> +++ b/arch/arm/boot/dts/omap3-igep.dtsi
>> @@ -43,12 +43,6 @@
>> interrupts = <7>; /* SYS_NIRQ cascaded to intc */
>> interrupt-parent = <&intc>;
>>
>> - vsim: regulator at 10 {
>> - compatible = "ti,twl4030-vsim";
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <3000000>;
>> - };
>> -
>> twl_audio: audio {
>> compatible = "ti,twl4030-audio";
>> codec {
>
> Hi Benoit,
>
> It is ok for you that I send delta patches for the IGEP DT initial
> support [1] such as this patch and the MMC device node mux pins setup
> [2] or should I merge these changes and resend a new patch-set?
It is always better to re-send a clean patch set instead of fixing a
previously broken one. It will be bisect friendly.
Regards,
Benoit
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator
2012-12-19 12:36 ` Benoit Cousson
@ 2012-12-19 12:53 ` Javier Martinez Canillas
0 siblings, 0 replies; 4+ messages in thread
From: Javier Martinez Canillas @ 2012-12-19 12:53 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Dec 19, 2012 at 1:36 PM, Benoit Cousson <b-cousson@ti.com> wrote:
> Hi Javier,
>
> On 12/19/2012 10:31 AM, Javier Martinez Canillas wrote:
>> On Sat, Dec 15, 2012 at 1:52 AM, Javier Martinez Canillas
>> <javier.martinez@collabora.co.uk> wrote:
>>> commit 5a8095e9 ARM: dts: Add omap3-beagle.dts
>>>
>>> moved the VSIM regulator definition to the twl4030.dtsi to avoid
>>> duplication. A definition for the VSIM regulator was also present
>>> on omap3-igep.dtsi which leads to the following build error:
>>>
>>> DTC arch/arm/boot/dts/omap3-igep0020.dtb
>>> DTC arch/arm/boot/dts/omap3-igep0030.dtb
>>> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
>>> ERROR: Input tree has errors, aborting (use -f to force output)
>>> ERROR (duplicate_label): Duplicate label 'vsim' on /ocp/i2c at 48070000/twl at 48/regulator-vsim and /ocp/i2c at 48070000/twl at 48/regulator at 10
>>> ERROR: Input tree has errors, aborting (use -f to force output)
>>> make[1]: *** [arch/arm/boot/dts/omap3-igep0020.dtb] Error 2
>>> make[1]: *** Waiting for unfinished jobs....
>>> make[1]: *** [arch/arm/boot/dts/omap3-igep0030.dtb] Error 2
>>> make: *** [dtbs] Error 2
>>>
>>> Since IGEP devices uses the same PMIC as Beagle boards, the VSIM
>>> definition from twl4030.dtsi can be used.
>>>
>>> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>>> ---
>>> arch/arm/boot/dts/omap3-igep.dtsi | 6 ------
>>> 1 files changed, 0 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
>>> index 125fe00..de708ca 100644
>>> --- a/arch/arm/boot/dts/omap3-igep.dtsi
>>> +++ b/arch/arm/boot/dts/omap3-igep.dtsi
>>> @@ -43,12 +43,6 @@
>>> interrupts = <7>; /* SYS_NIRQ cascaded to intc */
>>> interrupt-parent = <&intc>;
>>>
>>> - vsim: regulator at 10 {
>>> - compatible = "ti,twl4030-vsim";
>>> - regulator-min-microvolt = <1800000>;
>>> - regulator-max-microvolt = <3000000>;
>>> - };
>>> -
>>> twl_audio: audio {
>>> compatible = "ti,twl4030-audio";
>>> codec {
>>
>> Hi Benoit,
>>
>> It is ok for you that I send delta patches for the IGEP DT initial
>> support [1] such as this patch and the MMC device node mux pins setup
>> [2] or should I merge these changes and resend a new patch-set?
>
> It is always better to re-send a clean patch set instead of fixing a
> previously broken one. It will be bisect friendly.
>
> Regards,
> Benoit
>
ok, it wasn't broken when I sent it but the recent change on
twl4030.dtsi broke it...
I'll send a v4 of the patch-set with this fix + the MMC mux pins setup
Thanks a lot and best regards,
Javier
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-19 12:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-15 0:52 [PATCH 1/1] ARM: dts: omap3-igep: remove VSIM regulator Javier Martinez Canillas
2012-12-19 9:31 ` Javier Martinez Canillas
2012-12-19 12:36 ` Benoit Cousson
2012-12-19 12:53 ` Javier Martinez Canillas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox