Commit 2af7e810159fc94d23d7bf6d02658f09aae2a909

Authored by Eric Nelson
Committed by Tom Rini
1 parent de710a14b5
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.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, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, 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, v2017.01-smarct4x

i.MX6: get rid of redundant struct src_regs (dupe of struct src)

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>

Showing 2 changed files with 1 additions and 22 deletions Side-by-side Diff

arch/arm/cpu/armv7/mx6/soc.c
... ... @@ -146,7 +146,7 @@
146 146 void boot_mode_apply(unsigned cfg_val)
147 147 {
148 148 unsigned reg;
149   - struct src_regs *psrc = (struct src_regs *)SRC_BASE_ADDR;
  149 + struct src *psrc = (struct src *)SRC_BASE_ADDR;
150 150 writel(cfg_val, &psrc->gpr9);
151 151 reg = readl(&psrc->gpr10);
152 152 if (cfg_val)
arch/arm/include/asm/arch-mx6/imx-regs.h
... ... @@ -593,27 +593,6 @@
593 593 u32 daisy[104]; /* 0x7b0..94c */
594 594 };
595 595  
596   -struct src_regs {
597   - u32 scr; /* 0x00 */
598   - u32 sbmr1; /* 0x04 */
599   - u32 srsr; /* 0x08 */
600   - u32 reserved1; /* 0x0c */
601   - u32 reserved2; /* 0x10 */
602   - u32 sisr; /* 0x14 */
603   - u32 simr; /* 0x18 */
604   - u32 sbmr2; /* 0x1c */
605   - u32 gpr1; /* 0x20 */
606   - u32 gpr2; /* 0x24 */
607   - u32 gpr3; /* 0x28 */
608   - u32 gpr4; /* 0x2c */
609   - u32 gpr5; /* 0x30 */
610   - u32 gpr6; /* 0x34 */
611   - u32 gpr7; /* 0x38 */
612   - u32 gpr8; /* 0x3c */
613   - u32 gpr9; /* 0x40 */
614   - u32 gpr10; /* 0x44 */
615   -};
616   -
617 596 #endif /* __ASSEMBLER__*/
618 597 #endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */