From f2723a7b17fccf3a5d7ff874b5ae646bd2d894dc Mon Sep 17 00:00:00 2001 From: anusha Date: Thu, 18 Mar 2021 18:16:49 +0530 Subject: [PATCH] ipq9574: Change references of ipq9048 to ipq9574 Signed-off-by: anusha Change-Id: I306a9eae54aa31b3153ad3ebf58f73b6a973a710 --- Makefile | 2 +- arch/arm/Kconfig | 6 +++--- arch/arm/cpu/armv7/start.S | 2 +- arch/arm/dts/Makefile | 2 +- arch/arm/dts/ipq9574-emulation.dts | 6 +++--- arch/arm/dts/ipq9574-soc.dtsi | 2 +- arch/arm/include/asm/arch-ipq9574/clk.h | 8 ++++---- .../include/asm/arch-qca-common/qca_common.h | 4 ++-- .../include/asm/arch-qca-common/qpic_nand.h | 2 +- board/ipq9574/Kconfig | 8 ++++---- board/qca/arm/ipq9574/Makefile | 6 +++--- board/qca/arm/ipq9574/clock.c | 6 +++--- board/qca/arm/ipq9574/ipq9574.c | 10 +++++----- board/qca/arm/ipq9574/ipq9574.h | 8 ++++---- configs/ipq9574_defconfig | 4 ++-- drivers/gpio/Makefile | 2 +- drivers/serial/Makefile | 2 +- drivers/spi/Makefile | 2 +- include/common.h | 6 +++--- include/configs/ipq9574.h | 20 +++++++++---------- include/dt-bindings/qcom/gpio-ipq9574.h | 4 ++-- 21 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Makefile b/Makefile index 4137725b8b..9b3069959b 100644 --- a/Makefile +++ b/Makefile @@ -581,7 +581,7 @@ else ifdef CONFIG_ARCH_IPQ6018 KBUILD_CFLAGS += $(call cc-option,-fstack-protector) else -ifdef CONFIG_ARCH_IPQ9048 +ifdef CONFIG_ARCH_IPQ9574 KBUILD_CFLAGS += $(call cc-option,-fstack-protector) else KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0472c28e10..76d9df4382 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -469,8 +469,8 @@ config ARCH_IPQ6018 select SYS_GENERIC_BOARD select QCA_COMMON -config ARCH_IPQ9048 - bool "QCA, IPQ9048" +config ARCH_IPQ9574 + bool "QCA, IPQ9574" select DM select DM_SERIAL select CPU_V7 @@ -868,7 +868,7 @@ source "board/ipq40xx/Kconfig" source "board/ipq5018/Kconfig" source "board/ipq6018/Kconfig" source "board/ipq806x/Kconfig" -source "board/ipq9048/Kconfig" +source "board/ipq9574/Kconfig" source "board/ipq807x/Kconfig" source "board/isee/igep0033/Kconfig" source "board/maxbcm/Kconfig" diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 14aac2c49b..0439263ae4 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -48,7 +48,7 @@ save_boot_params_ret: msr cpsr,r0 #if defined (CONFIG_ARCH_IPQ807x) || defined (CONFIG_ARCH_IPQ6018) \ - || defined (CONFIG_ARCH_IPQ5018) || defined (CONFIG_ARCH_IPQ9048) + || defined (CONFIG_ARCH_IPQ5018) || defined (CONFIG_ARCH_IPQ9574) /* Setup CP15 barrier */ mrc p15, 0, r0, c1, c0, 0 @Read SCTLR to r0 orr r0, r0, #0x20 @set the cp15 barrier enable bit diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 1da6d75a60..36e96f7307 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -94,7 +94,7 @@ dtb-$(CONFIG_ARCH_IPQ6018) += ipq6018-cp01-c1.dtb \ ipq6018-db-cp01.dtb \ ipq6018-db-cp02.dtb -dtb-$(CONFIG_ARCH_IPQ9048) += ipq9048-emulation.dtb +dtb-$(CONFIG_ARCH_IPQ9574) += ipq9574-emulation.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-firefly.dtb \ diff --git a/arch/arm/dts/ipq9574-emulation.dts b/arch/arm/dts/ipq9574-emulation.dts index 4c901ffeb2..ad9ba5843a 100644 --- a/arch/arm/dts/ipq9574-emulation.dts +++ b/arch/arm/dts/ipq9574-emulation.dts @@ -12,10 +12,10 @@ */ /dts-v1/; -#include "ipq9048-soc.dtsi" +#include "ipq9574-soc.dtsi" / { - model ="QCA, IPQ9048-EMULATION"; - compatible = "qca,ipq9048", "qca,ipq9048-emulation"; + model ="QCA, IPQ9574-EMULATION"; + compatible = "qca,ipq9574", "qca,ipq9574-emulation"; machid = <0xf030000>; config_name = "config@1"; diff --git a/arch/arm/dts/ipq9574-soc.dtsi b/arch/arm/dts/ipq9574-soc.dtsi index 1e3adeb382..a610fd86d4 100644 --- a/arch/arm/dts/ipq9574-soc.dtsi +++ b/arch/arm/dts/ipq9574-soc.dtsi @@ -12,7 +12,7 @@ */ #include "skeleton.dtsi" -#include +#include / { diff --git a/arch/arm/include/asm/arch-ipq9574/clk.h b/arch/arm/include/asm/arch-ipq9574/clk.h index cef2642baa..2721494028 100644 --- a/arch/arm/include/asm/arch-ipq9574/clk.h +++ b/arch/arm/include/asm/arch-ipq9574/clk.h @@ -11,13 +11,13 @@ * GNU General Public License for more details. */ -#ifndef IPQ9048_CLK_H -#define IPQ9048_CLK_H +#ifndef IPQ9574_CLK_H +#define IPQ9574_CLK_H #include /* I2C clocks configuration */ -#ifdef CONFIG_IPQ9048_I2C +#ifdef CONFIG_IPQ9574_I2C #define GCC_BLSP1_QUP1_I2C_APPS_CFG_RCGR 0x180201C #define GCC_BLSP1_QUP1_I2C_APPS_CFG_RCGR_SRC_SEL (1 << 8) @@ -75,4 +75,4 @@ void i2c_clock_config(void); int uart_clock_config(struct ipq_serial_platdata *plat); -#endif /*IPQ9048_CLK_H*/ +#endif /*IPQ9574_CLK_H*/ diff --git a/arch/arm/include/asm/arch-qca-common/qca_common.h b/arch/arm/include/asm/arch-qca-common/qca_common.h index 683c275b48..eabc845651 100644 --- a/arch/arm/include/asm/arch-qca-common/qca_common.h +++ b/arch/arm/include/asm/arch-qca-common/qca_common.h @@ -25,8 +25,8 @@ #include #endif -#ifdef CONFIG_ARCH_IPQ9048 -#include +#ifdef CONFIG_ARCH_IPQ9574 +#include #endif #ifdef CONFIG_ARCH_IPQ807x diff --git a/arch/arm/include/asm/arch-qca-common/qpic_nand.h b/arch/arm/include/asm/arch-qca-common/qpic_nand.h index 9c33c96bae..0908be8f50 100644 --- a/arch/arm/include/asm/arch-qca-common/qpic_nand.h +++ b/arch/arm/include/asm/arch-qca-common/qpic_nand.h @@ -32,7 +32,7 @@ #if defined(CONFIG_IPQ40XX) || defined(CONFIG_IPQ_RUMI) \ || defined(CONFIG_IPQ6018) || defined(CONFIG_IPQ5018) \ - || defined(CONFIG_IPQ9048) + || defined(CONFIG_IPQ9574) #define QPIC_EBI2ND_BASE (0x079b0000) #else #error "QPIC NAND not supported" diff --git a/board/ipq9574/Kconfig b/board/ipq9574/Kconfig index 14bb3b3e43..2192ed62af 100644 --- a/board/ipq9574/Kconfig +++ b/board/ipq9574/Kconfig @@ -1,15 +1,15 @@ -if ARCH_IPQ9048 +if ARCH_IPQ9574 config SYS_CPU - default "ipq9048" + default "ipq9574" config SYS_BOARD - default "ipq9048" + default "ipq9574" config SYS_VENDOR default "qca/arm" config SYS_CONFIG_NAME - default "ipq9048" + default "ipq9574" endif diff --git a/board/qca/arm/ipq9574/Makefile b/board/qca/arm/ipq9574/Makefile index 5b4984518d..873a1e01b3 100644 --- a/board/qca/arm/ipq9574/Makefile +++ b/board/qca/arm/ipq9574/Makefile @@ -1,5 +1,5 @@ -ccflags-y += -I$(srctree)/board/qca/arm/ipq9048 -cppflags-y += -I$(srctree)/board/qca/arm/ipq9048 -obj-y := ipq9048.o +ccflags-y += -I$(srctree)/board/qca/arm/ipq9574 +cppflags-y += -I$(srctree)/board/qca/arm/ipq9574 +obj-y := ipq9574.o obj-y += clock.o diff --git a/board/qca/arm/ipq9574/clock.c b/board/qca/arm/ipq9574/clock.c index 3d273f7801..00c32f60d2 100644 --- a/board/qca/arm/ipq9574/clock.c +++ b/board/qca/arm/ipq9574/clock.c @@ -13,13 +13,13 @@ #include #include -#include +#include #include -#ifdef CONFIG_IPQ9048_I2C +#ifdef CONFIG_IPQ9574_I2C void i2c_clock_config(void) { -#ifndef CONFIG_IPQ9048_RUMI +#ifndef CONFIG_IPQ9574_RUMI int cfg; /* Configure qup1_i2c_apps_clk_src */ diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index 55020c9d09..0270f2d5f8 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -83,7 +83,7 @@ void fdt_fixup_qpic(void *blob) #ifdef CONFIG_QPIC_NAND void qpic_set_clk_rate(unsigned int clk_rate, int blk_type, int req_clk_src_type) { -#ifndef CONFIG_IPQ9048_RUMI +#ifndef CONFIG_IPQ9574_RUMI switch (blk_type) { case QPIC_IO_MACRO_CLK: /* select the clk source for IO_PAD_MACRO @@ -170,7 +170,7 @@ void board_nand_init(void) #ifdef CONFIG_QCA_MMC void emmc_clock_config(void) { -#ifndef CONFIG_IPQ9048_RUMI +#ifndef CONFIG_IPQ9574_RUMI int cfg; /* Configure sdcc1_apps_clk_src */ @@ -210,7 +210,7 @@ void sdhci_bus_pwr_off(struct sdhci_host *host) void emmc_clock_disable(void) { -#ifndef CONFIG_IPQ9048_RUMI +#ifndef CONFIG_IPQ9574_RUMI /* Clear divider */ writel(0x0, GCC_SDCC1_MISC); #endif @@ -223,7 +223,7 @@ void board_mmc_deinit(void) void emmc_clock_reset(void) { -#ifndef CONFIG_IPQ9048_RUMI +#ifndef CONFIG_IPQ9574_RUMI writel(0x1, GCC_SDCC1_BCR); udelay(10); writel(0x0, GCC_SDCC1_BCR); diff --git a/board/qca/arm/ipq9574/ipq9574.h b/board/qca/arm/ipq9574/ipq9574.h index 443da79bb0..a2743d50ad 100644 --- a/board/qca/arm/ipq9574/ipq9574.h +++ b/board/qca/arm/ipq9574/ipq9574.h @@ -11,10 +11,10 @@ * GNU General Public License for more details. */ -#ifndef _IPQ9048_CDP_H_ -#define _IPQ9048_CDP_H_ +#ifndef _IPQ9574_CDP_H_ +#define _IPQ9574_CDP_H_ -#include +#include #include #include @@ -328,4 +328,4 @@ extern const add_node_t add_fdt_node[]; int ipq_get_tz_version(char *version_name, int buf_size); void ipq_fdt_fixup_socinfo(void *blob); int ipq_board_usb_init(void); -#endif /* _IPQ9048_CDP_H_ */ +#endif /* _IPQ9574_CDP_H_ */ diff --git a/configs/ipq9574_defconfig b/configs/ipq9574_defconfig index 913169a7fc..1fb92a903b 100644 --- a/configs/ipq9574_defconfig +++ b/configs/ipq9574_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_HAS_VBAR=y CONFIG_CPU_V7=y -CONFIG_ARCH_IPQ9048=y +CONFIG_ARCH_IPQ9574=y CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_SYS_MALLOC_F=y CONFIG_DM_SERIAL=y @@ -15,7 +15,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y # CONFIG_FIT_SIGNATURE is not set CONFIG_SYS_EXTRA_OPTIONS="" -CONFIG_SYS_PROMPT="IPQ9048# " +CONFIG_SYS_PROMPT="IPQ9574# " # # Commands diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 0bc09124eb..a24a00284d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_ARCH_IPQ806x) += ipq_gpio.o obj-$(CONFIG_ARCH_IPQ40xx) += ipq_gpio.o obj-$(CONFIG_ARCH_IPQ5018) += ipq_gpio.o obj-$(CONFIG_ARCH_IPQ6018) += ipq_gpio.o -obj-$(CONFIG_ARCH_IPQ9048) += ipq_gpio.o +obj-$(CONFIG_ARCH_IPQ9574) += ipq_gpio.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_DWAPB_GPIO) += dwapb_gpio.o obj-$(CONFIG_AXP_GPIO) += axp_gpio.o diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 84516cab17..5e395a4a3e 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_ARCH_IPQ806x) += qca_uart.o obj-$(CONFIG_ARCH_IPQ40xx) += qca_uart.o obj-$(CONFIG_ARCH_IPQ5018) += qca_uart.o obj-$(CONFIG_ARCH_IPQ6018) += qca_uart.o -obj-$(CONFIG_ARCH_IPQ9048) += qca_uart.o +obj-$(CONFIG_ARCH_IPQ9574) += qca_uart.o ifdef CONFIG_DM_SERIAL obj-y += serial-uclass.o obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index e465376295..0842b208b3 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -37,7 +37,7 @@ obj-$(CONFIG_ARCH_IPQ40xx) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ807x) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ6018) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ5018) += qca_qup_spi_bam.o -obj-$(CONFIG_ARCH_IPQ9048) += qca_qup_spi_bam.o +obj-$(CONFIG_ARCH_IPQ9574) += qca_qup_spi_bam.o obj-$(CONFIG_ARCH_IPQ806x) += ipq_spi.o endif diff --git a/include/common.h b/include/common.h index c707d113f9..c1ad31ae2e 100644 --- a/include/common.h +++ b/include/common.h @@ -41,8 +41,8 @@ typedef volatile unsigned char vu_char; #elif defined(CONFIG_IPQ6018) #include <../board/qca/arm/ipq6018/ipq6018.h> -#elif defined(CONFIG_IPQ9048) -#include <../board/qca/arm/ipq9048/ipq9048.h> +#elif defined(CONFIG_IPQ9574) +#include <../board/qca/arm/ipq9574/ipq9574.h> #elif defined(CONFIG_IPQ_RUMI) #include <../board/qca/arm/ipq807x/ipq807x.h> @@ -416,7 +416,7 @@ ulong getenv_hex(const char *varname, ulong default_val); * Return -1 if variable does not exist (default to true) */ int getenv_yesno(const char *var); -#if defined(CONFIG_IPQ40XX_ENV) || defined(CONFIG_IPQ807X_ENV) || defined(CONFIG_IPQ806X_ENV) || defined(CONFIG_IPQ5018_ENV) || defined(CONFIG_IPQ6018_ENV) || defined(CONFIG_IPQ9048_ENV) +#if defined(CONFIG_IPQ40XX_ENV) || defined(CONFIG_IPQ807X_ENV) || defined(CONFIG_IPQ806X_ENV) || defined(CONFIG_IPQ5018_ENV) || defined(CONFIG_IPQ6018_ENV) || defined(CONFIG_IPQ9574_ENV) extern int (*saveenv)(void); #else int saveenv (void); diff --git a/include/configs/ipq9574.h b/include/configs/ipq9574.h index c37388e372..3486523e02 100644 --- a/include/configs/ipq9574.h +++ b/include/configs/ipq9574.h @@ -11,19 +11,19 @@ * GNU General Public License for more details. */ -#ifndef _IPQ9048_H -#define _IPQ9048_H +#ifndef _IPQ9574_H +#define _IPQ9574_H #ifndef DO_DEPS_ONLY #include #endif /* - * Support for IPQ9048 RUMI + * Support for IPQ9574 RUMI */ -#define CONFIG_IPQ9048_RUMI +#define CONFIG_IPQ9574_RUMI -#define CONFIG_IPQ9048 +#define CONFIG_IPQ9574 #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT @@ -33,7 +33,7 @@ #define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) -#define CONFIG_IPQ9048_UART +#define CONFIG_IPQ9574_UART #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SKIP_LOWLEVEL_INIT @@ -118,7 +118,7 @@ extern loff_t board_env_range; extern loff_t board_env_size; #endif -#define CONFIG_IPQ9048_ENV 1 +#define CONFIG_IPQ9574_ENV 1 #define CONFIG_ENV_OFFSET board_env_offset #define CONFIG_ENV_SIZE CONFIG_ENV_SIZE_MAX #define CONFIG_ENV_RANGE board_env_range @@ -136,8 +136,8 @@ extern loff_t board_env_size; #define HAVE_BLOCK_DEVICE #define CONFIG_DOS_PARTITION -#define CONFIG_IPQ9048_I2C 1 -#ifdef CONFIG_IPQ9048_I2C +#define CONFIG_IPQ9574_I2C 1 +#ifdef CONFIG_IPQ9574_I2C #define CONFIG_SYS_I2C_QUP #define CONFIG_CMD_I2C #define CONFIG_DM_I2C @@ -318,4 +318,4 @@ extern loff_t board_env_size; #define CONFIG_IPQ_TZT #define CONFIG_IPQ_FDT_FIXUP #define CONFIG_ARMV7_PSCI -#endif /* _IPQ9048_H */ +#endif /* _IPQ9574_H */ diff --git a/include/dt-bindings/qcom/gpio-ipq9574.h b/include/dt-bindings/qcom/gpio-ipq9574.h index e595b44e69..1f0ddfeef1 100644 --- a/include/dt-bindings/qcom/gpio-ipq9574.h +++ b/include/dt-bindings/qcom/gpio-ipq9574.h @@ -11,8 +11,8 @@ * GNU General Public License for more details. */ -#ifndef __DT_BINDINGS_IPQ9048_GPIO_H__ -#define __DT_BINDINGS_IPQ9048_GPIO_H__ +#ifndef __DT_BINDINGS_IPQ9574_GPIO_H__ +#define __DT_BINDINGS_IPQ9574_GPIO_H__ /* GPIO TLMM: Direction */ #define GPIO_INPUT 0