mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-29 15:43:59 +08:00
Trivial typos and some macros removal & modification
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJRY84IAAoJEAf03oE53VmQNaAIAJ8WTPV9cxGPO+h55QiRL2WZ 9MMBpOV0f06s0cKIoE/lKrpKfOQcBYW74C9koERs7CrBWnAKGePairAgfpNduTrC uYgF29kfeapMgr3CbKzacWZs8KRF+1DguACZ177mAOBUtNORzUGnBM80SAL26s8w 7BLUjQVNu2q8ELA30KFqxPHvFWTCsXMFdHjKGJH4n4n8sxMIvtCCXIq26oDvX+G8 yLZ2lD1bC5byI35uPPF9mBsjXPwh5BYguPAETkbawuE4K2d1T8Y2w/GgRobJ/2DZ WzsednDcuxkk2AfmxVDdtqnOCO3v84BhqlnRcBBNW5neE/779wzop9olk8gcshc= =sFrg -----END PGP SIGNATURE----- Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup From Nicolas Ferre <nicolas.ferre@atmel.com>: Trivial typos and some macros removal & modification * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: ARM: at91: remove trailing semicolon from macros ARM: at91/setup: fix trivial typos ARM: at91: remove unused dbgu_readl() macro Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
3da2541645
@ -23,7 +23,7 @@ extern void __iomem *at91_rstc_base;
|
||||
__raw_readl(at91_rstc_base + field)
|
||||
|
||||
#define at91_rstc_write(field, value) \
|
||||
__raw_writel(value, at91_rstc_base + field);
|
||||
__raw_writel(value, at91_rstc_base + field)
|
||||
#else
|
||||
.extern at91_rstc_base
|
||||
#endif
|
||||
|
@ -23,7 +23,7 @@ extern void __iomem *at91_shdwc_base;
|
||||
__raw_readl(at91_shdwc_base + field)
|
||||
|
||||
#define at91_shdwc_write(field, value) \
|
||||
__raw_writel(value, at91_shdwc_base + field);
|
||||
__raw_writel(value, at91_shdwc_base + field)
|
||||
#endif
|
||||
|
||||
#define AT91_SHDW_CR 0x00 /* Shut Down Control Register */
|
||||
|
@ -33,7 +33,7 @@
|
||||
__raw_readl(AT91_IO_P2V(AT91_TC) + field)
|
||||
|
||||
#define at91_tc_write(field, value) \
|
||||
__raw_writel(value, AT91_IO_P2V(AT91_TC) + field);
|
||||
__raw_writel(value, AT91_IO_P2V(AT91_TC) + field)
|
||||
|
||||
/*
|
||||
* 3 counter/timer units present.
|
||||
|
@ -16,9 +16,6 @@
|
||||
#ifndef AT91_DBGU_H
|
||||
#define AT91_DBGU_H
|
||||
|
||||
#define dbgu_readl(dbgu, field) \
|
||||
__raw_readl(AT91_VA_BASE_SYS + dbgu + AT91_DBGU_ ## field)
|
||||
|
||||
#if !defined(CONFIG_ARCH_AT91X40)
|
||||
#define AT91_DBGU_CR (0x00) /* Control Register */
|
||||
#define AT91_DBGU_MR (0x04) /* Mode Register */
|
||||
|
@ -14,7 +14,7 @@ extern void __iomem *at91_matrix_base;
|
||||
__raw_readl(at91_matrix_base + field)
|
||||
|
||||
#define at91_matrix_write(field, value) \
|
||||
__raw_writel(value, at91_matrix_base + field);
|
||||
__raw_writel(value, at91_matrix_base + field)
|
||||
|
||||
#else
|
||||
.extern at91_matrix_base
|
||||
|
@ -23,7 +23,7 @@ extern void __iomem *at91_st_base;
|
||||
__raw_readl(at91_st_base + field)
|
||||
|
||||
#define at91_st_write(field, value) \
|
||||
__raw_writel(value, at91_st_base + field);
|
||||
__raw_writel(value, at91_st_base + field)
|
||||
#else
|
||||
.extern at91_st_base
|
||||
#endif
|
||||
|
@ -353,7 +353,7 @@ static void at91_dt_ramc(void)
|
||||
|
||||
np = of_find_matching_node(NULL, ramc_ids);
|
||||
if (!np)
|
||||
panic("unable to find compatible ram conroller node in dtb\n");
|
||||
panic("unable to find compatible ram controller node in dtb\n");
|
||||
|
||||
at91_ramc_base[0] = of_iomap(np, 0);
|
||||
if (!at91_ramc_base[0])
|
||||
@ -403,7 +403,7 @@ static void at91_dt_shdwc(void)
|
||||
|
||||
np = of_find_matching_node(NULL, shdwc_ids);
|
||||
if (!np) {
|
||||
pr_debug("AT91: unable to find compatible shutdown (shdwc) conroller node in dtb\n");
|
||||
pr_debug("AT91: unable to find compatible shutdown (shdwc) controller node in dtb\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -419,7 +419,7 @@ static void at91_dt_shdwc(void)
|
||||
|
||||
if (!of_property_read_u32(np, "atmel,wakeup-counter", ®)) {
|
||||
if (reg > AT91_SHDW_CPTWK0_MAX) {
|
||||
pr_warn("AT91: shdwc wakeup conter 0x%x > 0x%x reduce it to 0x%x\n",
|
||||
pr_warn("AT91: shdwc wakeup counter 0x%x > 0x%x reduce it to 0x%x\n",
|
||||
reg, AT91_SHDW_CPTWK0_MAX, AT91_SHDW_CPTWK0_MAX);
|
||||
reg = AT91_SHDW_CPTWK0_MAX;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user