* [PATCH 0/5] mv64xxx updates
From: Gregory CLEMENT @ 2014-02-13 20:41 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1392323793-4125-1-git-send-email-wsa@the-dreams.de>
Hi Wolfram,
On 13/02/2014 21:36, Wolfram Sang wrote:
> So, this is a series I came up with trying to fix the issue found by Kevin.
> Patches 1+2 are hopefully fixing the bug (in theory, I don't have the HW).
> Patches 3-5 are RFC, and if patch 3 actually works (see the CHECKME), then 4+5
> are further cleanup possibilities. And there is still more potential, I mainly
> wanted to give some inspiration and awareness that the driver could need some
> more love. Please test at least 1+2, comments to 3-5 very welcome.
>
> Sorry for the delay, I got distracted by an NMI.
>
Thanks for this series, indeed the code looks better.
I will test it tomorrow and let you know if it fixed the bug.
I will also take time to review the RFC patches.
Greogry
> Wolfram Sang (5):
> i2c: mv64xxx: put offload check into offload prepare function
> i2c: mv64xxx: refactor message start to ensure proper initialization
> i2c: mv64xxx: refactor send_start
> i2c: mv64xxx: directly call send_start when initializing transfer
> i2c: mv64xxx: refactor initialization for new msgs
>
> drivers/i2c/busses/i2c-mv64xxx.c | 67 ++++++++++++++++------------------------
> 1 file changed, 27 insertions(+), 40 deletions(-)
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [PATCH RESEND] ARM: mcpm: Make all mcpm functions notrace
From: Nicolas Pitre @ 2014-02-13 20:42 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1392279975.3469.4.camel@linaro1.home>
On Thu, 13 Feb 2014, Jon Medhurst (Tixy) wrote:
> From: Dave Martin <dave.martin@linaro.org>
>
> The functions in mcpm_entry.c are mostly intended for use during
> scary cache and coherency disabling sequences, or do other things
> which confuse trace ... like powering a CPU down and not
> returning. Similarly for the backend code.
>
> For simplicity, this patch just makes whole files notrace.
> There should be more than enough traceable points on the paths to
> these functions, but we can be more fine-grained later if there is
> a need for it.
>
> Signed-off-by: Dave Martin <dave.martin@linaro.org>
>
> Also added spc.o to the list of files as it contains functions used by
> MCPM code which have comments comments like: "might be used in code
> paths where normal cacheable locks are not working"
>
> Signed-off-by: Jon Medhurst <tixy@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Please send to RMK's patch system.
> ---
> arch/arm/common/Makefile | 1 +
> arch/arm/mach-vexpress/Makefile | 3 +++
> 2 files changed, 4 insertions(+)
>
> diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
> index 4bdc416..70b1eff 100644
> --- a/arch/arm/common/Makefile
> +++ b/arch/arm/common/Makefile
> @@ -13,6 +13,7 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o
> obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o
> obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
> obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
> +CFLAGS_REMOVE_mcpm_entry.o = -pg
> AFLAGS_mcpm_head.o := -march=armv7-a
> AFLAGS_vlock.o := -march=armv7-a
> obj-$(CONFIG_TI_PRIV_EDMA) += edma.o
> diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
> index 0997e0b..fc649bc 100644
> --- a/arch/arm/mach-vexpress/Makefile
> +++ b/arch/arm/mach-vexpress/Makefile
> @@ -8,8 +8,11 @@ obj-y := v2m.o
> obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
> obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o
> CFLAGS_dcscb.o += -march=armv7-a
> +CFLAGS_REMOVE_dcscb.o = -pg
> obj-$(CONFIG_ARCH_VEXPRESS_SPC) += spc.o
> +CFLAGS_REMOVE_spc.o = -pg
> obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o
> CFLAGS_tc2_pm.o += -march=armv7-a
> +CFLAGS_REMOVE_tc2_pm.o = -pg
> obj-$(CONFIG_SMP) += platsmp.o
> obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
> --
> 1.7.10.4
>
>
>
^ permalink raw reply
* [PATCH 0/5] mv64xxx updates
From: Thomas Petazzoni @ 2014-02-13 20:51 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1392323793-4125-1-git-send-email-wsa@the-dreams.de>
Dear Wolfram Sang,
On Thu, 13 Feb 2014 21:36:28 +0100, Wolfram Sang wrote:
> So, this is a series I came up with trying to fix the issue found by Kevin.
> Patches 1+2 are hopefully fixing the bug (in theory, I don't have the HW).
> Patches 3-5 are RFC, and if patch 3 actually works (see the CHECKME), then 4+5
> are further cleanup possibilities. And there is still more potential, I mainly
> wanted to give some inspiration and awareness that the driver could need some
> more love. Please test at least 1+2, comments to 3-5 very welcome.
>
> Sorry for the delay, I got distracted by an NMI.
I'm adding Maxime Ripard in Cc, since he is the maintainer of the
Allwinner platform, which also uses this I2C driver. So I guess he
would like to be notified of such changes in order to test that the
driver still works for him.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [PATCH v3 0/3] net: stmmac: Add STi GMAC ethernet
From: David Miller @ 2014-02-13 21:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1392112716-30803-1-git-send-email-srinivas.kandagatla@st.com>
From: <srinivas.kandagatla@st.com>
Date: Tue, 11 Feb 2014 09:58:36 +0000
> Dave, Can I request you to take the first patch via net tree for v3.15, I can
> request Arnd or Olof to take the DT patches via the arm-soc tree for v3.15.
Since it's a new driver, I decided to add it to the plain 'net' tree.
Thanks.
^ permalink raw reply
* [PATCH] ARM: SAMSUNG: remove unneeded s3c24xx_init_cpu()
From: Kukjin Kim @ 2014-02-13 22:19 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <3865198.Kyn1P03kbU@phil>
On 01/13/14 05:34, Heiko St?bner wrote:
> The function is nearly empty and samsung_cpu_rev is static so already 0
> making the function obsolete, therefore remove it.
>
> Signed-off-by: Heiko Stuebner<heiko@sntech.de>
> ---
> arch/arm/mach-s3c24xx/common.c | 1 -
> arch/arm/plat-samsung/cpu.c | 7 -------
> arch/arm/plat-samsung/include/plat/cpu.h | 1 -
> 3 files changed, 9 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
> index bf57d4c..97edd4d 100644
> --- a/arch/arm/mach-s3c24xx/common.c
> +++ b/arch/arm/mach-s3c24xx/common.c
> @@ -232,7 +232,6 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)
> } else {
> samsung_cpu_id = s3c24xx_read_idcode_v4();
> }
> - s3c24xx_init_cpu();
>
> s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
>
> diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c
> index 46b426e..364963a 100644
> --- a/arch/arm/plat-samsung/cpu.c
> +++ b/arch/arm/plat-samsung/cpu.c
> @@ -28,13 +28,6 @@ unsigned int samsung_rev(void)
> }
> EXPORT_SYMBOL(samsung_rev);
>
> -void __init s3c24xx_init_cpu(void)
> -{
> - /* nothing here yet */
> -
> - samsung_cpu_rev = 0;
> -}
> -
> void __init s3c64xx_init_cpu(void)
> {
> samsung_cpu_id = __raw_readl(S3C_VA_SYS + 0x118);
> diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
> index 8f09488..262ef86 100644
> --- a/arch/arm/plat-samsung/include/plat/cpu.h
> +++ b/arch/arm/plat-samsung/include/plat/cpu.h
> @@ -207,7 +207,6 @@ extern void s5p_init_irq(u32 *vic, u32 num_vic);
>
> extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);
>
> -extern void s3c24xx_init_cpu(void);
> extern void s3c64xx_init_cpu(void);
> extern void s5p_init_cpu(void __iomem *cpuid_addr);
>
Applied, thanks.
- Kukjin
^ permalink raw reply
* [PATCH] clocksource: exynos_mct: remove unwanted header file inclusion
From: Kukjin Kim @ 2014-02-13 22:23 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1389314025-2890-1-git-send-email-pankaj.dubey@samsung.com>
On 01/10/14 09:33, Pankaj Dubey wrote:
> remove unwanted header file inclusion "asm/mach/time.h" from exynos_mct.c
>
> Signed-off-by: Pankaj Dubey<pankaj.dubey@samsung.com>
> ---
> drivers/clocksource/exynos_mct.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
> index 48f76bc..ed49b25 100644
> --- a/drivers/clocksource/exynos_mct.c
> +++ b/drivers/clocksource/exynos_mct.c
> @@ -25,8 +25,6 @@
> #include<linux/of_address.h>
> #include<linux/clocksource.h>
>
> -#include<asm/mach/time.h>
> -
> #define EXYNOS4_MCTREG(x) (x)
> #define EXYNOS4_MCT_G_CNT_L EXYNOS4_MCTREG(0x100)
> #define EXYNOS4_MCT_G_CNT_U EXYNOS4_MCTREG(0x104)
Looks good, applied.
Thanks,
Kukjin
^ permalink raw reply
* [PATCH 1/3] irqchip: exynos-combiner: call handle_bad_irq directly
From: Kukjin Kim @ 2014-02-13 22:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <52D01D96.8000401@samsung.com>
On 01/11/14 01:19, Tomasz Figa wrote:
> Hi Pankaj,
>
> On 10.01.2014 03:32, Pankaj Dubey wrote:
>> This patch is inspired from following commit
>> aec0095653: (irqchip: gic: Call handle_bad_irq() directly)
>>
>> Also this will help in removing unwanted inclusion
>> of header file "asm/mach/irq.h"
>>
>> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
>> ---
>> drivers/irqchip/exynos-combiner.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> Reviewed-by: Tomasz Figa <t.figa@samsung.com>
>
Applied, thanks.
- Kukjin
^ permalink raw reply
* [PATCH] ARM: S3C24XX: Fix typo "CONFIG_CPUS_3C2443"
From: Kukjin Kim @ 2014-02-13 22:33 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAK9yfHyXmY52KmKPj6=te829-R83dfM7wB813h=+=zCpzzxobA@mail.gmail.com>
On 02/12/14 18:47, Sachin Kamat wrote:
> On 12 February 2014 15:11, Paul Bolle<pebolle@tiscali.nl> wrote:
>> Signed-off-by: Paul Bolle<pebolle@tiscali.nl>
>> ---
>> Untested. This needs testing by people with access to knowledge,
>> compilers, and/or hardware related to CPU_S3C2443. I'm not one of them.
>>
>> arch/arm/mach-s3c24xx/common.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
>> index 4adaa4b..1d77d70 100644
>> --- a/arch/arm/mach-s3c24xx/common.c
>> +++ b/arch/arm/mach-s3c24xx/common.c
>> @@ -484,7 +484,7 @@ struct platform_device s3c2440_device_dma = {
>> };
>> #endif
>>
>> -#if defined(CONFIG_CPUS_3C2443) || defined(CONFIG_CPU_S3C2416)
>> +#if defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)
>
> This is definitely a typo and the current fix looks good.
>
> Reviewed-by: Sachin Kamat<sachin.kamat@linaro.org>
>
Applied, thanks.
- Kukjin
^ permalink raw reply
* [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern
From: Maxime Ripard @ 2014-02-13 22:37 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20140213081935.GB2619@katana>
On Thu, Feb 13, 2014 at 09:19:36AM +0100, Wolfram Sang wrote:
>
> > This is the second version of the i2c compatible changes.
> > The only difference with the v1 being that we're now droping the old
> > compatibles, instead of keeping them, since the DT maintainers said it was
> > fine.
>
> Please provide a pointer to that discussion.
>
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/229438.html
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140213/5f8a90e9/attachment.sig>
^ permalink raw reply
* [PATCH v2] bus: imx-weim: support CS GPR config for imx6q-weim
From: Philippe De Muyter @ 2014-02-13 22:38 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1392296342-21115-1-git-send-email-shawn.guo@linaro.org>
Hi Shawn,
On Thu, Feb 13, 2014 at 08:59:02PM +0800, Shawn Guo wrote:
> For imx6q-weim type of device, there might a WEIM CS space configuration
> register in General Purpose Register controller, e.g. IOMUXC_GPR1 on
> i.MX6Q.
>
> Depending on which configuration of the following 4 is chosen for given
> system, IOMUXC_GPR1[11:0] should be set up as 05, 033, 0113 or 01111
> correspondingly.
>
> CS0(128M) CS1(0M) CS2(0M) CS3(0M)
> CS0(64M) CS1(64M) CS2(0M) CS3(0M)
> CS0(64M) CS1(32M) CS2(32M) CS3(0M)
> CS0(32M) CS1(32M) CS2(32M) CS3(32M)
>
> The patch creates a function for imx6q-weim type of device, which scans
> 'ranges' property of WEIM node and build the GPR value incrementally.
> Thus the WEIM CS GPR can be set up automatically at boot time.
Please add that text to Documentation/devicetree/bindings/bus/imx-weim.txt.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> Changes since v1:
> - Drop device tree property fsl,weim-cs-gpr
> - Use octal value for IOMUXC_GPR1[11:0] bit field
> - Use of_property_for_each_u32() to build gprval incrementally
>
> drivers/bus/imx-weim.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 59 insertions(+)
>
> diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
> index 3ef58c8..a120c93 100644
> --- a/drivers/bus/imx-weim.c
> +++ b/drivers/bus/imx-weim.c
> @@ -11,6 +11,9 @@
> #include <linux/clk.h>
> #include <linux/io.h>
> #include <linux/of_device.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
> +#include <linux/regmap.h>
>
> struct imx_weim_devtype {
> unsigned int cs_count;
> @@ -56,6 +59,59 @@ static const struct of_device_id weim_id_table[] = {
> };
> MODULE_DEVICE_TABLE(of, weim_id_table);
>
> +static int __init imx6q_weim_gpr_setup(struct platform_device *pdev)
> +{
> + struct device_node *np = pdev->dev.of_node;
> + struct property *prop;
> + const __be32 *p;
> + struct regmap *gpr;
> + u32 gprvals[4] = {
> + 05, /* CS0(128M) CS1(0M) CS2(0M) CS3(0M) */
> + 033, /* CS0(64M) CS1(64M) CS2(0M) CS3(0M) */
> + 0113, /* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */
> + 0111, /* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */
01111, /* CS0(32M) CS1(32M) CS2(32M) CS3(32M) */
> + };
> + u32 gprval = 0;
> + u32 val;
> + int len;
> + int cs = 0;
> + int i = 0;
> +
> + gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
> + if (IS_ERR(gpr)) {
> + dev_err(&pdev->dev, "failed to find fsl,imx6q-iomuxc-gpr\n");
> + return -ENOENT;
> + }
> +
> + prop = of_find_property(np, "ranges", &len);
> + if (prop == NULL)
> + return -ENOENT;
> + if (len % (sizeof(u32) * 4))
> + return -EINVAL;
> +
> + of_property_for_each_u32(np, "ranges", prop, p, val) {
> + if (i % 4 == 0) {
> + cs = val;
> + } else if (i % 4 == 3 && val) {
> + val /= SZ_64M;
> + val = (val << 1) | 1;
or
val = (val / SZ_32M) | 1;
> + gprval |= val << cs * 3;
> + }
> + i++;
> + }
You may replace the tests above (from "prop = of_find_property" to "EINVAL;")
by :
if (i == 0 || (i % 4))
goto err;
> +
> + for (i = 0; i < ARRAY_SIZE(gprvals); i++) {
> + if (gprval == gprvals[i]) {
> + /* Found it. Set up IOMUXC_GPR1[11:0] with it. */
> + regmap_update_bits(gpr, IOMUXC_GPR1, 0xfff, gprval);
> + return 0;
> + }
> + }
> +
err:
> + dev_err(&pdev->dev, "Invalid 'ranges' configuration\n");
> + return -EINVAL;
> +}
> +
> /* Parse and set the timing for this device. */
> static int __init weim_timing_setup(struct device_node *np, void __iomem *base,
> const struct imx_weim_devtype *devtype)
> @@ -92,6 +148,9 @@ static int __init weim_parse_dt(struct platform_device *pdev,
> struct device_node *child;
> int ret;
>
> + if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6q-weim"))
> + imx6q_weim_gpr_setup(pdev);
> +
> for_each_child_of_node(pdev->dev.of_node, child) {
> if (!child->name)
> continue;
> --
> 1.7.9.5
>
I have tested this v2 patch, and, except for the typo (0111 instead of 01111),
it works perfectly.
Thanks
Philippe
--
Philippe De Muyter +32 2 6101532 Macq SA rue de l'Aeronef 2 B-1140 Bruxelles
^ permalink raw reply
* [PATCH] ARM: dts: omap3-gta04: Add EOC irq gpio line handling.
From: Tony Lindgren @ 2014-02-13 22:44 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAAfyv36Y+N9DpFWPf5SLmJv=fcnvktVPd30QBOEsNGFdr-A0xA@mail.gmail.com>
* Belisko Marek <marek.belisko@gmail.com> [140120 12:27]:
> Ping? Benoit can you please merge this trivial update. Thanks.
Applying into omap-for-v3.14/fixes thanks.
Tony
^ permalink raw reply
* [PATCH] ARM: dts: exynos5250-arndale: Keep G3D regulator always on
From: Kukjin Kim @ 2014-02-13 22:44 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1392141043-27170-1-git-send-email-t.figa@samsung.com>
On 02/12/14 02:50, Tomasz Figa wrote:
> Apparently, if G3D regulator is powered off, the SoC cannot enter low
> power modes and just hangs. This patch fixes this by keeping the
> regulator always on when the system is running, as suggested by Exynos 4
> User's Manual in case of Exynos4210/4x12 SoCs (Exynos5250 UM does not
> have such note, but observed behavior seems to confirm that it is true
> for this SoC as well).
>
> This fixes an issue preventing Arndale board from entering sleep mode
> observed since commit
>
> 346f372f7b72a0 clk: exynos5250: Add CLK_IGNORE_UNUSED flag for pmu clock
>
> that landed in kernel 3.11, which has fixed the clock driver to make the
> SoC actually try to enter the sleep mode.
>
> Signed-off-by: Tomasz Figa<t.figa@samsung.com>
> Acked-by: Kyungmin Park<kyungmin.park@samsung.com>
> Cc: stable at vger.kernel.org
> ---
> arch/arm/boot/dts/exynos5250-arndale.dts | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
> index e14dd62..5e9ddb8 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -287,6 +287,7 @@
> regulator-name = "vdd_g3d";
> regulator-min-microvolt =<1000000>;
> regulator-max-microvolt =<1000000>;
> + regulator-always-on;
> regulator-boot-on;
> op_mode =<1>;
> };
Looks good to me, applied. BTW, the patch you mentioned has been merged
since v3.10 so I fixed it.
Thanks,
Kukjin
^ permalink raw reply
* [PATCH 0/2] ARM: DTS: am335x-evmsk: Audio and MMC1 fix (for 3.13?)
From: Tony Lindgren @ 2014-02-13 22:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <52CBB788.9070404@ti.com>
* Peter Ujfalusi <peter.ujfalusi@ti.com> [140107 00:16]:
> Hi Benoit,
>
> On 12/23/2013 11:28 AM, Peter Ujfalusi wrote:
> > Hi,
> >
> > The audio frequency has been incorrectly set in the DTS file which results
> > incorrect playback frequency on EVM-SK.
> >
> > The SD card can not be used without the second patch on 3.13-rc5.
>
> Can you take a look at these and if it is possible send it for 3.13?
Applying both into omap-for-v3.14/fixes thanks.
Tony
^ permalink raw reply
* [PATCH] arm: omap1: fix build when !CONFIG_OMAP_32K_TIMER
From: Tony Lindgren @ 2014-02-13 22:52 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1389636237-2998-1-git-send-email-balbi@ti.com>
* Felipe Balbi <balbi@ti.com> [140113 10:06]:
> If CONFIG_OMAP_32K_TIMER isn't enabled, we will
> try to use enable_dyn_sleep which wasn't defined
> anywhere.
>
> In order to fix the problem, we always define
> enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER.
>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
Thanks applying into omap-for-v3.14/fixes.
Tony
^ permalink raw reply
* [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles
From: Maxime Ripard @ 2014-02-13 22:52 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20140213082630.GA3119@katana>
On Thu, Feb 13, 2014 at 09:26:30AM +0100, Wolfram Sang wrote:
>
> Why is the devicetree list not on CC? (Added now)
>
> On Thu, Feb 06, 2014 at 10:51:25AM +0100, Maxime Ripard wrote:
> > Switch the device tree to the new compatibles introduced in the i2c drivers
> > to have a common pattern accross all Allwinner SoCs.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> > arch/arm/boot/dts/sun4i-a10.dtsi | 6 +++---
> > arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +++---
> > arch/arm/boot/dts/sun5i-a13.dtsi | 6 +++---
> > arch/arm/boot/dts/sun7i-a20.dtsi | 10 +++++-----
> > 4 files changed, 14 insertions(+), 14 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
> > index 28273f9..ac65c8a 100644
> > --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> > @@ -518,7 +518,7 @@
> > };
> >
> > i2c0: i2c at 01c2ac00 {
> > - compatible = "allwinner,sun4i-i2c";
> > + compatible = "allwinner,sun4i-a10-i2c";
>
> Can't we have:
>
> compatible = "allwinner,sun4i-a10-i2c", "allwinner,sun4i-i2c";
>
> ? And keep the old "allwinner,sun4i-i2c" and extend it with a SoC
> specific a10 compatible entry when a distinction is needed?
Actually, the two are exactly equivalent. The point is that the
compatible naming scheme doesn't follow what we are using (which is
<family>-<soc>-i2c), so we wan't to get rid of the old naming scheme
all together.
> > diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
> > index 6de40b6..537072c 100644
> > --- a/arch/arm/boot/dts/sun5i-a13.dtsi
> > +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
> > @@ -377,7 +377,7 @@
> > };
> >
> > i2c0: i2c at 01c2ac00 {
> > - compatible = "allwinner,sun4i-i2c";
> > + compatible = "allwinner,sun4i-a10-i2c";
>
> For non-a10, That should be at least
>
> compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c";
>
> or
>
> compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c";
>
> depending on the outcome above.
>
> Or is my knowledge outdated already?
>
Since they are strictly compatible, we don't need to introduce any
different compatible string here.
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140213/e625a811/attachment.sig>
^ permalink raw reply
* [PATCH] arm: dtsi: am335x-bone-common, usb0 is peripheral only
From: Tony Lindgren @ 2014-02-13 22:54 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1389448851-20010-1-git-send-email-mpa@pengutronix.de>
* Markus Pargmann <mpa@pengutronix.de> [140111 06:03]:
> The PMIC is using usb0 vbus line as power source. It is also connected
> to the am335x processor as vbus sense. But there is no possibility to
> pullup usb0 vbus to operate as host. This patch fixes the dr_mode of usb0.
That's the MUSB? AFAIK it's not possible to operate MUSB in peripheral
only mode because the hardware does what it wants based on the ID
pin state.
Regards,
Tony
^ permalink raw reply
* [PATCH 22/28] Remove S3C24XX_GPIO_EXTRA128
From: Kukjin Kim @ 2014-02-13 22:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <52F999A1.1070709@samsung.com>
On 02/11/14 12:31, Kukjin Kim wrote:
> On 02/10/14 03:48, Richard Weinberger wrote:
>> The symbol is an orphan, get rid of it.
>>
>> Signed-off-by: Richard Weinberger<richard@nod.at>
>> ---
>> arch/arm/mach-s3c24xx/Kconfig | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-s3c24xx/Kconfig
>> b/arch/arm/mach-s3c24xx/Kconfig
>> index 1c67f04..bb1fa603 100644
>> --- a/arch/arm/mach-s3c24xx/Kconfig
>> +++ b/arch/arm/mach-s3c24xx/Kconfig
>> @@ -561,7 +561,6 @@ config MACH_OSIRIS
>> select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
>> select S3C2440_XTAL_12000000
>> select S3C24XX_DCLK
>> - select S3C24XX_GPIO_EXTRA128
>> select S3C24XX_SIMTEC_PM if PM
>> select S3C_DEV_NAND
>> select S3C_DEV_USB_HOST
>
> OK good, but I will squash this with 13th for mach-s3c24xx/Kconfig when
> I apply.
>
+ Paul Bolle
Richard,
I found same patch ([PATCH] ARM: s3c24xx: get rid of unneeded selects)
for S3C24XX from Paul before your posting. So I picked that up.
Thanks,
Kukjin
^ permalink raw reply
* [PATCH] ARM: OMAP2+: add missing ARCH_HAS_OPP
From: Tony Lindgren @ 2014-02-13 22:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <52E901B3.5070307@ti.com>
* Nishanth Menon <nm@ti.com> [140129 05:29]:
> Hi Tony,
> On 01/15/2014 02:00 PM, Nishanth Menon wrote:
> > OMAP5, DRA7, AM43xx all have OPPs. So select the same to allow SoC
> > only configuration boot to work with OPP.
> >
> > Reported-by: Nikhil Devshatwar <nikhil.nd@ti.com>
> > Signed-off-by: Nishanth Menon <nm@ti.com>
> > ---
> >
> > For DRA7, depends on: https://patchwork.kernel.org/patch/3465411/
>
> Considering that dependent patch is now on linus master,
> a gentle ping -> The patch does apply on latest linus master commit
> 0e47c969c65e213421450c31043353ebe3c67e0c
Thanks applying into omap-for-v3.14/fixes.
Tony
^ permalink raw reply
* [PATCH 2/2] ARM: OMAP2+: fix dpll round_rate() to actually round
From: Tony Lindgren @ 2014-02-13 23:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1389944699-27962-3-git-send-email-tomi.valkeinen@ti.com>
* Tomi Valkeinen <tomi.valkeinen@ti.com> [140116 23:47]:
> omap2_dpll_round_rate() doesn't actually round the given rate, even if
> the name and the description so hints. Instead it only tries to find an
> exact rate match, or if that fails, return ~0 as an error.
>
> What this basically means is that the user of the clock needs to know
> what rates the dpll can support, which obviously isn't right.
>
> This patch adds a simple method of rounding: during the iteration, the
> code keeps track of the closest rate match. If no exact match is found,
> the closest is returned.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Paul & Tero, please ack if you want me to queue this.
Tony
> ---
> arch/arm/mach-omap2/clkt_dpll.c | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c
> index 1f1708ef77bb..1b4e68dfb713 100644
> --- a/arch/arm/mach-omap2/clkt_dpll.c
> +++ b/arch/arm/mach-omap2/clkt_dpll.c
> @@ -298,6 +298,7 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,
> struct dpll_data *dd;
> unsigned long ref_rate;
> const char *clk_name;
> + unsigned long diff, closest_diff = ~0;
>
> if (!clk || !clk->dpll_data)
> return ~0;
> @@ -345,20 +346,26 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,
> pr_debug("clock: %s: m = %d: n = %d: new_rate = %lu\n",
> clk_name, m, n, new_rate);
>
> - if (target_rate == new_rate) {
> + diff = max(target_rate, new_rate) - min(target_rate, new_rate);
> +
> + if (diff < closest_diff) {
> + closest_diff = diff;
> +
> dd->last_rounded_m = m;
> dd->last_rounded_n = n;
> - dd->last_rounded_rate = target_rate;
> - break;
> + dd->last_rounded_rate = new_rate;
> +
> + if (diff == 0)
> + break;
> }
> }
>
> - if (target_rate != new_rate) {
> + if (closest_diff == ~0) {
> pr_debug("clock: %s: cannot round to rate %lu\n",
> clk_name, target_rate);
> return ~0;
> }
>
> - return target_rate;
> + return dd->last_rounded_rate;
> }
>
> --
> 1.8.3.2
>
^ permalink raw reply
* [PATCH] ARM: s3c24xx: get rid of unneeded selects
From: Kukjin Kim @ 2014-02-13 23:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1391957465.25424.14.camel@x220>
On 02/09/14 23:51, Paul Bolle wrote:
> Commit c67d0f29262b ("ARM: s3c24xx: get rid of custom<mach/gpio.h>")
> got rid of the Kconfig symbols S3C24XX_GPIO_EXTRA64 and
> S3C24XX_GPIO_EXTRA128. It missed one select of both of these symbols, so
> get rid of those now.
>
> Signed-off-by: Paul Bolle<pebolle@tiscali.nl>
> ---
> Untested.
>
> arch/arm/mach-s3c24xx/Kconfig | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
> index d876431..bb1fa603 100644
> --- a/arch/arm/mach-s3c24xx/Kconfig
> +++ b/arch/arm/mach-s3c24xx/Kconfig
> @@ -521,7 +521,6 @@ config MACH_ANUBIS
> select HAVE_PATA_PLATFORM
> select S3C2440_XTAL_12000000
> select S3C24XX_DCLK
> - select S3C24XX_GPIO_EXTRA64
> select S3C24XX_SIMTEC_PM if PM
> select S3C_DEV_USB_HOST
> help
> @@ -562,7 +561,6 @@ config MACH_OSIRIS
> select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
> select S3C2440_XTAL_12000000
> select S3C24XX_DCLK
> - select S3C24XX_GPIO_EXTRA128
> select S3C24XX_SIMTEC_PM if PM
> select S3C_DEV_NAND
> select S3C_DEV_USB_HOST
Applied, thanks.
- Kukjin
^ permalink raw reply
* [PATCH] mmc: omap_hsmmc: Add support for Erratum 2.1.1.128 in device tree boot
From: Tony Lindgren @ 2014-02-13 23:05 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <52F246CC.6070600@ti.com>
* Nishanth Menon <nm@ti.com> [140205 06:15]:
> On Wed 05 Feb 2014 08:10:34 AM CST, Balaji T K wrote:
> >>>
> >>> Rather than ti,errata.. specific property, something like
> >>> caps no/disable multiblock read is more readable in my opinion, Otherwise
> >>
> >> Is'nt the better definition to state i have quirk X and allow the
> >> driver to do the necessary thing/things needed to handle quirk X? in
> >> this case, there is just one thing to do: broken multi_block_read, in
> >> the case of other quirks, there might be more than 1 thing to do.. let
> >> driver figure that out, dts just states the h/w capabilty or in this
> >> case, the quirk capability.
> >>
> >
> > But in this case there is only one. disable multi block read is more readable
> > than the errata reference, No strong feelings though.
>
> Considering this might set an precedence for other quirk description,
> I'd like to leave it as it stands.
Hmm if this really depends on the hardware version, how about
just add new compatible flag ti,omap3430-rev-xyz-hsmmc that
allows the driver to deal with the errata?
Regards,
Tony
^ permalink raw reply
* [PATCH v2 7/9] clk: samsung: Drop old suspend/resume code
From: Kukjin Kim @ 2014-02-13 23:07 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <4274393.fPXjFZLa78@phil>
On 02/07/14 18:50, Heiko St?bner wrote:
> Am Donnerstag, 6. Februar 2014, 19:16:54 schrieb Tomasz Figa:
>> Since all SoC drivers have been moved to local suspend/resume handling,
>> the old code can be safely dropped.
>>
>> Signed-off-by: Tomasz Figa<t.figa@samsung.com>
>> Acked-by: Kyungmin Park<kyungmin.park@samsung.com>
>
> So it looks like I'll need to respin my s3c24xx-ccf patches again, but
> nevertheless:
>
> Acked-by: Heiko Stuebner<heiko@sntech.de>
>
Heiko,
I'll apply this series, so please re-work your s3c24xx CCF based on
this. you can see in v3.15-next/s2r-pm-samsung.
Thanks,
- Kukjin
>> ---
>> drivers/clk/samsung/clk-exynos4.c | 2 +-
>> drivers/clk/samsung/clk-exynos5250.c | 2 +-
>> drivers/clk/samsung/clk-exynos5420.c | 2 +-
>> drivers/clk/samsung/clk-exynos5440.c | 2 +-
>> drivers/clk/samsung/clk-s3c64xx.c | 2 +-
>> drivers/clk/samsung/clk.c | 54
>> +----------------------------------- drivers/clk/samsung/clk.h |
>> 4 +--
>> 7 files changed, 7 insertions(+), 61 deletions(-)
^ permalink raw reply
* [PATCH v2 1/2] net: axienet: Fix compilation error
From: David Miller @ 2014-02-13 23:08 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <2082312fdbceca394080302b1709a5f71d7d3652.1392275432.git.michal.simek@xilinx.com>
From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 13 Feb 2014 08:10:42 +0100
> Add missing header to fix compilation error.
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1575:22:
> error: undefined identifier 'irq_of_parse_and_map'
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1576:22:
> error: undefined identifier 'irq_of_parse_and_map'
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Applied.
^ permalink raw reply
* [PATCH v2 2/2] net: axienet: Fix compilation warnings
From: David Miller @ 2014-02-13 23:08 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <9be652e995e74663de1df69e6ea101225cb670a2.1392275432.git.michal.simek@xilinx.com>
From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 13 Feb 2014 08:10:43 +0100
> Warning log:
> xilinx_axienet_main.c: In function 'axienet_start_xmit_done':
> xilinx_axienet_main.c:617:16: warning: operation on 'lp->tx_bd_ci' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c: In function 'axienet_start_xmit':
> xilinx_axienet_main.c:703:18: warning: operation on 'lp->tx_bd_tail' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c:719:17: warning: operation on 'lp->tx_bd_tail' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c: In function 'axienet_recv':
> xilinx_axienet_main.c:792:16: warning: operation on 'lp->rx_bd_ci' may be undefined [-Wsequence-point]
> xilinx_axienet_main.c: In function 'axienet_of_probe':
> xilinx_axienet_main.c:1501:21: warning: unused variable 'rc' [-Wunused-variable]
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Applied.
^ permalink raw reply
* [PATCH 1/9] ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
From: Tony Lindgren @ 2014-02-13 23:08 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1390685343-11663-2-git-send-email-marek@goldelico.com>
* Marek Belisko <marek@goldelico.com> [140125 13:31]:
> From: NeilBrown <neilb@suse.de>
>
> It should be ACTIVE_HIGH.
>
> Signed-off-by: NeilBrown <neilb@suse.de>
> ---
> arch/arm/boot/dts/omap3-gta04.dts | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/omap3-gta04.dts b/arch/arm/boot/dts/omap3-gta04.dts
> index b9b55c9..9d37184 100644
> --- a/arch/arm/boot/dts/omap3-gta04.dts
> +++ b/arch/arm/boot/dts/omap3-gta04.dts
> @@ -32,7 +32,7 @@
> aux-button {
> label = "aux";
> linux,code = <169>;
> - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
> + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
> gpio-key,wakeup;
> };
> };
Picking this one into omap-for-v3.14/fixes thanks.
Tony
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox