platform/kernel/linux-amlogic.git
6 years agoprintk: fix user fault debug log in disorder issue
jiamin ma [Mon, 8 Oct 2018 03:16:00 +0000 (11:16 +0800)]
printk: fix user fault debug log in disorder issue

PD#154008: the log output is in disorder[2/2]

We should explicitly using pr_cont when try to print continuous
msgs in one line

Change-Id: I0d2f6f462c4b4b95898f9c33a5a1d138030e05e5
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years agoclk: G12A/G12B: fix gpu clk enable count error [1/1]
Shunzhou Jiang [Wed, 16 May 2018 06:24:34 +0000 (14:24 +0800)]
clk: G12A/G12B: fix gpu clk enable count error [1/1]

PD#173995: fix gpu clk enable count error

Change-Id: I31f7908507ea2cdb76284977cb17fbe3fc68ce5c
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
6 years agoosd: fix osd coverity error
Jian Cao [Sat, 29 Sep 2018 01:46:57 +0000 (09:46 +0800)]
osd: fix osd coverity error

PD#174272: osd: fix osd coverity error

Change-Id: I7eb1c40b9453f85c618b9bd3f2112eb854ff9ef7
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
6 years agoclock: fix coverity warning
Jian Hu [Sun, 30 Sep 2018 07:53:28 +0000 (15:53 +0800)]
clock: fix coverity warning

PD#174376: clock: fix coverity warning

Fix suspicious implicit sign extension,
val << (shift), the val is defined as u16, after
shift to left,the val maybe overflow, a u32 variable
should instead of "val << (shift)".

Change-Id: I5b481c2b5d249426c20973fb261fb5ba905528f7
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agodi: support compress type progressive input
Jihong Sui [Mon, 17 Sep 2018 07:47:41 +0000 (15:47 +0800)]
di: support compress type progressive input

PD#162632: di: support compress input

1. for gxl, txlx, g12a;
2. change di post configuration;

Change-Id: Iff03f0e5bca379d593fade2ba6043538de9c81c7
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
6 years agoaudio: auge: check resample is inited
Xing Wang [Sun, 30 Sep 2018 05:14:42 +0000 (13:14 +0800)]
audio: auge: check resample is inited

PD#163795: audio: auge: check resample is inited

Change-Id: Ib6f06f1e6f9d95a03a8ae5f968fd67af8c17f197
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agoclock-measure: tl1: add clock measurement support
Jian Hu [Tue, 25 Sep 2018 09:05:07 +0000 (17:05 +0800)]
clock-measure: tl1: add clock measurement support

PD#172587: clock-measure: tl1: add clock measurement support

Change-Id: I14ab8859b205154bb89139e215fef5898efac681
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agowatchdog: meson: add watchdog support for tl1
Bo Yang [Mon, 24 Sep 2018 03:11:39 +0000 (11:11 +0800)]
watchdog: meson: add watchdog support for tl1

PD#172587: watchdog: meson: add watchdog support for tl1

TL1's watchdog is same with G12A.

Change-Id: Iaa8c502e6a8889a33ed2875e7a16cca07873738a
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoi2c: meson: add support for tl1
Jian Hu [Thu, 20 Sep 2018 03:25:26 +0000 (11:25 +0800)]
i2c: meson: add support for tl1

PD#172578: i2c: add support for tl1

Change-Id: I8c761aabfc0c701e2e31eb23e437c9f0e30cf3fd
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agoclock: tl1: initial add tl1 clock driver
Jian Hu [Tue, 11 Sep 2018 04:22:40 +0000 (12:22 +0800)]
clock: tl1: initial add tl1 clock driver

PD#172587: clock: tl1: initial add tl1 clock driver

Initial add tl1 clock driver refered to txlx clock driver.

Change-Id: I2f25c465ae7f3f4e65e842a9d0c35f0e0e75662f
Signed-off-by: Jian Hu <jian.hu@amlogic.com>
6 years agopwm: meson: add support for tl1
bichao.zheng [Wed, 19 Sep 2018 08:39:47 +0000 (16:39 +0800)]
pwm: meson: add support for tl1

PD#172587: pwm: meson: add support for tl1

Add support for tl1.

Change-Id: I5db1be16765a8e2f2a07815e6d7d139eec4dcf16
Signed-off-by: bichao.zheng <bichao.zheng@amlogic.com>
6 years agoirqchip: meson: add gpio IRQ support for tl1
Xingyu Chen [Sat, 15 Sep 2018 04:22:34 +0000 (12:22 +0800)]
irqchip: meson: add gpio IRQ support for tl1

PD#172587: irqchip: add gpio IRQ support for tl1

Change-Id: I35480088e85c0bb26d04158ced42c3d85153f806
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agopinctrl: meson: add pinctrl & gpio driver for tl1
Xingyu Chen [Mon, 10 Sep 2018 02:08:09 +0000 (10:08 +0800)]
pinctrl: meson: add pinctrl & gpio driver for tl1

PD#172587: pinctrl: add pinctrl & gpio driver for tl1

Change-Id: Ibd04477b8e6d586f4263cda9760b06c3e8e6ac72
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agochipid: meson: add chip id definition for tl1
Xingyu Chen [Tue, 25 Sep 2018 09:27:24 +0000 (17:27 +0800)]
chipid: meson: add chip id definition for tl1

PD#172587: chipid: add chip id definition for tl1

Change-Id: Icd45ea3b960de2d9094878f96a6da584cc5c6d55
Signed-off-by: Xingyu Chen <xingyu.chen@amlogic.com>
6 years agodv: turn off overscan when dv on
Yi Zhou [Fri, 21 Sep 2018 11:40:51 +0000 (19:40 +0800)]
dv: turn off overscan when dv on

PD#173674: dv: turn off overscan when dv on

Change-Id: Ib0b56402038812df1b5e540271608862a59f085e
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
6 years agoaudio: auge: fix spdif in & out work at the same time for ASRC
Xing Wang [Tue, 3 Apr 2018 06:03:41 +0000 (14:03 +0800)]
audio: auge: fix spdif in & out work at the same time for ASRC

