Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b5ff205cdb0da6eff8a02653bf5192ea8d661faa

Authored by Igor Grinberg
Committed by Tom Rini
1 parent f1b14179f0
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

omap3/am33xx: mux: fix several checkpatch issues 

Fix the following checkpatch issues:

CHECK: No space is necessary after a cast
\#39: FILE: arch/arm/include/asm/arch-am33xx/mux.h:39:
+#define PAD_CTRL_BASE  0x800
+#define OFFSET(x)      (unsigned int) (&((struct pad_signals *) \

CHECK: Avoid CamelCase: <CONTROL_PADCONF_JTAG_nTRST>
\#284: FILE: arch/arm/include/asm/arch-omap3/mux.h:284:
+#define CONTROL_PADCONF_JTAG_nTRST     0x0A1C

ERROR: space required after that ',' (ctx:VxV)
\#446: FILE: arch/arm/include/asm/arch-omap3/mux.h:446:
+#define MUX_VAL(OFFSET,VALUE)\
                       ^
Cc: Raphael Assenat <raph@8d.com>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Peter Barada <peter.barada@logicpd.com>
Cc: Grazvydas Ignotas <notasas@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Nagendra T S <nagendra@mistralsolutions.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Tom Rini <trini@ti.com>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: Stefan Roese <sr@denx.de>

Showing 14 changed files with 15 additions and 15 deletions Side-by-side Diff

arch/arm/include/asm/arch-am33xx/mux.h
Diff comments   View file @ b5ff205
... ... @@ -36,7 +36,7 @@
36 36  
37 37 /* Pad control register offset */
38 38 #define PAD_CTRL_BASE 0x800
39   -#define OFFSET(x) (unsigned int) (&((struct pad_signals *) \
  39 +#define OFFSET(x) (unsigned int) (&((struct pad_signals *)\
40 40 (PAD_CTRL_BASE))->x)
41 41  
42 42 /*
arch/arm/include/asm/arch-omap3/mux.h
Diff comments   View file @ b5ff205
... ... @@ -281,7 +281,7 @@
281 281 #define CONTROL_PADCONF_SYS_OFF_MODE 0x0A18
282 282 #define CONTROL_PADCONF_SYS_CLKOUT1 0x0A1A
283 283 #define CONTROL_PADCONF_SYS_CLKOUT2 0x01E2
284   -#define CONTROL_PADCONF_JTAG_nTRST 0x0A1C
  284 +#define CONTROL_PADCONF_JTAG_NTRST 0x0A1C
285 285 #define CONTROL_PADCONF_JTAG_TCK 0x0A1E
286 286 #define CONTROL_PADCONF_JTAG_TMS 0x0A20
287 287 #define CONTROL_PADCONF_JTAG_TDI 0x0A22
... ... @@ -443,7 +443,7 @@
443 443 #define OMAP34XX_CTRL_WKUP_CTRL (OMAP34XX_CTRL_BASE + 0x0A5C)
444 444 #define OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ (1<<6)
445 445  
446   -#define MUX_VAL(OFFSET,VALUE)\
  446 +#define MUX_VAL(OFFSET, VALUE)\
447 447 writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET));
448 448  
449 449 #define CP(x) (CONTROL_PADCONF_##x)
board/8dtech/eco5pk/eco5pk.h
Diff comments   View file @ b5ff205
... ... @@ -332,7 +332,7 @@
332 332 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) \
333 333 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)) \
334 334 /* JTAG */\
335   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) \
  335 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) \
336 336 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) \
337 337 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) \
338 338 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) \
board/compulab/cm_t35/cm_t35.c
Diff comments   View file @ b5ff205
... ... @@ -368,7 +368,7 @@
368 368 MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)); /*OFF_MODE*/
369 369 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)); /*CLKOUT1*/
370 370 MUX_VAL(CP(SYS_CLKOUT2), (IDIS | PTU | DIS | M4)); /*green LED*/
371   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)); /*JTAG_nTRST*/
  371 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)); /*JTAG_NTRST*/
