Re: [PATCH] ARM: EXYNOS: Fix compile error in dev-audio.c
Hi, On Mon, Dec 17, 2012 at 6:12 AM, Olof Johansson wrote: > On Fri, Dec 14, 2012 at 12:15 AM, Jonghwan Choi > wrote: >> arch/arm/mach-exynos/dev-audio.c:58:4: error: unknown field 'src_clk' >> specified in initializer >> arch/arm/mach-exynos/dev-audio.c:58:4: warning: initialization makes integer >> from pointer without a cast [enabled by default] >> arch/arm/mach-exynos/dev-audio.c:58:4: warning: (near initialization for >> 'i2sv5_pdata.type.i2s.idma_addr') [enabled by default] >> arch/arm/mach-exynos/dev-audio.c:91:4: error: unknown field 'src_clk' >> specified in initializer >> arch/arm/mach-exynos/dev-audio.c:91:4: warning: initialization makes integer >> from pointer without a cast [enabled by default] >> arch/arm/mach-exynos/dev-audio.c:91:4: warning: (near initialization for >> 'i2sv3_pdata.type.i2s.idma_addr') [enabled by default] >> >> Signed-off-by: Jonghwan Choi > > This only fixes one of many build errors caused by the i2s change: > > 1 arch/arm/mach-s3c64xx/dev-audio.c:113:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s3c64xx/dev-audio.c:113:4: warning: (near > initialization for 'i2sv4_pdata.type.i2s.idma_addr') [enabled by > default] > 1 arch/arm/mach-s3c64xx/dev-audio.c:69:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s3c64xx/dev-audio.c:69:4: warning: (near > initialization for 'i2sv3_pdata.type.i2s.quirks') [enabled by default] > 1 arch/arm/mach-s5p64x0/dev-audio.c:115:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s5p64x0/dev-audio.c:115:4: warning: (near > initialization for 's5p6450_i2s_pdata.type.i2s.quirks') [enabled by > default] > 1 arch/arm/mach-s5p64x0/dev-audio.c:48:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s5p64x0/dev-audio.c:48:4: warning: (near > initialization for 's5p6440_i2s_pdata.type.i2s.idma_addr') [enabled by > default] > 1 arch/arm/mach-s5p64x0/dev-audio.c:96:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s5p64x0/dev-audio.c:96:4: warning: (near > initialization for 's5p6450_i2s0_pdata.type.i2s.idma_addr') [enabled > by default] > 1 arch/arm/mach-s5pc100/dev-audio.c:53:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s5pc100/dev-audio.c:53:4: warning: (near > initialization for 'i2sv5_pdata.type.i2s.idma_addr') [enabled by > default] > 1 arch/arm/mach-s5pc100/dev-audio.c:84:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s5pc100/dev-audio.c:84:4: warning: (near > initialization for 'i2sv3_pdata.type.i2s.quirks') [enabled by default] > 1 arch/arm/mach-s5pv210/dev-audio.c:55:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s5pv210/dev-audio.c:55:4: warning: (near > initialization for 'i2sv5_pdata.type.i2s.idma_addr') [enabled by > default] > 1 arch/arm/mach-s5pv210/dev-audio.c:87:4: warning: > initialization makes integer from pointer without a cast [enabled by > default] > 1 arch/arm/mach-s5pv210/dev-audio.c:87:4: warning: (near > initialization for 'i2sv3_pdata.type.i2s.quirks') [enabled by default] > > > Looks like the breakage was caused by the following commit: > > commit 1974a042dd15f1f007a3a1a2dd7a23ca0e42c01d > Author: Padmavathi Venna > AuthorDate: Wed Nov 28 16:17:48 2012 +0530 > Commit: Mark Brown > CommitDate: Wed Nov 28 19:18:00 2012 + > > ASoC: Samsung: Get I2S src_clk from clock alias id. > > Padmavathi, you can't send out code that breaks all Samsung platforms > like this, even if there are patches out there that fixes it. Changes > have to be bisectable, which means that you can't break and unbreak > the build, least of all if you merge through different maintainers. > And you need to tell the other maintainer that there are dependent > patches, you just sent the above patch to Mark without any such > information. In V3, as I posted all the patches together I didn't mention about the dependency. But I could have mentioned about it in V4. I apologize for the build break. > > Kukjin, I see that Padmavathi has posted a V3 series of patches to > remove all this from the dev-audio files on November 23. Are you ok > with us picking them up and sending ASAP? Kukjin, Could you please give your conformation for the above patches? > > > -Olof > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" > in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Thanks Padma -- To unsubscribe from this list: send the line "unsub
Re: [PATCH] ARM: EXYNOS: Fix compile error in dev-audio.c
On Fri, Dec 14, 2012 at 12:15 AM, Jonghwan Choi wrote: > arch/arm/mach-exynos/dev-audio.c:58:4: error: unknown field 'src_clk' > specified in initializer > arch/arm/mach-exynos/dev-audio.c:58:4: warning: initialization makes integer > from pointer without a cast [enabled by default] > arch/arm/mach-exynos/dev-audio.c:58:4: warning: (near initialization for > 'i2sv5_pdata.type.i2s.idma_addr') [enabled by default] > arch/arm/mach-exynos/dev-audio.c:91:4: error: unknown field 'src_clk' > specified in initializer > arch/arm/mach-exynos/dev-audio.c:91:4: warning: initialization makes integer > from pointer without a cast [enabled by default] > arch/arm/mach-exynos/dev-audio.c:91:4: warning: (near initialization for > 'i2sv3_pdata.type.i2s.idma_addr') [enabled by default] > > Signed-off-by: Jonghwan Choi This only fixes one of many build errors caused by the i2s change: 1 arch/arm/mach-s3c64xx/dev-audio.c:113:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s3c64xx/dev-audio.c:113:4: warning: (near initialization for 'i2sv4_pdata.type.i2s.idma_addr') [enabled by default] 1 arch/arm/mach-s3c64xx/dev-audio.c:69:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s3c64xx/dev-audio.c:69:4: warning: (near initialization for 'i2sv3_pdata.type.i2s.quirks') [enabled by default] 1 arch/arm/mach-s5p64x0/dev-audio.c:115:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s5p64x0/dev-audio.c:115:4: warning: (near initialization for 's5p6450_i2s_pdata.type.i2s.quirks') [enabled by default] 1 arch/arm/mach-s5p64x0/dev-audio.c:48:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s5p64x0/dev-audio.c:48:4: warning: (near initialization for 's5p6440_i2s_pdata.type.i2s.idma_addr') [enabled by default] 1 arch/arm/mach-s5p64x0/dev-audio.c:96:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s5p64x0/dev-audio.c:96:4: warning: (near initialization for 's5p6450_i2s0_pdata.type.i2s.idma_addr') [enabled by default] 1 arch/arm/mach-s5pc100/dev-audio.c:53:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s5pc100/dev-audio.c:53:4: warning: (near initialization for 'i2sv5_pdata.type.i2s.idma_addr') [enabled by default] 1 arch/arm/mach-s5pc100/dev-audio.c:84:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s5pc100/dev-audio.c:84:4: warning: (near initialization for 'i2sv3_pdata.type.i2s.quirks') [enabled by default] 1 arch/arm/mach-s5pv210/dev-audio.c:55:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s5pv210/dev-audio.c:55:4: warning: (near initialization for 'i2sv5_pdata.type.i2s.idma_addr') [enabled by default] 1 arch/arm/mach-s5pv210/dev-audio.c:87:4: warning: initialization makes integer from pointer without a cast [enabled by default] 1 arch/arm/mach-s5pv210/dev-audio.c:87:4: warning: (near initialization for 'i2sv3_pdata.type.i2s.quirks') [enabled by default] Looks like the breakage was caused by the following commit: commit 1974a042dd15f1f007a3a1a2dd7a23ca0e42c01d Author: Padmavathi Venna AuthorDate: Wed Nov 28 16:17:48 2012 +0530 Commit: Mark Brown CommitDate: Wed Nov 28 19:18:00 2012 + ASoC: Samsung: Get I2S src_clk from clock alias id. Padmavathi, you can't send out code that breaks all Samsung platforms like this, even if there are patches out there that fixes it. Changes have to be bisectable, which means that you can't break and unbreak the build, least of all if you merge through different maintainers. And you need to tell the other maintainer that there are dependent patches, you just sent the above patch to Mark without any such information. Kukjin, I see that Padmavathi has posted a V3 series of patches to remove all this from the dev-audio files on November 23. Are you ok with us picking them up and sending ASAP? -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v3 1/2] ARM: Exynos5250: Enabling ehci-s5p driver
On Thu, 13 Dec 2012 22:06:01 +0530, Vivek Gautam
wrote:
> Adding EHCI device tree node for Exynos5250 along with
> the device base adress and gpio line for vbus.
>
> Signed-off-by: Vivek Gautam
> Acked-by: Jingoo Han
> ---
> .../devicetree/bindings/usb/exynos-usb.txt | 25
>
> arch/arm/boot/dts/exynos5250-smdk5250.dts |4 +++
> arch/arm/boot/dts/exynos5250.dtsi |6
> arch/arm/mach-exynos/include/mach/map.h|1 +
> arch/arm/mach-exynos/mach-exynos5-dt.c |2 +
> 5 files changed, 38 insertions(+), 0 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt
>
> diff --git a/Documentation/devicetree/bindings/usb/exynos-usb.txt
> b/Documentation/devicetree/bindings/usb/exynos-usb.txt
> new file mode 100644
> index 000..e8bbb47
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/exynos-usb.txt
> @@ -0,0 +1,25 @@
> +Samsung Exynos SoC USB controller
> +
> +The USB devices interface with USB controllers on Exynos SOCs.
> +The device node has following properties.
> +
> +EHCI
> +Required properties:
> + - compatible: should be "samsung,exynos4210-ehci" for USB 2.0
> + EHCI controller in host mode.
> + - reg: physical base address of the controller and length of memory mapped
> + region.
> + - interrupts: interrupt number to the cpu.
> +
> +Optional properties:
> + - samsung,vbus-gpio: if present, specifies the GPIO that
> + needs to be pulled up for the bus to be powered.
> +
> +Example:
> +
> + usb@1211 {
> + compatible = "samsung,exynos4210-ehci";
> + reg = <0x1211 0x100>;
> + interrupts = <0 71 0>;
> + samsung,vbus-gpio = <&gpx2 6 1 3 3>;
> + };
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index 711b55f..f990086 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -218,4 +218,8 @@
> i2s_2: i2s@12D7 {
> status = "disabled";
> };
> +
> + usb@1211 {
> + samsung,vbus-gpio = <&gpx2 6 1 3 3>;
> + };
> };
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi
> b/arch/arm/boot/dts/exynos5250.dtsi
> index 581e57a..584bb9a 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -299,6 +299,12 @@
> rx-dma-channel = <&pdma0 11>; /* preliminary */
> };
>
> + usb@1211 {
> + compatible = "samsung,exynos4210-ehci";
> + reg = <0x1211 0x100>;
> + interrupts = <0 71 0>;
> + };
> +
> amba {
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm/mach-exynos/include/mach/map.h
> b/arch/arm/mach-exynos/include/mach/map.h
> index cbb2852..b2c662f 100644
> --- a/arch/arm/mach-exynos/include/mach/map.h
> +++ b/arch/arm/mach-exynos/include/mach/map.h
> @@ -201,6 +201,7 @@
> #define EXYNOS4_PA_EHCI 0x1258
> #define EXYNOS4_PA_OHCI 0x1259
> #define EXYNOS4_PA_HSPHY 0x125B
> +#define EXYNOS5_PA_EHCI 0x1211
> #define EXYNOS4_PA_MFC 0x1340
>
> #define EXYNOS4_PA_UART 0x1380
> diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c
> b/arch/arm/mach-exynos/mach-exynos5-dt.c
> index 462e5ac..b3b9af1 100644
> --- a/arch/arm/mach-exynos/mach-exynos5-dt.c
> +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
> @@ -110,6 +110,8 @@ static const struct of_dev_auxdata
> exynos5250_auxdata_lookup[] __initconst = {
> "samsung-i2s.1", NULL),
> OF_DEV_AUXDATA("samsung,samsung-i2s", 0x12D7,
> "samsung-i2s.2", NULL),
> + OF_DEV_AUXDATA("samsung,exynos4210-ehci", EXYNOS5_PA_EHCI,
> + "s5p-ehci", NULL),
I'm assuming the above change is temporary. What is left to be done to
drop the auxdata in theses two patches?
Otherwise the patch looks fine.
Acked-by: Grant Likely
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/2] usb: exynos: Fix compatible strings used for device
On Thu, 13 Dec 2012 20:22:26 +0530, Vivek Gautam wrote: > Using chip specific compatible string as it should be. > So fixing this for ehci-s5p, ohci-exynos and dwc3-exynos > which till now used a generic 'exynos' in their compatible strings. > > This goes as per the discussion happened in the thread for > [PATCH v2] ARM: Exynos5250: Enabling dwc3-exynos driver > available at: > http://www.spinics.net/lists/linux-usb/msg74145.html > > Vivek Gautam (2): > usb: ehci-s5p/ohci-exynos: Fix compatible strings for the device > usb: dwc3-exynos: Fix compatible strings for the device for both patches: Acked-by: Grant Likely > > drivers/usb/dwc3/dwc3-exynos.c |2 +- > drivers/usb/host/ehci-s5p.c|2 +- > drivers/usb/host/ohci-exynos.c |2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > -- > 1.7.6.5 > -- Grant Likely, B.Sc, P.Eng. Secret Lab Technologies, Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
