Commit Graph

397028 Commits

Author SHA1 Message Date
黄涛
94b975e9b8 pinctrl: rockchip: enable clock support, disable pinmux disable and RK30_PIN_PXX to GPIO_XX 2014-01-06 12:43:08 +08:00
黄涛
4a7bf65a43 rk: l2c: only init when chip is rockchip 2014-01-06 10:43:36 +08:00
黄涛
176fe4946e rk: support make kernel.img and board_kernel.img 2014-01-06 10:36:57 +08:00
黄涛
14cec1c89c rk: fix PIE support, libpie_stage2.o depends on pie_rename.syms 2014-01-06 10:35:20 +08:00
Tony Lindgren
7eed91bf69 pinctrl: Remove duplicate code in pinctrl_pm_select_state functions
There's no need to duplicate essentially the same functions. Let's
introduce static int pinctrl_pm_select_state() and make the other
related functions call that.

This allows us to add support later on for multiple active states,
and more optimized dynamic remuxing.

Note that we still need to export the various pinctrl_pm_select
functions as we want to keep struct pinctrl_state private to the
pinctrl code, and cannot replace those with inline functions.

Cc: Felipe Balbi <balbi@ti.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-01-03 18:56:01 +08:00
Arnd Bergmann
3e91bba6a9 pinctrl: export pinctrl_pm_select_*_state
The three functions pinctrl_pm_select_default_state,
pinctrl_pm_select_sleep_state, and pinctrl_pm_select_idle_state
are used in drivers that can be loadable modules, and should
be exported.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-01-03 18:55:46 +08:00
Linus Walleij
a76eed156f drivers: pinctrl sleep and idle states in the core
If a device have sleep and idle states in addition to the
default state, look up these in the core and stash them in
the pinctrl state container.

Add accessor functions for pinctrl consumers to put the pins
into "default", "sleep" and "idle" states passing nothing but
the struct device * affected.

Solution suggested by Kevin Hilman, Mark Brown and Dmitry
Torokhov in response to a patch series from Hebbar
Gururaja.

Cc: Hebbar Gururaja <gururaja.hebbar@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-01-03 18:55:18 +08:00
xxx
845faabf3e add clock init 2014-01-03 14:28:11 +08:00
luowei
a882ac960e pinctrl:fix irq operation bug 2013-12-30 09:39:15 +08:00
hhb
6d8c70793a fiq debugger: modify switch_cpu() 2013-12-26 10:32:04 +08:00
chenxing
d07e65676a rk3188: set mux/divider/gate flags && fix some bugs 2013-12-23 12:06:09 +08:00
Haojian Zhuang
bb3b68c691 clk: gate: add CLK_GATE_HIWORD_MASK
In Rockchip Cortex-A9 based chips, they don't use paradigm of
reading-changing-writing the register contents.  Instead they
use a hiword mask to indicate the changed bits.

When b1 should be set as gate, it also needs to indicate the change
by setting hiword mask (b1 << 16).

The patch adds gate flag for this usage.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2013-12-23 10:45:39 +08:00
Haojian Zhuang
cbb9133851 clk: divider: add CLK_DIVIDER_HIWORD_MASK flag
In both Hisilicon & Rockchip Cortex-A9 based chips, they don't use the
paradigm of reading-changing-writing the register contents.
Instead they use a hiword mask to indicate the changed bits.

When b01 should be set as setting divider, it also needs to indicate
the change by setting hiword mask (b11 << 16).

The patch adds divider flag for this usage.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2013-12-23 10:45:32 +08:00
Haojian Zhuang
4d21675335 clk: mux: add CLK_MUX_HIWORD_MASK
In both Hisilicon & Rockchip Cortex-A9 based chips, they don't use the
paradigm of reading-changing-writing the register contents.
Instead they use a hiword mask to indicate the changed bits.

When b01 should be set as switching mux, it also needs to indicate
the change by setting hiword mask (b11 << 16).

