shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 05:17:10 +09:00
Code Issues Packages Projects Releases Wiki Activity
651,694 Commits 55 Branches 2,486 Tags
89fbbd2ef0c606659b5e73e3dce777d1df1d2a76
Commit Graph

651694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mauro (mdrjr) Ribeiro
89fbbd2ef0 Merge tag 'v4.9.134' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.134 stable release
 2020-04-07 13:34:58 -03:00
Mauro (mdrjr) Ribeiro
5d0203a9a9 Merge tag 'v4.9.133' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.133 stable release
 2020-04-07 13:32:59 -03:00
Mauro (mdrjr) Ribeiro
bb28e4bf23 Merge tag 'v4.9.132' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.132 stable release
 2020-04-07 13:29:55 -03:00
Mauro (mdrjr) Ribeiro
e70755fb49 Merge tag 'v4.9.131' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.131 stable release
 2020-04-07 13:29:46 -03:00
Mauro (mdrjr) Ribeiro
5da875f73c Merge tag 'v4.9.130' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.130 stable release
 2020-04-07 13:26:22 -03:00
Mauro (mdrjr) Ribeiro
e75ef2c8ca Merge tag 'v4.9.129' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.129 stable release
 2020-04-07 13:26:16 -03:00
Mauro (mdrjr) Ribeiro
649073e44f Merge tag 'v4.9.128' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.128 stable release
 2020-04-07 13:26:06 -03:00
Mauro (mdrjr) Ribeiro
a4e561af29 Merge tag 'v4.9.127' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.127 stable release
 2020-04-07 13:21:25 -03:00
Mauro (mdrjr) Ribeiro
22a70830a5 Merge tag 'v4.9.126' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.126 stable release
 2020-04-07 13:20:23 -03:00
Mauro (mdrjr) Ribeiro
bcd0914f11 Merge tag 'v4.9.125' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.125 stable release
 2020-04-07 13:20:06 -03:00
Mauro (mdrjr) Ribeiro
7e341d6e4a Merge tag 'v4.9.124' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.124 stable release
 2020-04-07 11:15:39 -03:00
Mauro (mdrjr) Ribeiro
5318e566cc Merge tag 'v4.9.123' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.123 stable release
 2020-04-07 11:11:36 -03:00
Mauro (mdrjr) Ribeiro
fb5579cc49 Merge tag 'v4.9.122' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.122 stable release
 2020-04-07 11:11:29 -03:00
Mauro (mdrjr) Ribeiro
2d5a6919e5 Merge tag 'v4.9.121' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.121 stable release
 2020-04-07 11:11:19 -03:00
Mauro (mdrjr) Ribeiro
77b94557ac Merge tag 'v4.9.120' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.120 stable release
 2020-04-07 11:11:08 -03:00
Mauro (mdrjr) Ribeiro
a6ce694357 Merge tag 'v4.9.119' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.119 stable release
 2020-04-07 10:35:54 -03:00
Mauro (mdrjr) Ribeiro
9af539029b Merge tag 'v4.9.118' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.118 stable release
 2020-04-07 10:31:24 -03:00
Mauro (mdrjr) Ribeiro
8cc5b2adad Merge tag 'v4.9.117' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.117 stable release
 2020-04-06 22:43:27 -03:00
Mauro (mdrjr) Ribeiro
1a14244ee0 Merge tag 'v4.9.116' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.116 stable release
 2020-04-06 22:37:50 -03:00
Mauro (mdrjr) Ribeiro
e5a0a1f8cd Merge tag 'v4.9.115' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.115 stable release
 2020-04-06 22:31:40 -03:00
Mauro (mdrjr) Ribeiro
b43260cc08 ODROID-G12: config: update to 114 kernel 2020-04-06 22:31:22 -03:00
Mauro (mdrjr) Ribeiro
3835849be0 Merge tag 'v4.9.114' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y 
This is the 4.9.114 stable release
 2020-04-06 20:04:56 -03:00
