Commit Graph

591721 Commits

Author SHA1 Message Date
Mark Yao
88f9467e51 video: rk322x: rename vop rk3228 to rk322x
Change-Id: I6d8d9ff84f76d7fa5c820b682081bbe0cb851ff1
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-25 20:40:45 +08:00
Huang Jiachai
cd3f162865 video: rockchip: lvds: rk31xx_lvds.c add support rk3366
Change-Id: Iecd6bacf28cb4620a1141c89ff16612ec4866230
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-01-25 20:31:13 +08:00
Huang Jiachai
7ec167829a video: rockchip: lcdc: 3368: add support rk3366
Change-Id: I7e6137418b18c58c53f958089527635ac62eb887
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-01-25 20:28:24 +08:00
Xu Jianqun
9da1bda27c staging: ion: cma heap support map/unmap iommu
Add apis for cma-heap to map/unmap iommu.

Change-Id: I993d54285691e7015ffa302a4bb776234ca45bcb
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-25 18:46:27 +08:00
Mark Yao
f6916789d5 video: rk_fb: align 24bit data format
Vop hardware only support the 4 byte align stride, but
if logo's stride is not align with 4 byte, will get
error display.

Change-Id: I543bbbea98f14702ae0e5f058075c39b8fd6fd68
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-25 18:45:13 +08:00
Mark Yao
810a6c3735 video: rk_fb: fix ymirror for kernel logo
kernel logo not use ymirror now, so if uboot logo use ymirror,
we need close it when switch to kernel logo, otherwise, would get
iommu crash

Change-Id: I4a607f75ada4cf6454c7e0f4614b629ef747e851
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-25 18:44:36 +08:00
Huang Jiachai
1463fbda0c dtsi: display: add fpga rgb screen timing dtsi
Change-Id: I803aa5a4a8b5bf221ab0a56d6d739464cc501de5
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-01-25 18:43:23 +08:00
Huang Jiachai
cd3559daa4 video: rockchip: screen: init extend screen type
if the extend screen type is same to prmry screen type,
the GRF reg config for vop selete will be error;

Change-Id: I6671ae69da175352bd1935254603e434e85900ea
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2016-01-25 18:42:51 +08:00
Sugar Zhang
f899e3a55f ASoC: rockchip: i2s: add rk3399 compatible string
Change-Id: Iaf539e003efc4cb9d219e866f6637368d5b2da81
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2016-01-25 10:23:17 +08:00
Sugar Zhang
c3bc30c6a8 ARM64: dts: rk3399: add i2s node
Change-Id: I02c7fd587c4233910b2a29c99bd8c7fc809779bf
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2016-01-25 10:20:14 +08:00
Xu Jianqun
6ac5fe994f doc: dt: add dt-bindings for rockchip ion driver
Change-Id: Ia2ec4985ead6ee986dce9bdb6ac910373ec1cd18
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-21 15:18:20 +08:00
Xu Jianqun
a891b7390b ARM64: dts: rockchip: rk3368 support cma-heap
Support cma-heap, also remove unused id definations.

Change-Id: I81608291b076ed55a1c439abfa9281ba30dff1b6
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-21 14:59:10 +08:00
Xu Jianqun
8baee85773 staging: ion: rockchip: support cma-heap
With this patch, ion could alloc by cma heap.

Change-Id: I23b4ebf3b6f8de573c9833574f926f38db1c67bc
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-21 14:47:27 +08:00
Zhaoyifeng
4fb0468002 nand: add ftl driver and nand drivers for rk3366
Change-Id: I2ea7fe6218b32666b91fce54bc17f976feb7f4d2
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
2016-01-19 11:44:50 +08:00
zxl
3c1d52c9de GPU: Rogue_M: update to 1.31_2 version & support gpu pd.
1. Add GPU pd support.
2. Disable RD power island.

Change-Id: Ib2ee45c647d0bed5aaa5c4f0c591c0f527f3d11e
Signed-off-by: zxl <zhuangxl@rock-chips.com>
2016-01-18 19:04:28 +08:00
zxl
78ee7c5c07 GPU: Rogue_M: support gpu dvfs & adjust code.
1. Add GPU dvfs support.
2. Adjust the code indentation.
3. Use late_initcall instead of module_init to load gpu driver.

