Skip to content

Commit 53469d1

Browse files
RobertCNelsonRobertCNelson
committed
Signed-off-by: Robert Nelson <[email protected]>
1 parent 7b49874 commit 53469d1

File tree

7 files changed

+43
-30
lines changed

7 files changed

+43
-30
lines changed

‎patch.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ imx_next () {
102102
${git} "${DIR}/patches/imx_next/0031-ARM-dts-added-several-new-imx-pinmux-groups.patch"
103103
${git} "${DIR}/patches/imx_next/0032-ARM-dts-add-Gateworks-Ventana-support.patch"
104104
${git} "${DIR}/patches/imx_next/0033-ARM-dts-mxs-add-auart2-pinmux-to-imx28.dtsi.patch"
105-
${git} "${DIR}/patches/imx_next/0034-of-add-vendor-prefix-for-Eukrea-Electromatique.patch"
105+
# ${git} "${DIR}/patches/imx_next/0034-of-add-vendor-prefix-for-Eukrea-Electromatique.patch"
106106
${git} "${DIR}/patches/imx_next/0035-ARM-dts-i.MX25-Add-ssi-clocks-and-DMA-events.patch"
107107
${git} "${DIR}/patches/imx_next/0036-ARM-dts-i.MX25-Add-sdma-script-path.patch"
108108
${git} "${DIR}/patches/imx_next/0037-ARM-dts-imx25.dtsi-Add-a-label-for-the-Audio-Multipl.patch"
@@ -126,7 +126,7 @@ imx_next () {
126126
${git} "${DIR}/patches/imx_next/0055-ARM-dts-imx-use-generic-node-name-for-fixed-regulato.patch"
127127
${git} "${DIR}/patches/imx_next/0056-ARM-dts-imx25-Add-pinctrl-functions-and-groups.patch"
128128
${git} "${DIR}/patches/imx_next/0057-ARM-dts-imx25.dtsi-label-the-iomuxc.patch"
129-
${git} "${DIR}/patches/imx_next/0058-DT-Add-Data-Modul-vendor-prefix.patch"
129+
# ${git} "${DIR}/patches/imx_next/0058-DT-Add-Data-Modul-vendor-prefix.patch"
130130
${git} "${DIR}/patches/imx_next/0059-ARM-dts-imx6-Add-support-for-imx6q-dmo-edmqmx6.patch"
131131
${git} "${DIR}/patches/imx_next/0060-ARM-mxs-add-support-for-I2SE-s-duckbill-series.patch"
132132
${git} "${DIR}/patches/imx_next/0061-ARM-dts-i.MX51-Update-CPU-node.patch"
@@ -258,26 +258,26 @@ omap_dt_dss_v3 () {
258258
echo "dir: omap_dt_dss_v3"
259259
#From: https://git.kernel.org/cgit/linux/kernel/git/tomba/linux.git/log/?h=work/dss-dt-review-3
260260

261-
${git} "${DIR}/patches/omap_dt_dss_v3/0001-OMAPDSS-fix-missing-EXPORT_SYMBOL-s.patch"
262-
${git} "${DIR}/patches/omap_dt_dss_v3/0002-OMAPDSS-fix-debug-prints.patch"
263-
${git} "${DIR}/patches/omap_dt_dss_v3/0003-OMAPDSS-apply-fixes.patch"
264-
${git} "${DIR}/patches/omap_dt_dss_v3/0004-OMAPDSS-DISPC-Add-MFLAG-defines.patch"
265-
${git} "${DIR}/patches/omap_dt_dss_v3/0005-OMAPDSS-rename-display-sysfs-name-entry.patch"
266-
${git} "${DIR}/patches/omap_dt_dss_v3/0006-OMAPDSS-DSI-fix-fifosize.patch"
267-
${git} "${DIR}/patches/omap_dt_dss_v3/0007-OMAPDSS-HDMI4-Accept-non-standard-timings.patch"
268-
${git} "${DIR}/patches/omap_dt_dss_v3/0008-OMAPDSS-HDMI4-remove-useless-func-calls.patch"
269-
${git} "${DIR}/patches/omap_dt_dss_v3/0009-OMAPDSS-DISPC-fix-context-restore.patch"
270-
${git} "${DIR}/patches/omap_dt_dss_v3/0010-OMAPDSS-HDMI-fix-hdmi_wait_for_bit_change.patch"
271-
${git} "${DIR}/patches/omap_dt_dss_v3/0011-OMAPDSS-HDMI-fix-HDMI_WP_CLK-name.patch"
272-
${git} "${DIR}/patches/omap_dt_dss_v3/0012-OMAPDSS-HDMI-add-missing-core-irq.patch"
273-
${git} "${DIR}/patches/omap_dt_dss_v3/0013-OMAPDSS-DSI-split-DSI-memory-map-to-smaller-blocks.patch"
274-
${git} "${DIR}/patches/omap_dt_dss_v3/0014-OMAPDSS-HDMI-rename-resource-names.patch"
275-
${git} "${DIR}/patches/omap_dt_dss_v3/0015-OMAPFB-give-informative-print-when-probe-succeeds.patch"
276-
${git} "${DIR}/patches/omap_dt_dss_v3/0016-OMAPDSS-don-t-print-errors-on-EPROBE_DEFER.patch"
277-
${git} "${DIR}/patches/omap_dt_dss_v3/0017-OMAPFB-disable-overlays-on-driver-removal.patch"
278-
${git} "${DIR}/patches/omap_dt_dss_v3/0018-OMAPDSS-DISPC-Preload-more-data-in-pipeline-DMAs-for.patch"
279-
${git} "${DIR}/patches/omap_dt_dss_v3/0019-OMAPDSS-panel-acx565akm-clean-up-locking.patch"
280-
${git} "${DIR}/patches/omap_dt_dss_v3/0020-OMAPDSS-DISPC-Fix-34xx-overlay-scaling-calculation.patch"
261+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0001-OMAPDSS-fix-missing-EXPORT_SYMBOL-s.patch"
262+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0002-OMAPDSS-fix-debug-prints.patch"
263+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0003-OMAPDSS-apply-fixes.patch"
264+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0004-OMAPDSS-DISPC-Add-MFLAG-defines.patch"
265+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0005-OMAPDSS-rename-display-sysfs-name-entry.patch"
266+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0006-OMAPDSS-DSI-fix-fifosize.patch"
267+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0007-OMAPDSS-HDMI4-Accept-non-standard-timings.patch"
268+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0008-OMAPDSS-HDMI4-remove-useless-func-calls.patch"
269+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0009-OMAPDSS-DISPC-fix-context-restore.patch"
270+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0010-OMAPDSS-HDMI-fix-hdmi_wait_for_bit_change.patch"
271+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0011-OMAPDSS-HDMI-fix-HDMI_WP_CLK-name.patch"
272+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0012-OMAPDSS-HDMI-add-missing-core-irq.patch"
273+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0013-OMAPDSS-DSI-split-DSI-memory-map-to-smaller-blocks.patch"
274+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0014-OMAPDSS-HDMI-rename-resource-names.patch"
275+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0015-OMAPFB-give-informative-print-when-probe-succeeds.patch"
276+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0016-OMAPDSS-don-t-print-errors-on-EPROBE_DEFER.patch"
277+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0017-OMAPFB-disable-overlays-on-driver-removal.patch"
278+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0018-OMAPDSS-DISPC-Preload-more-data-in-pipeline-DMAs-for.patch"
279+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0019-OMAPDSS-panel-acx565akm-clean-up-locking.patch"
280+
# ${git} "${DIR}/patches/omap_dt_dss_v3/0020-OMAPDSS-DISPC-Fix-34xx-overlay-scaling-calculation.patch"
281281
${git} "${DIR}/patches/omap_dt_dss_v3/0021-ARM-OMAP2-add-omapdss_init_of.patch"
282282
${git} "${DIR}/patches/omap_dt_dss_v3/0022-ARM-OMAP2-DT-compatible-tweak-for-displays.patch"
283283
${git} "${DIR}/patches/omap_dt_dss_v3/0023-OMAPDSS-add-label-support-for-DT.patch"

‎patches/defconfig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,6 @@ CONFIG_GENERIC_CPUFREQ_CPU0=y
615615
#
616616
# ARM CPU frequency scaling drivers
617617
#
618-
# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
619618
CONFIG_ARM_IMX6Q_CPUFREQ=y
620619
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
621620
# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
@@ -1419,7 +1418,6 @@ CONFIG_KEYBOARD_ATKBD=y
14191418
# CONFIG_KEYBOARD_SAMSUNG is not set
14201419
# CONFIG_KEYBOARD_STOWAWAY is not set
14211420
# CONFIG_KEYBOARD_SUNKBD is not set
1422-
# CONFIG_KEYBOARD_SH_KEYSC is not set
14231421
# CONFIG_KEYBOARD_OMAP4 is not set
14241422
# CONFIG_KEYBOARD_TWL4030 is not set
14251423
# CONFIG_KEYBOARD_XTKBD is not set
@@ -1884,19 +1882,22 @@ CONFIG_HWMON=y
18841882
# CONFIG_SENSORS_W83627EHF is not set
18851883
CONFIG_THERMAL=y
18861884
CONFIG_THERMAL_HWMON=y
1885+
CONFIG_THERMAL_OF=y
18871886
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
18881887
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
18891888
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
18901889
CONFIG_THERMAL_GOV_FAIR_SHARE=y
18911890
CONFIG_THERMAL_GOV_STEP_WISE=y
18921891
CONFIG_THERMAL_GOV_USER_SPACE=y
1893-
# CONFIG_CPU_THERMAL is not set
1892+
CONFIG_CPU_THERMAL=y
18941893
# CONFIG_THERMAL_EMULATION is not set
1894+
CONFIG_IMX_THERMAL=y
18951895

18961896
#
18971897
# Texas Instruments thermal drivers
18981898
#
18991899
CONFIG_TI_SOC_THERMAL=y
1900+
CONFIG_TI_THERMAL=y
19001901
CONFIG_OMAP4_THERMAL=y
19011902
CONFIG_OMAP5_THERMAL=y
19021903
CONFIG_WATCHDOG=y
@@ -2133,6 +2134,7 @@ CONFIG_FB_MODE_HELPERS=y
21332134
# CONFIG_FB_CYBER2000 is not set
21342135
# CONFIG_FB_ASILIANT is not set
21352136
# CONFIG_FB_IMSTT is not set
2137+
# CONFIG_FB_OPENCORES is not set
21362138
# CONFIG_FB_S1D13XXX is not set
21372139
# CONFIG_FB_NVIDIA is not set
21382140
# CONFIG_FB_RIVA is not set

‎patches/example_imx_v6_v7_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,6 @@ CONFIG_KEYBOARD_IMX=y
12741274
# CONFIG_KEYBOARD_SAMSUNG is not set
12751275
# CONFIG_KEYBOARD_STOWAWAY is not set
12761276
# CONFIG_KEYBOARD_SUNKBD is not set
1277-
# CONFIG_KEYBOARD_SH_KEYSC is not set
12781277
# CONFIG_KEYBOARD_STMPE is not set
12791278
# CONFIG_KEYBOARD_XTKBD is not set
12801279
CONFIG_INPUT_MOUSE=y
@@ -1349,6 +1348,7 @@ CONFIG_INPUT_MISC=y
13491348
CONFIG_INPUT_MMA8450=y
13501349
# CONFIG_INPUT_MPU3050 is not set
13511350
# CONFIG_INPUT_GP2A is not set
1351+
# CONFIG_INPUT_GPIO_BEEPER is not set
13521352
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
13531353
# CONFIG_INPUT_ATI_REMOTE2 is not set
13541354
# CONFIG_INPUT_KEYSPAN_REMOTE is not set
@@ -1952,6 +1952,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
19521952
#
19531953
# CONFIG_FB_IMX is not set
19541954
# CONFIG_FB_UVESA is not set
1955+
# CONFIG_FB_OPENCORES is not set
19551956
# CONFIG_FB_S1D13XXX is not set
19561957
# CONFIG_FB_TMIO is not set
19571958
# CONFIG_FB_SMSCUFX is not set

‎patches/example_omap2plus_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,6 @@ CONFIG_KEYBOARD_MATRIX=m
13521352
# CONFIG_KEYBOARD_SAMSUNG is not set
13531353
# CONFIG_KEYBOARD_STOWAWAY is not set
13541354
# CONFIG_KEYBOARD_SUNKBD is not set
1355-
# CONFIG_KEYBOARD_SH_KEYSC is not set
13561355
# CONFIG_KEYBOARD_OMAP4 is not set
13571356
CONFIG_KEYBOARD_TWL4030=y
13581357
# CONFIG_KEYBOARD_XTKBD is not set
@@ -1423,6 +1422,7 @@ CONFIG_INPUT_MISC=y
14231422
# CONFIG_INPUT_MMA8450 is not set
14241423
# CONFIG_INPUT_MPU3050 is not set
14251424
# CONFIG_INPUT_GP2A is not set
1425+
# CONFIG_INPUT_GPIO_BEEPER is not set
14261426
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
14271427
# CONFIG_INPUT_ATI_REMOTE2 is not set
14281428
# CONFIG_INPUT_KEYSPAN_REMOTE is not set
@@ -1838,6 +1838,7 @@ CONFIG_SENSORS_LM75=m
18381838
# CONFIG_SENSORS_W83627EHF is not set
18391839
CONFIG_THERMAL=y
18401840
CONFIG_THERMAL_HWMON=y
1841+
CONFIG_THERMAL_OF=y
18411842
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
18421843
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
18431844
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -2026,6 +2027,7 @@ CONFIG_FB_TILEBLITTING=y
20262027
# Frame buffer hardware drivers
20272028
#
20282029
# CONFIG_FB_UVESA is not set
2030+
# CONFIG_FB_OPENCORES is not set
20292031
# CONFIG_FB_S1D13XXX is not set
20302032
# CONFIG_FB_TMIO is not set
20312033
# CONFIG_FB_SMSCUFX is not set

‎patches/ref_multi_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,6 @@ CONFIG_KEYBOARD_ATKBD=y
12101210
# CONFIG_KEYBOARD_SAMSUNG is not set
12111211
# CONFIG_KEYBOARD_STOWAWAY is not set
12121212
# CONFIG_KEYBOARD_SUNKBD is not set
1213-
# CONFIG_KEYBOARD_SH_KEYSC is not set
12141213
# CONFIG_KEYBOARD_OMAP4 is not set
12151214
CONFIG_KEYBOARD_SPEAR=y
12161215
# CONFIG_KEYBOARD_TWL4030 is not set
@@ -1871,6 +1870,7 @@ CONFIG_FB_MODE_HELPERS=y
18711870
# Frame buffer hardware drivers
18721871
#
18731872
CONFIG_FB_ARMCLCD=y
1873+
# CONFIG_FB_OPENCORES is not set
18741874
# CONFIG_FB_S1D13XXX is not set
18751875
# CONFIG_FB_VT8500 is not set
18761876
CONFIG_FB_WM8505=y

‎tools/config-checker.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ config="CONFIG_PCI_IMX6"
143143
check_if_set_then_set
144144
config="CONFIG_REGULATOR_ANATOP"
145145
check_if_set_then_set
146+
config="CONFIG_CPU_THERMAL"
147+
check_if_set_then_set
148+
config="CONFIG_IMX_THERMAL"
149+
check_if_set_then_set
146150
config="CONFIG_ARM_IMX6Q_CPUFREQ"
147151
check_if_set_then_set
148152
config="CONFIG_RTC_DRV_SNVS"
@@ -297,6 +301,8 @@ config="CONFIG_CPU_FREQ_GOV_ONDEMAND"
297301
check_if_set_then_set
298302
config="CONFIG_CPU_FREQ_GOV_CONSERVATIVE"
299303
check_if_set_then_set
304+
config="CONFIG_CPU_THERMAL"
305+
check_if_set_then_set
300306
config="CONFIG_GENERIC_CPUFREQ_CPU0"
301307
check_if_set_then_set
302308
config="CONFIG_DRM"
@@ -357,6 +363,8 @@ config="CONFIG_THERMAL_GOV_USER_SPACE"
357363
check_if_set_then_set
358364
config="CONFIG_TI_SOC_THERMAL"
359365
check_if_set_then_set
366+
config="CONFIG_TI_THERMAL"
367+
check_if_set_then_set
360368
config="CONFIG_OMAP4_THERMAL"
361369
check_if_set_then_set
362370
config="CONFIG_OMAP5_THERMAL"

‎version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8"
2929
#Kernel/Build
3030
KERNEL_REL=3.13
3131
KERNEL_TAG=${KERNEL_REL}
32-
BUILD=armv7-devel-r21
32+
BUILD=armv7-devel-r22
3333

3434
#v3.X-rcX + upto SHA
35-
KERNEL_SHA="3aacd625f20129f5a41ea3ff3b5353b0e4dabd01"
35+
KERNEL_SHA="2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d"
3636

3737
#git branch
3838
#BRANCH="v3.13.x"

0 commit comments

Comments
 (0)