PD#163795: audio: auge: fix spdif in & out work at the same time for ASRC

1. fix spdifin toddr as right_j for asrc, not support asrc 32bit now
2. fix clk dir for set_sysclk
3. auto enable/disable asrc when switch raw data and pcm data source
4. fix lr channel swap when replug in
5. detect spdifin sample mode by max_width
6. force to clear spdif in sample rate irq bit for axg
7. enable spdif in for s420 boards

Change-Id: I83dc211815068b9d073fb20433c76ce9f129b40e
Signed-off-by: Xing Wang <xing.wang@amlogic.com>
6 years agoarm: dts: tl1: add gpu dtsi for 32bit
Jiyu Yang [Tue, 18 Sep 2018 11:50:44 +0000 (19:50 +0800)]
arm: dts: tl1: add gpu dtsi for 32bit

PD#172587: arm: dts: tl1: add gpu dtsi for 32bit

Change-Id: I19699e911871b1daf374aa6e949f1b41a255e0f7
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
6 years agoarm: dts: tl1: add initial device tree for tl1
Bo Yang [Thu, 27 Sep 2018 09:14:42 +0000 (17:14 +0800)]
arm: dts: tl1: add initial device tree for tl1

PD#172587: arm: dts: tl1: add initial device tree for tl1

Change-Id: I17734ee00d88a84ff19bf17f8edf519e3ed2f0e4
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agogdc: Sync the gdc dma buffer
keke.li [Wed, 26 Sep 2018 05:51:54 +0000 (13:51 +0800)]
gdc: Sync the gdc dma buffer

PD#173042: gdc: Sync the gdc dma buffer

Change-Id: Id4f70c2379ab82519e3b3eeb780f8db17b4deeaf
Signed-off-by: Keke Li <keke.li@amlogic.com>
6 years agoamvecm: change ve hist from limit to full range for tv chips
Bencheng Jing [Fri, 21 Sep 2018 11:19:36 +0000 (19:19 +0800)]
amvecm: change ve hist from limit to full range for tv chips

PD#173611: change ve hist from limit to full range for tv chips.

Change-Id: Ibe7050023a0e4fb740283c7aa2d3b82e37be0ab3
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agoge2d: fix ge2d coverity error
pengcheng chen [Tue, 25 Sep 2018 09:40:40 +0000 (17:40 +0800)]
ge2d: fix ge2d coverity error

PD#174270: ge2d: fix ge2d coverity error

Change-Id: I870b17d9665e3af435f36aacd64a3c9ce59d5f1b
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoion_dev: fix detects in ion_dev
binqi.zhang [Tue, 25 Sep 2018 09:01:51 +0000 (17:01 +0800)]
ion_dev: fix detects in ion_dev

PD#166793: SWPL-198 Coverity for ion

Change-Id: I0f327888fc3fbb0247e489b8da9d1bc3dce03c23
Signed-off-by: binqi.zhang <binqi.zhang@amlogic.com>
6 years agoMerge "audio: correct the 958 clock setting after dd+ pass through" into amlogic...
Jianxin Pan [Thu, 27 Sep 2018 14:31:05 +0000 (07:31 -0700)]
Merge "audio: correct the 958 clock setting after dd+ pass through" into amlogic-4.9-dev

6 years agoaudio: correct the 958 clock setting after dd+ pass through
Xu Jian [Fri, 14 Sep 2018 06:07:18 +0000 (14:07 +0800)]
audio: correct the 958 clock setting after dd+ pass through

PD#166264: correct the 958 clock

Change-Id: I3961bc21e9d9c13973ecdbc0d944b5411750f377
Signed-off-by: Shen Liu <shen.liu@amlogic.com>
Signed-off-by: Shuai Li <shuai.li@amlogic.com>
6 years agoscript: amlogic: add script to build 32bit image for meson64
Bo Yang [Thu, 13 Sep 2018 11:10:37 +0000 (19:10 +0800)]
script: amlogic: add script to build 32bit image for meson64

PD#172587: script: add script to build 32bit image for meson64

    Use the new options:

      -c        specify defconfig with full name
      -f        specify rootfs
      -b        specify prefix or suffix of dts for the board
      -p        specify prefix of dts for the chip
      -d        make distclean
      -h        print help summary and examples

Change-Id: I44effd373f9c2928c7aa2ecb226baa6e4799da7e
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agodi: fix mc config issue
Dezhi Kong [Thu, 13 Sep 2018 10:58:59 +0000 (18:58 +0800)]
di: fix mc config issue

PD#173918: di: fix mc config issue

Change-Id: Iaa685cb579552fbc94889ca482b2ced72c899210
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agodts: limit g12b gpu freq to 800M
Jiyu Yang [Tue, 18 Sep 2018 11:17:44 +0000 (19:17 +0800)]
dts: limit g12b gpu freq to 800M

PD#173903: dts: limit g12b gpu freq to 800M
Change-Id: I82baa92fb81f14edbccffc6ad14fe0c3df1ab222
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
6 years agog12b: clk: improve pcie high/low vol and high/low temperature effect
Shunzhou Jiang [Mon, 10 Sep 2018 09:23:29 +0000 (17:23 +0800)]
g12b: clk: improve pcie high/low vol and high/low temperature effect

PD#173423: improve pcie

Change-Id: Ifb4713c6a49d0dd8ba9ec310a8d95b8e6eec17a8
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
6 years agoamvecm: enable rdma write registers [2/2]
Bencheng Jing [Fri, 21 Sep 2018 04:24:24 +0000 (12:24 +0800)]
amvecm: enable rdma write registers [2/2]

PD#173259: enable rdma write registers

Change-Id: I862bfac20e98e30b1188af5a5f8ad3a1f2662095
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agoDTS: axg_s420_128m change secmon reserve method to CMA.
yuegui.he [Fri, 21 Sep 2018 08:07:06 +0000 (16:07 +0800)]
DTS: axg_s420_128m change secmon reserve method to CMA.