The patch adds mux flag for this usage.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2013-12-23 10:45:27 +08:00
chenxing
b4902e5442 rk3188: revert clk-divider.c and clk-mux.c in drivers/clk/ 2013-12-23 10:48:57 +08:00
chenxing
a456b372ec rk3188: add clock support 2013-12-20 19:07:36 +08:00
luowei
95a82fdada pinctrl:delete unused code 2013-12-19 18:38:22 +08:00
Arve Hjønnevåg
70327d84e7 ARM: Fix "Make low-level printk work" to use a separate config option
Signed-off-by: Arve Hjønnevåg <arve@android.com>

Conflicts:
	kernel/printk.c
2013-12-17 14:59:38 +08:00
黄涛
2ec6a20c2e Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android-common-3.10' into develop-3.10 2013-12-17 14:48:54 +08:00
黄涛
2e5f07e656 Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro-lsk-v3.10-android+android-common-3.10 2013-12-17 14:41:39 +08:00
黄涛
4d426f612e Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into linux-linaro-lsk-v3.10-android+android-common-3.10
Conflicts:
	kernel/printk.c
2013-12-17 14:41:09 +08:00
Alexandre Courbot
a1eabac6e2 gpiolib: safer implementation of desc_to_gpio()
The current implementation of desc_to_gpio() relies on the chip pointer
to be set to a valid value in order to compute the GPIO number. This
was done in the hope that we can get rid of the gpio_desc global array,
but this is not happening anytime soon.

This patch reimplements desc_to_gpio() in a fashion similar to that of
gpio_to_desc(). As a result, desc_to_gpio(gpio_to_desc(gpio)) == gpio is
now always true. This allows to call desc_to_gpio() on non-initialized
descriptors as some error-handling code currently does.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Reported-by: Dr. H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-12-17 02:01:29 +00:00
John Stultz
e513299f8d ion: Fix build warning
Add #include <linux/device.h> to fix the following warning seen
with gcc 4.7.3:

In file included from drivers/staging/android/ion/ion_heap.c:26:0:
drivers/staging/android/ion/ion_priv.h:358:21: warning: ‘struct device’ declared inside parameter list [enabled by default]
drivers/staging/android/ion/ion_priv.h:358:21: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]

Change-Id: Icc249b32d877a5b76b1669c99bef2b05d9e322da
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-12-17 01:35:47 +00:00
Colin Cross
8d9bc14049 ion: remove ion_user_handle_t from ion_test.h
ion_test.h should not define ion_user_handle_t, and defining it
causes a warning:
In file included from drivers/staging/android/ion/ion_test.c:31:
drivers/staging/android/ion/../uapi/ion_test.h:23: error: redefinition of typedef 'ion_user_handle_t'
drivers/staging/android/ion/../uapi/ion.h:23: note: previous declaration of 'ion_user_handle_t' was here

Change-Id: I541897745a5ff128790a7e51b23f3034f5d3d6d9
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Colin Cross <ccross@android.com>
2013-12-16 16:33:00 -08:00
John Stultz
f2b94c5264 ion: Don't allow building ION as a module.
ION doesn't export the proper symbols for it to be a module. This
causes build issues when ION is configured as a module.

Since Andorid kernels rarely use modules (I think recent policy
requires no modules?), go ahead and set the ION config to a bool
from the tristate option.

If folks decide ION as a module is important, we will have to go
through and export the various needed symbols.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-16 16:30:59 -08:00
Mark Brown
425f051d39 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2013-12-16 16:28:09 +00:00
Mark Brown
d1eda188a3 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fvp' into linux-linaro-lsk 2013-12-16 16:27:59 +00:00
Mark Brown
9c5050cb97 arm64: dts: Add properties required for CLCD enumeration
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-12-16 16:26:36 +00:00
luowei
ba826e8490 pinctrl:add vol_domain dts support 2013-12-16 22:23:44 +08:00
黄涛
bba66615b5 rk: fix PIE support, better support clean 2013-12-16 19:34:04 +08:00
黄涛
48a48cd79b Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into develop-3.10 2013-12-16 14:23:41 +08:00
luowei
679b182411 pinctrl:add interface for drive and vol setting 2013-12-14 19:14:15 +08:00
Greg Hackmann
a8694287f5 timerfd: support CLOCK_BOOTTIME clock
Add CLOCK_BOOTTIME support to timerfd

