| Age | Commit message (Collapse) | Author |
|---|
|
Conflicting files:
|
|
Conflicting files:
|
|
Conflicting files:
drivers/Kconfig
|
|
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
Hisilicon Soc hip04 has four gpio controllers, each one has 32
gpios and can be configured to be an interrupt controller.The gpio
controllers are compatible with the snps,dw-apb-gpio driver.
This patch add the corresponding device tree nodes.
Signed-off-by: Zhou Wang <wangzhou1@hisilicon.com>
|
|
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Conflicts:
arch/arm/boot/dts/hip04.dtsi
|
|
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
touchscreen:
Device Drivers --->
Input device support --->
[*] Touchscreens --->
[*] Atmel mXT224E based touchscreens
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
|
|
Support hi6421 rtc function.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
|
|
Support Hi6421 PMIC powerkey driver.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
|
|
gpio-ranges property could binds gpio to pinctrl. But there may be some
gpios without pinctrl operation. So check whether gpio-ranges property
exists in device node first.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
|
|
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
|
|
Add Hi6421 MFD dts node and regulator nodes into hi3620-hi4511
board config dts file.
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
|
|
|
|
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
|
|
Conflicts:
linaro/configs/vexpress64.conf
|
|
Conflicts:
linaro/configs/vexpress64.conf
|
|
|
|
|
|
|
|
|
|
|
|
merge-linux-linaro-core-tracking
|
|
merge-linux-linaro-core-tracking
|
|
|
|
Temporarily drop AOSP's PPPoLAC and PPPoPNS drivers
because of broken build. Need some time to fix
these drivers for 4.1+ kernels.
Following PPPoLAC and PPPoPNS are effectively nullified:
* commit f119bc2ac432 "net: add PPP on PPTP Network Server (PPPoPNS) driver."
* commit e7e501c60e65 "net: add PPP on L2TP Access Concentrator (PPPoLAC) driver."
* commit 9b2fc55c6130 "net: PPPoPNS and PPPoLAC fixes."
* commit ccf633bcc20a "net: Reorder incoming packets in PPPoLAC and PPPoPNS."
* commit 118c20547f3c "net: PPPoPNS and PPPoLAC update to use PPP_MRU instead of PPP_MRU"
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
|
|
Mainline commit dedf22e9e66e "cgroup: separate out
cgroup_procs_write_permission() from __cgroup_procs_write()",
moved out task/process migration permission check from
__cgroup_procs_write() into cgroup_procs_write_permission().
Hence reformat the changes from AOSP commit 53b5e2f0b1ce
"cgroup: Add generic cgroup subsystem permission checks"
accordingly.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
|
|
Include module.h instead of init.h since module_{init,exit}
is no longer part of init.h, they have been moved to module.h
instead. See mainline commit 0fd972a7d91d "module: relocate
module_init from init.h to module.h" for more details.
Otherwise we run into following build failure:
--------------------
CC kernel/power/suspend_time.o
kernel/power/suspend_time.c:110:1: warning: data definition has no type or storage class [enabled by default]
kernel/power/suspend_time.c:110:1: error: type defaults to ‘int’ in declaration of ‘module_init’ [-Werror=implicit-int]
kernel/power/suspend_time.c:110:1: warning: parameter names (without types) in function declaration [enabled by default]
kernel/power/suspend_time.c:111:1: warning: data definition has no type or storage class [enabled by default]
kernel/power/suspend_time.c:111:1: error: type defaults to ‘int’ in declaration of ‘module_exit’ [-Werror=implicit-int]
kernel/power/suspend_time.c:111:1: warning: parameter names (without types) in function declaration [enabled by default]
kernel/power/suspend_time.c:99:12: warning: ‘suspend_time_syscore_init’ defined but not used [-Wunused-function]
kernel/power/suspend_time.c:106:13: warning: ‘suspend_time_syscore_exit’ defined but not used [-Wunused-function]
cc1: some warnings being treated as errors
make[2]: *** [kernel/power/suspend_time.o] Error 1
make[1]: *** [kernel/power] Error 2
make[1]: *** Waiting for unfinished jobs....
--------------------
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
|
|
Merge early linaro-android-4.1 snapshot into v4.2-rc3.
For the records, it is not a "linaro-android-4.1" tag
merge in v4.2-rc3. "linaro-android-4.1" tag is couple
of commits ahead at this point. I'll be cherrypicking
those changes into this llct branch as well so no need
to panic.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
AOSP patches dropped in this merge:
==> AOSP's RNDIS multipacket and Uplink data aggregation
support is temporarily dropped because of broken build.
Need some time to sort this one out.
* commit e77389702c49 "USB: gadget: rndis: Add module parameter for DL max packets per xfer"
* commit 0e8b24fb6c0b "ndis: Add debug support to disable RNDIS Multipacket Feature"
* commit e298eec11b3a "RNDIS: Add Data aggregation (multi packet) support"
* commit c5ecbca49ba3 "usb: Add support for rndis uplink aggregation"
* commit 34c2b5747249 "USB: rndis: Free the rndis response queue during REMOTE_NDIS_RESET_MSG"
==> Dropped AOSP's clock frequency stats accounting support,
for now, due to non-trivial merge conflicts. Need some time
to sort this one out as well.
* commit 3a3804ba0a4a "clk: debugfs: Support frequency stats accounting"
Conflicts:
arch/arm/mm/fault.c
==> Refactor changes from AOSP commit 73e652f2b871
"ARM: fault: assume no context when IRQs are disabled
during data abort." to align with changes from mainline
commit 70ffdb9393a7 "mm/fault, arch: Use pagefault_disable()
to check for disabled pagefaults in the handler".
drivers/base/power/wakeup.c
==> Picked changes from mainline commit 4990d4fe327b
"PM / Wakeirq: Add automated device wake IRQ handling"
as well as AOSP changes from commit 171b2594e9a4
"wakeup: Add last wake up source logging for suspend
abort reason."
drivers/clk/Kconfig
drivers/clk/clk.c
==> Picked mainline changes and dropped AOSP's clock
frequency stats accounting support temporarily as
mentioned above.
drivers/input/evdev.c
==> Picked changes from mainline commit 67367fd259f2
"Input: evdev - use kvfree() in evdev_release()"
as well as AOSP changes from commit fd10c981e1b3
"Input: evdev - Add ioctl to block suspend while event
queue is not empty."
drivers/mmc/core/core.c
==> Picked changes from mainline commit 8f11d1064e01
"mmc: core: Hold re-tuning during erase commands"
as well as AOSP changes from commit c01980e6c9a2
"mmc: Add tracepoints of mmc block operations".
drivers/staging/android/lowmemorykiller.c
==> Refactor changes from AOSP commit bad385c687f8
"lowmemorykiller: make default lowmemorykiller debug
message useful", to align with changes from mainline
commit e1099a69a624 "android, lmk: avoid setting
TIF_MEMDIE if process has already exited".
drivers/usb/gadget/function/f_rndis.c
drivers/usb/gadget/function/rndis.c
drivers/usb/gadget/function/rndis.h
==> Dropped AOSP's RNDIS multipacket and Uplink data
aggregation support because of broken build and
non-trivial conflicts.
fs/fuse/dev.c
==> Refactor changes from AOSP commit 71a389ba6177
"fuse: Freeze client on suspend when request sent
to userspace", to align with changes from mainline
commit 33e14b4dfdc4 "fuse: req state use flags".
include/linux/cgroup.h
kernel/cgroup.c
==> Refactor changes from AOSP commit 53b5e2f0b1ce
"cgroup: Add generic cgroup subsystem permission
checks", to align with changes from mainline commit
b4a04ab7a37b "cgroup: separate out include/linux/cgroup-defs.h".
include/uapi/linux/netfilter/xt_socket.h
==> Picked changes from mainline commit 01555e74bde5
"netfilter: xt_socket: add XT_SOCKET_RESTORESKMARK flag"
as well as linaro-android fixes from commit
1f9ab8933609 "Fix xt_qtaguid build error".
kernel/power/suspend.c
==> Add changes from AOSP commit 722c1106fc36
"power: Adds functionality to log the last suspend
abort reason."
kernel/trace/trace_functions_graph.c
==> Dropped changes from mainline commits 9023c930902f
"tracing: Rename (un)register_ftrace_event() to
(un)register_trace_event()" and 9106b6938291 "tracing:
Add ftrace events for graph tracer" since they are
incompatible with AOSP commit 6f6f99a38132 "trace:
add non-hierarchical function_graph option".
net/rfkill/core.c
==> Refactor changes from AOSP commit 1fb6edeb817a
"rfkill: Introduce CONFIG_RFKILL_PM and use instead
of CONFIG_PM to power down", to align with changes
from mainline commit 28f297a7af7e "net: rfkill:
Switch to PM ops".
|
|
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
The pci-generic-host controller is designed for firmware-initialised
systems, such as virtual machines. On juno-r1 we expect uefi to
initialise the host controller, so this driver is sufficient.
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
For designs where EEPROMs are not connected to PCI Yukon2
chips we need to get the MAC address from the firmware.
Add a module parameter called 'mac_address' for this. It
will be used if no DT node can be found and the B2_MAC
register holds an invalid value.
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
Make pci-host-generic driver available on arm64. This needs
drivers/pci/setup-irq.o to be built for the arm64 as well.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
The current code in pci-host-generic.c uses pci_common_init_dev()
from the arch/arm/ to do a part of the PCI initialization, and this
prevents it from being used on arm64.
The initialization done by pci_common_init_dev() that is really
needed by pci-host-generic.c can be done in the same file without
using the hw_pci API of ARM.
The ARM platform requires a pci_sys_data as sysdata for the PCI bus,
this is be handled by setting up 'struct gen_pci' to embed a
pci_sys_data variable as the first element on the ARM platform.
Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
The only two users of that field are not using the msi_controller
structure anymore, so drop it altogether.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
The GICv3 ITS only uses the msi_controller structure as a way
to match the PHB with its MSI HW, and thus the msi_domain.
But now that we can directly associate an msi_domain with a device,
there is no use keeping this msi_controller around.
Just remove all traces of msi_controller from the driver.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
GICv2m only uses the msi_controller structure as a way to match
the PHB with its MSI HW, and thus the msi_domain. But now that
we can directly associate an msi_domain with a device, there is
no use keeping this msi_controller around.
Just remove all traces of msi_controller from the driver.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
Now that we can easily find which MSI domain a PCI device is
using, use dev_get_msi_domain as a way to retrieve the information.
The original code is still used as a fallback.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
A number of platforms do not need to use the msi-parent property,
as the host bridge itself provides the MSI controller.
Allow this configuration by performing an irq domain lookup based
on the PHB node if it doesn't have a valid msi-parent property.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
In order to populate the PHB msi_domain, use the "msi-parent"
attribute to lookup a corresponding irq domain. If found,
this is our MSI domain.
This gets plugged into the core PCI code.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
In order to be able to populate the device msi_domain field,
add the necesary hooks to propagate the PHB msi_domain across
secondary busses to devices.
So far, nobody populates the initial msi_domain.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
As MSI-type features are creeping into non-PCI devices, it is
starting to make sense to give our struct device some form of
support for this, by allowing a pointer to an MSI irq domain to
be set/retrieved.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
We need this available to use as a broadcast timer on Juno r0 which has
a broken memory mapped architected timer.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
This patch adds the CPU clocks so that the CPU DVFS can be enabled.
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
This patch adds CPU topology on Juno. It will be useful for ther other
IP blocks depending on this topology.
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
|
This patch adds support for the MHU mailbox peripheral used on Juno by
application processors to communicate with remote SCP handling most of
the CPU/system power management. It also adds the SRAM reserving the
shared memory and SCPI message protocol using that shared memory.
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Cc: Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
|