Change-Id: I9bac24b567b43ae6a395d9bac1b1d7e2729c48b4
Signed-off-by: zxl <zhuangxl@rock-chips.com>
2016-01-18 18:56:56 +08:00
Xu Jianqun
05cf816fff ARM64: dts: add dts for Rockchip RK3399 FPGA board
With the RK3399 FPGA dts file, the FPGA board is able to boot with
very simple boot system.

Change-Id: I3484faf02cf9e6adab4379752abcc6cb8c9ed5b2
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-18 16:17:32 +08:00
Xu Jianqun
d404c1e21f ARM64: dts: rockchip: fix copy-paste error in rk3399 dtsi file
Change-Id: I4eb21f4ee8e8d4bfc3dd37649e7c57c06489db1d
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-18 14:28:54 +08:00
Xing Zheng
b0520a10e6 clk: rockchip: add dt-binding header for rk3399
Add the dt-bindings header for the rk3399, that gets shared between
the clock controller and the clock references in the dts.

Change-Id: I01830a46b679f4630506e8cb48b1a39e113a9952
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2016-01-18 13:58:17 +08:00
Jeffy Chen
b260018adb clk: rockchip: allow more than 2 parents for cpuclk
RK3228's armclk has 3 parents, so allow cpuclk to have
more than 2 parents.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
(cherry picked from linux-next.git
commit ea03835fb8)

Change-Id: Iddb60e4f7bda91b98b4a3e42f196eee510173dce
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2016-01-15 17:52:15 +08:00
Sugar Zhang
a10ca571fc ARM64: dts: rk3399: add dmac node
Change-Id: Ib59775c317f936c54d521d714293a3ab9a546937
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2016-01-15 17:33:46 +08:00
Jeffy Chen
6558ce149b serial: core: remove baud_rates when serial console setup
Currently, when tring to set up a serial console with a higher
baud rate, it would fallback to 921600.

Tested-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Change-Id: Id93f2b559478f38c735213d523d3f72f6745f6a0
2016-01-15 16:36:16 +08:00
Mark Yao
483f8df0a0 video: rk_fb: add BGR888 support
Direct load 24bit bmp data to display, but its data format
is BGR888, so add BGR888 support for uboot logo.

Change-Id: Id93f2b559478f38c735213d523d3f72f6745f6a8
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-14 13:59:50 +08:00
Mark Yao
d14bc670a6 video: rk_fb: spilt mirror into x/y mirror
Uboot logo need ymirror function, but now only have mirror_en to
enable both xmirror and ymirror.

Change-Id: Ic676c4451817db2127327a1a56addeccb2436f21
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-14 13:59:49 +08:00
Mark Yao
38c4c22a5b video: rk_fb: align uboot logo address
Uboot logo address start point may be not align PAGE_SIZE, it would
align to wrong point by pages vmap, and cause uboot logo error display.

So before pages vmap, align the uboot logo address.

Change-Id: I93f030e1b7ee13a4dc19d1421f520478868318ef
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reported-by: Wen Dingxian <shawn.wen@rock-chips.com>
2016-01-14 13:59:48 +08:00
Mark Yao
f25987ec71 video: rockchip_fb: synchronous win state
We enable win0 for uboot display, but win last_state is 0,
when we update win config from config_done ioctl, the state judge
is wrong.

Change-Id: I9955bed1683586254a908cb9395d27585e234b10
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-14 13:59:48 +08:00
Mark Yao
a99d6b4e09 video: rockchip_fb: support ymirror for uboot logo
Now only find rk322x and rk3368 support do ymirror in windows.

Change-Id: Iba49d64bb51db8fb35e6b21cab8aeba23dbd52b6
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-14 13:59:47 +08:00
Mark Yao
c991a1a4ee video: rk_fb: widen out var config limit
All layers allow out of right side and bottom side.
And hardware cursor want to support outside of right and bottom.

