Huang, Tao [Mon, 16 Mar 2015 12:30:06 +0000 (20:30 +0800)]
Merge branch linux-linaro-lsk-v3.10-android
dkl [Sat, 14 Mar 2015 12:03:26 +0000 (20:03 +0800)]
pd: rk3368: add rk3368 power domain support (as pd clk)
Signed-off-by: dkl <dkl@rock-chips.com>
dkl [Mon, 16 Mar 2015 08:44:27 +0000 (16:44 +0800)]
dts: rk3368: remove "clk_ignore_unused" from bootargs
Signed-off-by: dkl <dkl@rock-chips.com>
Zheng Yang [Sat, 14 Mar 2015 02:11:56 +0000 (10:11 +0800)]
rk3368-box.dts: set initial display timing to 1080P.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
guoyi [Fri, 13 Mar 2015 07:57:41 +0000 (15:57 +0800)]
3368_P9: dts: renamed 818 DCDC2 regulator to vdd_logic
Alpha Lin [Fri, 13 Mar 2015 02:27:56 +0000 (10:27 +0800)]
VPU: remove dev_set_name.
dev_set_name is prohibit in linux, and may casue system
warning dump.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
hjc [Thu, 12 Mar 2015 08:16:56 +0000 (16:16 +0800)]
rk312x lcdc: add to get hwc layer status
Signed-off-by: hjc <hjc@rock-chips.com>
Mark Yao [Tue, 10 Mar 2015 11:22:43 +0000 (19:22 +0800)]
bmp_helper: fix bmp rle8 display abnormal
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Huang, Tao [Thu, 12 Mar 2015 07:48:12 +0000 (15:48 +0800)]
rtc: HYM8563: don't call rtc_year_days
If i2c error, the driver may call rtc_year_days with month -1, which will
cause crash. Fix this by never call rtc_year_days at all.
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
CMY [Tue, 10 Mar 2015 07:39:38 +0000 (15:39 +0800)]
arm64: ion: fix scatterlist alloc fault on ion_system heap
Fix this bug:
WARNING: at lib/scatterlist.c:251 __sg_alloc_table+0x5c/0x15c()
Modules linked in: pvrsrvkm(O)
CPU: 2 PID: 582 Comm: Binder_5 Tainted: G O 3.10.0 #10
Call trace:
[<
ffffffc000088164>] dump_backtrace+0x0/0x140
[<
ffffffc0000882b4>] show_stack+0x10/0x1c
[<
ffffffc0008ccaf0>] dump_stack+0x1c/0x28
[<
ffffffc0000a13c0>] warn_slowpath_common+0x74/0x9c
[<
ffffffc0000a14ac>] warn_slowpath_null+0x14/0x20
[<
ffffffc0002fadc4>] __sg_alloc_table+0x58/0x15c
[<
ffffffc0002faee8>] sg_alloc_table+0x20/0x50
[<
ffffffc00067ab7c>] ion_system_heap_allocate+0x188/0x318
[<
ffffffc00067823c>] ion_alloc+0x134/0x788
[<
ffffffc000678d68>] ion_ioctl+0x15c/0x344
[<
ffffffc0001840ac>] vfs_ioctl+0x20/0x3c
[<
ffffffc0001849b4>] do_vfs_ioctl+0x478/0x550
[<
ffffffc000184ae8>] SyS_ioctl+0x5c/0x88
Signed-off-by: CMY <cmy@rock-chips.com>
hjc [Tue, 10 Mar 2015 07:05:27 +0000 (15:05 +0800)]
rk3368 dtsi: update vop iommu compatible name
Signed-off-by: hjc <hjc@rock-chips.com>
Mark Brown [Mon, 9 Mar 2015 12:27:34 +0000 (12:27 +0000)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Mark Brown [Mon, 9 Mar 2015 12:27:27 +0000 (12:27 +0000)]
Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
Mark Brown [Mon, 9 Mar 2015 12:26:45 +0000 (12:26 +0000)]
cpufreq: Revert "cpufreq: suspend governors on system suspend/hibernate"
This reverts commit
adb665056afe23db0687c1d1a208806c108add08.
The commit has too many hidden dependencies to be sensibly backported.
Signed-off-by: Mark Brown <broonie@linaro.org>
Mark Brown [Mon, 9 Mar 2015 12:25:38 +0000 (12:25 +0000)]
cpufreq: Revert "cpufreq: Don't iterate over all CPUs when suspending and resuming governors"
This reverts commit
212df5dd3212092602119d03a2f5d3a27be77ce4.
The commit it's fixing has too many other dependencies.
Signed-off-by: Mark Brown <broonie@linaro.org>
hjc [Mon, 9 Mar 2015 10:32:01 +0000 (18:32 +0800)]
rk3368 lcdc: FBDC_ABGR_888 data format support alpha
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 9 Mar 2015 10:09:37 +0000 (18:09 +0800)]
rk fb: if not want the config effect,set reserved[3] bit[0] 1
Signed-off-by: hjc <hjc@rock-chips.com>
hwg [Mon, 9 Mar 2015 09:17:20 +0000 (17:17 +0800)]
update wifi bcmdhd driver:
solve kernel panic when use gmac and hotspots at same time
dkl [Mon, 9 Mar 2015 07:32:28 +0000 (15:32 +0800)]
dts: rk3036/rk312x/rk3288: add dma clk to fit
commit
75ce2b93307105d10a21e995ab27ec30cc50aaf3
Signed-off-by: dkl <dkl@rock-chips.com>
hjc [Mon, 9 Mar 2015 07:44:14 +0000 (15:44 +0800)]
rk3368 lcdc: add fbdc data format: HAL_PIXEL_FORMAT_FBDC_RGBA888
hjc [Mon, 9 Mar 2015 07:04:04 +0000 (15:04 +0800)]
rk3368 lcdc:
1. check act and size in win2 win3 layer;
2. add support yuv420sp nv21 data format;
3. in read bit func,not need to backup reg;
4. complete get win state func;
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 9 Mar 2015 04:10:48 +0000 (12:10 +0800)]
rk fb: add memsize check
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 9 Mar 2015 03:34:40 +0000 (11:34 +0800)]
rk lcdc: if win not support scale, make sure dsp size equal to act size
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Mon, 9 Mar 2015 03:14:14 +0000 (11:14 +0800)]
rk fb: add support yuv420sp nv21 data format
Signed-off-by: hjc <hjc@rock-chips.com>
Conflicts:
drivers/video/rockchip/rkfb_sysfs.c
include/linux/rk_fb.h
hjc [Mon, 9 Mar 2015 02:38:07 +0000 (10:38 +0800)]
rk fb: make sure win close state take effect when update regs
Signed-off-by: hjc <hjc@rock-chips.com>
dkl [Mon, 9 Mar 2015 03:39:59 +0000 (11:39 +0800)]
rk3368: clk: modify relation in software of clocks under PD_VIO
It is necessary to enable hclk_vio_h2p\pclk_vio_h2p\hclk_vio_ahb_arbi
for devices under power doamin PD_VIO wen they work. Thus these clks
are modified to be parent of other clks from hclk_vio.
Signed-off-by: dkl <dkl@rock-chips.com>
dkl [Mon, 9 Mar 2015 03:34:14 +0000 (11:34 +0800)]
DMA: rk3368: add dma clk enable/disable
Signed-off-by: dkl <dkl@rock-chips.com>
Zheng Yang [Mon, 9 Mar 2015 03:11:52 +0000 (11:11 +0800)]
HDMI: Modify color output policy.
Introduce feature SUPPORT_YCBCR_INPUT. If VOP can
output YCbCr, VOP output color mode is equal to HDMI
output color mode. Otherwise, VOP just output RGB,
HDMI will conver color space.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Mon, 9 Mar 2015 03:07:28 +0000 (11:07 +0800)]
HDMI: add mutex lock when hdmi is set to auto mode, to avoid
system crash by NULL pointer.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
David Wu [Sat, 7 Mar 2015 05:08:39 +0000 (13:08 +0800)]
rk3368: thermal: add log trigger for tsadc
enable log:
echo t > sys/rockchip_thermal/temp
disable log:
echo f > sys/rockchip_thermal/temp
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Fri, 6 Mar 2015 16:28:42 +0000 (00:28 +0800)]
rk3368: tb_8846: change 8846 mode for tsadc
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Fri, 6 Mar 2015 13:00:38 +0000 (21:00 +0800)]
rk3368: add tsadc for p9
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Fri, 6 Mar 2015 12:54:26 +0000 (20:54 +0800)]
rk3368: tsadc: remove tsadc-int pin for p9
Signed-off-by: David Wu <wdc@rock-chips.com>
chenzhi [Fri, 6 Mar 2015 09:32:31 +0000 (17:32 +0800)]
ethernet: fix dts for rk3368-box
Signed-off-by: chenzhi <roger.chen@rock-chips.com>
David Wu [Fri, 6 Mar 2015 09:43:01 +0000 (17:43 +0800)]
rk3368: thermal: remove dbg log
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Fri, 6 Mar 2015 09:08:06 +0000 (17:08 +0800)]
rk3368: use pvtm for 32k tep
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Fri, 6 Mar 2015 09:07:12 +0000 (17:07 +0800)]
rk3368: tsadc: remove tsadc_tockchip defconfig
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Fri, 6 Mar 2015 08:59:31 +0000 (16:59 +0800)]
rk3368: thermal: tsadc use usermode for rk3368
Signed-off-by: David Wu <wdc@rock-chips.com>
dkl [Fri, 30 Jan 2015 06:57:59 +0000 (14:57 +0800)]
pvtm: rk3368: add pvtm_pmu clk support (output 32k)
Support pvtm_pmu output 32k clk. By default, 32k use xin32k,
and pvtm_pmu 32k clk is disabled.
Signed-off-by: dkl <dkl@rock-chips.com>
smj [Fri, 6 Mar 2015 04:09:26 +0000 (12:09 +0800)]
rk3368 codec : add support for headset detection of es8316
Signed-off-by: smj <smj@rock-chips.com>
David Wu [Fri, 6 Mar 2015 03:00:46 +0000 (11:00 +0800)]
rk3368: thermal: rockchip_thermal support rk3368
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Fri, 6 Mar 2015 02:56:39 +0000 (10:56 +0800)]
rk3368: thermal: sync form upstream for rockchip-thermal
Signed-off-by: David Wu <wdc@rock-chips.com>
Huang, Tao [Thu, 5 Mar 2015 09:11:40 +0000 (17:11 +0800)]
Merge tag 'lsk-v3.10-android-15.02'
LSK Android 15.02 v3.10
Conflicts:
drivers/Kconfig
drivers/regulator/core.c
include/linux/of.h
Alpha Lin [Thu, 5 Mar 2015 06:47:18 +0000 (14:47 +0800)]
A mistaken dts property name, cause driver could
not get the irq resource.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
Huang, Tao [Thu, 5 Mar 2015 02:21:27 +0000 (10:21 +0800)]
Merge branch develop-3.10
Conflicts:
drivers/staging/android/ion/rockchip/rockchip_ion.c
hwg [Thu, 5 Mar 2015 00:46:05 +0000 (08:46 +0800)]
wifi: update broadcom wifi driver bcmdhd to 1.201.34.2
hwg [Thu, 5 Mar 2015 00:46:05 +0000 (08:46 +0800)]
wifi: update broadcom wifi driver bcmdhd to 1.201.34.2
dalon.zhang [Wed, 4 Mar 2015 14:11:03 +0000 (22:11 +0800)]
camsys_drv config y defaultly
dalon.zhang [Sat, 28 Feb 2015 07:25:41 +0000 (15:25 +0800)]
dtsi: add rk3368 camera support
Signed-off-by: dalon.zhang <dalon.zhang@rock-chips.com>
dalon.zhang [Wed, 4 Mar 2015 13:40:28 +0000 (21:40 +0800)]
camera:
camsys_drv: v0.0x1c.0
oneframe: v0.2.0
pingpong: v0.1.a
Conflicts:
drivers/media/video/rk_camsys/camsys_gpio.h
drivers/media/video/rk_camsys/camsys_internal.h
drivers/media/video/rk_camsys/camsys_soc_priv.c
include/linux/rockchip/cru.h
Jianqun Xu [Wed, 4 Mar 2015 10:30:30 +0000 (18:30 +0800)]
rk3368: rk818: enable HDMI 5V
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Jianqun Xu [Wed, 4 Mar 2015 09:58:53 +0000 (17:58 +0800)]
rk3368: rk818 battery: allow capacity to be negative value
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
smj [Wed, 4 Mar 2015 08:14:50 +0000 (16:14 +0800)]
rk3368 codec : fix the es8316 codec capture gain
Signed-off-by: smj <smj@rock-chips.com>
hjc [Wed, 4 Mar 2015 08:16:47 +0000 (16:16 +0800)]
rk fb: in no_dual mode, dsp parameter according to user setting
Signed-off-by: hjc <hjc@rock-chips.com>
hjc [Wed, 4 Mar 2015 07:25:26 +0000 (15:25 +0800)]
rk3368 lcdc: add support overscan
Signed-off-by: hjc <hjc@rock-chips.com>
guoyi [Wed, 4 Mar 2015 07:02:37 +0000 (15:02 +0800)]
rk3368-p9: backlight: Polarity reversal
huang zhibao [Wed, 4 Mar 2015 03:04:47 +0000 (11:04 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
huang zhibao [Wed, 4 Mar 2015 02:52:18 +0000 (10:52 +0800)]
add support rk1000 codec and tvencoder
hwg [Wed, 4 Mar 2015 02:49:13 +0000 (10:49 +0800)]
support different wifi bt chip auto compatible, modify
arch/arm64/boot/dts/rk3368-p9_818.dts, arch/arm64/boot/dts/rk3368-tb_8846.dts
hwg [Wed, 4 Mar 2015 02:46:28 +0000 (10:46 +0800)]
Revert "support different wifi bt chip auto compatible"
This reverts commit
2506d1678c7f5ed228e2a7ed4130a5f9ede641db.
hwg [Wed, 4 Mar 2015 02:44:44 +0000 (10:44 +0800)]
support different wifi bt chip auto compatible
arch/arm64/boot/dts/rk3368-p9_818.dts
arch/arm64/boot/dts/rk3368-tb_8846.dts
hwg [Wed, 4 Mar 2015 02:37:27 +0000 (10:37 +0800)]
solve make clean error causeed by wifi driver
CMY [Wed, 4 Mar 2015 01:27:51 +0000 (09:27 +0800)]
rk: ion: fix compilation warning without CONFIG_COMPAT
Signed-off-by: CMY <cmy@rock-chips.com>
Huang, Tao [Tue, 10 Feb 2015 08:48:02 +0000 (16:48 +0800)]
rk: ion: fix compilation error without CONFIG_COMPAT
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit
52315d4d540dd3ef6db618b6856ceee0b5af8d98)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Tue, 3 Mar 2015 05:56:52 +0000 (13:56 +0800)]
rk: ion: fix compile warnning
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
ee9707a058c52a0d0c27f5804db9e9e96075d363)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Mon, 2 Mar 2015 07:42:55 +0000 (15:42 +0800)]
rk: uboot_mem_reserve: lost a '=' in 'if' statement
(cherry picked from commit
b9721d0365d9e88d0c16c3f0c2aff4b2c09c9dec)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Mon, 2 Mar 2015 03:33:35 +0000 (11:33 +0800)]
rk: uboot_mem_reserve: fix print format
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
c9bbb3032c50e9b9ecaca58a4aa06ef4192bdbba)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Fri, 27 Feb 2015 09:59:00 +0000 (17:59 +0800)]
rk: ion: allow the cacheable buffer to map iommu
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
db95a55ffa214b0bab8643454875a42d655a8ad7)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Sat, 14 Feb 2015 10:05:01 +0000 (18:05 +0800)]
rk: ion: assign sg's dma_length in ion allocation if CONFIG_NEED_SG_DMA_LENGTH is set
(cherry picked from commit
c85ce1ade533fe0d02b7539dbe85d55b69386125)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Wed, 7 Jan 2015 07:42:54 +0000 (15:42 +0800)]
ARM64: ion: ION_IOC_GET_PHYS compat 32bit userspace app.
Signed-off-by: CMY <cmy@rock-chips.com>
(cherry picked from commit
92ad540611e8599b7fb386a28793c77b410c81c6)
Signed-off-by: CMY <cmy@rock-chips.com>
CMY [Thu, 25 Dec 2014 03:39:38 +0000 (11:39 +0800)]
ion: export ion_device for some kernel modules
(cherry picked from commit
c32433f1e0847cffdee4e0c04c6d8ee7d64392bc)
Signed-off-by: CMY <cmy@rock-chips.com>
hwg [Wed, 4 Mar 2015 02:37:27 +0000 (10:37 +0800)]
solve make clean error causeed by wifi driver
hwg [Tue, 3 Mar 2015 09:56:58 +0000 (17:56 +0800)]
rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288
hwg [Sat, 28 Feb 2015 09:06:56 +0000 (17:06 +0800)]
remove unused wifi driver: rda5990, mt5931, mt7601, mt6620
hwg [Sat, 28 Feb 2015 06:05:32 +0000 (14:05 +0800)]
support different wifi bt chip auto compatible
like auto recognize rtl8188eu, ap6210, esp8089 in android
Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
net/rfkill/rfkill-wlan.c
lintao [Tue, 3 Mar 2015 13:31:10 +0000 (21:31 +0800)]
mmc: rk_sdmmc: edmac limit FIFOTH when mburst exceed limitation
Signed-off-by: lintao <lintao@rock-chips.com>
lintao [Tue, 3 Mar 2015 13:09:54 +0000 (21:09 +0800)]
mmc: rk_sdmmc: doesn't enforce hpclk to be used
Signed-off-by: lintao <lintao@rock-chips.com>
hwg [Tue, 3 Mar 2015 09:56:58 +0000 (17:56 +0800)]
rfkill-wlan.c use CONFIG_MFD_SYSCON to compatible rk3368 and rk3288
hwg [Thu, 12 Feb 2015 07:22:38 +0000 (15:22 +0800)]
rfkill-wlan.c: support rk3368
Conflicts:
net/rfkill/rfkill-wlan.c
hwg [Thu, 12 Feb 2015 07:21:52 +0000 (15:21 +0800)]
update rkwifi bcmdhd to version 1.201.34.1
Conflicts:
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile
Mark Brown [Tue, 3 Mar 2015 09:34:14 +0000 (09:34 +0000)]
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Mark Brown [Tue, 3 Mar 2015 09:33:54 +0000 (09:33 +0000)]
Merge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk
Mark Brown [Tue, 3 Mar 2015 09:23:31 +0000 (09:23 +0000)]
Merge branch 'v3.10-backport' of git.linaro.org/people/mathieu.poirier/coresight into lsk-v3.10-coresight
hjc [Tue, 3 Mar 2015 09:00:57 +0000 (17:00 +0800)]
rk fb: if uboot logo not display, there is not need to poll blank and enable iommu
Signed-off-by: hjc <hjc@rock-chips.com>
lintao [Tue, 3 Mar 2015 06:26:03 +0000 (14:26 +0800)]
mmc: add hclk_mmc_peri for 3368
Signed-off-by: lintao <lintao@rock-chips.com>
CMY [Tue, 3 Mar 2015 05:56:52 +0000 (13:56 +0800)]
rk: ion: fix compile warnning
Signed-off-by: CMY <cmy@rock-chips.com>
chenzhi [Tue, 3 Mar 2015 03:54:13 +0000 (11:54 +0800)]
ethernet: GMAC driver for RK3368
Signed-off-by: chenzhi <roger.chen@rock-chips.com>
Kaixu Xia [Mon, 26 Jan 2015 16:22:25 +0000 (09:22 -0700)]
coresight: fix function etm_writel_cp14() parameter order
Function etm_writel_cp14() takes an offset and a value rather
than the other way around, something this patch is correcting.
The semantic remains the same since it is only a function stub.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
5fb31cd839c21130c0b2524ceb9244e98dfe10e3)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Paul Bolle [Mon, 26 Jan 2015 16:22:24 +0000 (09:22 -0700)]
coresight-etm: remove check for unknown Kconfig macro
The CoreSight ETM/PTM driver contains a check for a
CONFIG_CORESIGHT_SOURCE_ETM_DEFAULT_ENABLE macro. But there's no related
Kconfig symbol CORESIGHT_SOURCE_ETM_DEFAULT_ENABLE. Remove that check
and the single line of code it hides.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
406b9f659fbc966ab47a1fe8f5c1a2e8110483ad)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Mathieu Poirier [Mon, 26 Jan 2015 16:22:23 +0000 (09:22 -0700)]
coresight: fixing CPU hwid lookup in device tree
Some DT specification will represent CPU nodes with address
cells greater than one, making the current code fail. Using
the proper retrieval helper function ensure the correct hwid
for CPUs is read properly with different address cell size.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
34a03c1d30f04ca7439c685c0ea9b7d79c353705)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Mon, 26 Jan 2015 16:22:22 +0000 (09:22 -0700)]
coresight: remove the unnecessary function coresight_is_bit_set()
This function coresight_is_bit_set() isn't called, so we should
remove it.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
c4546f246636ccf4cda092bcfcafcb5f5f752ec7)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Mon, 26 Jan 2015 16:22:21 +0000 (09:22 -0700)]
coresight: fix the debug AMBA bus name
The right debug AMBA bus name should be APB(Advanced Peripheral Bus),
so just fix it.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
7af8792b4d3ad94774fb40f422fa245ab3755bb4)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Mon, 26 Jan 2015 16:22:20 +0000 (09:22 -0700)]
coresight: remove the extra spaces
There are some extra spaces, so just remove them from these lines.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
d786a47de97fd194d6cf4f9087543119b9b330c3)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Mon, 26 Jan 2015 16:22:19 +0000 (09:22 -0700)]
coresight: fix the link between orphan connection and newly added device
When founding a component that has orphan connections, we should
validate if it match the newly added device. If it does not match,
only then should the @still_orphan flag should be set.
The tested result as follows.
pre:
/sys/bus/coresight/devices # echo 1 >
e3c42000.etb/enable_sink
/sys/bus/coresight/devices # echo 1 >
e3c7c000.ptm/enable_source
[ 15.527692] Unable to handle kernel NULL pointer dereference at virtual address
00000124
[ 15.555142] pgd =
c2294000
[ 15.564226] [
00000124] *pgd=
3d393831, *pte=
00000000, *ppte=
00000000
[ 15.585391] Internal error: Oops: 817 [#1] PREEMPT SMP ARM
[ 15.603807] CPU: 0 PID: 144 Comm: sh Not tainted
3.17.0-rc1-12634-g1222fe0-dirty #3
[ 15.629490] task:
ed3803c0 ti:
c213a000 task.ti:
c213a000
[ 15.647627] PC is at coresight_build_paths+0x1c/0x314
[ 15.664579] LR is at coresight_build_paths+0x6c/0x314
[ 15.681526] pc : [<
c02da20c>] lr : [<
c02da25c>] psr:
20000013
[ 15.681526] sp :
c213be88 ip :
c02da800 fp :
00000000
[ 15.720023] r10:
00000002 r9 :
ed13250c r8 :
00000001
[ 15.737549] r7 :
c213bee8 r6 :
ffffffea r5 :
00000000 r4 :
00000124
[ 15.759446] r3 :
ed216f24 r2 :
00000001 r1 :
c213bee8 r0 :
00000000
[ 15.781346] Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user
post:
/sys/bus/coresight/devices # echo 1 >
e3c42000.etb/enable_sink
/sys/bus/coresight/devices # echo 1 >
e3c7c000.ptm/enable_source
[ 59.934255] coresight-etb10
e3c42000.etb: ETB enabled
[ 59.951317] coresight-replicator replicator0: REPLICATOR enabled
[ 59.971581] coresight-funnel
e3c41000.funnel: FUNNEL inport 0 enabled
[ 59.993334] coresight-etm3x
e3c7c000.ptm: ETM tracing enabled
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
22394bc58543639e5135f19eee2b03d14e4a9b66)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Mon, 26 Jan 2015 16:22:18 +0000 (09:22 -0700)]
coresight: remove the unnecessary replicator property
Now we use the device name to identify replicator instead
of a unique number, so just remove it.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
603101708c9c9ad2bc5a183d6d10b115738098c7)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Mon, 26 Jan 2015 16:22:17 +0000 (09:22 -0700)]
coresight: fix the replicator subtype value
According to the classification, the type of replicator
is link, so the subtype should also be link_subtype.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
410d841a599683408a77f42f110cd17298682520)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Fri, 9 Jan 2015 23:57:22 +0000 (16:57 -0700)]
coresight: fixing validity check on remote device
A validity check should be made on the remote device, i.e rdev,
rather than the current device.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
2ccffaf92e7b7cc9dfa6c3458fc9cb151621680a)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Fri, 9 Jan 2015 23:57:21 +0000 (16:57 -0700)]
coresight: fix comment in of_coresight.c
Outports is a member of the struct pdata and should be
a better choice.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
f7c55298f17f0bf9d257ea7f2f15cf920248db5b)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Mathieu Poirier [Fri, 9 Jan 2015 23:57:20 +0000 (16:57 -0700)]
coresight: Fixing wrong #ifdef/#endif placement
Fixing problem reported by:
https://lkml.org/lkml/2015/1/6/86
The #ifdef/#endif is wrong and prevents the stub of function
of_get_coresight_platform_data() from being visible when
CONFIG_OF is not defined.
Moving CONFIG_OF condition out of CONFIG_CORESIGHT, making
them both independent.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
c61c4b5dd2c6b5dbf0f7e299db1e8411ef590f5c)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Kaixu Xia [Fri, 9 Jan 2015 23:57:19 +0000 (16:57 -0700)]
coresight: fix typo in comment in of_coresight.c
Debugfs isn't used for coresight configuration, so the corresponding
comments should be changed.
Signed-off-by: Kaixu Xia <xiakaixu@huawei.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
ff1e33b0c16ba422e3bf3fa8cc7e89b2c958e193)
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
projects / firefly-linux-kernel-4.4.55.git / log