Change-Id: I14dee6d1104f15a05f463a632268ac4564753faf
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-13 23:04:58 +00:00
JP Abgrall
e89d9fc608 android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS
TCPMSS is required for the Android Vpn service to correctly
handle the MTU on tun/ppp devices.  Bug: 11579326
We don't really need SCHED_TRACER and the TIMER_STATS.

Change-Id: I10c5767a6324a496713752d4fe9eff361dc8e06a
(cherry picked from commit 23f01e8e81f3c53985958fa291b39c84293ad047)
2013-12-13 19:22:06 +00:00
Mark Brown
e992529818 Merge remote-tracking branch 'lsk/v3.10/topic/aosp-warnings' into linux-linaro-lsk-android 2013-12-13 18:53:19 +00:00
Mark Brown
358194677f Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
	drivers/staging/android/ion/ion_chunk_heap.c
	kernel/printk.c
2013-12-13 18:52:59 +00:00
Mark Brown
679160a872 Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp 2013-12-13 18:50:12 +00:00
Mark Hambleton
7138440c58 netfilter: fix function return types for 64bit
Fix functions to return ssize_t instead of int to match
prototypes.

Signed-off-by: Mark Hambleton <mahamble@broadcom.com>
Reviewed-by: Edwin Chan <echan@broadcom.com>
Reviewed-by: James King <jamesk@broadcom.com>
Reviewed-by: John Garry <jgarry@broadcom.com>
Reviewed-by: Mark Hambleton <mark.hambleton@broadcom.com>
Reviewed-by: Joyjit Nath <joyjit@broadcom.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-12-13 18:48:02 +00:00
Mark Brown
5a4b318f12 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2013-12-13 17:25:16 +00:00
Mark Brown
e6b9c92939 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hmp' into linux-linaro-lsk 2013-12-13 17:24:35 +00:00
Mark Hambleton
8ecd48091c arm64: Enable HMP for ARMv8
Signed-off-by: Mark Hambleton <mahamble@broadcom.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-12-13 13:23:36 +00:00
Mark Brown
492df0b134 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2013-12-13 12:31:39 +00:00
Mark Brown
32af9f3d6c Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpu' into linux-linaro-lsk 2013-12-13 12:28:13 +00:00
Sudeep KarkadaNagesha
5066e800ba ARM64: DT: define ARM64 specific arch_match_cpu_phys_id
OF/DT core library provides architecture specific hook to match the
logical cpu index with the corresponding physical identifier.

On ARM64, the MPIDR_EL1 contains specific bitfields(MPIDR_EL1.Aff{3..0})
which uniquely identify a CPU, in addition to some non-identifying
information and reserved bits. The ARM cpu binding defines the 'reg'
property to only contain the affinity bits, and any cpu nodes with other
bits set in their 'reg' entry are skipped.

This patch overrides the weak definition of arch_match_cpu_phys_id
with ARM64 specific version using MPIDR_EL1.Aff{3..0} as cpu physical
identifiers.

Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 6e15d0e04b)
2013-12-13 12:27:35 +00:00
黄涛
8005ed7517 ARM: rockchip: add grf.h 2013-12-13 19:53:50 +08:00
黄涛
e946170d8a ARM: rockchip: update rockchip_defconfig to support module and i2c, etc 2013-12-13 19:49:51 +08:00
黄涛
ce551444a1 i2c: rockchip: i2c_msg add scl_rate for compat support old driver 2013-12-13 19:44:36 +08:00
黄涛
76bc099308 ARM: rockchip: rk3188-tb enable i2c 2013-12-13 19:42:23 +08:00
黄涛
2f26fa3bab i2c: add rockchip i2c driver 2013-12-13 19:41:11 +08:00
Mark Brown
2de8a21235 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-topology' into linux-linaro-lsk 2013-12-13 10:56:15 +00:00