Deokgyu Yang
3650222e43 ODROID-C4: arm64/dts: Add sx865x node into i2c2 for HK 3.5 touchscreen 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: Iff2fe9294dc8614e9fef5877c2b989f0ad367a33
 2020-04-03 12:08:19 +09:00
Deokgyu Yang
e759ffd3b0 ODROID-COMMON: arm64/configs: Add CONFIG_FB_TFT_HKTFT32 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I001caa234417398ef93f703e0890ee88e501e454
 2020-04-03 11:14:34 +09:00
Deokgyu Yang
3d6003d21f ODROID-C4: arm64/dts: Add hktft32 node to support HK 3.2 inch touchscreen shield 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: Ide22f905ac50efcfaa6756dc8bb922ff84bfa62e
 2020-04-03 11:14:34 +09:00
Deokgyu Yang
677244d300 ODROID-COMMON: staging/fbtft: Add fb_hktft32 module for Hardkernel 3.2 inch TFT LCD 
This is for Odroid-N2/C4. Slightly different from the one for Odroid-XU4.

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I615bd5494191c69c75fe6c98d399ebad27fac80b
 2020-04-03 11:14:34 +09:00
Deokgyu Yang
8d4a280349 ODROID-COMMON: arm64/configs: Add CONFIG_FB_TFT_HKTFT35 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I8ddd062218a4ec297f68ab1947da9918ed567917
 2020-04-03 11:14:29 +09:00
Deokgyu Yang
76060b19da ODROID-C4: arm64/dts: Add hktft35 node to support HK 3.5 inch touchscreen shield 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I82200d59e4a1a6b90e3fa04f176154d250202f5f
 2020-04-02 10:20:42 +09:00
Deokgyu Yang
f0b1b6af08 ODROID-COMMON: staging/fbtft: Add fb_hktft35 module for Hardkernel 3.5 inch TFT LCD 
This is for Odroid-N2/C4. Slightly different from the one for Odroid-XU4.

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I7456b91615e8e9dc377e88ebb1e524620ca18f26
 2020-04-02 10:20:20 +09:00
Deokgyu Yang
8d363a57d0 ODROID-C4: arm64/dts: Add i2c2 and pcf8563 nodes to support HK RTC shield 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: Iac7b4f67e369ad5ac97f5a09095dd891de6c132a
 2020-04-01 13:31:57 +09:00
Deokgyu Yang
b689aceb6e ODROID-COMMON: defconfig: Disable USB_UAS by default 
Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I6c31f0daeff90f7d21435a0f77f65b2a2409bb55
 2020-04-01 13:31:40 +09:00
ckkim
e5b2027801 ODROID-C4: arm64/dts: fix SPI cs_1 pin after H/W (rev.0.4) 
Signed-off-by: ckkim <changkon12@gmail.com>
Change-Id: Ibeccdde5bb96779946110ebdf7dad49439e719c8
 2020-03-31 12:48:41 +09:00
cdu13a
2e65f010b5 ODROID-COMMON: media/hdmitx: add "now" to attr to trigger set_disp_mode_auto() 
Useful for testing. Adding "now" to attr is a one shot way to force
changes to current hdmi settings to take effect imediatly instead of
waiting for a mode change.

Change-Id: I2eb7388d615dc420a2a0899a567f1da761ebee9a
4.9.113-8 		2020-03-27 17:59:01 +09:00
Dongjin Kim
a1b5589413 ODROID-COMMON: cpufreq: Add 'max_freq_a55=' for ODROID-C4 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Ibdb7045d980a44358113881d5579ce20945e89da
 2020-03-27 11:50:05 +09:00
Dongjin Kim
9c4b862152 ODROID-C4: arm64/dts: remove 2.1GHz support due to unstability 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Ie307bccc6d59ee56f504ffea2978f4fcd23346e6
 2020-03-26 11:07:04 +09:00
Laura Abbott
0c6c2d82f6 staging: android: ion: Call dma_map_sg for syncing and mapping [2/2] 
PD#SWPL-9254

Problem:
uncached display unexpectly.

Solution:
Technically, calling dma_buf_map_attachment should return a buffer
properly dma_mapped. Add calls to dma_map_sg to begin_cpu_access to
ensure this happens. As a side effect, this lets Ion buffers take
advantage of the dma_buf sync ioctls.

