diff options
| author | Richard Genoud <[email protected]> | 2026-01-23 12:44:40 +0100 |
|---|---|---|
| committer | Michael Trimarchi <[email protected]> | 2026-02-03 21:44:33 +0100 |
| commit | 8034c41d63c985de3bab9980ce81aa70342f64bf (patch) | |
| tree | f39b505b694c895969c6e4db06c2cf27ed2be230 /arch | |
| parent | 46d5ef0416a68e2e7084c5443cf0c76f44593b1a (diff) | |
mtd: rawnand: sunxi: remove usage of struct sunxi_ccm_reg
The sunxi_ccm_reg is legacy, drop its usage from nand related code
For that, CCU_NAND0_CLK_CFG and CCU_AHB_GATE1 are added to the clock
files when missing.
And clock code in sunxi_nand{,_spl}.c and board.c are changed to use the
new scheme.
Moreover, drop AHB_DIV_1 in favor of the more readable CCM_NAND_CTRL_M/N
Suggested-by: Andre Przywara <[email protected]>
Signed-off-by: Richard Genoud <[email protected]>
Signed-off-by: Michael Trimarchi <[email protected]>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/clock_sun9i.h | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h index 00bdd5f938d..caa4b62b3e2 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h @@ -11,6 +11,7 @@ #define _SUNXI_CLOCK_SUN4I_H #define CCU_AHB_GATE0 0x60 +#define CCU_NAND0_CLK_CFG 0x80 #define CCU_MMC0_CLK_CFG 0x88 #define CCU_MMC1_CLK_CFG 0x8c #define CCU_MMC2_CLK_CFG 0x90 diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index 28c3faccbbc..c8f3a16e7d0 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -11,6 +11,7 @@ #define _SUNXI_CLOCK_SUN6I_H #define CCU_AHB_GATE0 0x060 +#define CCU_NAND0_CLK_CFG 0x080 #define CCU_MMC0_CLK_CFG 0x088 #define CCU_MMC1_CLK_CFG 0x08c #define CCU_MMC2_CLK_CFG 0x090 diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h index 5ad2163926a..98c69f47f32 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h @@ -14,6 +14,7 @@ #define _SUNXI_CLOCK_SUN8I_A83T_H #define CCU_AHB_GATE0 0x060 +#define CCU_NAND0_CLK_CFG 0x080 #define CCU_MMC0_CLK_CFG 0x088 #define CCU_MMC1_CLK_CFG 0x08c #define CCU_MMC2_CLK_CFG 0x090 diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h index 8d696e533f8..3448f3fb322 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h @@ -12,11 +12,13 @@ #include <linux/bitops.h> #endif +#define CCU_NAND0_CLK_CFG 0x400 #define CCU_MMC0_CLK_CFG 0x410 #define CCU_MMC1_CLK_CFG 0x414 #define CCU_MMC2_CLK_CFG 0x418 #define CCU_MMC3_CLK_CFG 0x41c #define CCU_AHB_GATE0 0x580 +#define CCU_AHB_GATE1 0x584 #define CCU_AHB_RESET0_CFG 0x5a0 struct sunxi_ccm_reg { |