* [PATCH] ARM: omap2plus_defconfig: Run make savedefconfig to save some space
From: Tony Lindgren @ 2016-11-15 19:02 UTC (permalink / raw)
To: linux-arm-kernel
This shrinks down omap2plus_defconfig a bit and makes it easier for
people to generate minimal patches against it.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/configs/omap2plus_defconfig | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -1,7 +1,6 @@
CONFIG_KERNEL_LZMA=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
-CONFIG_FHANDLE=y
CONFIG_AUDIT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
@@ -40,7 +39,6 @@ CONFIG_ARCH_MULTI_V6=y
CONFIG_POWER_AVS_OMAP=y
CONFIG_POWER_AVS_OMAP_CLASS3=y
CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX_DEBUG=y
CONFIG_ARCH_OMAP2=y
CONFIG_ARCH_OMAP3=y
CONFIG_ARCH_OMAP4=y
@@ -50,7 +48,6 @@ CONFIG_SOC_AM43XX=y
CONFIG_SOC_DRA7XX=y
CONFIG_ARM_THUMBEE=y
CONFIG_ARM_ERRATA_411920=y
-CONFIG_ARM_ERRATA_430973=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
CONFIG_CMA=y
@@ -62,7 +59,6 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200"
CONFIG_KEXEC=y
CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -241,14 +237,14 @@ CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_TWL4030=y
CONFIG_W1=m
CONFIG_HDQ_MASTER_OMAP=m
+CONFIG_POWER_AVS=y
+CONFIG_POWER_RESET=y
CONFIG_BATTERY_BQ27XXX=m
CONFIG_CHARGER_ISP1704=m
CONFIG_CHARGER_TWL4030=m
CONFIG_CHARGER_BQ2415X=m
CONFIG_CHARGER_BQ24190=m
CONFIG_CHARGER_BQ24735=m
-CONFIG_POWER_RESET=y
-CONFIG_POWER_AVS=y
CONFIG_HWMON=m
CONFIG_SENSORS_GPIO_FAN=m
CONFIG_SENSORS_LM75=m
--
2.10.2
^ permalink raw reply
* [PATCH/RESEND] recordmcount: arm: Implement make_nop
From: Stephen Boyd @ 2016-11-15 19:18 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAKv+Gu-Cp775gbLxPcJQ4G2nEnwm9G_gxh5B1Sf2LGkkov_OZA@mail.gmail.com>
On 11/15, Ard Biesheuvel wrote:
> On 19 October 2016 at 00:42, Stephen Boyd <sboyd@codeaurora.org> wrote:
> > In similar spirit to x86 and arm64 support, add a make_nop_arm()
> > to replace calls to mcount with a nop in sections that aren't
> > traced.
> >
> > Cc: Russell King <linux@arm.linux.org.uk>
> > Acked-by: Rabin Vincent <rabin@rab.in>
> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> > ---
> > scripts/recordmcount.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 65 insertions(+)
> >
> > diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
> > index 5423a58d1b06..aeb34223167c 100644
> > --- a/scripts/recordmcount.c
> > +++ b/scripts/recordmcount.c
> > @@ -213,6 +213,59 @@ static int make_nop_x86(void *map, size_t const offset)
> > return 0;
> > }
> >
> > +static unsigned char ideal_nop4_arm_le[4] = { 0x00, 0x00, 0xa0, 0xe1 }; /* mov r0, r0 */
> > +static unsigned char ideal_nop4_arm_be[4] = { 0xe1, 0xa0, 0x00, 0x00 }; /* mov r0, r0 */
>
> Shouldn't you be taking the difference between BE8 and BE32 into
> account here? IIRC, BE8 uses little endian encoding for instructions.
I admit I haven't tested on a pre-armv6 CPU so I haven't come
across the case of a BE32 CPU. But from what I can tell that
doesn't matter.
According to scripts/Makefile.build, cmd_record_mcount only runs
the recordmcount program if CONFIG_FTRACE_MCOUNT_RECORD=y. That
config is defined as:
config FTRACE_MCOUNT_RECORD
def_bool y
depends on DYNAMIC_FTRACE
depends on HAVE_FTRACE_MCOUNT_RECORD
And in arch/arm/Kconfig we see that DYNAMIC_FTRACE is selected:
select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU
which means that FTRACE_MCOUNT_RECORD can't be set when
CPU_ENDIAN_BE32 is set.
Do you agree that BE32 is not a concern here?
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply
* [PATCH v15 01/13] clocksource/drivers/arm_arch_timer: Move enums and defines to header file
From: kbuild test robot @ 2016-11-15 19:23 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1479215615-26950-2-git-send-email-fu.wei@linaro.org>
Hi Fu,
[auto build test ERROR on tip/timers/core]
[also build test ERROR on v4.9-rc5 next-20161115]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/fu-wei-linaro-org/acpi-clocksource-add-GTDT-driver-and-GTDT-support-in-arm_arch_timer/20161116-004444
config: arm-hisi_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
Note: the linux-review/fu-wei-linaro-org/acpi-clocksource-add-GTDT-driver-and-GTDT-support-in-arm_arch_timer/20161116-004444 HEAD 47004b0566d2fd65c05836078319b02c5af2a1fc builds fine.
It only hurts bisectibility.
All error/warnings (new ones prefixed by >>):
>> drivers/clocksource/arm_arch_timer.c:70:13: error: variable 'arch_timer_uses_ppi' has initializer but incomplete type
static enum ppi_nr arch_timer_uses_ppi = VIRT_PPI;
^~~~~~
drivers/clocksource/arm_arch_timer.c: In function '__arch_timer_setup':
>> drivers/clocksource/arm_arch_timer.c:358:3: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
clk->irq = arch_timer_ppi[arch_timer_uses_ppi];
^~~
drivers/clocksource/arm_arch_timer.c:359:3: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
switch (arch_timer_uses_ppi) {
^~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_has_nonsecure_ppi':
drivers/clocksource/arm_arch_timer.c:447:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
return (arch_timer_uses_ppi == PHYS_SECURE_PPI &&
^~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_starting_cpu':
drivers/clocksource/arm_arch_timer.c:471:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
flags = check_ppi_trigger(arch_timer_ppi[arch_timer_uses_ppi]);
^~~~~
drivers/clocksource/arm_arch_timer.c:472:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
enable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi], flags);
^~~~~~~~~~~~~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_banner':
drivers/clocksource/arm_arch_timer.c:512:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
pr_info("Architected %s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n",
^~~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_counter_register':
drivers/clocksource/arm_arch_timer.c:589:3: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
if (IS_ENABLED(CONFIG_ARM64) || arch_timer_uses_ppi == VIRT_PPI)
^~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_stop':
drivers/clocksource/arm_arch_timer.c:624:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
disable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi]);
^~~~~~~~~~~~~~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_register':
drivers/clocksource/arm_arch_timer.c:687:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
ppi = arch_timer_ppi[arch_timer_uses_ppi];
^~~
drivers/clocksource/arm_arch_timer.c:688:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
switch (arch_timer_uses_ppi) {
^~~~~~
drivers/clocksource/arm_arch_timer.c:737:2: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
free_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi], arch_timer_evt);
^~~~~~~~~~~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_init':
drivers/clocksource/arm_arch_timer.c:838:4: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
arch_timer_uses_ppi = HYP_PPI;
^~~~~~~~~~~~~~~~~~~
drivers/clocksource/arm_arch_timer.c:841:4: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
arch_timer_uses_ppi = PHYS_SECURE_PPI;
^~~~~~~~~~~~~~~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_of_init':
drivers/clocksource/arm_arch_timer.c:897:3: error: 'arch_timer_uses_ppi' has an incomplete type 'enum ppi_nr'
arch_timer_uses_ppi = PHYS_SECURE_PPI;
^~~~~~~~~~~~~~~~~~~
drivers/clocksource/arm_arch_timer.c: At top level:
>> drivers/clocksource/arm_arch_timer.c:70:20: error: storage size of 'arch_timer_uses_ppi' isn't known
static enum ppi_nr arch_timer_uses_ppi = VIRT_PPI;
^~~~~~~~~~~~~~~~~~~
drivers/clocksource/arm_arch_timer.c: In function 'arch_timer_has_nonsecure_ppi':
>> drivers/clocksource/arm_arch_timer.c:449:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
vim +/arch_timer_uses_ppi +70 drivers/clocksource/arm_arch_timer.c
220069945 Stephen Boyd 2013-07-18 64
8a4da6e36 Mark Rutland 2012-11-12 65 static u32 arch_timer_rate;
8a4da6e36 Mark Rutland 2012-11-12 66 static int arch_timer_ppi[MAX_TIMER_PPI];
8a4da6e36 Mark Rutland 2012-11-12 67
8a4da6e36 Mark Rutland 2012-11-12 68 static struct clock_event_device __percpu *arch_timer_evt;
8a4da6e36 Mark Rutland 2012-11-12 69
f81f03fa2 Marc Zyngier 2014-02-20 @70 static enum ppi_nr arch_timer_uses_ppi = VIRT_PPI;
82a561941 Lorenzo Pieralisi 2014-04-08 71 static bool arch_timer_c3stop;
220069945 Stephen Boyd 2013-07-18 72 static bool arch_timer_mem_use_virtual;
8a4da6e36 Mark Rutland 2012-11-12 73
:::::: The code at line 70 was first introduced by commit
:::::: f81f03fa231a8c3aacd580759e73b9238b92ba29 arm64: Allow the arch timer to use the HYP timer
:::::: TO: Marc Zyngier <marc.zyngier@arm.com>
:::::: CC: Marc Zyngier <marc.zyngier@arm.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/gzip
Size: 17771 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161116/2bc04733/attachment-0001.gz>
^ permalink raw reply
* [GIT PULL] Reset controller changes for v4.10
From: Philipp Zabel @ 2016-11-15 19:23 UTC (permalink / raw)
To: linux-arm-kernel
Dear arm-soc maintainers,
Please consider merging this tag which adds OX820 support, removes
unused modular code and obsolete STiH41[56] support, and adds support
for multiple devices sharing a pulsed reset, as long as their
requirement is just being reset once, some time before use.
regards
Philipp
The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/pza/linux.git tags/reset-for-4.10
for you to fetch changes up to 7da33a37b48f11ffcb4a718f29a3d4552423fea1:
reset: allow using reset_control_reset with shared reset (2016-11-14 09:58:28 +0100)
----------------------------------------------------------------
Reset controller changes for v4.10
- remove obsolete STiH41[56] platform support
- add Oxford Semiconductor OX820 support
- add reset index include files for OX810SE and OX820
- make drivers with boolean Kconfig options explicitly
non-modular
- allow shared pulsed resets via reset_control_reset, which
in this case means that the reset must have been triggered
once, but possibly earlier, after the function returns, and
is never triggered again for the lifetime of the reset
control
----------------------------------------------------------------
Martin Blumenstingl (1):
reset: allow using reset_control_reset with shared resetany
Neil Armstrong (3):
reset: oxnas: Add OX820 support
dt-bindings: reset: oxnas: Add include file with reset indexes
dt-bindings: reset: oxnas: Update for OX820
Paul Gortmaker (5):
reset: berlin: make it explicitly non-modular
reset: socfpga: make it explicitly non-modular
reset: sunxi: make it explicitly non-modular
reset: zynq: make it explicitly non-modular
reset: lpc18xx: make it explicitly non-modular
Peter Griffin (2):
reset: sti: Remove STiH415/6 reset support
reset: sti: softreset: Remove obsolete platforms from dt binding doc.
.../devicetree/bindings/reset/oxnas,reset.txt | 44 ++-----
.../devicetree/bindings/reset/st,sti-softreset.txt | 8 +-
arch/arm/mach-sti/Kconfig | 2 -
drivers/reset/core.c | 43 ++++++-
drivers/reset/reset-berlin.c | 12 +-
drivers/reset/reset-lpc18xx.c | 32 +----
drivers/reset/reset-oxnas.c | 1 +
drivers/reset/reset-socfpga.c | 10 +-
drivers/reset/reset-sunxi.c | 9 +-
drivers/reset/reset-zynq.c | 10 +-
drivers/reset/sti/Kconfig | 8 --
drivers/reset/sti/Makefile | 2 -
drivers/reset/sti/reset-stih415.c | 112 ----------------
drivers/reset/sti/reset-stih416.c | 143 ---------------------
include/dt-bindings/reset/oxsemi,ox810se.h | 53 ++++++++
include/dt-bindings/reset/oxsemi,ox820.h | 53 ++++++++
16 files changed, 175 insertions(+), 367 deletions(-)
delete mode 100644 drivers/reset/sti/reset-stih415.c
delete mode 100644 drivers/reset/sti/reset-stih416.c
create mode 100644 include/dt-bindings/reset/oxsemi,ox810se.h
create mode 100644 include/dt-bindings/reset/oxsemi,ox820.h
^ permalink raw reply
* [PATCH/RESEND] recordmcount: arm: Implement make_nop
From: Ard Biesheuvel @ 2016-11-15 19:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20161115191807.GC25626@codeaurora.org>
On 15 November 2016 at 19:18, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 11/15, Ard Biesheuvel wrote:
>> On 19 October 2016 at 00:42, Stephen Boyd <sboyd@codeaurora.org> wrote:
>> > In similar spirit to x86 and arm64 support, add a make_nop_arm()
>> > to replace calls to mcount with a nop in sections that aren't
>> > traced.
>> >
>> > Cc: Russell King <linux@arm.linux.org.uk>
>> > Acked-by: Rabin Vincent <rabin@rab.in>
>> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
>> > ---
>> > scripts/recordmcount.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
>> > 1 file changed, 65 insertions(+)
>> >
>> > diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
>> > index 5423a58d1b06..aeb34223167c 100644
>> > --- a/scripts/recordmcount.c
>> > +++ b/scripts/recordmcount.c
>> > @@ -213,6 +213,59 @@ static int make_nop_x86(void *map, size_t const offset)
>> > return 0;
>> > }
>> >
>> > +static unsigned char ideal_nop4_arm_le[4] = { 0x00, 0x00, 0xa0, 0xe1 }; /* mov r0, r0 */
>> > +static unsigned char ideal_nop4_arm_be[4] = { 0xe1, 0xa0, 0x00, 0x00 }; /* mov r0, r0 */
>>
>> Shouldn't you be taking the difference between BE8 and BE32 into
>> account here? IIRC, BE8 uses little endian encoding for instructions.
>
> I admit I haven't tested on a pre-armv6 CPU so I haven't come
> across the case of a BE32 CPU. But from what I can tell that
> doesn't matter.
>
> According to scripts/Makefile.build, cmd_record_mcount only runs
> the recordmcount program if CONFIG_FTRACE_MCOUNT_RECORD=y. That
> config is defined as:
>
> config FTRACE_MCOUNT_RECORD
> def_bool y
> depends on DYNAMIC_FTRACE
> depends on HAVE_FTRACE_MCOUNT_RECORD
>
>
> And in arch/arm/Kconfig we see that DYNAMIC_FTRACE is selected:
>
> select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU
>
> which means that FTRACE_MCOUNT_RECORD can't be set when
> CPU_ENDIAN_BE32 is set.
>
> Do you agree that BE32 is not a concern here?
>
Yes. But that implies then that you should not be using big-endian
instruction encodings at all, and simply use the _le variants for both
LE and BE8
^ permalink raw reply
* [PATCH 1/2] ARM: davinci: PM: rework init, support DT platforms
From: Kevin Hilman @ 2016-11-15 19:30 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <835e8f6b-0c8f-7381-21e1-2fb4b0b006ca@ti.com>
Sekhar Nori <nsekhar@ti.com> writes:
> Hi Kevin,
>
> Looks good to me overall, I have some minor comments.
>
> On Tuesday 15 November 2016 04:34 AM, Kevin Hilman wrote:
>> Remove fake platform device used for PM init. Move pdata values which
>> are common across all current platforms into pm.c.
>>
>> Also add PM support for DT platforms (vi da8xx-dt.c)
>
> Can you please separate out PM enabling on DT platform to a separate
> patch? Its a small change, but it will be nice to separate it from rest
> of the cleanup.
Yes, will do.
>> diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
>> index f9f9713aacdd..3d7a13789661 100644
>> --- a/arch/arm/mach-davinci/include/mach/da8xx.h
>> +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
>> @@ -101,7 +101,6 @@ int da8xx_register_gpio(void *pdata);
>> int da850_register_cpufreq(char *async_clk);
>> int da8xx_register_cpuidle(void);
>> void __iomem *da8xx_get_mem_ctlr(void);
>> -int da850_register_pm(struct platform_device *pdev);
>> int da850_register_sata(unsigned long refclkpn);
>> int da850_register_vpif(void);
>> int da850_register_vpif_display
>> diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c
>> index 8929569b1f8a..fc6a5710b3fa 100644
>> --- a/arch/arm/mach-davinci/pm.c
>> +++ b/arch/arm/mach-davinci/pm.c
>> @@ -23,13 +23,18 @@
>> #include <mach/da8xx.h>
>> #include "sram.h"
>> #include <mach/pm.h>
>> +#include <mach/mux.h>
>
> Can you please add the mux.h inclusion above pm.h? Looks like the sram.h
> inclusion is out of place already, but since you are touching this part,
> can you please move it below along with rest of the local includes.
>
> I see that linux/ includes are not sorted as well, but lets keep that
> aside until someone needs to touch them.
>
>> #include "clock.h"
>> +#include "psc.h"
>>
>> +#define DA850_PLL1_BASE 0x01e1a000
>> #define DEEPSLEEP_SLEEPCOUNT_MASK 0xFFFF
>> +#define DEEPSLEEP_SLEEPCOUNT 128
>>
>> static void (*davinci_sram_suspend) (struct davinci_pm_config *);
>> -static struct davinci_pm_config *pdata;
>> +static struct davinci_pm_config pm_config;
>> +static struct davinci_pm_config *pdata = &pm_config;
>>
>> static void davinci_sram_push(void *dest, void *src, unsigned int size)
>> {
>> @@ -117,17 +122,38 @@ static const struct platform_suspend_ops davinci_pm_ops = {
>> .valid = suspend_valid_only_mem,
>> };
>>
>> -static int __init davinci_pm_probe(struct platform_device *pdev)
>> +int __init davinci_pm_init(void)
>> {
>> - pdata = pdev->dev.platform_data;
>> - if (!pdata) {
>> - dev_err(&pdev->dev, "cannot get platform data\n");
>> - return -ENOENT;
>> + int ret;
>> +
>> + ret = davinci_cfg_reg(DA850_RTC_ALARM);
>> + if (ret)
>> + return ret;
>> +
>> + pdata->sleepcount = DEEPSLEEP_SLEEPCOUNT;
>> + pdata->ddr2_ctlr_base = da8xx_get_mem_ctlr();
>> + pdata->deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);
>> + pdata->ddrpsc_num = DA8XX_LPSC1_EMIF3C;
>
> Some of these could be statically initialized in pm_config. Can you
> please move the constants to static initialization.
Yes.
Kevin
^ permalink raw reply
* [PATCH 2/2] ARM: davinci: PM: rework init: cleanup
From: Kevin Hilman @ 2016-11-15 19:39 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <c8be7b69-551e-dd70-40d1-a36aa74aeb55@ti.com>
Sekhar Nori <nsekhar@ti.com> writes:
> On Tuesday 15 November 2016 04:34 AM, Kevin Hilman wrote:
>> A follow-on cleanup renaming 'pdata' since it is no longer
>> platform_data.
>>
>> Signed-off-by: Kevin Hilman <khilman@baylibre.com>
>
> Looks good to me. Thanks for separating this out. Makes it much easier
> to review.
>
> In the subject line though, instead of just calling it cleanup, how
> about a bit more descriptive statement like "remove references to pdata".
Sure. respin coming right up.
Kevin
^ permalink raw reply
* [PATCH v2 0/3] ARM: davinci: PM: cleanup init, add DT support
From: Kevin Hilman @ 2016-11-15 19:54 UTC (permalink / raw)
To: linux-arm-kernel
This series removes the fake platform_device used to initialize PM on
legacy davinci platforms, and also adds PM support for DT platforms.
Tested with legacy boot on da850-evm, and DT boot on da850-lcdk. Used
RTC to wake from suspend-to-RAM: e.g. rtcwake -m mem -s 4 -d /dev/rtc0
Changes since v1:
- separated support for DT platfroms into separate patch
- misc. cleanup, re-structuring
Kevin Hilman (3):
ARM: davinci: PM: rework init, support DT platforms
ARM: davinci: PM: cleanup: remove references to pdata
ARM: davinci: PM: support da8xx DT platforms
arch/arm/mach-davinci/board-da850-evm.c | 17 +----
arch/arm/mach-davinci/board-mityomapl138.c | 16 +----
arch/arm/mach-davinci/common.c | 1 -
arch/arm/mach-davinci/da850.c | 38 -----------
arch/arm/mach-davinci/da8xx-dt.c | 1 +
arch/arm/mach-davinci/include/mach/da8xx.h | 1 -
arch/arm/mach-davinci/pm.c | 102 ++++++++++++++++-------------
7 files changed, 60 insertions(+), 116 deletions(-)
--
2.9.3
^ permalink raw reply
* [PATCH v2 1/3] ARM: davinci: PM: rework init, support DT platforms
From: Kevin Hilman @ 2016-11-15 19:54 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20161115195421.19983-1-khilman@baylibre.com>
Remove fake platform device used for PM init. Move pdata values which
are common across all current platforms into pm.c.
Also, since PM is only used on da8xx, remove davinci_pm_init() from
common init code, and only use in da850/omapl138 board files that are
currently creating the fake platform_device.
Suggested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
arch/arm/mach-davinci/board-da850-evm.c | 17 +-------
arch/arm/mach-davinci/board-mityomapl138.c | 16 +------
arch/arm/mach-davinci/common.c | 1 -
arch/arm/mach-davinci/da850.c | 38 -----------------
arch/arm/mach-davinci/include/mach/da8xx.h | 1 -
arch/arm/mach-davinci/pm.c | 67 ++++++++++++++++++------------
6 files changed, 42 insertions(+), 98 deletions(-)
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 8e4539f69fdc..4e88723c23c7 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -196,18 +196,6 @@ static struct platform_device da850_evm_norflash_device = {
.resource = da850_evm_norflash_resource,
};
-static struct davinci_pm_config da850_pm_pdata = {
- .sleepcount = 128,
-};
-
-static struct platform_device da850_pm_device = {
- .name = "pm-davinci",
- .dev = {
- .platform_data = &da850_pm_pdata,
- },
- .id = -1,
-};
-
/* DA850/OMAP-L138 EVM includes a 512 MByte large-page NAND flash
* (128K blocks). It may be used instead of the (default) SPI flash
* to boot, using TI's tools to install the secondary boot loader
@@ -1453,10 +1441,7 @@ static __init void da850_evm_init(void)
if (ret)
pr_warn("%s: cpuidle registration failed: %d\n", __func__, ret);
- ret = da850_register_pm(&da850_pm_device);
- if (ret)
- pr_warn("%s: suspend registration failed: %d\n", __func__, ret);
-
+ davinci_pm_init();
da850_vpif_init();
ret = spi_register_board_info(da850evm_spi_info,
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index bc4e63fa9808..9e7388ba413c 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -498,18 +498,6 @@ static void __init mityomapl138_config_emac(void)
pr_warn("emac registration failed: %d\n", ret);
}
-static struct davinci_pm_config da850_pm_pdata = {
- .sleepcount = 128,
-};
-
-static struct platform_device da850_pm_device = {
- .name = "pm-davinci",
- .dev = {
- .platform_data = &da850_pm_pdata,
- },
- .id = -1,
-};
-
static void __init mityomapl138_init(void)
{
int ret;
@@ -555,9 +543,7 @@ static void __init mityomapl138_init(void)
if (ret)
pr_warn("cpuidle registration failed: %d\n", ret);
- ret = da850_register_pm(&da850_pm_device);
- if (ret)
- pr_warn("suspend registration failed: %d\n", ret);
+ davinci_pm_init();
}
#ifdef CONFIG_SERIAL_8250_CONSOLE
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index 049025f6d531..9f9fbfa6da0d 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -118,6 +118,5 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info)
void __init davinci_init_late(void)
{
davinci_cpufreq_init();
- davinci_pm_init();
davinci_clk_disable_unused();
}
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index ed3d0e9f72ac..28771923199f 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1172,44 +1172,6 @@ static int da850_round_armrate(struct clk *clk, unsigned long rate)
}
#endif
-int __init da850_register_pm(struct platform_device *pdev)
-{
- int ret;
- struct davinci_pm_config *pdata = pdev->dev.platform_data;
-
- ret = davinci_cfg_reg(DA850_RTC_ALARM);
- if (ret)
- return ret;
-
- pdata->ddr2_ctlr_base = da8xx_get_mem_ctlr();
- pdata->deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);
- pdata->ddrpsc_num = DA8XX_LPSC1_EMIF3C;
-
- pdata->cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K);
- if (!pdata->cpupll_reg_base)
- return -ENOMEM;
-
- pdata->ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);
- if (!pdata->ddrpll_reg_base) {
- ret = -ENOMEM;
- goto no_ddrpll_mem;
- }
-
- pdata->ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K);
- if (!pdata->ddrpsc_reg_base) {
- ret = -ENOMEM;
- goto no_ddrpsc_mem;
- }
-
- return platform_device_register(pdev);
-
-no_ddrpsc_mem:
- iounmap(pdata->ddrpll_reg_base);
-no_ddrpll_mem:
- iounmap(pdata->cpupll_reg_base);
- return ret;
-}
-
/* VPIF resource, platform data */
static u64 da850_vpif_dma_mask = DMA_BIT_MASK(32);
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index f9f9713aacdd..3d7a13789661 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -101,7 +101,6 @@ int da8xx_register_gpio(void *pdata);
int da850_register_cpufreq(char *async_clk);
int da8xx_register_cpuidle(void);
void __iomem *da8xx_get_mem_ctlr(void);
-int da850_register_pm(struct platform_device *pdev);
int da850_register_sata(unsigned long refclkpn);
int da850_register_vpif(void);
int da850_register_vpif_display
diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c
index 8929569b1f8a..3f1fb191c03f 100644
--- a/arch/arm/mach-davinci/pm.c
+++ b/arch/arm/mach-davinci/pm.c
@@ -21,15 +21,23 @@
#include <mach/common.h>
#include <mach/da8xx.h>
-#include "sram.h"
+#include <mach/mux.h>
#include <mach/pm.h>
#include "clock.h"
+#include "psc.h"
+#include "sram.h"
+#define DA850_PLL1_BASE 0x01e1a000
#define DEEPSLEEP_SLEEPCOUNT_MASK 0xFFFF
+#define DEEPSLEEP_SLEEPCOUNT 128
static void (*davinci_sram_suspend) (struct davinci_pm_config *);
-static struct davinci_pm_config *pdata;
+static struct davinci_pm_config pm_config = {
+ .sleepcount = DEEPSLEEP_SLEEPCOUNT,
+ .ddrpsc_num = DA8XX_LPSC1_EMIF3C,
+};
+static struct davinci_pm_config *pdata = &pm_config;
static void davinci_sram_push(void *dest, void *src, unsigned int size)
{
@@ -117,17 +125,36 @@ static const struct platform_suspend_ops davinci_pm_ops = {
.valid = suspend_valid_only_mem,
};
-static int __init davinci_pm_probe(struct platform_device *pdev)
+int __init davinci_pm_init(void)
{
- pdata = pdev->dev.platform_data;
- if (!pdata) {
- dev_err(&pdev->dev, "cannot get platform data\n");
- return -ENOENT;
+ int ret;
+
+ ret = davinci_cfg_reg(DA850_RTC_ALARM);
+ if (ret)
+ return ret;
+
+ pdata->ddr2_ctlr_base = da8xx_get_mem_ctlr();
+ pdata->deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);
+
+ pdata->cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K);
+ if (!pdata->cpupll_reg_base)
+ return -ENOMEM;
+
+ pdata->ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);
+ if (!pdata->ddrpll_reg_base) {
+ ret = -ENOMEM;
+ goto no_ddrpll_mem;
+ }
+
+ pdata->ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K);
+ if (!pdata->ddrpsc_reg_base) {
+ ret = -ENOMEM;
+ goto no_ddrpsc_mem;
}
davinci_sram_suspend = sram_alloc(davinci_cpu_suspend_sz, NULL);
if (!davinci_sram_suspend) {
- dev_err(&pdev->dev, "cannot allocate SRAM memory\n");
+ pr_err("PM: cannot allocate SRAM memory\n");
return -ENOMEM;
}
@@ -136,23 +163,9 @@ static int __init davinci_pm_probe(struct platform_device *pdev)
suspend_set_ops(&davinci_pm_ops);
- return 0;
-}
-
-static int __exit davinci_pm_remove(struct platform_device *pdev)
-{
- sram_free(davinci_sram_suspend, davinci_cpu_suspend_sz);
- return 0;
-}
-
-static struct platform_driver davinci_pm_driver = {
- .driver = {
- .name = "pm-davinci",
- },
- .remove = __exit_p(davinci_pm_remove),
-};
-
-int __init davinci_pm_init(void)
-{
- return platform_driver_probe(&davinci_pm_driver, davinci_pm_probe);
+no_ddrpsc_mem:
+ iounmap(pdata->ddrpll_reg_base);
+no_ddrpll_mem:
+ iounmap(pdata->cpupll_reg_base);
+ return ret;
}
--
2.9.3
^ permalink raw reply related
* [PATCH v2 2/3] ARM: davinci: PM: cleanup: remove references to pdata
From: Kevin Hilman @ 2016-11-15 19:54 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20161115195421.19983-1-khilman@baylibre.com>
Since the PM core code is no longer using a fake platform_device or
platform_data, remove references to 'pdata'.
No functional changes.
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
arch/arm/mach-davinci/pm.c | 57 +++++++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 29 deletions(-)
diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c
index 3f1fb191c03f..0afd201ab980 100644
--- a/arch/arm/mach-davinci/pm.c
+++ b/arch/arm/mach-davinci/pm.c
@@ -37,7 +37,6 @@ static struct davinci_pm_config pm_config = {
.sleepcount = DEEPSLEEP_SLEEPCOUNT,
.ddrpsc_num = DA8XX_LPSC1_EMIF3C,
};
-static struct davinci_pm_config *pdata = &pm_config;
static void davinci_sram_push(void *dest, void *src, unsigned int size)
{
@@ -49,58 +48,58 @@ static void davinci_pm_suspend(void)
{
unsigned val;
- if (pdata->cpupll_reg_base != pdata->ddrpll_reg_base) {
+ if (pm_config.cpupll_reg_base != pm_config.ddrpll_reg_base) {
/* Switch CPU PLL to bypass mode */
- val = __raw_readl(pdata->cpupll_reg_base + PLLCTL);
+ val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~(PLLCTL_PLLENSRC | PLLCTL_PLLEN);
- __raw_writel(val, pdata->cpupll_reg_base + PLLCTL);
+ __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
udelay(PLL_BYPASS_TIME);
/* Powerdown CPU PLL */
- val = __raw_readl(pdata->cpupll_reg_base + PLLCTL);
+ val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val |= PLLCTL_PLLPWRDN;
- __raw_writel(val, pdata->cpupll_reg_base + PLLCTL);
+ __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
}
/* Configure sleep count in deep sleep register */
- val = __raw_readl(pdata->deepsleep_reg);
+ val = __raw_readl(pm_config.deepsleep_reg);
val &= ~DEEPSLEEP_SLEEPCOUNT_MASK,
- val |= pdata->sleepcount;
- __raw_writel(val, pdata->deepsleep_reg);
+ val |= pm_config.sleepcount;
+ __raw_writel(val, pm_config.deepsleep_reg);
/* System goes to sleep in this call */
- davinci_sram_suspend(pdata);
+ davinci_sram_suspend(&pm_config);
- if (pdata->cpupll_reg_base != pdata->ddrpll_reg_base) {
+ if (pm_config.cpupll_reg_base != pm_config.ddrpll_reg_base) {
/* put CPU PLL in reset */
- val = __raw_readl(pdata->cpupll_reg_base + PLLCTL);
+ val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~PLLCTL_PLLRST;
- __raw_writel(val, pdata->cpupll_reg_base + PLLCTL);
+ __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
/* put CPU PLL in power down */
- val = __raw_readl(pdata->cpupll_reg_base + PLLCTL);
+ val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~PLLCTL_PLLPWRDN;
- __raw_writel(val, pdata->cpupll_reg_base + PLLCTL);
+ __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
/* wait for CPU PLL reset */
udelay(PLL_RESET_TIME);
/* bring CPU PLL out of reset */
- val = __raw_readl(pdata->cpupll_reg_base + PLLCTL);
+ val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val |= PLLCTL_PLLRST;
- __raw_writel(val, pdata->cpupll_reg_base + PLLCTL);
+ __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
/* Wait for CPU PLL to lock */
udelay(PLL_LOCK_TIME);
/* Remove CPU PLL from bypass mode */
- val = __raw_readl(pdata->cpupll_reg_base + PLLCTL);
+ val = __raw_readl(pm_config.cpupll_reg_base + PLLCTL);
val &= ~PLLCTL_PLLENSRC;
val |= PLLCTL_PLLEN;
- __raw_writel(val, pdata->cpupll_reg_base + PLLCTL);
+ __raw_writel(val, pm_config.cpupll_reg_base + PLLCTL);
}
}
@@ -133,21 +132,21 @@ int __init davinci_pm_init(void)
if (ret)
return ret;
- pdata->ddr2_ctlr_base = da8xx_get_mem_ctlr();
- pdata->deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);
+ pm_config.ddr2_ctlr_base = da8xx_get_mem_ctlr();
+ pm_config.deepsleep_reg = DA8XX_SYSCFG1_VIRT(DA8XX_DEEPSLEEP_REG);
- pdata->cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K);
- if (!pdata->cpupll_reg_base)
+ pm_config.cpupll_reg_base = ioremap(DA8XX_PLL0_BASE, SZ_4K);
+ if (!pm_config.cpupll_reg_base)
return -ENOMEM;
- pdata->ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);
- if (!pdata->ddrpll_reg_base) {
+ pm_config.ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K);
+ if (!pm_config.ddrpll_reg_base) {
ret = -ENOMEM;
goto no_ddrpll_mem;
}
- pdata->ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K);
- if (!pdata->ddrpsc_reg_base) {
+ pm_config.ddrpsc_reg_base = ioremap(DA8XX_PSC1_BASE, SZ_4K);
+ if (!pm_config.ddrpsc_reg_base) {
ret = -ENOMEM;
goto no_ddrpsc_mem;
}
@@ -164,8 +163,8 @@ int __init davinci_pm_init(void)
suspend_set_ops(&davinci_pm_ops);
no_ddrpsc_mem:
- iounmap(pdata->ddrpll_reg_base);
+ iounmap(pm_config.ddrpll_reg_base);
no_ddrpll_mem:
- iounmap(pdata->cpupll_reg_base);
+ iounmap(pm_config.cpupll_reg_base);
return ret;
}
--
2.9.3
^ permalink raw reply related
* [PATCH v2 3/3] ARM: davinci: PM: support da8xx DT platforms
From: Kevin Hilman @ 2016-11-15 19:54 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20161115195421.19983-1-khilman@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
arch/arm/mach-davinci/da8xx-dt.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index c9f7e9274aa8..aed44dcdfd30 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -46,6 +46,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
static void __init da850_init_machine(void)
{
of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);
+ davinci_pm_init();
}
static const char *const da850_boards_compat[] __initconst = {
--
2.9.3
^ permalink raw reply related
* [PATCH 03/15] net: bcm63xx_enet: Utilize phy_ethtool_nway_reset
From: Heinrich Schuchardt @ 2016-11-15 19:59 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20161115180644.3941-4-f.fainelli@gmail.com>
On 11/15/2016 07:06 PM, Florian Fainelli wrote:
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Each patch of your patch series should have a commit message.
You can add the missing commit messages with
git rebase -i HEAD~15
choosing reword.
Please, add a cover letter message describing the patch series using
git format-patch -ns --cover-letter HEAD~15..HEAD
and provide a summary in the 0/15 message.
The cover letter and all patches should be in one mails thhread.
If you put all messages into one directory you can send the series as
one mail thread with
git send-email <directory>
> ---
> drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> index 5c7acef1de2e..a43ab90c051e 100644
> --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
> @@ -1434,11 +1434,8 @@ static int bcm_enet_nway_reset(struct net_device *dev)
> struct bcm_enet_priv *priv;
>
> priv = netdev_priv(dev);
> - if (priv->has_phy) {
> - if (!dev->phydev)
> - return -ENODEV;
> - return genphy_restart_aneg(dev->phydev);
> - }
> + if (priv->has_phy)
> + return phy_ethtool_nway_reset(dev),
>
> return -EOPNOTSUPP;
> }
>
^ permalink raw reply
* [PATCH 03/15] net: bcm63xx_enet: Utilize phy_ethtool_nway_reset
From: Florian Fainelli @ 2016-11-15 20:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <3dc4471a-1afd-0e28-1de9-60558cece143@gmx.de>
On 11/15/2016 11:59 AM, Heinrich Schuchardt wrote:
> On 11/15/2016 07:06 PM, Florian Fainelli wrote:
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>
> Each patch of your patch series should have a commit message.
It's pretty obvious what this does, really.
>
> You can add the missing commit messages with
> git rebase -i HEAD~15
> choosing reword.
>
> Please, add a cover letter message describing the patch series using
>
> git format-patch -ns --cover-letter HEAD~15..HEAD
>
> and provide a summary in the 0/15 message.
I did:
https://www.mail-archive.com/netdev at vger.kernel.org/maillist.html
and that is also apparent from:
In-Reply-To: <20161115180644.3941-1-f.fainelli@gmail.com>
References: <20161115180644.3941-1-f.fainelli@gmail.com>
And what I also did is to intentionally make sure that for each patch,
there would not be 50+ people CC'd, but just the relevant people for
each driver, which is exactly how cc-cmd=scripts/get_maintainer.pl work,
making my life simpler honestly.
It's not nearly my first patch submission, but I admit I have been semi
intentionally lazy with this patch set considering the number of patches.
Anyway, enough time wasted on this.
--
Florian
^ permalink raw reply
* specifying order of /dev/mmcblk devices via device-tree?
From: Tim Harvey @ 2016-11-15 20:27 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20161114190839.GS1041@n2100.armlinux.org.uk>
On Mon, Nov 14, 2016 at 11:08 AM, Russell King - ARM Linux
<linux@armlinux.org.uk> wrote:
> So, someone merged a patch which makes mmcblk devices follow the
> host controller numbering.
>
> Now my cubox-i fails to boot correctly because the SD card in the
> _only_ SD card slot now gets called "mmcblk1" and not "mmcblk0".
>
> USDHC1 is wired to the on-microsom WiFi, and never has anything
> remotely near a SD card or eMMC present. So, this change is
> confusing on these platforms.
>
> Moreover, this is _going_ to break SolidRun distros if people upgrade
> their kernels.
>
> It may be appropriate for eMMC, but it's not appropriate everywhere.
>
> This is a user visible _regression_ in 4.9-rc. Whoever did this,
> please revert whatever change caused this, and next time limit it
> to only eMMC.
>
> Thanks.
I see the same thing on newer kernels, which is why I asked the
question. I didn't expect (or even want honestly) a non mmcblk0 boot
device and was looking for a way to control that via dt. Now I'm
understanding that to avoid this kind of bootloader/kernel dependence
issue I should be using UUID's to identify the boot device.
>From my testing it looks like the change your looking for occurred
some time ago and is somewhere between 4.5 and 4.6 and not a 4.9
regression specifically.
Regards,
Tim
^ permalink raw reply
* [GIT PULL] Allwinner DT changes for 4.10
From: Maxime Ripard @ 2016-11-15 20:41 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Here is our pull request for the next merge window.
Thanks!
Maxime
The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/sunxi-dt-for-4.10
for you to fetch changes up to e39a30cf736144814b0bddb3fff28fbbc2a8be0f:
ARM: sunxi: Add the missing clocks to the pinctrl nodes (2016-11-15 18:49:47 +0100)
----------------------------------------------------------------
Allwinner DT additions for 4.10
The usual bunch of DT additions, but most notably:
- A31 DRM driver
- A31 audio codec
- WiFi for the A80-Based boards and the CHIP
- Support for the NextThing Co CHIP Pro (the first board with NAND
enabled)
- New boards: NanoPi M1,
----------------------------------------------------------------
Antoine Tenart (1):
ARM: sun5i: chip: add a node for the w1 gpio controller
Chen-Yu Tsai (12):
ARM: dts: sun6i: Sort pinmux setting nodes
ARM: dts: sun6i: Add device nodes for first display pipeline
ARM: dts: sun6i: Add A31 LCD0 RGB888 pins
ARM: dts: sun9i: Add mmc1 pinmux setting
ARM: dts: sun9i: a80-optimus: Enable AP6330 WiFi
ARM: dts: sun9i: cubieboard4: Enable AP6330 WiFi
ARM: dts: sun6i: Add audio codec device node
ARM: dts: sun6i: hummingbird: Enable internal audio codec
ARM: dts: sun6i: sina31s: Enable internal audio codec
ARM: dts: sun7i: bananapi-m1-plus: Enable USB PHY for USB host support
ARM: dts: sun7i: bananapi-m1-plus: Add PMIC regulators
ARM: dts: sun7i: bananapi-m1-plus: Enable USB OTG
Emmanuel Vadot (1):
ARM: dts: sunxi: Add cpu-supply for Olimex A20 EVB
Hans de Goede (1):
ARM: dts: sun8i: reference-design-tablet: ldo_io1 is vcc-touchscreen
Maxime Ripard (16):
ARM: sun5i: a13-olinuxino: Enable VGA bridge
ARM: gr8: Add the UART3
ARM: gr8: Fix typo in the i2s mclk pin group
ARM: gr8: Add missing pwm channel 1 pin
ARM: gr8: Add UART2 pins
ARM: gr8: Add UART3 pins
ARM: gr8: Add CHIP Pro support
ARM: sun5i: chip: Enable Wi-Fi SDIO chip
ARM: sun5i: Rename A10s pins
ARM: sun5i: Add SPI2 pins
ARM: sun5i: Add RGB 565 LCD pins
ARM: sun5i: chip: Add optional buses
ARM: gr8: evb: Enable SPDIF
ARM: gr8: evb: Add i2s codec
ARM: sun8i: sina33: Enable USB gadget
ARM: sunxi: Add the missing clocks to the pinctrl nodes
Milo Kim (5):
ARM: dts: sun8i: Add common dtsi file for NanoPi SBCs
ARM: dts: sun8i: Use the common file in NanoPi NEO SBC
ARM: dts: sun8i: Add dts file for NanoPi M1 SBC
ARM: dts: sun8i: Add SPI pinctrl node in H3
ARM: dts: sun8i: Add SPI controller node in H3
Sudeep Holla (1):
ARM: dts: sun8i: replace enable-sdio-wakeup with wakeup-source for BananaPi M1+
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/ntc-gr8-chip-pro.dts | 266 +++++++++++++++++++++
arch/arm/boot/dts/ntc-gr8-evb.dts | 33 +++
arch/arm/boot/dts/ntc-gr8.dtsi | 47 +++-
arch/arm/boot/dts/sun4i-a10.dtsi | 3 +-
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 4 +-
arch/arm/boot/dts/sun5i-a10s.dtsi | 4 +-
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 54 +++++
arch/arm/boot/dts/sun5i-r8-chip.dts | 69 ++++++
arch/arm/boot/dts/sun5i.dtsi | 27 ++-
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 13 +
arch/arm/boot/dts/sun6i-a31.dtsi | 266 +++++++++++++++++----
arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 8 +
arch/arm/boot/dts/sun6i-a31s.dtsi | 8 +
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 62 ++++-
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 4 +
arch/arm/boot/dts/sun7i-a20.dtsi | 3 +-
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +-
.../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 7 -
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 5 +
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 64 +++++
arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 79 +-----
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 144 +++++++++++
arch/arm/boot/dts/sun8i-h3.dtsi | 52 +++-
.../boot/dts/sun8i-reference-design-tablet.dtsi | 7 +
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 32 +++
arch/arm/boot/dts/sun9i-a80-optimus.dts | 30 +++
arch/arm/boot/dts/sun9i-a80.dtsi | 14 +-
28 files changed, 1165 insertions(+), 147 deletions(-)
create mode 100644 arch/arm/boot/dts/ntc-gr8-chip-pro.dts
create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161115/c1f6ab49/attachment.sig>
^ permalink raw reply
* [RFCv2 PATCH 1/5] video: add HDMI state notifier support
From: Hans Verkuil @ 2016-11-15 20:41 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1479234278.2456.49.camel@pengutronix.de>
Hi Philipp,
On 11/15/2016 07:24 PM, Philipp Zabel wrote:
> Hi Hans,
>
> Am Montag, den 14.11.2016, 16:22 +0100 schrieb Hans Verkuil:
>> From: Hans Verkuil <hans.verkuil@cisco.com>
>>
>> Add support for HDMI hotplug and EDID notifiers, which is used to convey
>> information from HDMI drivers to their CEC and audio counterparts.
>>
>> Based on an earlier version from Russell King:
>>
>> https://patchwork.kernel.org/patch/9277043/
>>
>> The hdmi_notifier is a reference counted object containing the HDMI state
>> of an HDMI device.
>>
>> When a new notifier is registered the current state will be reported to
>> that notifier at registration time.
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>> ---
>> drivers/video/Kconfig | 3 +
>> drivers/video/Makefile | 1 +
>> drivers/video/hdmi-notifier.c | 136 ++++++++++++++++++++++++++++++++++++++++++
>> include/linux/hdmi-notifier.h | 43 +++++++++++++
>> 4 files changed, 183 insertions(+)
>> create mode 100644 drivers/video/hdmi-notifier.c
>> create mode 100644 include/linux/hdmi-notifier.h
>>
>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
>> index 3c20af9..1ee7b9f 100644
>> --- a/drivers/video/Kconfig
>> +++ b/drivers/video/Kconfig
>> @@ -36,6 +36,9 @@ config VIDEOMODE_HELPERS
>> config HDMI
>> bool
>>
>> +config HDMI_NOTIFIERS
>> + bool
>> +
>> if VT
>> source "drivers/video/console/Kconfig"
>> endif
>> diff --git a/drivers/video/Makefile b/drivers/video/Makefile
>> index 9ad3c17..65f5649 100644
>> --- a/drivers/video/Makefile
>> +++ b/drivers/video/Makefile
>> @@ -1,5 +1,6 @@
>> obj-$(CONFIG_VGASTATE) += vgastate.o
>> obj-$(CONFIG_HDMI) += hdmi.o
>> +obj-$(CONFIG_HDMI_NOTIFIERS) += hdmi-notifier.o
>>
>> obj-$(CONFIG_VT) += console/
>> obj-$(CONFIG_LOGO) += logo/
>> diff --git a/drivers/video/hdmi-notifier.c b/drivers/video/hdmi-notifier.c
>> new file mode 100644
>> index 0000000..c2a4f1b
>> --- /dev/null
>> +++ b/drivers/video/hdmi-notifier.c
>> @@ -0,0 +1,136 @@
>> +#include <linux/export.h>
>> +#include <linux/hdmi-notifier.h>
>> +#include <linux/string.h>
>> +#include <linux/slab.h>
>> +#include <linux/list.h>
>> +
>> +struct hdmi_notifiers {
>> + struct list_head head;
>> + struct device *dev;
>> + struct hdmi_notifier *n;
>> +};
>
> This struct is not used, can be removed.
Indeed.
>
>> +static LIST_HEAD(hdmi_notifiers);
>> +static DEFINE_MUTEX(hdmi_notifiers_lock);
>> +
>> +struct hdmi_notifier *hdmi_notifier_get(struct device *dev)
>> +{
>> + struct hdmi_notifier *n;
>> +
>> + mutex_lock(&hdmi_notifiers_lock);
>> + list_for_each_entry(n, &hdmi_notifiers, head) {
>> + if (n->dev == dev) {
>> + mutex_unlock(&hdmi_notifiers_lock);
>> + kref_get(&n->kref);
>> + return n;
>> + }
>> + }
>> + n = kzalloc(sizeof(*n), GFP_KERNEL);
>> + if (!n)
>> + goto unlock;
>> + mutex_init(&n->lock);
>> + BLOCKING_INIT_NOTIFIER_HEAD(&n->notifiers);
>> + kref_init(&n->kref);
>
> + n->dev = dev;
>
> Currently n->dev is never set, so every caller of this function gets its
> own hdmi_notifier.
Oops! Well, I did say it was compile-tested only :-)
>
>> + list_add_tail(&n->head, &hdmi_notifiers);
>> +unlock:
>> + mutex_unlock(&hdmi_notifiers_lock);
>> + return n;
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_notifier_get);
>> +
>> +static void hdmi_notifier_release(struct kref *kref)
>> +{
>> + struct hdmi_notifier *n =
>> + container_of(kref, struct hdmi_notifier, kref);
>> +
>> + kfree(n->edid);
>> + kfree(n);
>> +}
>> +
>> +void hdmi_notifier_put(struct hdmi_notifier *n)
>> +{
>> + kref_put(&n->kref, hdmi_notifier_release);
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_notifier_put);
>> +
>> +int hdmi_notifier_register(struct hdmi_notifier *n, struct notifier_block *nb)
>> +{
>> + int ret = blocking_notifier_chain_register(&n->notifiers, nb);
>> +
>> + if (ret)
>> + return ret;
>> + kref_get(&n->kref);
>> + mutex_lock(&n->lock);
>> + if (n->connected) {
>> + blocking_notifier_call_chain(&n->notifiers, HDMI_CONNECTED, n);
>> + if (n->edid_size)
>> + blocking_notifier_call_chain(&n->notifiers, HDMI_NEW_EDID, n);
>> + if (n->has_eld)
>> + blocking_notifier_call_chain(&n->notifiers, HDMI_NEW_ELD, n);
>> + }
>> + mutex_unlock(&n->lock);
>> + return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_notifier_register);
>> +
>> +int hdmi_notifier_unregister(struct hdmi_notifier *n, struct notifier_block *nb)
>> +{
>> + int ret = blocking_notifier_chain_unregister(&n->notifiers, nb);
>> +
>> + if (ret == 0)
>> + hdmi_notifier_put(n);
>> + return ret;
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_notifier_unregister);
>> +
>> +void hdmi_event_connect(struct hdmi_notifier *n)
>> +{
>> + mutex_lock(&n->lock);
>> + n->connected = true;
>> + blocking_notifier_call_chain(&n->notifiers, HDMI_CONNECTED, n);
>> + mutex_unlock(&n->lock);
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_event_connect);
>> +
>> +void hdmi_event_disconnect(struct hdmi_notifier *n)
>> +{
>> + mutex_lock(&n->lock);
>> + n->connected = false;
>> + n->has_eld = false;
>> + n->edid_size = 0;
>> + blocking_notifier_call_chain(&n->notifiers, HDMI_DISCONNECTED, n);
>> + mutex_unlock(&n->lock);
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_event_disconnect);
>> +
>> +int hdmi_event_new_edid(struct hdmi_notifier *n, const void *edid, size_t size)
>> +{
>> + mutex_lock(&n->lock);
>> + if (n->edid_allocated_size < size) {
>> + void *p = kmalloc(size, GFP_KERNEL);
>> +
>> + if (p == NULL) {
>> + mutex_unlock(&n->lock);
>> + return -ENOMEM;
>> + }
>> + kfree(n->edid);
>> + n->edid = p;
>> + n->edid_allocated_size = size;
>> + }
>> + memcpy(n->edid, edid, size);
>> + n->edid_size = size;
>> + blocking_notifier_call_chain(&n->notifiers, HDMI_NEW_EDID, n);
>> + mutex_unlock(&n->lock);
>> + return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_event_new_edid);
>> +
>> +void hdmi_event_new_eld(struct hdmi_notifier *n, const u8 eld[128])
>> +{
>> + mutex_lock(&n->lock);
>> + memcpy(n->eld, eld, sizeof(n->eld));
>> + n->has_eld = true;
>> + blocking_notifier_call_chain(&n->notifiers, HDMI_NEW_ELD, n);
>> + mutex_unlock(&n->lock);
>> +}
>> +EXPORT_SYMBOL_GPL(hdmi_event_new_eld);
>> diff --git a/include/linux/hdmi-notifier.h b/include/linux/hdmi-notifier.h
>> new file mode 100644
>> index 0000000..f7fc405
>> --- /dev/null
>> +++ b/include/linux/hdmi-notifier.h
>> @@ -0,0 +1,43 @@
>> +#ifndef LINUX_HDMI_NOTIFIER_H
>> +#define LINUX_HDMI_NOTIFIER_H
>> +
>> +#include <linux/types.h>
>> +#include <linux/notifier.h>
>> +#include <linux/kref.h>
>> +
>> +enum {
>> + HDMI_CONNECTED,
>> + HDMI_DISCONNECTED,
>> + HDMI_NEW_EDID,
>> + HDMI_NEW_ELD,
>> +};
>> +
>> +struct device;
>> +
>> +struct hdmi_notifier {
>> + struct mutex lock;
>> + struct list_head head;
>> + struct kref kref;
>> + struct blocking_notifier_head notifiers;
>> + struct device *dev;
>> +
>> + /* Current state */
>> + bool connected;
>> + bool has_eld;
>> + unsigned char eld[128];
>> + void *edid;
>> + size_t edid_size;
>> + size_t edid_allocated_size;
>> +};
>> +
>> +struct hdmi_notifier *hdmi_notifier_get(struct device *dev);
>> +void hdmi_notifier_put(struct hdmi_notifier *n);
>> +int hdmi_notifier_register(struct hdmi_notifier *n, struct notifier_block *nb);
>> +int hdmi_notifier_unregister(struct hdmi_notifier *n, struct notifier_block *nb);
>> +
>> +void hdmi_event_connect(struct hdmi_notifier *n);
>> +void hdmi_event_disconnect(struct hdmi_notifier *n);
>> +int hdmi_event_new_edid(struct hdmi_notifier *n, const void *edid, size_t size);
>> +void hdmi_event_new_eld(struct hdmi_notifier *n, const u8 eld[128]);
>> +
>> +#endif
>
> With the above change,
>
> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> (on MT8173)
>
> I'll send the patches for mediatek-drm and hdmi-codec that I used for
> testing in a bit.
Thanks for testing this so quickly! Much appreciated!
Regards,
Hans
^ permalink raw reply
* [GIT PULL] Allwinner late DT changes for 4.10
From: Maxime Ripard @ 2016-11-15 21:00 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Here is a pull request that should be merged after the pinctrl PR,
hence probably in your late PR.
This is just a mechanic conversion to the generic pinconf bindings and
removal of the useless pinmux properties we had.
This is based on the previous DT PR I just sent.
Thanks!
Maxime
The following changes since commit e39a30cf736144814b0bddb3fff28fbbc2a8be0f:
ARM: sunxi: Add the missing clocks to the pinctrl nodes (2016-11-15 18:49:47 +0100)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/sunxi-dt-late-for-4.10
for you to fetch changes up to 1d20ba07ea57ae227a925302b42221df5b830f2b:
ARM: sunxi: Convert pinctrl nodes to generic bindings (2016-11-15 21:56:30 +0100)
----------------------------------------------------------------
Allwinner late DT additions for 4.10
Conversion to the generic pin conf bindings for our device trees
----------------------------------------------------------------
Maxime Ripard (3):
ARM: sunxi: Remove useless allwinner,drive property
ARM: sunxi: Remove useless allwinner,pull property
ARM: sunxi: Convert pinctrl nodes to generic bindings
arch/arm/boot/dts/ntc-gr8-chip-pro.dts | 12 +-
arch/arm/boot/dts/ntc-gr8-evb.dts | 24 +-
arch/arm/boot/dts/ntc-gr8.dtsi | 122 ++++-----
arch/arm/boot/dts/sun4i-a10-a1000.dts | 12 +-
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 14 +-
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 14 +-
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 38 ++-
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +-
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 12 +-
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 16 +-
arch/arm/boot/dts/sun4i-a10-inet1.dts | 26 +-
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 14 +-
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 29 +--
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 12 +-
arch/arm/boot/dts/sun4i-a10-marsboard.dts | 13 +-
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +-
arch/arm/boot/dts/sun4i-a10-mk802.dts | 18 +-
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 27 +-
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 19 +-
arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 6 +-
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 32 +--
arch/arm/boot/dts/sun4i-a10.dtsi | 169 +++++--------
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 18 +-
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 29 +--
arch/arm/boot/dts/sun5i-a10s-mk802.dts | 19 +-
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 36 ++-
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 20 +-
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 21 +-
arch/arm/boot/dts/sun5i-a10s.dtsi | 43 ++--
.../boot/dts/sun5i-a13-empire-electronix-d709.dts | 23 +-
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 22 +-
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 40 ++-
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 36 ++-
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 17 +-
arch/arm/boot/dts/sun5i-a13.dtsi | 24 +-
arch/arm/boot/dts/sun5i-r8-chip.dts | 27 +-
.../boot/dts/sun5i-reference-design-tablet.dtsi | 33 +--
arch/arm/boot/dts/sun5i.dtsi | 75 +++---
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 6 +-
arch/arm/boot/dts/sun6i-a31-colombus.dts | 22 +-
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 23 +-
arch/arm/boot/dts/sun6i-a31-i7.dts | 19 +-
arch/arm/boot/dts/sun6i-a31-m9.dts | 19 +-
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 19 +-
arch/arm/boot/dts/sun6i-a31.dtsi | 98 +++-----
arch/arm/boot/dts/sun6i-a31s-primo81.dts | 20 +-
arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 13 +-
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 29 +--
.../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 9 +-
.../boot/dts/sun6i-reference-design-tablet.dtsi | 14 +-
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 27 +-
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 26 +-
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 37 +--
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 13 +-
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 38 +--
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 24 +-
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 26 +-
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 7 +-
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 30 +--
arch/arm/boot/dts/sun7i-a20-m3.dts | 6 +-
arch/arm/boot/dts/sun7i-a20-mk808c.dts | 12 +-
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 32 +--
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 27 +-
.../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 6 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 33 +--
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 28 +--
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 45 ++--
arch/arm/boot/dts/sun7i-a20-orangepi.dts | 38 ++-
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 25 +-
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +-
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 25 +-
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 13 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 277 ++++++++-------------
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 95 +++----
arch/arm/boot/dts/sun8i-a23-evb.dts | 7 +-
.../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 8 +-
.../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 8 +-
arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 9 +-
arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 18 +-
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +-
arch/arm/boot/dts/sun8i-a33.dtsi | 6 +-
arch/arm/boot/dts/sun8i-a83t.dtsi | 21 +-
arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 18 +-
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 18 +-
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 26 +-
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 18 +-
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 18 +-
arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 4 +-
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 18 +-
arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 10 +-
arch/arm/boot/dts/sun8i-h3.dtsi | 104 +++-----
arch/arm/boot/dts/sun8i-q8-common.dtsi | 9 +-
arch/arm/boot/dts/sun8i-r16-parrot.dts | 36 ++-
.../boot/dts/sun8i-reference-design-tablet.dtsi | 26 +-
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 23 +-
arch/arm/boot/dts/sun9i-a80-optimus.dts | 41 ++-
arch/arm/boot/dts/sun9i-a80.dtsi | 61 ++---
arch/arm/boot/dts/sunxi-common-regulators.dtsi | 24 +-
99 files changed, 1083 insertions(+), 1783 deletions(-)
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161115/d965478b/attachment.sig>
^ permalink raw reply
* [GIT PULL] Allwinner defconfig changes for 4.10
From: Maxime Ripard @ 2016-11-15 21:03 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Please pull the following changes for the next merge window.
Thanks!
Maxime
The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/sunxi-defconfig-for-4.10
for you to fetch changes up to a0eb3ee3c8dbe918c397eaf52ea0c887defd35a7:
ARM: multi_v7: enable VGA bridge (2016-10-16 14:31:52 +0200)
----------------------------------------------------------------
Allwinner defconfig changes for 4.10
Two patches to enable the dumb VGA bridges in the multi_v7 and sunxi
defconfig.
----------------------------------------------------------------
Maxime Ripard (2):
ARM: sunxi: Enable VGA bridge
ARM: multi_v7: enable VGA bridge
arch/arm/configs/multi_v7_defconfig | 1 +
arch/arm/configs/sunxi_defconfig | 1 +
2 files changed, 2 insertions(+)
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161115/43a599eb/attachment.sig>
^ permalink raw reply
* [GIT PULL] Allwinner fixes for 4.9
From: Maxime Ripard @ 2016-11-15 21:10 UTC (permalink / raw)
To: linux-arm-kernel
hi Arnd, Olof,
Please pull the following changes for 4.9.
Thanks!
Maxime
The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/sunxi-fixes-for-4.9
for you to fetch changes up to b7f865ede20c87073216f77fe97f6fc56666e3da:
ARM: dts: sun8i: fix the pinmux for UART1 (2016-10-25 12:51:06 +0200)
----------------------------------------------------------------
Allwinner fixes for 4.9
A fix to reintroduce missing pinmux options that turned out not to be
optional.
----------------------------------------------------------------
Icenowy Zheng (1):
ARM: dts: sun8i: fix the pinmux for UART1
arch/arm/boot/dts/sun8i-a23-a33.dtsi | 4 ++++
1 file changed, 4 insertions(+)
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161115/e2a8bfc4/attachment.sig>
^ permalink raw reply
* [PATCH v4 0/4] Add DT support for DA8xx
From: Bin Liu @ 2016-11-15 21:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1478188752-22447-1-git-send-email-abailon@baylibre.com>
On Thu, Nov 03, 2016 at 04:59:08PM +0100, Alexandre Bailon wrote:
> Changes in v2:
> * Remove unrelated changes in patch 3
> * Rename the device node in patch 4
>
> Changes in v3:
> * Fix few mistakes in DT binding sample
> * Only build the device table if DT is enabled
>
> Change in v4:
> * Fix a nit
>
> Alexandre Bailon (1):
> ARM: dts: da850: Add the usb otg device node
>
> Petr Kulhavy (3):
> dt/bindings: Add binding for the DA8xx MUSB driver
> usb: musb: core: added helper function for parsing DT
> usb: musb: da8xx: Add DT support for the DA8xx driver
Applied. Thanks.
-Bin.
>
> .../devicetree/bindings/usb/da8xx-usb.txt | 43 ++++++++++++++++++++
> arch/arm/boot/dts/da850-lcdk.dts | 8 ++++
> arch/arm/boot/dts/da850.dtsi | 15 +++++++
> drivers/usb/musb/da8xx.c | 46 ++++++++++++++++++++++
> drivers/usb/musb/musb_core.c | 19 +++++++++
> drivers/usb/musb/musb_core.h | 6 +++
> 6 files changed, 137 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/da8xx-usb.txt
>
> --
> 2.7.3
>
^ permalink raw reply
* [GIT PULL] Allwinner arm64 DT changes for 4.9
From: Maxime Ripard @ 2016-11-15 21:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof,
Here are our changes for arm64 DT for the next merge window.
Thanks!
Maxime
The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/sunxi-dt64-for-4.10
for you to fetch changes up to 4e3886081848b7ea16452a92c4324acaab644d49:
arm64: dts: add Pine64 support (2016-11-03 09:08:24 +0100)
----------------------------------------------------------------
Allwinner arm64 DT changes for 4.10
Support for the Allwinner A64, their first armv8 SoC.
----------------------------------------------------------------
Andre Przywara (3):
arm64: dts: add Allwinner A64 SoC .dtsi
Documentation: devicetree: add vendor prefix for Pine64
arm64: dts: add Pine64 support
Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
MAINTAINERS | 1 +
arch/arm64/boot/dts/Makefile | 1 +
arch/arm64/boot/dts/allwinner/Makefile | 5 +
.../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 50 ++++
.../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 74 ++++++
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 263 +++++++++++++++++++++
8 files changed, 396 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/Makefile
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161115/0327c43c/attachment.sig>
^ permalink raw reply
* [PATCH v3 2/3] musb: sunxi: Remove custom babble handling
From: Bin Liu @ 2016-11-15 21:14 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160923134058.26828-2-hdegoede@redhat.com>
On Fri, Sep 23, 2016 at 04:40:57PM +0300, Hans de Goede wrote:
> The musb core already handles babble interrupts, so the sunxi glue
> having its own custom handling is redundant.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Applied. Thanks.
-Bin.
> ---
> Changes in v2:
> -This is a new patch in v2 of this patch series
> Changes in v3:
> -Improve commit msg
> ---
> drivers/usb/musb/sunxi.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
> index 1408245..82eba92 100644
> --- a/drivers/usb/musb/sunxi.c
> +++ b/drivers/usb/musb/sunxi.c
> @@ -186,16 +186,6 @@ static irqreturn_t sunxi_musb_interrupt(int irq, void *__hci)
> if (musb->int_usb)
> writeb(musb->int_usb, musb->mregs + SUNXI_MUSB_INTRUSB);
>
> - /*
> - * sunxi musb often signals babble on low / full speed device
> - * disconnect, without ever raising MUSB_INTR_DISCONNECT, since
> - * normally babble never happens treat it as disconnect.
> - */
> - if ((musb->int_usb & MUSB_INTR_BABBLE) && is_host_active(musb)) {
> - musb->int_usb &= ~MUSB_INTR_BABBLE;
> - musb->int_usb |= MUSB_INTR_DISCONNECT;
> - }
> -
> if ((musb->int_usb & MUSB_INTR_RESET) && !is_host_active(musb)) {
> /* ep0 FADDR must be 0 when (re)entering peripheral mode */
> musb_ep_select(musb->mregs, 0);
> --
> 2.9.3
>
^ permalink raw reply
* [PATCH v3 3/3] musb: sunxi: Force session end on babble errors in host-mode
From: Bin Liu @ 2016-11-15 21:14 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20160923134058.26828-3-hdegoede@redhat.com>
On Fri, Sep 23, 2016 at 04:40:58PM +0300, Hans de Goede wrote:
> The sunxi musb has a bug where sometimes it will generate a babble
> error on device disconnect instead of a disconnect irq. When this
> happens the musb-controller switches from host mode to device mode
> (it clears MUSB_DEVCTL_SESSION and sets MUSB_DEVCTL_BDEVICE) and
> gets stuck in this state.
>
> Clearing this requires reporting Vbus low for 200 or more ms, but
> on some devices Vbus is simply always high (host-only mode, no Vbus
> control).
>
> This commit adds a sunxi_musb_recover() callback which makes
> sunxi_musb_work call phy_set_mode with the current mode, which
> will force end the current session.
>
> This fixes the musb controller getting stuck in this state on systems
> without Vbus control; and also fixes the need to unplug the usb-b ->
> usb-a cable to get out of this state on systems with Vbus control.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Applied. Thanks.
-Bin.
> ---
> Changes in v2:
> -Use musb_platform_recover callback instead of using DYI code in the
> interrupt handler
> -Call phy_set_mode with the current mode instead of adding a new custom
> sunxi phy callback
> ---
> drivers/usb/musb/sunxi.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
> index 82eba92..d0be0ea 100644
> --- a/drivers/usb/musb/sunxi.c
> +++ b/drivers/usb/musb/sunxi.c
> @@ -380,6 +380,20 @@ static int sunxi_musb_set_mode(struct musb *musb, u8 mode)
> return 0;
> }
>
> +static int sunxi_musb_recover(struct musb *musb)
> +{
> + struct sunxi_glue *glue = dev_get_drvdata(musb->controller->parent);
> +
> + /*
> + * Schedule a phy_set_mode with the current glue->phy_mode value,
> + * this will force end the current session.
> + */
> + set_bit(SUNXI_MUSB_FL_PHY_MODE_PEND, &glue->flags);
> + schedule_work(&glue->work);
> +
> + return 0;
> +}
> +
> /*
> * sunxi musb register layout
> * 0x00 - 0x17 fifo regs, 1 long per fifo
> @@ -608,6 +622,7 @@ static const struct musb_platform_ops sunxi_musb_ops = {
> .dma_init = sunxi_musb_dma_controller_create,
> .dma_exit = sunxi_musb_dma_controller_destroy,
> .set_mode = sunxi_musb_set_mode,
> + .recover = sunxi_musb_recover,
> .set_vbus = sunxi_musb_set_vbus,
> .pre_root_reset_end = sunxi_musb_pre_root_reset_end,
> .post_root_reset_end = sunxi_musb_post_root_reset_end,
> --
> 2.9.3
>
^ permalink raw reply
* Default atomic_pool_size value & changing it
From: Rafał Miłecki @ 2016-11-15 21:15 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
I've hit problem with allocating enough coherent DMA memory. Obviously
there is a limit of this memory as pointed by:
[ 0.283667] DMA: preallocated 256 KiB pool for atomic coherent allocations
In my case I was experimenting with a coherent memory used for DMA
descriptors. They are some small structs addressing SKBs and
controlling them:
struct bgmac_dma_desc {
__le32 ctl0;
__le32 ctl1;
__le32 addr_low;
__le32 addr_high;
} __packed;
Having 5-6 rings 512 entries each requires 48 KiB. There are devices
with 3 Ethernet bgmac devices and 2 wireless devices, 48 KiB * 5 gets
me dangerously close to the limit. I don't see this problem with
upstream default drivers yet, but it may become an issue at some
point.
Raspberry Pi was dealing a similar problem:
https://github.com/raspberrypi/linux/issues/170
Does it make any sense to increase default atomic_pool_size value?
I see there is init_dma_coherent_pool_size function but it seems to be
dead code (can we drop it?).
I can change that value using coherent_pool param, but is that sane to
put it in bootargs of upstream DTS files?
Any advise on this?
--
Rafa?
^ permalink raw reply
* [GIT PULL] sun4i-drm fixes for 4.9
From: Maxime Ripard @ 2016-11-15 21:18 UTC (permalink / raw)
To: linux-arm-kernel
Hi David,
Please pull the following fixes for the 4.9 cycle.
Thanks!
Maxime
The following changes since commit 1001354ca34179f3db924eb66672442a173147dc:
Linux 4.9-rc1 (2016-10-15 12:17:50 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git tags/sunxi-drm-fixes-for-4.9
for you to fetch changes up to 4db069a2bf990e278ea57ff615dcaa89b85376bd:
drm/sun4i: Propagate error to the caller (2016-11-07 16:09:35 +0100)
----------------------------------------------------------------
sun4i-drm fixes for 4.9
A few patches to fix our error handling and our panel / bridge calls.
----------------------------------------------------------------
Christophe JAILLET (2):
drm/sun4i: Fix error handling
drm/sun4i: Propagate error to the caller
Jonathan Liu (1):
drm/sun4i: rgb: Enable panel after controller
Maxime Ripard (1):
drm/sun4i: rgb: Remove the bridge enable/disable functions
drivers/gpu/drm/sun4i/sun4i_drv.c | 4 ++--
drivers/gpu/drm/sun4i/sun4i_rgb.c | 20 ++++++++------------
2 files changed, 10 insertions(+), 14 deletions(-)
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161115/d1cebdf5/attachment.sig>
^ 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