PD#174134: axg s420 128m ddr trunk secmon malloc failure

Change-Id: Ie836d84537056cd28c1d5a4868b3cdc5fd710cac
Signed-off-by: yuegui.he <yuegui.he@amlogic.com>
6 years agoscripts/amlogic: adjust the name of the options
Bo Yang [Thu, 13 Sep 2018 09:04:05 +0000 (17:04 +0800)]
scripts/amlogic: adjust the name of the options

PD#172587: scripts/amlogic: adjust the name of the options

Use the new options:

  -c specify defconfig with full name
  -f specify rootfs
  -b specify prefix or suffix of dts for the board
  -p specify prefix of dts for the chip
  -d make distclean
  -h print help summary and examples

Change-Id: I709c468fd06a15d3a66cc2c9d316e7898aab4d99
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoscripts/amlogic: fix spelling mistake
Bo Yang [Thu, 13 Sep 2018 07:52:58 +0000 (15:52 +0800)]
scripts/amlogic: fix spelling mistake

PD#172587: scripts/amlogic: fix spelling mistake

Change-Id: I56fd60b2ee32e0b01eef796ae1a91839e8d1453d
Signed-off-by: Bo Yang <bo.yang@amlogic.com>
6 years agoamvecm: Modified hist and pq_load_table struct define [2/2]
Bencheng Jing [Wed, 19 Sep 2018 07:07:32 +0000 (15:07 +0800)]
amvecm: Modified hist and pq_load_table struct define [2/2]

PD#173911: to compatible 64 bit with 32 bit

Change-Id: Ie3da5b63a05a306a99a7844eea7c2918cc15d5a9
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agoosd: dts: fix osd cma alloc-ranges caused uboot logo show blurrry
pengcheng chen [Fri, 21 Sep 2018 03:22:31 +0000 (11:22 +0800)]
osd: dts: fix osd cma alloc-ranges caused uboot logo show blurrry

PD#173881: osd: dts: fix osd cma alloc-ranges caused uboot logo
           show blurrry

Change-Id: I60503a95f83d66605ecf4c24f882b4606cc37ed3
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoamvecm: fix cm2 adj interface error
Bencheng Jing [Tue, 18 Sep 2018 08:59:35 +0000 (16:59 +0800)]
amvecm: fix cm2 adj interface error

PD#173878: fix cm2_sat/cm2_luma/cm2_hue_by_hs interface error

Change-Id: Ia2a6bb19396cb1c74094330ba7428a7fc899bd56
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agoamvecm: optimize amvecm_set_saturation_hue_post
Bencheng Jing [Wed, 19 Sep 2018 02:34:20 +0000 (10:34 +0800)]
amvecm: optimize amvecm_set_saturation_hue_post

PD#173878: protect array index to avoid overstep the boundary

Change-Id: I86d0f75e35dbdaed45166e6e860bb90ce6bd062b
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
6 years agoviuin: do not clear viu sel venc status
xuhua zhang [Thu, 13 Sep 2018 11:50:00 +0000 (19:50 +0800)]
viuin: do not clear viu sel venc status

PD#171181: viuin: do not clear viu sel venc status

Change-Id: I1476a960a32fa0ba36b2d4d34b5fc6bcaadc7d28
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
6 years agovdin: fix vdin dobly addr alloc error.
xuhua zhang [Fri, 7 Sep 2018 07:24:32 +0000 (15:24 +0800)]
vdin: fix vdin dobly addr alloc error.

PD#155104: fix vdin dobly addr alloc error.

Change-Id: Iaabf5ed9513f37b438eeb2e00d43d1ecc6b1c5f8
Signed-off-by: xuhua zhang <xuhua.zhang@amlogic.com>
6 years agoemmc: add fix adj calculation.
Nan Li [Thu, 30 Aug 2018 11:16:30 +0000 (19:16 +0800)]
emmc: add fix adj calculation.

PD#173425: add emmc fix adj calculation.

Change-Id: Iab512f0971abe0d0452be4d0b58405c6eba103eb
Signed-off-by: Nan Li <nan.li@amlogic.com>
6 years agoamlvideo2: fix screen black when change hdmi resolution
Guosong Zhou [Thu, 13 Sep 2018 10:47:22 +0000 (18:47 +0800)]
amlvideo2: fix screen black when change hdmi resolution

PD#173275: amlvideo2: optimize amlvideo2 notifier callback

Change-Id: I9a961f6091e63fff1dfff318c06e0a068b791bac
Signed-off-by: Guosong Zhou <guosong.zhou@amlogic.com>
6 years agowifi: update broadcom dhd_static_buf.c
libo [Wed, 19 Sep 2018 09:11:58 +0000 (17:11 +0800)]
wifi: update broadcom dhd_static_buf.c

PD#171947: update broadcom dhd_static_buf.c

Change-Id: I8895e097744c375f5eaa3fdaaa6f1b1f2d2d8b73
Signed-off-by: libo <bo.li@amlogic.com>
6 years agoosd: disable mali afbc read when osd suspend
Brian Zhu [Wed, 19 Sep 2018 13:38:38 +0000 (21:38 +0800)]
osd: disable mali afbc read when osd suspend

PD#171613: osd: disable mali afbc read when osd suspend

Change-Id: I39c900da599b97d7183dfbf9f68261fec997f154
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agodefconfig: aarch32: fix defects in aarch32 defconfig
Jianxiong Pan [Wed, 19 Sep 2018 10:44:32 +0000 (18:44 +0800)]
defconfig: aarch32: fix defects in aarch32 defconfig

PD#173683: defconfig

Change-Id: I54f9b9fe56e961ed1f4e002514fb821f991aad22
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
6 years agodefconfig: aarch32: sync defconfig between aarch32 and aarch64
Jianxiong Pan [Wed, 19 Sep 2018 02:25:09 +0000 (10:25 +0800)]
defconfig: aarch32: sync defconfig between aarch32 and aarch64