Verify:
galilei, franklin

Change-Id: Ib6ca06e59e81031d3c65c2df8824b46baaba6c9f
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
 2020-03-25 11:45:47 +09:00
Laura Abbott
ff3382a5df ODROID-COMMON: staging: android: ion: Duplicate sg_table [1/2] 
PD#SWPL-9254

Problem:
Ion currently returns a single sg_table on each dma_map call. This is
incorrect for later usage.

Solution:
dup sg table on each dma_map call

Verify:
galilei, franklin

Change-Id: I6df2baa33bba9303b2ac25210ebaf56a337d56a2
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
 2020-03-25 11:40:39 +09:00
Joy Cho
6f7138e3ac ODROID-COMMON: osd: Adjust osd scaler and vout serve to fit in KODI 
Change-Id: Iab2b015061ba29fd407282be21509d01165b3d50
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2020-03-25 11:21:59 +09:00
Dongjin Kim
a5da5e7df7 ODROID-COMMON: config: set CONFIG_ZRAM as a module 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I3eb0f09daa4a8c89901e19d06b41b91db4802ea2
 2020-03-25 11:15:58 +09:00
Joy Cho
e720010ff5 ODROID-COMMON: hdmitx: Update hdmi hpll generation logic of custombuilt mode 
Change-Id: If4ab95d0c95ac49f4ce78801e1c2346e6301635e
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2020-03-23 13:41:22 +09:00
Dongjin Kim
b8b282f2c6 ODROID-COMMON: config: remove 'CONFIG_AMLOGIC_<LCD|BACKLIGHT>' 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I981d47c10bf68f77f91a476d6cbe09621f863602
 2020-03-23 13:30:02 +09:00
Dongjin Kim
410d644457 ODROID-COMMON: media: code guard if CONFIG_AMLOGIC_LCD is not defined 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Id69e1b60e0e85111f5d91ee51969401913e4e2da
 2020-03-23 13:28:43 +09:00
Dongjin Kim
0211c5ead9 Merge "ODROID-COMMON: hdmitx: Add a new hdmi resolution, 480x272p60hz" into odroidc4-4.9.y 2020-03-23 13:26:52 +09:00
Dongjin Kim
ccfed8f8a9 Merge "ODROID-COMMON: hdmitx: custombuilt: consider hdmi pll output under 1GHz" into odroidc4-4.9.y 2020-03-23 13:26:44 +09:00
Dongjin Kim
7b2c9b5f7d Merge "ODROID-COMMON: hdmitx: add hdmi phy custombuilt mode" into odroidc4-4.9.y 2020-03-23 13:26:37 +09:00
Joy Cho
0218e5eae2 ODROID-COMMON: hdmitx: Add a new hdmi resolution, 480x272p60hz 
Change-Id: I7fa18b6168ffebcca4acaeff9dfd2492e7aab4d7
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2020-03-23 13:17:24 +09:00
Joy Cho
c43e8000a5 ODROID-COMMON: hdmitx: custombuilt: consider hdmi pll output under 1GHz 
Change-Id: I3730ad2d4c9e914c28f8d2e57da93561a72abe47
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2020-03-23 08:54:43 +09:00
Joy Cho
f82e27936c ODROID-COMMON: hdmitx: add hdmi phy custombuilt mode 
Change-Id: I2ee9c9eccda7d54e6a801ed6b90039deb3c3fc75
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2020-03-23 08:27:28 +09:00
Joy Cho
29ae17bcf5 ODROID-C4: Support true 4k framebuffer 
Change-Id: Ib72481158a1c19d0513c484eb2d94864b6bd362c
 2020-03-22 15:58:34 +09:00
Portisch
305fdc9a2f ODROID-COMMON: net/phy: do not check for suspend on resume Only check if the device was sent to suspend before. 
Change-Id: I75c54486a00056ee81de7d695873e1089a799531
Signed-off-by: Portisch <hugo.portisch@yahoo.de>
 2020-03-20 16:05:42 +09:00