tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: intc: Handle domain association for sparseirq pre-allocated vectors.
sh: sh7269: Fix LCD pinmux
sh: dma: fix request_irq usage

Linus Torvalds 15a063f7 1dd8372d

+165 -95
+1 -1
arch/sh/drivers/dma/dma-sh.c
··· 335 335 336 336 for (n = 0; n < NR_DMAE; n++) { 337 337 int i = request_irq(get_dma_error_irq(n), dma_err, 338 - IRQF_SHARED, dmae_name[n], NULL); 338 + IRQF_SHARED, dmae_name[n], (void *)dmae_name[n]); 339 339 if (unlikely(i < 0)) { 340 340 printk(KERN_ERR "%s request_irq fail\n", dmae_name[n]); 341 341 return i;
+24 -12
arch/sh/include/cpu-sh2a/cpu/sh7269.h
··· 183 183 GPIO_FN_DV_DATA1, GPIO_FN_DV_DATA0, 184 184 GPIO_FN_LCD_CLK, GPIO_FN_LCD_EXTCLK, 185 185 GPIO_FN_LCD_VSYNC, GPIO_FN_LCD_HSYNC, GPIO_FN_LCD_DE, 186 - GPIO_FN_LCD_DATA23, GPIO_FN_LCD_DATA22, 187 - GPIO_FN_LCD_DATA21, GPIO_FN_LCD_DATA20, 188 - GPIO_FN_LCD_DATA19, GPIO_FN_LCD_DATA18, 189 - GPIO_FN_LCD_DATA17, GPIO_FN_LCD_DATA16, 190 - GPIO_FN_LCD_DATA15, GPIO_FN_LCD_DATA14, 191 - GPIO_FN_LCD_DATA13, GPIO_FN_LCD_DATA12, 192 - GPIO_FN_LCD_DATA11, GPIO_FN_LCD_DATA10, 193 - GPIO_FN_LCD_DATA9, GPIO_FN_LCD_DATA8, 194 - GPIO_FN_LCD_DATA7, GPIO_FN_LCD_DATA6, 195 - GPIO_FN_LCD_DATA5, GPIO_FN_LCD_DATA4, 196 - GPIO_FN_LCD_DATA3, GPIO_FN_LCD_DATA2, 197 - GPIO_FN_LCD_DATA1, GPIO_FN_LCD_DATA0, 186 + GPIO_FN_LCD_DATA23_PG23, GPIO_FN_LCD_DATA22_PG22, 187 + GPIO_FN_LCD_DATA21_PG21, GPIO_FN_LCD_DATA20_PG20, 188 + GPIO_FN_LCD_DATA19_PG19, GPIO_FN_LCD_DATA18_PG18, 189 + GPIO_FN_LCD_DATA17_PG17, GPIO_FN_LCD_DATA16_PG16, 190 + GPIO_FN_LCD_DATA15_PG15, GPIO_FN_LCD_DATA14_PG14, 191 + GPIO_FN_LCD_DATA13_PG13, GPIO_FN_LCD_DATA12_PG12, 192 + GPIO_FN_LCD_DATA11_PG11, GPIO_FN_LCD_DATA10_PG10, 193 + GPIO_FN_LCD_DATA9_PG9, GPIO_FN_LCD_DATA8_PG8, 194 + GPIO_FN_LCD_DATA7_PG7, GPIO_FN_LCD_DATA6_PG6, 195 + GPIO_FN_LCD_DATA5_PG5, GPIO_FN_LCD_DATA4_PG4, 196 + GPIO_FN_LCD_DATA3_PG3, GPIO_FN_LCD_DATA2_PG2, 197 + GPIO_FN_LCD_DATA1_PG1, GPIO_FN_LCD_DATA0_PG0, 198 + GPIO_FN_LCD_DATA23_PJ23, GPIO_FN_LCD_DATA22_PJ22, 199 + GPIO_FN_LCD_DATA21_PJ21, GPIO_FN_LCD_DATA20_PJ20, 200 + GPIO_FN_LCD_DATA19_PJ19, GPIO_FN_LCD_DATA18_PJ18, 201 + GPIO_FN_LCD_DATA17_PJ17, GPIO_FN_LCD_DATA16_PJ16, 202 + GPIO_FN_LCD_DATA15_PJ15, GPIO_FN_LCD_DATA14_PJ14, 203 + GPIO_FN_LCD_DATA13_PJ13, GPIO_FN_LCD_DATA12_PJ12, 204 + GPIO_FN_LCD_DATA11_PJ11, GPIO_FN_LCD_DATA10_PJ10, 205 + GPIO_FN_LCD_DATA9_PJ9, GPIO_FN_LCD_DATA8_PJ8, 206 + GPIO_FN_LCD_DATA7_PJ7, GPIO_FN_LCD_DATA6_PJ6, 207 + GPIO_FN_LCD_DATA5_PJ5, GPIO_FN_LCD_DATA4_PJ4, 208 + GPIO_FN_LCD_DATA3_PJ3, GPIO_FN_LCD_DATA2_PJ2, 209 + GPIO_FN_LCD_DATA1_PJ1, GPIO_FN_LCD_DATA0_PJ0, 198 210 GPIO_FN_LCD_M_DISP, 199 211 }; 200 212
+117 -78
arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c
··· 758 758 DV_DATA3_MARK, DV_DATA2_MARK, DV_DATA1_MARK, DV_DATA0_MARK, 759 759 LCD_CLK_MARK, LCD_EXTCLK_MARK, 760 760 LCD_VSYNC_MARK, LCD_HSYNC_MARK, LCD_DE_MARK, 761 - LCD_DATA23_MARK, LCD_DATA22_MARK, LCD_DATA21_MARK, LCD_DATA20_MARK, 762 - LCD_DATA19_MARK, LCD_DATA18_MARK, LCD_DATA17_MARK, LCD_DATA16_MARK, 763 - LCD_DATA15_MARK, LCD_DATA14_MARK, LCD_DATA13_MARK, LCD_DATA12_MARK, 764 - LCD_DATA11_MARK, LCD_DATA10_MARK, LCD_DATA9_MARK, LCD_DATA8_MARK, 765 - LCD_DATA7_MARK, LCD_DATA6_MARK, LCD_DATA5_MARK, LCD_DATA4_MARK, 766 - LCD_DATA3_MARK, LCD_DATA2_MARK, LCD_DATA1_MARK, LCD_DATA0_MARK, 761 + LCD_DATA23_PG23_MARK, LCD_DATA22_PG22_MARK, LCD_DATA21_PG21_MARK, 762 + LCD_DATA20_PG20_MARK, LCD_DATA19_PG19_MARK, LCD_DATA18_PG18_MARK, 763 + LCD_DATA17_PG17_MARK, LCD_DATA16_PG16_MARK, LCD_DATA15_PG15_MARK, 764 + LCD_DATA14_PG14_MARK, LCD_DATA13_PG13_MARK, LCD_DATA12_PG12_MARK, 765 + LCD_DATA11_PG11_MARK, LCD_DATA10_PG10_MARK, LCD_DATA9_PG9_MARK, 766 + LCD_DATA8_PG8_MARK, LCD_DATA7_PG7_MARK, LCD_DATA6_PG6_MARK, 767 + LCD_DATA5_PG5_MARK, LCD_DATA4_PG4_MARK, LCD_DATA3_PG3_MARK, 768 + LCD_DATA2_PG2_MARK, LCD_DATA1_PG1_MARK, LCD_DATA0_PG0_MARK, 769 + LCD_DATA23_PJ23_MARK, LCD_DATA22_PJ22_MARK, LCD_DATA21_PJ21_MARK, 770 + LCD_DATA20_PJ20_MARK, LCD_DATA19_PJ19_MARK, LCD_DATA18_PJ18_MARK, 771 + LCD_DATA17_PJ17_MARK, LCD_DATA16_PJ16_MARK, LCD_DATA15_PJ15_MARK, 772 + LCD_DATA14_PJ14_MARK, LCD_DATA13_PJ13_MARK, LCD_DATA12_PJ12_MARK, 773 + LCD_DATA11_PJ11_MARK, LCD_DATA10_PJ10_MARK, LCD_DATA9_PJ9_MARK, 774 + LCD_DATA8_PJ8_MARK, LCD_DATA7_PJ7_MARK, LCD_DATA6_PJ6_MARK, 775 + LCD_DATA5_PJ5_MARK, LCD_DATA4_PJ4_MARK, LCD_DATA3_PJ3_MARK, 776 + LCD_DATA2_PJ2_MARK, LCD_DATA1_PJ1_MARK, LCD_DATA0_PJ0_MARK, 767 777 LCD_TCON6_MARK, LCD_TCON5_MARK, LCD_TCON4_MARK, 768 778 LCD_TCON3_MARK, LCD_TCON2_MARK, LCD_TCON1_MARK, LCD_TCON0_MARK, 769 779 LCD_M_DISP_MARK, ··· 1046 1036 1047 1037 PINMUX_DATA(PF1_DATA, PF1MD_000), 1048 1038 PINMUX_DATA(BACK_MARK, PF1MD_001), 1039 + PINMUX_DATA(SSL10_MARK, PF1MD_011), 1049 1040 PINMUX_DATA(TIOC4B_MARK, PF1MD_100), 1050 1041 PINMUX_DATA(DACK0_MARK, PF1MD_101), 1051 1042 ··· 1060 1049 PINMUX_DATA(PG27_DATA, PG27MD_00), 1061 1050 PINMUX_DATA(LCD_TCON2_MARK, PG27MD_10), 1062 1051 PINMUX_DATA(LCD_EXTCLK_MARK, PG27MD_11), 1052 + PINMUX_DATA(LCD_DE_MARK, PG27MD_11), 1063 1053 1064 1054 PINMUX_DATA(PG26_DATA, PG26MD_00), 1065 1055 PINMUX_DATA(LCD_TCON1_MARK, PG26MD_10), 1056 + PINMUX_DATA(LCD_HSYNC_MARK, PG26MD_10), 1066 1057 1067 1058 PINMUX_DATA(PG25_DATA, PG25MD_00), 1068 1059 PINMUX_DATA(LCD_TCON0_MARK, PG25MD_10), 1060 + PINMUX_DATA(LCD_VSYNC_MARK, PG25MD_10), 1069 1061 1070 1062 PINMUX_DATA(PG24_DATA, PG24MD_00), 1071 1063 PINMUX_DATA(LCD_CLK_MARK, PG24MD_10), 1072 1064 1073 1065 PINMUX_DATA(PG23_DATA, PG23MD_000), 1074 - PINMUX_DATA(LCD_DATA23_MARK, PG23MD_010), 1066 + PINMUX_DATA(LCD_DATA23_PG23_MARK, PG23MD_010), 1075 1067 PINMUX_DATA(LCD_TCON6_MARK, PG23MD_011), 1076 1068 PINMUX_DATA(TXD5_MARK, PG23MD_100), 1077 1069 1078 1070 PINMUX_DATA(PG22_DATA, PG22MD_000), 1079 - PINMUX_DATA(LCD_DATA22_MARK, PG22MD_010), 1071 + PINMUX_DATA(LCD_DATA22_PG22_MARK, PG22MD_010), 1080 1072 PINMUX_DATA(LCD_TCON5_MARK, PG22MD_011), 1081 1073 PINMUX_DATA(RXD5_MARK, PG22MD_100), 1082 1074 1083 1075 PINMUX_DATA(PG21_DATA, PG21MD_000), 1084 1076 PINMUX_DATA(DV_DATA7_MARK, PG21MD_001), 1085 - PINMUX_DATA(LCD_DATA21_MARK, PG21MD_010), 1077 + PINMUX_DATA(LCD_DATA21_PG21_MARK, PG21MD_010), 1086 1078 PINMUX_DATA(LCD_TCON4_MARK, PG21MD_011), 1087 1079 PINMUX_DATA(TXD4_MARK, PG21MD_100), 1088 1080 1089 1081 PINMUX_DATA(PG20_DATA, PG20MD_000), 1090 1082 PINMUX_DATA(DV_DATA6_MARK, PG20MD_001), 1091 - PINMUX_DATA(LCD_DATA20_MARK, PG21MD_010), 1083 + PINMUX_DATA(LCD_DATA20_PG20_MARK, PG21MD_010), 1092 1084 PINMUX_DATA(LCD_TCON3_MARK, PG20MD_011), 1093 1085 PINMUX_DATA(RXD4_MARK, PG20MD_100), 1094 1086 1095 1087 PINMUX_DATA(PG19_DATA, PG19MD_000), 1096 1088 PINMUX_DATA(DV_DATA5_MARK, PG19MD_001), 1097 - PINMUX_DATA(LCD_DATA19_MARK, PG19MD_010), 1089 + PINMUX_DATA(LCD_DATA19_PG19_MARK, PG19MD_010), 1098 1090 PINMUX_DATA(SPDIF_OUT_MARK, PG19MD_011), 1099 1091 PINMUX_DATA(SCK5_MARK, PG19MD_100), 1100 1092 1101 1093 PINMUX_DATA(PG18_DATA, PG18MD_000), 1102 1094 PINMUX_DATA(DV_DATA4_MARK, PG18MD_001), 1103 - PINMUX_DATA(LCD_DATA18_MARK, PG18MD_010), 1095 + PINMUX_DATA(LCD_DATA18_PG18_MARK, PG18MD_010), 1104 1096 PINMUX_DATA(SPDIF_IN_MARK, PG18MD_011), 1105 1097 PINMUX_DATA(SCK4_MARK, PG18MD_100), 1106 1098 ··· 1111 1097 // we're going with 2 bits 1112 1098 PINMUX_DATA(PG17_DATA, PG17MD_00), 1113 1099 PINMUX_DATA(WE3ICIOWRAHDQMUU_MARK, PG17MD_01), 1114 - PINMUX_DATA(LCD_DATA17_MARK, PG17MD_10), 1100 + PINMUX_DATA(LCD_DATA17_PG17_MARK, PG17MD_10), 1115 1101 1116 1102 // TODO hardware manual has PG16 3 bits wide in reg picture and 2 bits in description 1117 1103 // we're going with 2 bits 1118 1104 PINMUX_DATA(PG16_DATA, PG16MD_00), 1119 1105 PINMUX_DATA(WE2ICIORDDQMUL_MARK, PG16MD_01), 1120 - PINMUX_DATA(LCD_DATA16_MARK, PG16MD_10), 1106 + PINMUX_DATA(LCD_DATA16_PG16_MARK, PG16MD_10), 1121 1107 1122 1108 PINMUX_DATA(PG15_DATA, PG15MD_00), 1123 1109 PINMUX_DATA(D31_MARK, PG15MD_01), 1124 - PINMUX_DATA(LCD_DATA15_MARK, PG15MD_10), 1110 + PINMUX_DATA(LCD_DATA15_PG15_MARK, PG15MD_10), 1125 1111 PINMUX_DATA(PINT7_PG_MARK, PG15MD_11), 1126 1112 1127 1113 PINMUX_DATA(PG14_DATA, PG14MD_00), 1128 1114 PINMUX_DATA(D30_MARK, PG14MD_01), 1129 - PINMUX_DATA(LCD_DATA14_MARK, PG14MD_10), 1115 + PINMUX_DATA(LCD_DATA14_PG14_MARK, PG14MD_10), 1130 1116 PINMUX_DATA(PINT6_PG_MARK, PG14MD_11), 1131 1117 1132 1118 PINMUX_DATA(PG13_DATA, PG13MD_00), 1133 1119 PINMUX_DATA(D29_MARK, PG13MD_01), 1134 - PINMUX_DATA(LCD_DATA13_MARK, PG13MD_10), 1120 + PINMUX_DATA(LCD_DATA13_PG13_MARK, PG13MD_10), 1135 1121 PINMUX_DATA(PINT5_PG_MARK, PG13MD_11), 1136 1122 1137 1123 PINMUX_DATA(PG12_DATA, PG12MD_00), 1138 1124 PINMUX_DATA(D28_MARK, PG12MD_01), 1139 - PINMUX_DATA(LCD_DATA12_MARK, PG12MD_10), 1125 + PINMUX_DATA(LCD_DATA12_PG12_MARK, PG12MD_10), 1140 1126 PINMUX_DATA(PINT4_PG_MARK, PG12MD_11), 1141 1127 1142 1128 PINMUX_DATA(PG11_DATA, PG11MD_000), 1143 1129 PINMUX_DATA(D27_MARK, PG11MD_001), 1144 - PINMUX_DATA(LCD_DATA11_MARK, PG11MD_010), 1130 + PINMUX_DATA(LCD_DATA11_PG11_MARK, PG11MD_010), 1145 1131 PINMUX_DATA(PINT3_PG_MARK, PG11MD_011), 1146 1132 PINMUX_DATA(TIOC3D_MARK, PG11MD_100), 1147 1133 1148 1134 PINMUX_DATA(PG10_DATA, PG10MD_000), 1149 1135 PINMUX_DATA(D26_MARK, PG10MD_001), 1150 - PINMUX_DATA(LCD_DATA10_MARK, PG10MD_010), 1136 + PINMUX_DATA(LCD_DATA10_PG10_MARK, PG10MD_010), 1151 1137 PINMUX_DATA(PINT2_PG_MARK, PG10MD_011), 1152 1138 PINMUX_DATA(TIOC3C_MARK, PG10MD_100), 1153 1139 1154 1140 PINMUX_DATA(PG9_DATA, PG9MD_000), 1155 1141 PINMUX_DATA(D25_MARK, PG9MD_001), 1156 - PINMUX_DATA(LCD_DATA9_MARK, PG9MD_010), 1142 + PINMUX_DATA(LCD_DATA9_PG9_MARK, PG9MD_010), 1157 1143 PINMUX_DATA(PINT1_PG_MARK, PG9MD_011), 1158 1144 PINMUX_DATA(TIOC3B_MARK, PG9MD_100), 1159 1145 1160 1146 PINMUX_DATA(PG8_DATA, PG8MD_000), 1161 1147 PINMUX_DATA(D24_MARK, PG8MD_001), 1162 - PINMUX_DATA(LCD_DATA8_MARK, PG8MD_010), 1148 + PINMUX_DATA(LCD_DATA8_PG8_MARK, PG8MD_010), 1163 1149 PINMUX_DATA(PINT0_PG_MARK, PG8MD_011), 1164 1150 PINMUX_DATA(TIOC3A_MARK, PG8MD_100), 1165 1151 1166 1152 PINMUX_DATA(PG7_DATA, PG7MD_000), 1167 1153 PINMUX_DATA(D23_MARK, PG7MD_001), 1168 - PINMUX_DATA(LCD_DATA7_MARK, PG7MD_010), 1154 + PINMUX_DATA(LCD_DATA7_PG7_MARK, PG7MD_010), 1169 1155 PINMUX_DATA(IRQ7_PG_MARK, PG7MD_011), 1170 1156 PINMUX_DATA(TIOC2B_MARK, PG7MD_100), 1171 1157 1172 1158 PINMUX_DATA(PG6_DATA, PG6MD_000), 1173 1159 PINMUX_DATA(D22_MARK, PG6MD_001), 1174 - PINMUX_DATA(LCD_DATA6_MARK, PG6MD_010), 1160 + PINMUX_DATA(LCD_DATA6_PG6_MARK, PG6MD_010), 1175 1161 PINMUX_DATA(IRQ6_PG_MARK, PG6MD_011), 1176 1162 PINMUX_DATA(TIOC2A_MARK, PG6MD_100), 1177 1163 1178 1164 PINMUX_DATA(PG5_DATA, PG5MD_000), 1179 1165 PINMUX_DATA(D21_MARK, PG5MD_001), 1180 - PINMUX_DATA(LCD_DATA5_MARK, PG5MD_010), 1166 + PINMUX_DATA(LCD_DATA5_PG5_MARK, PG5MD_010), 1181 1167 PINMUX_DATA(IRQ5_PG_MARK, PG5MD_011), 1182 1168 PINMUX_DATA(TIOC1B_MARK, PG5MD_100), 1183 1169 1184 1170 PINMUX_DATA(PG4_DATA, PG4MD_000), 1185 1171 PINMUX_DATA(D20_MARK, PG4MD_001), 1186 - PINMUX_DATA(LCD_DATA4_MARK, PG4MD_010), 1172 + PINMUX_DATA(LCD_DATA4_PG4_MARK, PG4MD_010), 1187 1173 PINMUX_DATA(IRQ4_PG_MARK, PG4MD_011), 1188 1174 PINMUX_DATA(TIOC1A_MARK, PG4MD_100), 1189 1175 1190 1176 PINMUX_DATA(PG3_DATA, PG3MD_000), 1191 1177 PINMUX_DATA(D19_MARK, PG3MD_001), 1192 - PINMUX_DATA(LCD_DATA3_MARK, PG3MD_010), 1178 + PINMUX_DATA(LCD_DATA3_PG3_MARK, PG3MD_010), 1193 1179 PINMUX_DATA(IRQ3_PG_MARK, PG3MD_011), 1194 1180 PINMUX_DATA(TIOC0D_MARK, PG3MD_100), 1195 1181 1196 1182 PINMUX_DATA(PG2_DATA, PG2MD_000), 1197 1183 PINMUX_DATA(D18_MARK, PG2MD_001), 1198 - PINMUX_DATA(LCD_DATA2_MARK, PG2MD_010), 1184 + PINMUX_DATA(LCD_DATA2_PG2_MARK, PG2MD_010), 1199 1185 PINMUX_DATA(IRQ2_PG_MARK, PG2MD_011), 1200 1186 PINMUX_DATA(TIOC0C_MARK, PG2MD_100), 1201 1187 1202 1188 PINMUX_DATA(PG1_DATA, PG1MD_000), 1203 1189 PINMUX_DATA(D17_MARK, PG1MD_001), 1204 - PINMUX_DATA(LCD_DATA1_MARK, PG1MD_010), 1190 + PINMUX_DATA(LCD_DATA1_PG1_MARK, PG1MD_010), 1205 1191 PINMUX_DATA(IRQ1_PG_MARK, PG1MD_011), 1206 1192 PINMUX_DATA(TIOC0B_MARK, PG1MD_100), 1207 1193 1208 1194 PINMUX_DATA(PG0_DATA, PG0MD_000), 1209 1195 PINMUX_DATA(D16_MARK, PG0MD_001), 1210 - PINMUX_DATA(LCD_DATA0_MARK, PG0MD_010), 1196 + PINMUX_DATA(LCD_DATA0_PG0_MARK, PG0MD_010), 1211 1197 PINMUX_DATA(IRQ0_PG_MARK, PG0MD_011), 1212 1198 PINMUX_DATA(TIOC0A_MARK, PG0MD_100), 1213 1199 ··· 1289 1275 1290 1276 PINMUX_DATA(PJ23_DATA, PJ23MD_000), 1291 1277 PINMUX_DATA(DV_DATA23_MARK, PJ23MD_001), 1292 - PINMUX_DATA(LCD_DATA23_MARK, PJ23MD_010), 1278 + PINMUX_DATA(LCD_DATA23_PJ23_MARK, PJ23MD_010), 1293 1279 PINMUX_DATA(LCD_TCON6_MARK, PJ23MD_011), 1294 1280 PINMUX_DATA(IRQ3_PJ_MARK, PJ23MD_100), 1295 1281 PINMUX_DATA(CTX1_MARK, PJ23MD_101), 1296 1282 1297 1283 PINMUX_DATA(PJ22_DATA, PJ22MD_000), 1298 1284 PINMUX_DATA(DV_DATA22_MARK, PJ22MD_001), 1299 - PINMUX_DATA(LCD_DATA22_MARK, PJ22MD_010), 1285 + PINMUX_DATA(LCD_DATA22_PJ22_MARK, PJ22MD_010), 1300 1286 PINMUX_DATA(LCD_TCON5_MARK, PJ22MD_011), 1301 1287 PINMUX_DATA(IRQ2_PJ_MARK, PJ22MD_100), 1302 1288 PINMUX_DATA(CRX1_MARK, PJ22MD_101), ··· 1304 1290 1305 1291 PINMUX_DATA(PJ21_DATA, PJ21MD_000), 1306 1292 PINMUX_DATA(DV_DATA21_MARK, PJ21MD_001), 1307 - PINMUX_DATA(LCD_DATA21_MARK, PJ21MD_010), 1293 + PINMUX_DATA(LCD_DATA21_PJ21_MARK, PJ21MD_010), 1308 1294 PINMUX_DATA(LCD_TCON4_MARK, PJ21MD_011), 1309 1295 PINMUX_DATA(IRQ1_PJ_MARK, PJ21MD_100), 1310 1296 PINMUX_DATA(CTX2_MARK, PJ21MD_101), 1311 1297 1312 1298 PINMUX_DATA(PJ20_DATA, PJ20MD_000), 1313 1299 PINMUX_DATA(DV_DATA20_MARK, PJ20MD_001), 1314 - PINMUX_DATA(LCD_DATA20_MARK, PJ20MD_010), 1300 + PINMUX_DATA(LCD_DATA20_PJ20_MARK, PJ20MD_010), 1315 1301 PINMUX_DATA(LCD_TCON3_MARK, PJ20MD_011), 1316 1302 PINMUX_DATA(IRQ0_PJ_MARK, PJ20MD_100), 1317 1303 PINMUX_DATA(CRX2_MARK, PJ20MD_101), ··· 1319 1305 1320 1306 PINMUX_DATA(PJ19_DATA, PJ19MD_000), 1321 1307 PINMUX_DATA(DV_DATA19_MARK, PJ19MD_001), 1322 - PINMUX_DATA(LCD_DATA19_MARK, PJ19MD_010), 1308 + PINMUX_DATA(LCD_DATA19_PJ19_MARK, PJ19MD_010), 1323 1309 PINMUX_DATA(MISO0_PJ19_MARK, PJ19MD_011), 1324 1310 PINMUX_DATA(TIOC0D_MARK, PJ19MD_100), 1325 1311 PINMUX_DATA(SIOFRXD_MARK, PJ19MD_101), ··· 1327 1313 1328 1314 PINMUX_DATA(PJ18_DATA, PJ18MD_000), 1329 1315 PINMUX_DATA(DV_DATA18_MARK, PJ18MD_001), 1330 - PINMUX_DATA(LCD_DATA18_MARK, PJ18MD_010), 1316 + PINMUX_DATA(LCD_DATA18_PJ18_MARK, PJ18MD_010), 1331 1317 PINMUX_DATA(MOSI0_PJ18_MARK, PJ18MD_011), 1332 1318 PINMUX_DATA(TIOC0C_MARK, PJ18MD_100), 1333 1319 PINMUX_DATA(SIOFTXD_MARK, PJ18MD_101), 1334 1320 1335 1321 PINMUX_DATA(PJ17_DATA, PJ17MD_000), 1336 1322 PINMUX_DATA(DV_DATA17_MARK, PJ17MD_001), 1337 - PINMUX_DATA(LCD_DATA17_MARK, PJ17MD_010), 1323 + PINMUX_DATA(LCD_DATA17_PJ17_MARK, PJ17MD_010), 1338 1324 PINMUX_DATA(SSL00_PJ17_MARK, PJ17MD_011), 1339 1325 PINMUX_DATA(TIOC0B_MARK, PJ17MD_100), 1340 1326 PINMUX_DATA(SIOFSYNC_MARK, PJ17MD_101), 1341 1327 1342 1328 PINMUX_DATA(PJ16_DATA, PJ16MD_000), 1343 1329 PINMUX_DATA(DV_DATA16_MARK, PJ16MD_001), 1344 - PINMUX_DATA(LCD_DATA16_MARK, PJ16MD_010), 1330 + PINMUX_DATA(LCD_DATA16_PJ16_MARK, PJ16MD_010), 1345 1331 PINMUX_DATA(RSPCK0_PJ16_MARK, PJ16MD_011), 1346 1332 PINMUX_DATA(TIOC0A_MARK, PJ16MD_100), 1347 1333 PINMUX_DATA(SIOFSCK_MARK, PJ16MD_101), 1348 1334 1349 1335 PINMUX_DATA(PJ15_DATA, PJ15MD_000), 1350 1336 PINMUX_DATA(DV_DATA15_MARK, PJ15MD_001), 1351 - PINMUX_DATA(LCD_DATA15_MARK, PJ15MD_010), 1337 + PINMUX_DATA(LCD_DATA15_PJ15_MARK, PJ15MD_010), 1352 1338 PINMUX_DATA(PINT7_PJ_MARK, PJ15MD_011), 1353 1339 PINMUX_DATA(PWM2H_MARK, PJ15MD_100), 1354 1340 PINMUX_DATA(TXD7_MARK, PJ15MD_101), 1355 1341 1356 1342 PINMUX_DATA(PJ14_DATA, PJ14MD_000), 1357 1343 PINMUX_DATA(DV_DATA14_MARK, PJ14MD_001), 1358 - PINMUX_DATA(LCD_DATA14_MARK, PJ14MD_010), 1344 + PINMUX_DATA(LCD_DATA14_PJ14_MARK, PJ14MD_010), 1359 1345 PINMUX_DATA(PINT6_PJ_MARK, PJ14MD_011), 1360 1346 PINMUX_DATA(PWM2G_MARK, PJ14MD_100), 1361 1347 PINMUX_DATA(TXD6_MARK, PJ14MD_101), 1362 1348 1363 1349 PINMUX_DATA(PJ13_DATA, PJ13MD_000), 1364 1350 PINMUX_DATA(DV_DATA13_MARK, PJ13MD_001), 1365 - PINMUX_DATA(LCD_DATA13_MARK, PJ13MD_010), 1351 + PINMUX_DATA(LCD_DATA13_PJ13_MARK, PJ13MD_010), 1366 1352 PINMUX_DATA(PINT5_PJ_MARK, PJ13MD_011), 1367 1353 PINMUX_DATA(PWM2F_MARK, PJ13MD_100), 1368 1354 PINMUX_DATA(TXD5_MARK, PJ13MD_101), 1369 1355 1370 1356 PINMUX_DATA(PJ12_DATA, PJ12MD_000), 1371 1357 PINMUX_DATA(DV_DATA12_MARK, PJ12MD_001), 1372 - PINMUX_DATA(LCD_DATA12_MARK, PJ12MD_010), 1358 + PINMUX_DATA(LCD_DATA12_PJ12_MARK, PJ12MD_010), 1373 1359 PINMUX_DATA(PINT4_PJ_MARK, PJ12MD_011), 1374 1360 PINMUX_DATA(PWM2E_MARK, PJ12MD_100), 1375 1361 PINMUX_DATA(SCK7_MARK, PJ12MD_101), 1376 1362 1377 1363 PINMUX_DATA(PJ11_DATA, PJ11MD_000), 1378 1364 PINMUX_DATA(DV_DATA11_MARK, PJ11MD_001), 1379 - PINMUX_DATA(LCD_DATA11_MARK, PJ11MD_010), 1365 + PINMUX_DATA(LCD_DATA11_PJ11_MARK, PJ11MD_010), 1380 1366 PINMUX_DATA(PINT3_PJ_MARK, PJ11MD_011), 1381 1367 PINMUX_DATA(PWM2D_MARK, PJ11MD_100), 1382 1368 PINMUX_DATA(SCK6_MARK, PJ11MD_101), 1383 1369 1384 1370 PINMUX_DATA(PJ10_DATA, PJ10MD_000), 1385 1371 PINMUX_DATA(DV_DATA10_MARK, PJ10MD_001), 1386 - PINMUX_DATA(LCD_DATA10_MARK, PJ10MD_010), 1372 + PINMUX_DATA(LCD_DATA10_PJ10_MARK, PJ10MD_010), 1387 1373 PINMUX_DATA(PINT2_PJ_MARK, PJ10MD_011), 1388 1374 PINMUX_DATA(PWM2C_MARK, PJ10MD_100), 1389 1375 PINMUX_DATA(SCK5_MARK, PJ10MD_101), 1390 1376 1391 1377 PINMUX_DATA(PJ9_DATA, PJ9MD_000), 1392 1378 PINMUX_DATA(DV_DATA9_MARK, PJ9MD_001), 1393 - PINMUX_DATA(LCD_DATA9_MARK, PJ9MD_010), 1379 + PINMUX_DATA(LCD_DATA9_PJ9_MARK, PJ9MD_010), 1394 1380 PINMUX_DATA(PINT1_PJ_MARK, PJ9MD_011), 1395 1381 PINMUX_DATA(PWM2B_MARK, PJ9MD_100), 1396 1382 PINMUX_DATA(RTS5_MARK, PJ9MD_101), 1397 1383 1398 1384 PINMUX_DATA(PJ8_DATA, PJ8MD_000), 1399 1385 PINMUX_DATA(DV_DATA8_MARK, PJ8MD_001), 1400 - PINMUX_DATA(LCD_DATA8_MARK, PJ8MD_010), 1386 + PINMUX_DATA(LCD_DATA8_PJ8_MARK, PJ8MD_010), 1401 1387 PINMUX_DATA(PINT0_PJ_MARK, PJ8MD_011), 1402 1388 PINMUX_DATA(PWM2A_MARK, PJ8MD_100), 1403 1389 PINMUX_DATA(CTS5_MARK, PJ8MD_101), 1404 1390 1405 1391 PINMUX_DATA(PJ7_DATA, PJ7MD_000), 1406 1392 PINMUX_DATA(DV_DATA7_MARK, PJ7MD_001), 1407 - PINMUX_DATA(LCD_DATA7_MARK, PJ7MD_010), 1393 + PINMUX_DATA(LCD_DATA7_PJ7_MARK, PJ7MD_010), 1408 1394 PINMUX_DATA(SD_D2_MARK, PJ7MD_011), 1409 1395 PINMUX_DATA(PWM1H_MARK, PJ7MD_100), 1410 1396 1411 1397 PINMUX_DATA(PJ6_DATA, PJ6MD_000), 1412 1398 PINMUX_DATA(DV_DATA6_MARK, PJ6MD_001), 1413 - PINMUX_DATA(LCD_DATA6_MARK, PJ6MD_010), 1399 + PINMUX_DATA(LCD_DATA6_PJ6_MARK, PJ6MD_010), 1414 1400 PINMUX_DATA(SD_D3_MARK, PJ6MD_011), 1415 1401 PINMUX_DATA(PWM1G_MARK, PJ6MD_100), 1416 1402 1417 1403 PINMUX_DATA(PJ5_DATA, PJ5MD_000), 1418 1404 PINMUX_DATA(DV_DATA5_MARK, PJ5MD_001), 1419 - PINMUX_DATA(LCD_DATA5_MARK, PJ5MD_010), 1405 + PINMUX_DATA(LCD_DATA5_PJ5_MARK, PJ5MD_010), 1420 1406 PINMUX_DATA(SD_CMD_MARK, PJ5MD_011), 1421 1407 PINMUX_DATA(PWM1F_MARK, PJ5MD_100), 1422 1408 1423 1409 PINMUX_DATA(PJ4_DATA, PJ4MD_000), 1424 1410 PINMUX_DATA(DV_DATA4_MARK, PJ4MD_001), 1425 - PINMUX_DATA(LCD_DATA4_MARK, PJ4MD_010), 1411 + PINMUX_DATA(LCD_DATA4_PJ4_MARK, PJ4MD_010), 1426 1412 PINMUX_DATA(SD_CLK_MARK, PJ4MD_011), 1427 1413 PINMUX_DATA(PWM1E_MARK, PJ4MD_100), 1428 1414 1429 1415 PINMUX_DATA(PJ3_DATA, PJ3MD_000), 1430 1416 PINMUX_DATA(DV_DATA3_MARK, PJ3MD_001), 1431 - PINMUX_DATA(LCD_DATA3_MARK, PJ3MD_010), 1417 + PINMUX_DATA(LCD_DATA3_PJ3_MARK, PJ3MD_010), 1432 1418 PINMUX_DATA(SD_D0_MARK, PJ3MD_011), 1433 1419 PINMUX_DATA(PWM1D_MARK, PJ3MD_100), 1434 1420 1435 1421 PINMUX_DATA(PJ2_DATA, PJ2MD_000), 1436 1422 PINMUX_DATA(DV_DATA2_MARK, PJ2MD_001), 1437 - PINMUX_DATA(LCD_DATA2_MARK, PJ2MD_010), 1423 + PINMUX_DATA(LCD_DATA2_PJ2_MARK, PJ2MD_010), 1438 1424 PINMUX_DATA(SD_D1_MARK, PJ2MD_011), 1439 1425 PINMUX_DATA(PWM1C_MARK, PJ2MD_100), 1440 1426 1441 1427 PINMUX_DATA(PJ1_DATA, PJ1MD_000), 1442 1428 PINMUX_DATA(DV_DATA1_MARK, PJ1MD_001), 1443 - PINMUX_DATA(LCD_DATA1_MARK, PJ1MD_010), 1429 + PINMUX_DATA(LCD_DATA1_PJ1_MARK, PJ1MD_010), 1444 1430 PINMUX_DATA(SD_WP_MARK, PJ1MD_011), 1445 1431 PINMUX_DATA(PWM1B_MARK, PJ1MD_100), 1446 1432 1447 1433 PINMUX_DATA(PJ0_DATA, PJ0MD_000), 1448 1434 PINMUX_DATA(DV_DATA0_MARK, PJ0MD_001), 1449 - PINMUX_DATA(LCD_DATA0_MARK, PJ0MD_010), 1435 + PINMUX_DATA(LCD_DATA0_PJ0_MARK, PJ0MD_010), 1450 1436 PINMUX_DATA(SD_CD_MARK, PJ0MD_011), 1451 1437 PINMUX_DATA(PWM1A_MARK, PJ0MD_100), 1452 1438 }; ··· 1891 1877 PINMUX_GPIO(GPIO_FN_LCD_HSYNC, LCD_HSYNC_MARK), 1892 1878 PINMUX_GPIO(GPIO_FN_LCD_DE, LCD_DE_MARK), 1893 1879 1894 - PINMUX_GPIO(GPIO_FN_LCD_DATA23, LCD_DATA23_MARK), 1895 - PINMUX_GPIO(GPIO_FN_LCD_DATA22, LCD_DATA22_MARK), 1896 - PINMUX_GPIO(GPIO_FN_LCD_DATA21, LCD_DATA21_MARK), 1897 - PINMUX_GPIO(GPIO_FN_LCD_DATA20, LCD_DATA20_MARK), 1898 - PINMUX_GPIO(GPIO_FN_LCD_DATA19, LCD_DATA19_MARK), 1899 - PINMUX_GPIO(GPIO_FN_LCD_DATA18, LCD_DATA18_MARK), 1900 - PINMUX_GPIO(GPIO_FN_LCD_DATA17, LCD_DATA17_MARK), 1901 - PINMUX_GPIO(GPIO_FN_LCD_DATA16, LCD_DATA16_MARK), 1902 - PINMUX_GPIO(GPIO_FN_LCD_DATA15, LCD_DATA15_MARK), 1903 - PINMUX_GPIO(GPIO_FN_LCD_DATA14, LCD_DATA14_MARK), 1904 - PINMUX_GPIO(GPIO_FN_LCD_DATA13, LCD_DATA13_MARK), 1905 - PINMUX_GPIO(GPIO_FN_LCD_DATA12, LCD_DATA12_MARK), 1906 - PINMUX_GPIO(GPIO_FN_LCD_DATA11, LCD_DATA11_MARK), 1907 - PINMUX_GPIO(GPIO_FN_LCD_DATA10, LCD_DATA10_MARK), 1908 - PINMUX_GPIO(GPIO_FN_LCD_DATA9, LCD_DATA9_MARK), 1909 - PINMUX_GPIO(GPIO_FN_LCD_DATA8, LCD_DATA8_MARK), 1910 - PINMUX_GPIO(GPIO_FN_LCD_DATA7, LCD_DATA7_MARK), 1911 - PINMUX_GPIO(GPIO_FN_LCD_DATA6, LCD_DATA6_MARK), 1912 - PINMUX_GPIO(GPIO_FN_LCD_DATA5, LCD_DATA5_MARK), 1913 - PINMUX_GPIO(GPIO_FN_LCD_DATA4, LCD_DATA4_MARK), 1914 - PINMUX_GPIO(GPIO_FN_LCD_DATA3, LCD_DATA3_MARK), 1915 - PINMUX_GPIO(GPIO_FN_LCD_DATA2, LCD_DATA2_MARK), 1916 - PINMUX_GPIO(GPIO_FN_LCD_DATA1, LCD_DATA1_MARK), 1917 - PINMUX_GPIO(GPIO_FN_LCD_DATA0, LCD_DATA0_MARK), 1880 + PINMUX_GPIO(GPIO_FN_LCD_DATA23_PG23, LCD_DATA23_PG23_MARK), 1881 + PINMUX_GPIO(GPIO_FN_LCD_DATA22_PG22, LCD_DATA22_PG22_MARK), 1882 + PINMUX_GPIO(GPIO_FN_LCD_DATA21_PG21, LCD_DATA21_PG21_MARK), 1883 + PINMUX_GPIO(GPIO_FN_LCD_DATA20_PG20, LCD_DATA20_PG20_MARK), 1884 + PINMUX_GPIO(GPIO_FN_LCD_DATA19_PG19, LCD_DATA19_PG19_MARK), 1885 + PINMUX_GPIO(GPIO_FN_LCD_DATA18_PG18, LCD_DATA18_PG18_MARK), 1886 + PINMUX_GPIO(GPIO_FN_LCD_DATA17_PG17, LCD_DATA17_PG17_MARK), 1887 + PINMUX_GPIO(GPIO_FN_LCD_DATA16_PG16, LCD_DATA16_PG16_MARK), 1888 + PINMUX_GPIO(GPIO_FN_LCD_DATA15_PG15, LCD_DATA15_PG15_MARK), 1889 + PINMUX_GPIO(GPIO_FN_LCD_DATA14_PG14, LCD_DATA14_PG14_MARK), 1890 + PINMUX_GPIO(GPIO_FN_LCD_DATA13_PG13, LCD_DATA13_PG13_MARK), 1891 + PINMUX_GPIO(GPIO_FN_LCD_DATA12_PG12, LCD_DATA12_PG12_MARK), 1892 + PINMUX_GPIO(GPIO_FN_LCD_DATA11_PG11, LCD_DATA11_PG11_MARK), 1893 + PINMUX_GPIO(GPIO_FN_LCD_DATA10_PG10, LCD_DATA10_PG10_MARK), 1894 + PINMUX_GPIO(GPIO_FN_LCD_DATA9_PG9, LCD_DATA9_PG9_MARK), 1895 + PINMUX_GPIO(GPIO_FN_LCD_DATA8_PG8, LCD_DATA8_PG8_MARK), 1896 + PINMUX_GPIO(GPIO_FN_LCD_DATA7_PG7, LCD_DATA7_PG7_MARK), 1897 + PINMUX_GPIO(GPIO_FN_LCD_DATA6_PG6, LCD_DATA6_PG6_MARK), 1898 + PINMUX_GPIO(GPIO_FN_LCD_DATA5_PG5, LCD_DATA5_PG5_MARK), 1899 + PINMUX_GPIO(GPIO_FN_LCD_DATA4_PG4, LCD_DATA4_PG4_MARK), 1900 + PINMUX_GPIO(GPIO_FN_LCD_DATA3_PG3, LCD_DATA3_PG3_MARK), 1901 + PINMUX_GPIO(GPIO_FN_LCD_DATA2_PG2, LCD_DATA2_PG2_MARK), 1902 + PINMUX_GPIO(GPIO_FN_LCD_DATA1_PG1, LCD_DATA1_PG1_MARK), 1903 + PINMUX_GPIO(GPIO_FN_LCD_DATA0_PG0, LCD_DATA0_PG0_MARK), 1904 + 1905 + PINMUX_GPIO(GPIO_FN_LCD_DATA23_PJ23, LCD_DATA23_PJ23_MARK), 1906 + PINMUX_GPIO(GPIO_FN_LCD_DATA22_PJ22, LCD_DATA22_PJ22_MARK), 1907 + PINMUX_GPIO(GPIO_FN_LCD_DATA21_PJ21, LCD_DATA21_PJ21_MARK), 1908 + PINMUX_GPIO(GPIO_FN_LCD_DATA20_PJ20, LCD_DATA20_PJ20_MARK), 1909 + PINMUX_GPIO(GPIO_FN_LCD_DATA19_PJ19, LCD_DATA19_PJ19_MARK), 1910 + PINMUX_GPIO(GPIO_FN_LCD_DATA18_PJ18, LCD_DATA18_PJ18_MARK), 1911 + PINMUX_GPIO(GPIO_FN_LCD_DATA17_PJ17, LCD_DATA17_PJ17_MARK), 1912 + PINMUX_GPIO(GPIO_FN_LCD_DATA16_PJ16, LCD_DATA16_PJ16_MARK), 1913 + PINMUX_GPIO(GPIO_FN_LCD_DATA15_PJ15, LCD_DATA15_PJ15_MARK), 1914 + PINMUX_GPIO(GPIO_FN_LCD_DATA14_PJ14, LCD_DATA14_PJ14_MARK), 1915 + PINMUX_GPIO(GPIO_FN_LCD_DATA13_PJ13, LCD_DATA13_PJ13_MARK), 1916 + PINMUX_GPIO(GPIO_FN_LCD_DATA12_PJ12, LCD_DATA12_PJ12_MARK), 1917 + PINMUX_GPIO(GPIO_FN_LCD_DATA11_PJ11, LCD_DATA11_PJ11_MARK), 1918 + PINMUX_GPIO(GPIO_FN_LCD_DATA10_PJ10, LCD_DATA10_PJ10_MARK), 1919 + PINMUX_GPIO(GPIO_FN_LCD_DATA9_PJ9, LCD_DATA9_PJ9_MARK), 1920 + PINMUX_GPIO(GPIO_FN_LCD_DATA8_PJ8, LCD_DATA8_PJ8_MARK), 1921 + PINMUX_GPIO(GPIO_FN_LCD_DATA7_PJ7, LCD_DATA7_PJ7_MARK), 1922 + PINMUX_GPIO(GPIO_FN_LCD_DATA6_PJ6, LCD_DATA6_PJ6_MARK), 1923 + PINMUX_GPIO(GPIO_FN_LCD_DATA5_PJ5, LCD_DATA5_PJ5_MARK), 1924 + PINMUX_GPIO(GPIO_FN_LCD_DATA4_PJ4, LCD_DATA4_PJ4_MARK), 1925 + PINMUX_GPIO(GPIO_FN_LCD_DATA3_PJ3, LCD_DATA3_PJ3_MARK), 1926 + PINMUX_GPIO(GPIO_FN_LCD_DATA2_PJ2, LCD_DATA2_PJ2_MARK), 1927 + PINMUX_GPIO(GPIO_FN_LCD_DATA1_PJ1, LCD_DATA1_PJ1_MARK), 1928 + PINMUX_GPIO(GPIO_FN_LCD_DATA0_PJ0, LCD_DATA0_PJ0_MARK), 1918 1929 1919 1930 PINMUX_GPIO(GPIO_FN_LCD_M_DISP, LCD_M_DISP_MARK), 1920 1931 };
+23 -4
drivers/sh/intc/core.c
··· 324 324 325 325 res = irq_create_identity_mapping(d->domain, irq); 326 326 if (unlikely(res)) { 327 - pr_err("can't get irq_desc for %d\n", irq); 328 - continue; 327 + if (res == -EEXIST) { 328 + res = irq_domain_associate(d->domain, irq, irq); 329 + if (unlikely(res)) { 330 + pr_err("domain association failure\n"); 331 + continue; 332 + } 333 + } else { 334 + pr_err("can't identity map IRQ %d\n", irq); 335 + continue; 336 + } 329 337 } 330 338 331 339 intc_irq_xlate_set(irq, vect->enum_id, d); ··· 353 345 */ 354 346 res = irq_create_identity_mapping(d->domain, irq2); 355 347 if (unlikely(res)) { 356 - pr_err("can't get irq_desc for %d\n", irq2); 357 - continue; 348 + if (res == -EEXIST) { 349 + res = irq_domain_associate(d->domain, 350 + irq, irq); 351 + if (unlikely(res)) { 352 + pr_err("domain association " 353 + "failure\n"); 354 + continue; 355 + } 356 + } else { 357 + pr_err("can't identity map IRQ %d\n", 358 + irq); 359 + continue; 360 + } 358 361 } 359 362 360 363 vect2->enum_id = 0;