PD#173683: defconfig

Change-Id: I70017bc8af82d52c61d5c872c077b900879e9550
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
6 years agohdmitx: fix KASAN Bug in hdmitx_edid_parse [1/1]
Kaifu Hu [Tue, 18 Sep 2018 06:04:41 +0000 (14:04 +0800)]
hdmitx: fix KASAN Bug in hdmitx_edid_parse [1/1]

PD#173547: hdmitx: fix KASAN Bug in hdmitx_edid_parse
BUG: KASAN: stack-out-of-bounds in hdmitx_edid_parse+0x22c/0x2c40
Read of size 1 at addr ffffffc047927a4f by task power@1.0-servi/2947

Change-Id: Ia1dda5aa80a9fc33a0e81eb9af51ea42a3731c66
Signed-off-by: Kaifu Hu <kaifu.hu@amlogic.com>
6 years agogdc: support Y_grey/YUV444p/RGB444P format image
keke.li [Fri, 14 Sep 2018 08:02:03 +0000 (16:02 +0800)]
gdc: support Y_grey/YUV444p/RGB444P format image

PD#173042: gdc: support Y_grey/YUV444p/RGB444P format image

Change-Id: I5b6928bfb4000d58d2bbd05bf8b1121b83ec2c0a
Signed-off-by: Keke Li <keke.li@amlogic.com>
6 years agohdmirx: add hdcp22-not-support handle[2/2]
yicheng shen [Fri, 7 Sep 2018 06:21:32 +0000 (14:21 +0800)]
hdmirx: add hdcp22-not-support handle[2/2]

PD#173334: hdmirx: add hdcp22-not-support handle

if systemcontrol cant access the aic tool,inform driver
that hdcp2.2 is not support via ioctl

Change-Id: I2d9541a497842e027e898f5fa3a23c51583c8181
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agosdio: After the TXLX IC is changed to use the fixed adj way to tuning
Long Yu [Wed, 5 Sep 2018 06:10:18 +0000 (14:10 +0800)]
sdio: After the TXLX IC is changed to use the fixed adj way to tuning

PD#171973: sdio: After the TXLX IC is changed to use the fixed adj way to tuning

Change-Id: I986812841d0ef86bb801f3fd4d37d6f2f38fce05
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agohdr: fix sdr2hdr effect expose
MingLiang Dong [Mon, 17 Sep 2018 11:17:45 +0000 (19:17 +0800)]
hdr: fix sdr2hdr effect expose

PD#172383: hdr: fix sdr2hdr effect expose

1. change sdr2hdr ootf lut
2. disable cgain when sdr2hdr

Change-Id: I308c0d8071b932164363603cc6af81c6343b4ec0
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agoatv_demod: added protection when standby wakes up [1/1]
nengwen.chen [Thu, 13 Sep 2018 06:05:55 +0000 (14:05 +0800)]
atv_demod: added protection when standby wakes up [1/1]

PD#173542: added protection when standby wakes up

1.added protection when standby wakes up.
2.separate the register access, afc and monitor into a separate module.
3.optimize the code.
4.remove unused code.

Change-Id: Ib81ebb5a175d8e7c8934151fb3dd3033a29ae0f7
Signed-off-by: nengwen.chen <nengwen.chen@amlogic.com>
6 years agovlock: add adj stable check
Dezhi Kong [Wed, 25 Jul 2018 04:25:34 +0000 (12:25 +0800)]
vlock: add adj stable check

PD#170985: vlock: add pll adj stable check

1.add pll adj stable check avoid pll m adj
2.add vlock version info
3.add enc adj stable check avoid enc line adj repeate
4.add enc_max_line_switch default config
5.update pll default regmap setting
6.add pll adj value check avoid blink caused by big pll step adj
7.optimize enc pixel adj method
8.add support dts config vlock key parameters
9.move vlock process to start of vsync isr
10.optimize pll for txl vbyone

Change-Id: Ie6e0aaacd23bfd7178db48e6f0d7bbec426b271f
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agoarm64: dts: g12a/g12b: update cpufreq max to 1.8G.
Hong Guo [Mon, 17 Sep 2018 11:21:08 +0000 (19:21 +0800)]
arm64: dts: g12a/g12b: update cpufreq max to 1.8G.

PD#165143: cpufreq: update cpufreq max to 1.8G.

Change-Id: I8a1cc45a7586ac4342fd459987fc7f4c89471be2
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agodts: specify ion_reserved to allocate memory from low memory
Jianxiong Pan [Tue, 18 Sep 2018 07:36:43 +0000 (15:36 +0800)]
dts: specify ion_reserved to allocate memory from low memory

PD#173802: dts: ion_reserved address mapping problem in 32bit kernel4.9

Change-Id: I3bb23c435ecf4da59985782f6f54564ed76e121a
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
6 years agodts: arch32: sync dtb between aarch64 and aarch32
Jianxin Pan [Fri, 14 Sep 2018 08:53:47 +0000 (16:53 +0800)]
dts: arch32: sync dtb between aarch64 and aarch32

PD#173683: remove unnecessary difference between aarch32 and aarch64

Change-Id: I9a1248e3d38dadf9cc6c4bb5e0a6f8c5dbd24a0a
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
6 years agomedia: fix some coverity error.
Peng Yixin [Sun, 9 Sep 2018 08:17:30 +0000 (16:17 +0800)]
media: fix some coverity error.

PD#170543: media: fix some coverity error.

fix some coverity error

Change-Id: I09924231704c2752d86e52290b97e1e178379feb
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
6 years agovdac: add shutdown function
Nian Jing [Fri, 7 Sep 2018 09:27:41 +0000 (17:27 +0800)]
vdac: add shutdown function

PD#173443: add shutdown function
disable cvbsout driver config

