Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
da09b99e
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
da09b99e
编写于
10月 16, 2020
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '2020-10-15-further-cleanup_dev_xxx'
- Bring in the next round of dev_xxx cleanup patches.
上级
9dc6aef8
4a1989c0
变更
26
隐藏空白更改
内联
并排
Showing
26 changed file
with
74 addition
and
94 deletion
+74
-94
arch/arm/cpu/armv8/fsl-layerscape/soc.c
arch/arm/cpu/armv8/fsl-layerscape/soc.c
+1
-0
drivers/clk/at91/compat.c
drivers/clk/at91/compat.c
+1
-0
drivers/clk/sifive/fu540-prci.c
drivers/clk/sifive/fu540-prci.c
+7
-7
drivers/core/syscon-uclass.c
drivers/core/syscon-uclass.c
+2
-0
drivers/firmware/scmi/mailbox_agent.c
drivers/firmware/scmi/mailbox_agent.c
+1
-0
drivers/firmware/scmi/scmi_agent-uclass.c
drivers/firmware/scmi/scmi_agent-uclass.c
+1
-0
drivers/firmware/scmi/smt.c
drivers/firmware/scmi/smt.c
+1
-0
drivers/mtd/nand/raw/mxs_nand.c
drivers/mtd/nand/raw/mxs_nand.c
+15
-13
drivers/net/ldpaa_eth/ldpaa_eth.c
drivers/net/ldpaa_eth/ldpaa_eth.c
+7
-7
drivers/phy/phy-uclass.c
drivers/phy/phy-uclass.c
+1
-1
drivers/ram/imxrt_sdram.c
drivers/ram/imxrt_sdram.c
+1
-0
drivers/spi/fsl_qspi.c
drivers/spi/fsl_qspi.c
+5
-4
drivers/spi/nxp_fspi.c
drivers/spi/nxp_fspi.c
+4
-3
drivers/tee/optee/core.c
drivers/tee/optee/core.c
+1
-0
drivers/timer/timer-uclass.c
drivers/timer/timer-uclass.c
+3
-2
drivers/usb/host/dwc3-octeon-glue.c
drivers/usb/host/dwc3-octeon-glue.c
+1
-0
drivers/usb/host/xhci-mtk.c
drivers/usb/host/xhci-mtk.c
+3
-2
drivers/usb/host/xhci.c
drivers/usb/host/xhci.c
+4
-3
drivers/usb/musb-new/mt85xx.c
drivers/usb/musb-new/mt85xx.c
+4
-3
drivers/usb/musb-new/musb_core.c
drivers/usb/musb-new/musb_core.c
+2
-0
drivers/usb/musb-new/musb_dsps.c
drivers/usb/musb-new/musb_dsps.c
+2
-0
drivers/usb/musb-new/musb_gadget.c
drivers/usb/musb-new/musb_gadget.c
+2
-0
drivers/usb/musb-new/musb_gadget_ep0.c
drivers/usb/musb-new/musb_gadget_ep0.c
+3
-1
drivers/usb/musb-new/musb_host.c
drivers/usb/musb-new/musb_host.c
+2
-0
include/dm/device_compat.h
include/dm/device_compat.h
+0
-20
include/linux/compat.h
include/linux/compat.h
+0
-28
未找到文件。
arch/arm/cpu/armv8/fsl-layerscape/soc.c
浏览文件 @
da09b99e
...
...
@@ -37,6 +37,7 @@
#include <env_internal.h>
#endif
#include <dm.h>
#include <dm/device_compat.h>
#include <linux/err.h>
#if defined(CONFIG_TFABOOT) || defined(CONFIG_GIC_V3_ITS)
DECLARE_GLOBAL_DATA_PTR
;
...
...
drivers/clk/at91/compat.c
浏览文件 @
da09b99e
...
...
@@ -9,6 +9,7 @@
#include <common.h>
#include <clk-uclass.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <dm/lists.h>
#include <dm/util.h>
#include <mach/at91_pmc.h>
...
...
drivers/clk/sifive/fu540-prci.c
浏览文件 @
da09b99e
...
...
@@ -29,23 +29,23 @@
*/
#include <common.h>
#include <asm/io.h>
#include <asm/arch/reset.h>
#include <clk-uclass.h>
#include <clk.h>
#include <div64.h>
#include <dm.h>
#include <errno.h>
#include <reset-uclass.h>
#include <dm/device.h>
#include <dm/device_compat.h>
#include <dm/uclass.h>
#include <dt-bindings/clock/sifive-fu540-prci.h>
#include <dt-bindings/reset/sifive-fu540-prci.h>
#include <errno.h>
#include <reset-uclass.h>
#include <asm/io.h>
#include <asm/arch/reset.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/math64.h>
#include <linux/clk/analogbits-wrpll-cln28hpc.h>
#include <dt-bindings/clock/sifive-fu540-prci.h>
#include <dt-bindings/reset/sifive-fu540-prci.h>
/*
* EXPECTED_CLK_PARENT_COUNT: how many parent clocks this driver expects:
...
...
drivers/core/syscon-uclass.c
浏览文件 @
da09b99e
...
...
@@ -4,6 +4,8 @@
* Written by Simon Glass <sjg@chromium.org>
*/
#define LOG_CATEGORY UCLASS_SYSCON
#include <common.h>
#include <log.h>
#include <syscon.h>
...
...
drivers/firmware/scmi/mailbox_agent.c
浏览文件 @
da09b99e
...
...
@@ -5,6 +5,7 @@
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <errno.h>
#include <mailbox.h>
#include <scmi_agent.h>
...
...
drivers/firmware/scmi/scmi_agent-uclass.c
浏览文件 @
da09b99e
...
...
@@ -5,6 +5,7 @@
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <errno.h>
#include <scmi_agent-uclass.h>
#include <scmi_protocols.h>
...
...
drivers/firmware/scmi/smt.c
浏览文件 @
da09b99e
...
...
@@ -7,6 +7,7 @@
#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <errno.h>
#include <scmi_agent.h>
#include <asm/cache.h>
...
...
drivers/mtd/nand/raw/mxs_nand.c
浏览文件 @
da09b99e
...
...
@@ -16,19 +16,20 @@
#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <asm/cache.h>
#include <linux/mtd/rawnand.h>
#include <linux/sizes.h>
#include <linux/types.h>
#include <dm/device_compat.h>
#include <malloc.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <mxs_nand.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
#include <asm/cache.h>
#include <asm/io.h>
#include <asm/mach-imx/regs-bch.h>
#include <asm/mach-imx/regs-gpmi.h>
#include <asm/arch/sys_proto.h>
#include <mxs_nand.h>
#include <linux/errno.h>
#include <linux/mtd/rawnand.h>
#include <linux/sizes.h>
#include <linux/types.h>
#define MXS_NAND_DMA_DESCRIPTOR_COUNT 4
...
...
@@ -115,13 +116,14 @@ static uint32_t mxs_nand_aux_status_offset(void)
return
(
MXS_NAND_METADATA_SIZE
+
0x3
)
&
~
0x3
;
}
static
inline
bool
mxs_nand_bbm_in_data_chunk
(
struct
bch_geometry
*
geo
,
struct
mtd_info
*
mtd
,
unsigned
int
*
chunk_num
)
static
inline
bool
mxs_nand_bbm_in_data_chunk
(
struct
bch_geometry
*
geo
,
struct
mtd_info
*
mtd
,
unsigned
int
*
chunk_num
)
{
unsigned
int
i
,
j
;
if
(
geo
->
ecc_chunk0_size
!=
geo
->
ecc_chunkn_size
)
{
dev_err
(
this
->
dev
,
"The size of chunk0 must equal to chunkn
\n
"
);
dev_err
(
mtd
->
dev
,
"The size of chunk0 must equal to chunkn
\n
"
);
return
false
;
}
...
...
@@ -135,7 +137,7 @@ static inline bool mxs_nand_bbm_in_data_chunk(struct bch_geometry *geo, struct m
if
(
j
<
geo
->
ecc_chunkn_size
*
8
)
{
*
chunk_num
=
i
+
1
;
dev_dbg
(
this
->
dev
,
"Set ecc to %d and bbm in chunk %d
\n
"
,
dev_dbg
(
mtd
->
dev
,
"Set ecc to %d and bbm in chunk %d
\n
"
,
geo
->
ecc_strength
,
*
chunk_num
);
return
true
;
}
...
...
@@ -1118,7 +1120,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo)
if
((
!
(
chip
->
ecc_strength_ds
>
0
&&
chip
->
ecc_step_ds
>
0
)
&&
mtd
->
oobsize
<
1024
)
||
nand_info
->
legacy_bch_geometry
)
{
dev_warn
(
this
->
dev
,
"use legacy bch geometry
\n
"
);
dev_warn
(
mtd
->
dev
,
"use legacy bch geometry
\n
"
);
return
mxs_nand_legacy_calc_ecc_layout
(
geo
,
mtd
);
}
...
...
drivers/net/ldpaa_eth/ldpaa_eth.c
浏览文件 @
da09b99e
...
...
@@ -6,20 +6,20 @@
#include <common.h>
#include <cpu_func.h>
#include <dm/device_compat.h>
#include <fsl-mc/fsl_dpmac.h>
#include <fsl-mc/ldpaa_wriop.h>
#include <hwconfig.h>
#include <log.h>
#include <asm/io.h>
#include <asm/types.h>
#include <malloc.h>
#include <miiphy.h>
#include <net.h>
#include <hwconfig.h>
#include <phy.h>
#include <miiphy.h>
#include <asm/io.h>
#include <asm/types.h>
#include <linux/bug.h>
#include <linux/compat.h>
#include <fsl-mc/fsl_dpmac.h>
#include <linux/delay.h>
#include <fsl-mc/ldpaa_wriop.h>
#include "ldpaa_eth.h"
#ifdef CONFIG_PHYLIB
...
...
drivers/phy/phy-uclass.c
浏览文件 @
da09b99e
...
...
@@ -6,9 +6,9 @@
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <dm/devres.h>
#include <generic-phy.h>
#include <log.h>
static
inline
struct
phy_ops
*
phy_dev_ops
(
struct
udevice
*
dev
)
{
...
...
drivers/ram/imxrt_sdram.c
浏览文件 @
da09b99e
...
...
@@ -7,6 +7,7 @@
#include <common.h>
#include <clk.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <init.h>
#include <log.h>
#include <ram.h>
...
...
drivers/spi/fsl_qspi.c
浏览文件 @
da09b99e
...
...
@@ -24,19 +24,20 @@
*/
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <log.h>
#include <asm/io.h>
#include <spi.h>
#include <spi-mem.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/libfdt.h>
#include <linux/sizes.h>
#include <linux/iopoll.h>
#include <dm.h>
#include <linux/iopoll.h>
#include <linux/sizes.h>
#include <linux/err.h>
#include <spi.h>
#include <spi-mem.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR
;
...
...
drivers/spi/nxp_fspi.c
浏览文件 @
da09b99e
...
...
@@ -34,12 +34,13 @@
*/
#include <common.h>
#include <asm/io.h>
#include <clk.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <malloc.h>
#include <spi.h>
#include <spi-mem.h>
#include <dm.h>
#include <clk.h>
#include <asm/io.h>
#include <linux/bitops.h>
#include <linux/kernel.h>
#include <linux/sizes.h>
...
...
drivers/tee/optee/core.c
浏览文件 @
da09b99e
...
...
@@ -5,6 +5,7 @@
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <log.h>
#include <malloc.h>
#include <tee.h>
...
...
drivers/timer/timer-uclass.c
浏览文件 @
da09b99e
...
...
@@ -4,14 +4,15 @@
*/
#include <common.h>
#include <clk.h>
#include <cpu.h>
#include <dm.h>
#include <init.h>
#include <dm/lists.h>
#include <dm/device_compat.h>
#include <dm/device-internal.h>
#include <dm/root.h>
#include <clk.h>
#include <errno.h>
#include <init.h>
#include <timer.h>
#include <linux/err.h>
...
...
drivers/usb/host/dwc3-octeon-glue.c
浏览文件 @
da09b99e
...
...
@@ -13,6 +13,7 @@
#include <errno.h>
#include <usb.h>
#include <asm/io.h>
#include <dm/device_compat.h>
#include <dm/lists.h>
#include <dm/of_access.h>
#include <linux/bitfield.h>
...
...
drivers/usb/host/xhci-mtk.c
浏览文件 @
da09b99e
...
...
@@ -7,15 +7,16 @@
#include <clk.h>
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <dm/devres.h>
#include <generic-phy.h>
#include <malloc.h>
#include <power/regulator.h>
#include <usb.h>
#include <usb/xhci.h>
#include <linux/errno.h>
#include <linux/compat.h>
#include <power/regulator.h>
#include <linux/iopoll.h>
#include <usb/xhci.h>
/* IPPC (IP Port Control) registers */
#define IPPC_IP_PW_CTRL0 0x00
...
...
drivers/usb/host/xhci.c
浏览文件 @
da09b99e
...
...
@@ -22,11 +22,13 @@
#include <common.h>
#include <cpu_func.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <log.h>
#include <asm/byteorder.h>
#include <usb.h>
#include <malloc.h>
#include <usb.h>
#include <usb/xhci.h>
#include <watchdog.h>
#include <asm/byteorder.h>
#include <asm/cache.h>
#include <asm/unaligned.h>
#include <linux/bitops.h>
...
...
@@ -34,7 +36,6 @@
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/iopoll.h>
#include <usb/xhci.h>
#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
...
...
drivers/usb/musb-new/mt85xx.c
浏览文件 @
da09b99e
...
...
@@ -12,6 +12,7 @@
#include <common.h>
#include <clk.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <dm/lists.h>
#include <dm/root.h>
#include <linux/delay.h>
...
...
@@ -244,17 +245,17 @@ static int mtk_musb_init(struct musb *musb)
ret
=
clk_enable
(
&
glue
->
usbpllclk
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to enable usbpll clock
\n
"
);
dev_err
(
musb
->
controller
,
"failed to enable usbpll clock
\n
"
);
return
ret
;
}
ret
=
clk_enable
(
&
glue
->
usbmcuclk
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to enable usbmcu clock
\n
"
);
dev_err
(
musb
->
controller
,
"failed to enable usbmcu clock
\n
"
);
return
ret
;
}
ret
=
clk_enable
(
&
glue
->
usbclk
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to enable usb clock
\n
"
);
dev_err
(
musb
->
controller
,
"failed to enable usb clock
\n
"
);
return
ret
;
}
...
...
drivers/usb/musb-new/musb_core.c
浏览文件 @
da09b99e
...
...
@@ -80,6 +80,8 @@
#include <linux/io.h>
#else
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <usb.h>
#include <linux/bitops.h>
#include <linux/bug.h>
...
...
drivers/usb/musb-new/musb_dsps.c
浏览文件 @
da09b99e
...
...
@@ -32,6 +32,8 @@
#include <plat/usb.h>
#else
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <asm/omap_musb.h>
#include "linux-compat.h"
#endif
...
...
drivers/usb/musb-new/musb_gadget.c
浏览文件 @
da09b99e
...
...
@@ -23,6 +23,8 @@
#include <linux/slab.h>
#else
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <linux/bug.h>
#include <linux/usb/ch9.h>
#include "linux-compat.h"
...
...
drivers/usb/musb-new/musb_gadget_ep0.c
浏览文件 @
da09b99e
...
...
@@ -19,8 +19,10 @@
#include <linux/interrupt.h>
#else
#include <common.h>
#include "linux-compat.h"
#include <dm.h>
#include <dm/device_compat.h>
#include <asm/processor.h>
#include "linux-compat.h"
#endif
#include "musb_core.h"
...
...
drivers/usb/musb-new/musb_host.c
浏览文件 @
da09b99e
...
...
@@ -22,6 +22,8 @@
#include <linux/dma-mapping.h>
#else
#include <common.h>
#include <dm.h>
#include <dm/device_compat.h>
#include <usb.h>
#include <linux/bug.h>
#include "linux-compat.h"
...
...
include/dm/device_compat.h
浏览文件 @
da09b99e
...
...
@@ -15,26 +15,6 @@
#include <linux/build_bug.h>
#include <linux/compat.h>
/*
* REVISIT:
* remove the following after resolving conflicts with <linux/compat.h>
*/
#ifdef dev_dbg
#undef dev_dbg
#endif
#ifdef dev_vdbg
#undef dev_vdbg
#endif
#ifdef dev_info
#undef dev_info
#endif
#ifdef dev_err
#undef dev_err
#endif
#ifdef dev_warn
#undef dev_warn
#endif
/*
* Define a new identifier which can be tested on by C code. A similar
* definition is made for DEBUG in <log.h>.
...
...
include/linux/compat.h
浏览文件 @
da09b99e
...
...
@@ -24,34 +24,6 @@ struct p_current{
extern
struct
p_current
*
current
;
/* avoid conflict with <dm/device.h> */
#ifdef dev_dbg
#undef dev_dbg
#endif
#ifdef dev_vdbg
#undef dev_vdbg
#endif
#ifdef dev_info
#undef dev_info
#endif
#ifdef dev_err
#undef dev_err
#endif
#ifdef dev_warn
#undef dev_warn
#endif
#define dev_dbg(dev, fmt, args...) \
debug(fmt, ##args)
#define dev_vdbg(dev, fmt, args...) \
debug(fmt, ##args)
#define dev_info(dev, fmt, args...) \
printf(fmt, ##args)
#define dev_err(dev, fmt, args...) \
printf(fmt, ##args)
#define dev_warn(dev, fmt, args...) \
printf(fmt, ##args)
#define GFP_ATOMIC ((gfp_t) 0)
#define GFP_KERNEL ((gfp_t) 0)
#define GFP_NOFS ((gfp_t) 0)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录