Commit d3f297b0c47d37be2cc826d275596fb67f714f9e
1 parent
9f30bfb78d
Exists in
smarc-ti-linux-3.12.y
Fix Frambuffer red and blue swap problem and some minor bug fixed
Showing 3 changed files with 19 additions and 11 deletions Side-by-side Diff
arch/arm/configs/smarc_t335x_defconfig
| ... | ... | @@ -1009,8 +1009,7 @@ |
| 1009 | 1009 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 1010 | 1010 | CONFIG_FW_LOADER=y |
| 1011 | 1011 | CONFIG_FIRMWARE_IN_KERNEL=y |
| 1012 | -CONFIG_EXTRA_FIRMWARE="am335x-pm-firmware.bin" | |
| 1013 | -CONFIG_EXTRA_FIRMWARE_DIR="firmware" | |
| 1012 | +CONFIG_EXTRA_FIRMWARE="" | |
| 1014 | 1013 | CONFIG_FW_LOADER_USER_HELPER=y |
| 1015 | 1014 | # CONFIG_DEBUG_DRIVER is not set |
| 1016 | 1015 | # CONFIG_DEBUG_DEVRES is not set |
| ... | ... | @@ -2705,7 +2704,7 @@ |
| 2705 | 2704 | # |
| 2706 | 2705 | CONFIG_HID=y |
| 2707 | 2706 | # CONFIG_HID_BATTERY_STRENGTH is not set |
| 2708 | -# CONFIG_HIDRAW is not set | |
| 2707 | +CONFIG_HIDRAW=y | |
| 2709 | 2708 | CONFIG_UHID=y |
| 2710 | 2709 | CONFIG_HID_GENERIC=y |
| 2711 | 2710 | |
| ... | ... | @@ -2743,7 +2742,7 @@ |
| 2743 | 2742 | # CONFIG_HID_MAGICMOUSE is not set |
| 2744 | 2743 | # CONFIG_HID_MICROSOFT is not set |
| 2745 | 2744 | # CONFIG_HID_MONTEREY is not set |
| 2746 | -# CONFIG_HID_MULTITOUCH is not set | |
| 2745 | +CONFIG_HID_MULTITOUCH=m | |
| 2747 | 2746 | # CONFIG_HID_NTRIG is not set |
| 2748 | 2747 | # CONFIG_HID_ORTEK is not set |
| 2749 | 2748 | # CONFIG_HID_PANTHERLORD is not set |
| ... | ... | @@ -2852,7 +2851,7 @@ |
| 2852 | 2851 | # also be needed; see USB_STORAGE Help for more info |
| 2853 | 2852 | # |
| 2854 | 2853 | CONFIG_USB_STORAGE=y |
| 2855 | -# CONFIG_USB_STORAGE_DEBUG is not set | |
| 2854 | +CONFIG_USB_STORAGE_DEBUG=y | |
| 2856 | 2855 | CONFIG_USB_STORAGE_REALTEK=y |
| 2857 | 2856 | CONFIG_REALTEK_AUTOPM=y |
| 2858 | 2857 | CONFIG_USB_STORAGE_DATAFAB=y |
drivers/hid/hid-core.c
| ... | ... | @@ -2368,6 +2368,15 @@ |
| 2368 | 2368 | hdev->product <= USB_DEVICE_ID_CODEMERCS_IOW_LAST) |
| 2369 | 2369 | return true; |
| 2370 | 2370 | break; |
| 2371 | + case USB_VENDOR_ID_DWAV: | |
| 2372 | + /* These are handled by usbtouchscreen. hdev->type is probably | |
| 2373 | + * HID_TYPE_USBNONE, but we say !HID_TYPE_USBMOUSE to match | |
| 2374 | + * usbtouchscreen. */ | |
| 2375 | + if ((hdev->product == USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER || | |
| 2376 | + hdev->product == USB_DEVICE_ID_DWAV_TOUCHCONTROLLER) && | |
| 2377 | + hdev->type != HID_TYPE_USBMOUSE) | |
| 2378 | + return true; | |
| 2379 | + break; | |
| 2371 | 2380 | case USB_VENDOR_ID_LOGITECH: |
| 2372 | 2381 | if (hdev->product >= USB_DEVICE_ID_LOGITECH_HARMONY_FIRST && |
| 2373 | 2382 | hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST) |
drivers/video/da8xx-fb.c
| ... | ... | @@ -1126,33 +1126,33 @@ |
| 1126 | 1126 | var->nonstd = FB_NONSTD_REV_PIX_IN_B; |
| 1127 | 1127 | break; |
| 1128 | 1128 | case 16: /* RGB 565 */ |
| 1129 | - var->red.offset = 11; | |
| 1129 | + var->blue.offset = 11; | |
| 1130 | 1130 | var->red.length = 5; |
| 1131 | 1131 | var->green.offset = 5; |
| 1132 | 1132 | var->green.length = 6; |
| 1133 | - var->blue.offset = 0; | |
| 1133 | + var->red.offset = 0; | |
| 1134 | 1134 | var->blue.length = 5; |
| 1135 | 1135 | var->transp.offset = 0; |
| 1136 | 1136 | var->transp.length = 0; |
| 1137 | 1137 | var->nonstd = 0; |
| 1138 | 1138 | break; |
| 1139 | 1139 | case 24: |
| 1140 | - var->red.offset = 16; | |
| 1140 | + var->blue.offset = 16; | |
| 1141 | 1141 | var->red.length = 8; |
| 1142 | 1142 | var->green.offset = 8; |
| 1143 | 1143 | var->green.length = 8; |
| 1144 | - var->blue.offset = 0; | |
| 1144 | + var->red.offset = 0; | |
| 1145 | 1145 | var->blue.length = 8; |
| 1146 | 1146 | var->nonstd = 0; |
| 1147 | 1147 | break; |
| 1148 | 1148 | case 32: |
| 1149 | 1149 | var->transp.offset = 24; |
| 1150 | 1150 | var->transp.length = 8; |
| 1151 | - var->red.offset = 16; | |
| 1151 | + var->blue.offset = 16; | |
| 1152 | 1152 | var->red.length = 8; |
| 1153 | 1153 | var->green.offset = 8; |
| 1154 | 1154 | var->green.length = 8; |
| 1155 | - var->blue.offset = 0; | |
| 1155 | + var->red.offset = 0; | |
| 1156 | 1156 | var->blue.length = 8; |
| 1157 | 1157 | var->nonstd = 0; |
| 1158 | 1158 | break; |