Change-Id: I2c9a5e908b0c66e79bb200bebf0bf4fc312e77ef
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agohdr: optimize hdrv2 hdr2sdr effect
MingLiang Dong [Tue, 14 Aug 2018 12:11:23 +0000 (20:11 +0800)]
hdr: optimize hdrv2 hdr2sdr effect

PD#171788: hdr: optimize hdrv2 hdr2sdr effect

1. oetf blend with oogain
2. set oagin with max(RGB)
3. fix sdr2hlg osd too dark

Change-Id: Ib40de7dfa5727cec62573c43dfa38a931b177aed
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
6 years agousb: USB 2.0 EHHSEL for USB-IF Compliance Test
he.he [Fri, 14 Sep 2018 03:25:18 +0000 (11:25 +0800)]
usb: USB 2.0 EHHSEL for USB-IF Compliance Test

PD#173077

EHHSEL: Embedded Host High Speed Electrical Test.
The purpose of this commit is to send EHHSEL command in message.c .

Change-Id: I800deed43efba99398dcf22802383817931d1735
Signed-off-by: he.he <he.he@amlogic.com>
6 years agokmemleak: shouldn't scan reserved memory
Hanjie Lin [Mon, 23 Jul 2018 07:13:43 +0000 (15:13 +0800)]
kmemleak: shouldn't scan reserved memory

PD#170481: kmemleak: shouldn't scan reserved memory

set reserved memory to no scan

Change-Id: I39fce2ca8d4dc6525f3fbc15622a4b5bcbc5344b
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
6 years agoemmc: solve code coverity problem
Ruixuan Li [Tue, 11 Sep 2018 11:12:19 +0000 (19:12 +0800)]
emmc: solve code coverity problem

PD#173510 solve code coverity problem

Change-Id: Id4e661162c7fb5f975ffc4c0358e175b1c912c4b
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
6 years agoCPUFREQ: Release cpu opp table when entry suspend.[1/2]
Hong Guo [Thu, 13 Sep 2018 05:33:06 +0000 (13:33 +0800)]
CPUFREQ: Release cpu opp table when entry suspend.[1/2]

PD#165143: Release cpu opp table when entry suspend.

Change-Id: Iee5100385a4bd5fd871b38226668c1a24bf6755e
Signed-off-by: Hong Guo <hong.guo@amlogic.com>
6 years agoaudio: Add supporting of DTS HD for HDMI input[2/2]
yujie.wu [Thu, 30 Aug 2018 09:17:40 +0000 (17:17 +0800)]
audio: Add supporting of DTS HD for HDMI input[2/2]

PD#172835

Add dynamic PAO mode for HDMI input

Change-Id: I91849eaef1b225fb8734ea128a092e1c2fece6b3
Signed-off-by: yujie.wu <yujie.wu@amlogic.com>
6 years agomtd: fix recoverity isuue
xianjun.liu [Wed, 12 Sep 2018 03:00:52 +0000 (11:00 +0800)]
mtd: fix recoverity isuue

PD#172180: fix coverity issue for mtd

Change-Id: I00725b398edbee55863868c53ed901fb80607bd1
Signed-off-by: xianjun.liu <xianjun.liu@amlogic.com>
6 years agoOSD: viu2 cvbs display half UI
pengcheng chen [Mon, 9 Jul 2018 05:48:27 +0000 (13:48 +0800)]
OSD: viu2 cvbs display half UI

PD#169796: OSD: viu2 cvbs display half UI

Change-Id: I9d8cf88f7913d75fcfe7bd9428bd88e033087b55
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoosd: add fb3 viu2 support for direct render
pengcheng chen [Wed, 11 Jul 2018 08:37:54 +0000 (16:37 +0800)]
osd: add fb3 viu2 support for direct render

PD#169796: osd: add fb3 viu2 support for direct render

Change-Id: Ic3492a5f0c26d5d517791c79c4579109f7258682
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agodebug: show more debug info when hardlockup happens
jiamin ma [Thu, 6 Sep 2018 07:32:28 +0000 (15:32 +0800)]
debug: show more debug info when hardlockup happens

PD#173193: need more debug info when hardlockup happens

Change-Id: Ia265a58ba776168ac4838cc7f4a6d7cfbeaf6557
Signed-off-by: jiamin ma <jiamin.ma@amlogic.com>
6 years ago32bit: add P321 support for aarch32
Jianxin Pan [Thu, 13 Sep 2018 14:30:40 +0000 (22:30 +0800)]
32bit: add P321 support for aarch32

PD#173683: add P321

Change-Id: I46228d22a244e7c43b75f2a6f784c13ac413b57f
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
6 years agodts: add the suspend which match ATF1.0
zhiqiang.liang [Wed, 12 Sep 2018 09:09:42 +0000 (17:09 +0800)]
dts: add the suspend  which match ATF1.0

PD#173525: can't enter the suspend state

Change-Id: I10a21687e7fb9fb7f71de339c0b03175ee9a90ad
Signed-off-by: zhiqiang.liang <zhiqiang.liang@amlogic.com>
6 years agousb: usb: optimize g12a & g12b usb phy pll setting [2/2]
Yue Wang [Thu, 13 Sep 2018 09:13:09 +0000 (17:13 +0800)]
usb: usb: optimize g12a & g12b usb phy pll setting [2/2]

PD#173329

Problem:
optimize g12a & g12b usb phy pll setting.

Solution:
optimize g12a & g12b usb phy pll setting.

Verify:
s905d2 u200

Change-Id: I53f437e35ac9cf204e00a5b624f7728937042e70
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agousb: optimize g12a & g12b usb phy reset timing.
Yue Wang [Wed, 12 Sep 2018 05:31:27 +0000 (13:31 +0800)]
usb: optimize g12a & g12b usb phy reset timing.

PD#173329: usb: optimize g12a & g12b usb phy reset timing.

Change-Id: Ib1ffe45d418a6ec023d19e888c54d60cac226473
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agotvafe: optimiz 400ms for paln identification
Nian Jing [Fri, 31 Aug 2018 11:44:49 +0000 (19:44 +0800)]
tvafe: optimiz 400ms for paln identification