Change-Id: I27d64b2e12326fbad436f291a9fb5092538428f9
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2016-01-14 13:59:47 +08:00
Jianqun xu
09f913b31b ARM64: dts: rockchip: add core dtsi file for RK3399
Change-Id: Ie3b824e8ead967d4cb119d73222b7a198478c29c
Signed-off-by: Jianqun xu <jay.xu@rock-chips.com>
2016-01-13 11:05:22 +08:00
Zhaoyifeng
24faa1ca44 ARM64: dts: add nandc node for rk3368
Change-Id: I1c5fab31139e686297dd0da94d7274592fc22782
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
2016-01-13 11:04:19 +08:00
Xu Jianqun
5ba7074f42 ARM64: configs: rockchip_defconfig select RGA2
Change-Id: Id93ffb52d58aaaedaacdd47f0f2d4765e2429a30
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-13 10:55:00 +08:00
Xu Jianqun
4de90d4143 ARM64: dts: rockchip: add node for rga2
Change-Id: Icd6fd0917671a1f39e1c75d09387fdb30a8b3292
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-13 09:40:10 +08:00
Xu Jianqun
eb00bb54db video: rockchip: rga2 driver do codingstyle
Change-Id: I7cc3fbdd37da8e3b3b79779db62b6ac1e9ba61f5
Signed-off-by: Xu Jianqun <jay.xu@rock-chips.com>
2016-01-13 09:38:25 +08:00
Xiao Feng
e5252bc281 ARM64: dts: rockchip: rk3368: add cpu dvfs support for sheep board
Change-Id: Id0361d55f970ea814c6965b2772f7cdc3a004bfc
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2016-01-13 09:26:58 +08:00
Xiao Feng
c0a40fd97f cpufreq: rockchip: add driver
This driver will directly use cpufreq-dt driver as backend.

Change-Id: Iec5a4ff05a4829fdbc3535f94e92759d4238623d
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2016-01-12 16:07:05 +08:00
Shenfei xu
37910f0d5c ARM64: config: rockchip_defconfig add rk818-regulator driver.
Change-Id: I7a71bf6583570433f788502e4bdf9b56951c63d5
Signed-off-by: Shenfei xu <xsf@rock-chips.com>
2016-01-12 14:18:07 +08:00
Shenfei xu
ed77419d17 mfd: dt-bindings: Add RK818 device tree bindings document
Add device tree bindings documentation and a header file
for rockchip's RK818 pmic

Change-Id: Ic021c3555e980fa7f083b0720ab43ba757d032e4
Signed-off-by: Shenfei xu <xsf@rock-chips.com>
2016-01-12 14:17:44 +08:00
Shenfei xu
ce9e855821 ARM64: dts: add rk818 node for rk3368.
Change-Id: I7754f5db74db77929a20d3cd636066f0bd12baed
Signed-off-by: Shenfei xu <xsf@rock-chips.com>
2016-01-12 14:16:59 +08:00
Shenfei xu
9c61fd3e36 mfd: RK818: add new mfd driver for 818.
Change-Id: Iae0797ad17701a81ca91bc2396bfc2ec16241231
Signed-off-by: Shenfei xu <xsf@rock-chips.com>
2016-01-12 14:15:52 +08:00
zhangqing
6d2ef48485 ARM64: dts: rk3368-tb: modify syr82x nodes
modify syr82x nodes for use the shared driver fan53555

Change-Id: I42269ab63838244da2cde45e916ef953227e95c0
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2016-01-12 14:04:11 +08:00
zhangqing
19e8de0ccd ARM64: rockchip: syr82x: support syr82x regulator
Add suspend/resume enable/disable setting function.
Silergy SYR82x regulators share the exact same functionality and register
layout as the Fairchild FAN53555 regulators.
The fan53555 is upstreamed.
Therefore use fan53555.c for support syr82x.

Change-Id: If1d72a34d26c705796bc4d33de7187116edf4aa8
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2016-01-11 09:58:07 -08:00
Xing Zheng
65383105af dt-bindings: add documentation of rk3399 clock controller
Add the devicetree binding for the cru on the rk3399 which quite
similar structured as previous clock controllers.