372 372 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)); /*JTAG_TCK*/
373 373 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)); /*JTAG_TMS*/
374 374 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)); /*JTAG_TDI*/
board/htkw/mcx/mcx.h
Diff comments   View file @ b5ff205
... ... @@ -339,7 +339,7 @@
339 339 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M4))\
340 340 MUX_VAL(CP(SYS_CLKOUT2), (IDIS | PTU | DIS | M4))\
341 341 /* JTAG */\
342   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTU | EN | M4)) \
  342 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTU | EN | M4)) \
343 343 MUX_VAL(CP(JTAG_TCK), (IEN | PTU | EN | M4)) \
344 344 MUX_VAL(CP(JTAG_TMS), (IEN | PTU | EN | M4)) \
345 345 MUX_VAL(CP(JTAG_TDI), (IEN | PTU | EN | M4)) \
board/logicpd/am3517evm/am3517evm.h
Diff comments   View file @ b5ff205
... ... @@ -333,7 +333,7 @@
333 333 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) \
334 334 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)) \
335 335 /* JTAG */\
336   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) \
  336 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) \
337 337 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) \
338 338 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) \
339 339 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) \
board/logicpd/omap3som/omap3logic.c
Diff comments   View file @ b5ff205
... ... @@ -230,7 +230,7 @@
230 230 MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0));
231 231 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0));
232 232 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0));
233   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0));
  233 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0));
234 234 MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0));
235 235 }
board/pandora/pandora.h
Diff comments   View file @ b5ff205
... ... @@ -310,7 +310,7 @@
310 310 MUX_VAL(CP(SYS_BOOT6), (IEN | PTD | DIS | M4)) /*GPIO_8*/\
311 311 MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) /*SYS_OFF_MODE*/\
312 312 /*JTAG*/\
313   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) /*JTAG_nTRST*/\
  313 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) /*JTAG_NTRST*/\
314 314 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) /*JTAG_TCK*/\
315 315 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) /*JTAG_TMS*/\
316 316 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) /*JTAG_TDI*/\
board/technexion/tao3530/tao3530.h
Diff comments   View file @ b5ff205
... ... @@ -275,7 +275,7 @@
275 275 MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) \
276 276 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) \
277 277 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)) \
278   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) \
  278 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) \
279 279 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) \
280 280 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) \
281 281 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) \
board/technexion/twister/twister.h
Diff comments   View file @ b5ff205
... ... @@ -337,7 +337,7 @@
337 337 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) \
338 338 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)) \
339 339 /* JTAG */\
340   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) \
  340 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) \
341 341 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) \
342 342 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) \
343 343 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) \
board/teejet/mt_ventoux/mt_ventoux.h
Diff comments   View file @ b5ff205
... ... @@ -339,7 +339,7 @@
339 339 /* gpio_10 */\
340 340 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)) \
341 341 /* JTAG */\
342   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) \
  342 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) \
343 343 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) \
344 344 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) \
345 345 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) \
board/ti/am3517crane/am3517crane.h
Diff comments   View file @ b5ff205
... ... @@ -284,7 +284,7 @@
284 284 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M4))/*GPIO_10 TP*/\
285 285 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0))\
286 286 /*JTAG*/\
287   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0))\
  287 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0))\
288 288 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0))\
289 289 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0))\
290 290 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0))\
... ... @@ -300,7 +300,7 @@
300 300 MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) /*SYS_OFF_MODE*/\
301 301 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) /*SYS_CLKOUT1*/\
302 302 MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M0)) /*SYS_CLKOUT2*/\
303   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) /*JTAG_nTRST*/\
  303 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0)) /*JTAG_NTRST*/\
304 304 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) /*JTAG_TCK*/\
305 305 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) /*JTAG_TMS*/\
306 306 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) /*JTAG_TDI*/\
board/ti/sdp3430/sdp.h
Diff comments   View file @ b5ff205
... ... @@ -265,7 +265,7 @@
265 265 MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0))\
266 266 MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0))\
267 267 MUX_VAL(CP(SYS_CLKOUT2), (OFF_IN_PD | IEN | PTU | EN | M4))/*GPIO_186*/\
268   - MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0))\
  268 + MUX_VAL(CP(JTAG_NTRST), (IEN | PTD | DIS | M0))\
269 269 MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0))\
270 270 MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0))\
271 271 MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0))\