PD#172974: optimization for paln identification

Change-Id: I8e1e130c79e5d77ce7038cced09eda86be4ca753
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agoosd: add osd blend shift workaround
pengcheng chen [Mon, 25 Jun 2018 09:24:10 +0000 (17:24 +0800)]
osd: add osd blend shift workaround

PD#163001: osd: add osd blend shift workaround(default disable)

Change-Id: Ic488f9414a35f5a8e2ba7ec789c2061fe526e804
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agousb: optimize g12a & g12b usb phy pll setting.
Yue Wang [Tue, 11 Sep 2018 06:19:42 +0000 (14:19 +0800)]
usb: optimize g12a & g12b usb phy pll setting.

PD#173475: usb: optimize g12a & g12b usb phy pll setting.

Change-Id: Iaf2058849d9a112fbcc0e99cab38a65cf6efbd9a
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agokasan: fix bug report in xhci driver
Yue Wang [Mon, 10 Sep 2018 07:04:25 +0000 (15:04 +0800)]
kasan: fix bug report in xhci driver

PD#172700

KASAN found a use-after-free in xhci_free_virt_device+0x220/0x270
where xhci_free_virt_device() sets slot id to 0 if udev exists:
if (dev->udev && dev->udev->slot_id)
dev->udev->slot_id = 0;

dev->udev will be true even if udev is freed because dev->udev is
not set to NULL.

set dev->udev pointer to NULL in xhci_free_dev()

The original patch went to stable so this fix needs to be applied
there as well.

Change-Id: I552b245ac7a047d8190a59bd18876cd650f289a1
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
6 years agoosd: fix osd buildroot compile error
pengcheng chen [Wed, 12 Sep 2018 01:48:18 +0000 (09:48 +0800)]
osd: fix osd buildroot compile error

PD#163001: osd: fix osd buildroot compile error

Change-Id: I93b9b9646316879f013f901f683c092a20d9ff71
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agovideo: toggle first frame for netflix video peek
shuanglong.wang [Wed, 22 Aug 2018 05:13:34 +0000 (13:13 +0800)]
video: toggle first frame for netflix video peek

PD#172137 :toggle first frame for netflix video peek

Change-Id: I28b29cba40f621c71fd67f0cf0c8e80c835483cf
Signed-off-by: shuanglong.wang <shuanglong.wang@amlogic.com>
6 years agocodec_mm: fix serial port prints "memory allocate failure" message.
Peng Yixin [Thu, 30 Aug 2018 02:03:30 +0000 (10:03 +0800)]
codec_mm: fix serial port prints "memory allocate failure" message.

PD#172077

Change-Id: Id89a4b3e26ae928a3be0f098592ce42cdaead49b
Signed-off-by: Peng Yixin <yixin.peng@amlogic.com>
6 years agogdc: modify the line offset of gdc
keke.li [Mon, 10 Sep 2018 08:43:31 +0000 (16:43 +0800)]
gdc: modify the line offset of gdc

PD#173042: gdc: modify the line offset param of gdc

Change-Id: I946f174282fe6583432c408065a56f685db424d2
Signed-off-by: Keke Li <keke.li@amlogic.com>
6 years agolcd: g12b: update hpll & gp0_pll wait lock sequence [2/2]
Evoke Zhang [Fri, 31 Aug 2018 02:33:46 +0000 (10:33 +0800)]
lcd: g12b: update hpll & gp0_pll wait lock sequence [2/2]

PD#172762: lcd: g12b: update hpll & gp0_pll wait lock sequence

Change-Id: If085975292682ed5570e2fc326c895d38e896449
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agolcd: mipi-dsi: optimize power on sequence for encl and dsi [2/2]
Evoke Zhang [Thu, 19 Jul 2018 08:41:49 +0000 (16:41 +0800)]
lcd: mipi-dsi: optimize power on sequence for encl and dsi [2/2]

PD#170290: lcd: mipi-dsi: optimize power on sequence for encl and dsi

Change-Id: If081780fe22d2a94548ff7afe8dfdb099d6b725a
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agolcd: add viu2 vsync interrupt & no viu vsync supoort
Evoke Zhang [Mon, 3 Sep 2018 05:16:34 +0000 (13:16 +0800)]
lcd: add viu2 vsync interrupt & no viu vsync supoort

PD#172761: lcd: add viu2 vsync interrupt & no viu vsync supoort

Change-Id: Idefc6208af4cfe650907e97fd823353405fce35d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoosd: screen zoom in/out support for mesonhwc
pengcheng chen [Thu, 3 May 2018 10:41:14 +0000 (18:41 +0800)]
osd: screen zoom in/out support for mesonhwc

PD#163001: osd: screen zoom in/out support for mesonhwc
1. support screen zoom in/out
2. support 1080i
3. support afbcd RGBA_1010102
4. fix fence error for mesonhwc caused by commit 76382d549bd3
   ("osd: adjust render kthreads priority [1/1]")
5. fix cursor distort on top of the screen

Change-Id: I99e2593fd5eb5263da689321a84fbabd2527cf03
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
6 years agoemmc: aign all data lines with latest data for HS200 busmode
Long Yu [Fri, 27 Jul 2018 11:34:19 +0000 (19:34 +0800)]
emmc: aign all data lines with latest data for HS200 busmode

PD#170721: align all data lines with latest data for HS200 busmode

Change-Id: I94b07e6ae2e16a5dfd0c0dfafd4c9d45fe0b6d11
Signed-off-by: Long Yu <long.yu@amlogic.com>
6 years agolcd: mipi-dsi: update phy timing calculation [2/2]
Evoke Zhang [Tue, 19 Jun 2018 01:38:46 +0000 (09:38 +0800)]
lcd: mipi-dsi: update phy timing calculation [2/2]

PD#169192: lcd: mipi-dsi: update phy timing calculation