Change-Id: I726011854d84312c5b831612246ad0decf317d68
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2016-01-11 14:34:03 +08:00
Masahiro Yamada
4a28a53f28 dt-bindings: ARM: add arm,cortex-a72 compatible string
Change-Id: Ibbe90aa7a5c9d5b1307d72a81d2b70cfd22e5f74
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Rob Herring <robh@kernel.org>
(cherry picked from commit 182f4f098e)
2016-01-11 12:04:34 +08:00
Huang, Tao
1af256887d rk: gcc-wrapper.py ignore af_unix.c:1036
Change-Id: Ib850612060af29f271ec35c1b80a4a1a070c2670
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2016-01-11 11:49:11 +08:00
Huang, Tao
d33c384bbf Merge tag 'v4.4'
Linux 4.4
2016-01-11 11:25:13 +08:00
Linus Torvalds
afd2ff9b7e Linux 4.4 2016-01-10 15:01:32 -08:00
Linus Torvalds
eac6f76ac7 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
 "A single fix for machines with pages > 4k (PPC mostly).

  There's a bug in our optimal transfer size code where we don't account
  for pages > 4k and can set the transfer size to be less than the page
  size causing nasty failures"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  sd: Reject optimal transfer length smaller than page size
2016-01-09 14:53:48 -08:00
Linus Torvalds
c0cb139345 Merge tag 'pci-v4.4-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixlet from Bjorn Helgaas:
 "This marks the TI DRA7xx host bridge driver as broken.  Apparently it
  has never worked without some additional out-of-tree code, so I'm
  going to mark it broken now and remove it completely next cycle unless
  it's fixed"

* tag 'pci-v4.4-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: dra7xx: Mark driver as broken
2016-01-09 14:44:44 -08:00
Michal Hocko
751e5f5c75 vmstat: allocate vmstat_wq before it is used
kernel test robot has reported the following crash:

  BUG: unable to handle kernel NULL pointer dereference at 00000100
  IP: [<c1074df6>] __queue_work+0x26/0x390
  *pdpt = 0000000000000000 *pde = f000ff53f000ff53 *pde = f000ff53f000ff53
  Oops: 0000 [#1] PREEMPT PREEMPT SMP SMP
  CPU: 0 PID: 24 Comm: kworker/0:1 Not tainted 4.4.0-rc4-00139-g373ccbe #1
  Workqueue: events vmstat_shepherd
  task: cb684600 ti: cb7ba000 task.ti: cb7ba000
  EIP: 0060:[<c1074df6>] EFLAGS: 00010046 CPU: 0
  EIP is at __queue_work+0x26/0x390
  EAX: 00000046 EBX: cbb37800 ECX: cbb37800 EDX: 00000000
  ESI: 00000000 EDI: 00000000 EBP: cb7bbe68 ESP: cb7bbe38
   DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
  CR0: 8005003b CR2: 00000100 CR3: 01fd5000 CR4: 000006b0
  Stack:
  Call Trace:
    __queue_delayed_work+0xa1/0x160
    queue_delayed_work_on+0x36/0x60
    vmstat_shepherd+0xad/0xf0
    process_one_work+0x1aa/0x4c0
    worker_thread+0x41/0x440
    kthread+0xb0/0xd0
    ret_from_kernel_thread+0x21/0x40

The reason is that start_shepherd_timer schedules the shepherd work item
which uses vmstat_wq (vmstat_shepherd) before setup_vmstat allocates
that workqueue so if the further initialization takes more than HZ we
might end up scheduling on a NULL vmstat_wq.  This is really unlikely
but not impossible.

Fixes: 373ccbe592 ("mm, vmstat: allow WQ concurrency to discover memory reclaim doesn't make any progress")
Reported-by: kernel test robot <ying.huang@linux.intel.com>
Signed-off-by: Michal Hocko <mhocko@suse.com>
Tested-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: stable@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-01-08 23:47:54 -08:00
Linus Torvalds
44d8a7d5c1 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
 "This is the final small set of ARM SoC bug fixes for linux-4.4, almost
  all regressions:

  OMAP:
   - data corruption on the Nokia N900 flash

  Allwinner:
   - Two defconfig change to get USB working again

  ARM Versatile:
   - Interrupt numbers gone bad after an older bug fix

  Nomadik:
   - Crashes from incorrect L2 cache settings

  VIA vt8500:
   - SD/MMC support on WM8650 never worked"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  dts: vt8500: Add SDHC node to DTS file for WM8650
  ARM: Fix broken USB support in multi_v7_defconfig for sunxi devices
  ARM: versatile: fix MMC/SD interrupt assignment
  ARM: nomadik: set latencies to 8 cycles
  ARM: OMAP2+: Fix onenand rate detection to avoid filesystem corruption
  ARM: Fix broken USB support in sunxi_defconfig
2016-01-08 16:11:05 -08:00