Change-Id: I0ed035d3f1852da98abbea940e72b2fac396f858
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
6 years agoionvideo: support yuv422 frame from di
Rico Yang [Tue, 17 Apr 2018 08:51:47 +0000 (16:51 +0800)]
ionvideo: support yuv422 frame from di

PD#160993: ionvideo: support yuv422 frame from di

support yuv422 frame from di in ionvideo to enable deinterlacing on OSD

Change-Id: Ibc9a1e3021f06d0f9c3f21ac3e6359c0fd465b7c
Signed-off-by: Rico Yang <wei.yang@amlogic.com>
6 years agovdac: add Bandgap optimization
Nian Jing [Tue, 21 Aug 2018 09:19:33 +0000 (17:19 +0800)]
vdac: add Bandgap optimization

PD#171856: optimizationg bandgap for hdmi audio pll unlock

Change-Id: Iaa042ab0589ed85e812cdb18b6f4aa9fc7a0e85a
Signed-off-by: Nian Jing <nian.jing@amlogic.com>
6 years agoMH264: Support 4K MMU visition for G12A
Rong Zhang [Thu, 28 Jun 2018 02:24:59 +0000 (10:24 +0800)]
MH264: Support 4K MMU visition for G12A

PD#169065: Support 4K MMU visition

Change-Id: I8c93159aaf2079ec52be94f37226c3c50e3edbaa
Signed-off-by: Rong Zhang <rong.zhang@amlogic.com>
6 years agohdmirx: reset bandgap when aud pll error
yicheng shen [Thu, 23 Aug 2018 02:49:18 +0000 (10:49 +0800)]
hdmirx: reset bandgap when aud pll error

PD#171856: hdmirx: reset bandgap when aud pll error

Change-Id: I17970eeeea89726513dee61ea743769753a5e71a
Signed-off-by: yicheng shen <yicheng.shen@amlogic.com>
6 years agoamvecm: add cm enable/disable flag
Dezhi Kong [Tue, 7 Aug 2018 10:33:59 +0000 (18:33 +0800)]
amvecm: add cm enable/disable flag

PD#170727: amvecm: add cm enable/disable flag

Change-Id: Id56777a45c056216eb1c893fe7d8c7f4cabedfc0
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
6 years agodts: r311: reduce ion memory allocation [2/2]
Lei Qian [Mon, 10 Sep 2018 06:50:03 +0000 (14:50 +0800)]
dts: r311: reduce ion memory allocation [2/2]

PD#173394:dts: r311: reduce ion memory allocation

Change-Id: Ie8facd2079f9095e695f5c0047705741152bea37
Signed-off-by: Lei Qian <lei.qian@amlogic.com>
6 years agoMerge "hdmirx: fix kasan bug in rx_get_edid" into amlogic-4.9-dev
Tao Zeng [Mon, 10 Sep 2018 12:05:56 +0000 (05:05 -0700)]
Merge "hdmirx: fix kasan bug in rx_get_edid" into amlogic-4.9-dev

6 years agohdmirx: fix kasan bug in rx_get_edid
Hang Cheng [Thu, 6 Sep 2018 09:38:24 +0000 (17:38 +0800)]
hdmirx: fix kasan bug in rx_get_edid

PD#172927: hdmirx: fix KASAN bug in rx_get_edid

BUG: KASAN: global-out-of-bounds in rx_get_edid+0x74/0xa0
Read of size 8 at addr ffffff900bda5cb8 by task swapper/0/1

CPU: 3 PID: 1 Comm: swapper/0 Not tainted 4.9.113 #3
Hardware name: Amlogic (DT)
Call trace:
[<ffffff900908ecc0>] dump_backtrace+0x0/0x368
[<ffffff900908f0cc>] show_stack+0x24/0x30
[<ffffff900963bdb0>] dump_stack+0xa0/0xc8
[<ffffff90092ba21c>] print_address_description+0x144/0x258
[<ffffff90092ba694>] kasan_report+0x264/0x338
[<ffffff90092b8cd4>] __asan_load8+0x84/0x98
[<ffffff9009cdd394>] rx_get_edid+0x74/0xa0
[<ffffff9009cde2ec>] hdmi_rx_top_edid_update+0xb4/0x1d8
[<ffffff9009ccf524>] hdmirx_hw_probe+0x10c/0x168
[<ffffff9009cd3eb0>] hdmirx_probe+0x9d8/0x10f8
[<ffffff9009762b60>] platform_drv_probe+0x78/0xf8
[<ffffff900975f93c>] driver_probe_device+0x134/0x380
[<ffffff900975fc74>] __driver_attach+0xec/0xf0
[<ffffff900975c71c>] bus_for_each_dev+0xf4/0x160
[<ffffff900975eec8>] driver_attach+0x38/0x48
[<ffffff900975e748>] bus_add_driver+0x1b0/0x308
[<ffffff9009760d34>] driver_register+0xbc/0x1a0
[<ffffff9009762a4c>] __platform_driver_register+0x84/0x90
[<ffffff900ac1752c>] hdmirx_init+0xa0/0xfc
[<ffffff900908421c>] do_one_initcall+0xac/0x1f8
[<ffffff900abc10bc>] kernel_init_freeable+0x254/0x2f4
[<ffffff900a2929b0>] kernel_init+0x18/0x118
[<ffffff9009083e80>] ret_from_fork+0x10/0x50

The buggy address belongs to the variable:
 edid_list+0x38/0x60

Memory state around the buggy address:
 ffffff900bda5b80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 ffffff900bda5c00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffffff900bda5c80: 00 00 00 00 00 00 fa fa fa fa fa fa 04 fa fa fa
                                        ^
 ffffff900bda5d00: fa fa fa fa 01 fa fa fa fa fa fa fa 00 00 00 00
 ffffff900bda5d80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
==================================================================

Change-Id: Ie0bdc00195732b4bc6f317c33dcc34ace3dc4051
Signed-off-by: Hang Cheng <hang.cheng@amlogic.com>
6 years agoirblaster: code optimization for axg g12a and g12b
Yu Tu [Fri, 7 Sep 2018 09:55:08 +0000 (17:55 +0800)]
irblaster: code optimization for axg g12a and g12b

PD#172603: irblaster: code optimization

Add interrupt for irblaster. Because it adds a way to
interrupt starting with axg. Check out AO_IR_BLASTER_ADDR3
for details.

Change-Id: I24761207d43c1d783a4669b352f2f93e994df357
Signed-off-by: Yu Tu <yu.tu@amlogic.com>
6 years agoosd: fix using the fence_map which may be freed by KASAN scan
Brian Zhu [Fri, 31 Aug 2018 16:47:33 +0000 (00:47 +0800)]
osd: fix using the fence_map which may be freed by KASAN scan

PD#172928: osd: fix using the fence_map which may be freed by KASAN scan
    KASAN log:
        BUG: KASAN: use-after-free in sync_render_single_fence+0x25c/0x3b0
        Read of size 4 at addr ffffffc017f49864 by task HwBinder:3104_2/3182

Change-Id: Ia3e9987da9218eeba07e44178d62f55555707979
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agoosd: fix access disp_rect memory out-of-bounds by KASAN scan
Brian Zhu [Fri, 31 Aug 2018 18:10:02 +0000 (02:10 +0800)]
osd: fix access disp_rect memory out-of-bounds by KASAN scan

PD#172933: osd: fix access disp_rect memory out-of-bounds by KASAN scan
    KASAN log:
        BUG: KASAN: global-out-of-bounds in osd_notify_callback+0x1e8/0x5f0
        Read of size 4 at addr ffffff900c8e91a0 by task HwBinder:3063_2/3163

Change-Id: Icbea6a91da73919a09d37295660fb029e1de8488
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
6 years agodtc: enable generation of symbols
Jianxin Pan [Wed, 5 Sep 2018 14:37:24 +0000 (22:37 +0800)]
dtc: enable generation of symbols

PD#173147: update dtc to v1.4.4

add -@ to dtc option to enable generation of symbols

Change-Id: Ica497de494a3f228f4111773d9cba674b2a2e061
Signed-off-by: Jianxin Pan <jianxin.pan@amlogic.com>
6 years agoscripts/dtc: dtx_diff - 2nd update of include dts paths to match build
Frank Rowand [Tue, 19 Sep 2017 00:18:44 +0000 (17:18 -0700)]
scripts/dtc: dtx_diff - 2nd update of include dts paths to match build

PD#173147: update dtc to v1.4.4

Update dtx_diff include paths in the same manner as:
commit b12869a8d519 ("of: remove drivers/of/testcase-data from
include search path for CPP"), commit 5ffa2aed389c ("of: remove
arch/$(SRCARCH)/boot/dts from include search path for CPP"), and
commit 50f9ddaf64e1 ("of: search scripts/dtc/include-prefixes path
for both CPP and DTC").

Remove proposed include path kernel/dts/, which was never implemented
for the dtb build.

For the diff case, each source file is compiled separately.  For
each of those compiles, provide the location of the source file
as an include path, not the location of both source files.

Change-Id: I12b517369e7cde352d4021ceb46f21ec7b7291c0
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
6 years agoscripts/dtc: fix '%zx' warning
Russell King [Thu, 31 Aug 2017 23:15:36 +0000 (16:15 -0700)]
scripts/dtc: fix '%zx' warning

PD#173147: update dtc to v1.4.4

dtc uses an incorrect format specifier for printing a uint64_t value.
uint64_t may be either 'unsigned long' or 'unsigned long long' depending
on the host architecture.

Fix this by using %llx and casting to unsigned long long, which ensures
that we always have a wide enough variable to print 64 bits of hex.

    HOSTCC  scripts/dtc/checks.o
  scripts/dtc/checks.c: In function 'check_simple_bus_reg':
  scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]
    snprintf(unit_addr, sizeof(unit_addr), "%zx", reg);
    ^
  scripts/dtc/checks.c:876:2: warning: format '%zx' expects argument of type 'size_t', but argument 4 has type 'uint64_t' [-Wformat=]

Change-Id: I43a0277d4c136ab1fae9dbca23f96928e1087c20
Link: http://lkml.kernel.org/r/20170829222034.GJ20805@n2100.armlinux.org.uk
Fixes: 828d4cdd012c ("dtc: check.c fix compile error")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
6 years agoscripts/dtc: dtx_diff - update include dts paths to match build
Frank Rowand [Thu, 20 Jul 2017 01:35:31 +0000 (18:35 -0700)]
scripts/dtc: dtx_diff - update include dts paths to match build

PD#173147: update dtc to v1.4.4

Update the cpp include flags for compiling device tree dts files
to match the changes made to the kernel build process in
commit d5d332d3f7e8 ("devicetree: Move include prefixes from arch
to separate directory").

Change-Id: I173fb2ff01d854130f1942159b457a294f7e21ec
Cc: <stable@vger.kernel.org> # 4.12
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
6 years agoscripts/dtc: dtx_diff - Show real file names in diff header
Geert Uytterhoeven [Thu, 22 Jun 2017 13:07:06 +0000 (15:07 +0200)]
scripts/dtc: dtx_diff - Show real file names in diff header

PD#173147: update dtc to v1.4.4

As the comparison uses process substitution to pass files after
conversion to DTS format, the diff header doesn't show the real
filenames, but the names of the file descriptors used:

    --- /dev/fd/63  2017-06-22 11:21:47.531637188 +0200
    +++ /dev/fd/62  2017-06-22 11:21:47.531637188 +0200

This is especially annoying when comparing a bunch of DT files in a
loop, as the output doesn't show a clue about which files it refers to.

Fix this by explicitly passing the original file names to the diff
command using the --label option, giving e.g.:

    --- arch/arm/boot/dts/r8a7791-koelsch.dtb
    +++ arch/arm/boot/dts/r8a7791-porter.dtb

Change-Id: I6e070da490a8190682b7ec522e3f6746cdb651b2
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>