Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tbblgm119
lede
提交
fc170dfd
L
lede
项目概览
tbblgm119
/
lede
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
lede
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fc170dfd
编写于
6月 15, 2018
作者:
C
coolsnowwolf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update ramips target in 4.14
上级
2b27fd97
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
286 addition
and
20 deletion
+286
-20
target/linux/ramips/base-files/etc/board.d/01_leds
target/linux/ramips/base-files/etc/board.d/01_leds
+1
-0
target/linux/ramips/base-files/etc/board.d/02_network
target/linux/ramips/base-files/etc/board.d/02_network
+5
-1
target/linux/ramips/base-files/etc/diag.sh
target/linux/ramips/base-files/etc/diag.sh
+1
-0
target/linux/ramips/base-files/lib/upgrade/platform.sh
target/linux/ramips/base-files/lib/upgrade/platform.sh
+1
-0
target/linux/ramips/dts/MIR3G.dts
target/linux/ramips/dts/MIR3G.dts
+12
-9
target/linux/ramips/dts/WN-GX300GR.dts
target/linux/ramips/dts/WN-GX300GR.dts
+156
-0
target/linux/ramips/dts/mt7621.dtsi
target/linux/ramips/dts/mt7621.dtsi
+10
-9
target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c
target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c
+17
-1
target/linux/ramips/image/mt7621.mk
target/linux/ramips/image/mt7621.mk
+8
-0
target/linux/ramips/mt7621/config-4.14
target/linux/ramips/mt7621/config-4.14
+2
-0
target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
...-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
+73
-0
未找到文件。
target/linux/ramips/base-files/etc/board.d/01_leds
浏览文件 @
fc170dfd
...
...
@@ -168,6 +168,7 @@ dlink,dwr-921-c1)
ucidef_set_led_default
"sigstrength"
"Signal Strength"
"
$boardname
:green:sigstrength"
"0"
;;
dir-810l|
\
iodata,wn-gx300gr|
\
mzk-750dhp|
\
mzk-dp150n|
\
vr500
)
...
...
target/linux/ramips/base-files/etc/board.d/02_network
浏览文件 @
fc170dfd
...
...
@@ -143,6 +143,7 @@ ramips_setup_interfaces()
mzk-ex750np|
\
na930|
\
pbr-d1|
\
ravpower,wd03|
\
tama,w06|
\
u25awf-h1|
\
wli-tx4-ag300n|
\
...
...
@@ -194,6 +195,7 @@ ramips_setup_interfaces()
gl-mt300n|
\
gl-mt750|
\
hg255d|
\
iodata,wn-gx300gr|
\
jhr-n805r|
\
jhr-n825r|
\
jhr-n926r|
\
...
...
@@ -210,7 +212,6 @@ ramips_setup_interfaces()
ubnt-erx|
\
ubnt-erx-sfp|
\
ur-326n4g|
\
ravpower,wd03|
\
wrtnode|
\
wrtnode2p
|
\
wrtnode2r
|
\
...
...
@@ -459,6 +460,9 @@ ramips_setup_macs()
[
-n
"
$lan_mac
"
]
||
lan_mac
=
$(
cat
/sys/class/net/eth0/address
)
wan_mac
=
$(
macaddr_add
"
$lan_mac
"
1
)
;;
iodata,wn-gx300gr
)
wan_mac
=
$(
macaddr_add
"
$(
mtd_get_mac_binary Factory 4
)
"
1
)
;;
kn_rc|
\
kn_rf|
\
kng_rc
)
...
...
target/linux/ramips/base-files/etc/diag.sh
浏览文件 @
fc170dfd
...
...
@@ -27,6 +27,7 @@ get_status_led() {
fonera20n|
\
firewrt|
\
hg255d|
\
iodata,wn-gx300gr|
\
kn|
\
kn_rc|
\
kn_rf|
\
...
...
target/linux/ramips/base-files/lib/upgrade/platform.sh
浏览文件 @
fc170dfd
...
...
@@ -75,6 +75,7 @@ platform_check_image() {
hpm|
\
ht-tm02|
\
hw550-3g|
\
iodata,wn-gx300gr|
\
ip2202|
\
jhr-n805r|
\
jhr-n825r|
\
...
...
target/linux/ramips/dts/MIR3G.dts
浏览文件 @
fc170dfd
...
...
@@ -66,16 +66,19 @@
};
};
gpio_export
{
compatible
=
"gpio-export"
;
#
size
-
cells
=
<
0
>;
usbpower
{
gpio
-
export
,
name
=
"usbpower"
;
gpio
-
export
,
output
=
<
1
>;
gpios
=
<&
gpio0
12
GPIO_ACTIVE_HIGH
>;
};
reg_usb_vbus
:
reg_usb_vbus
{
compatible
=
"regulator-fixed"
;
regulator
-
name
=
"usb_vbus"
;
regulator
-
min
-
microvolt
=
<
5000000
>;
regulator
-
max
-
microvolt
=
<
5000000
>;
gpio
=
<&
gpio0
12
GPIO_ACTIVE_HIGH
>;
enable
-
active
-
high
;
};
};
&
xhci
{
vbus
-
supply
=
<&
reg_usb_vbus
>;
};
&
nand
{
...
...
target/linux/ramips/dts/WN-GX300GR.dts
0 → 100644
浏览文件 @
fc170dfd
/
dts
-
v1
/;
#
include
"mt7621.dtsi"
#
include
<
dt
-
bindings
/
gpio
/
gpio
.
h
>
#
include
<
dt
-
bindings
/
input
/
input
.
h
>
/
{
compatible
=
"iodata,wn-gx300gr"
,
"mediatek,mt7621-soc"
;
model
=
"I-O DATA WN-GX300GR"
;
memory
@
0
{
device_type
=
"memory"
;
reg
=
<
0x0
0x4000000
>;
};
chosen
{
bootargs
=
"console=ttyS0,115200"
;
};
gpio
-
leds
{
compatible
=
"gpio-leds"
;
power
{
label
=
"wn-gx300gr:green:power"
;
gpios
=
<&
gpio0
7
GPIO_ACTIVE_LOW
>;
};
wps
{
label
=
"wn-gx300gr:green:wps"
;
gpios
=
<&
gpio0
17
GPIO_ACTIVE_LOW
>;
};
};
gpio
-
keys
-
polled
{
compatible
=
"gpio-keys-polled"
;
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
poll
-
interval
=
<
20
>;
reset
{
label
=
"reset"
;
gpios
=
<&
gpio0
10
GPIO_ACTIVE_LOW
>;
linux
,
code
=
<
KEY_RESTART
>;
};
wps
{
label
=
"wps"
;
gpios
=
<&
gpio0
14
GPIO_ACTIVE_LOW
>;
linux
,
code
=
<
KEY_WPS_BUTTON
>;
};
auto
{
label
=
"auto"
;
gpios
=
<&
gpio0
15
GPIO_ACTIVE_LOW
>;
linux
,
code
=
<
BTN_0
>;
linux
,
input
-
type
=
<
EV_SW
>;
};
custom
{
label
=
"custom"
;
gpios
=
<&
gpio0
16
GPIO_ACTIVE_LOW
>;
linux
,
code
=
<
BTN_0
>;
linux
,
input
-
type
=
<
EV_SW
>;
};
};
};
&
spi0
{
status
=
"okay"
;
m25p80
@
0
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"jedec,spi-nor"
;
reg
=
<
0
>;
spi
-
max
-
frequency
=
<
10000000
>;
m25p
,
chunked
-
io
=
<
32
>;
partition
@
0
{
label
=
"Bootloader"
;
reg
=
<
0x0
0x30000
>;
read
-
only
;
};
partition
@
30000
{
label
=
"Config"
;
reg
=
<
0x30000
0x10000
>;
read
-
only
;
};
Factory
:
partition
@
40000
{
label
=
"Factory"
;
reg
=
<
0x40000
0x10000
>;
read
-
only
;
};
partition
@
50000
{
label
=
"iNIC_rf"
;
reg
=
<
0x50000
0x10000
>;
read
-
only
;
};
partition
@
60000
{
label
=
"firmware"
;
reg
=
<
0x60000
0x770000
>;
};
partition
@
7
d0000
{
label
=
"Key"
;
reg
=
<
0x7d0000
0x10000
>;
read
-
only
;
};
partition
@
7e0000
{
label
=
"backup"
;
reg
=
<
0x7e0000
0x10000
>;
read
-
only
;
};
partition
@
7f0000
{
label
=
"storage"
;
reg
=
<
0x7f0000
0x10000
>;
read
-
only
;
};
};
};
&
ethernet
{
mtd
-
mac
-
address
=
<&
Factory
0x4
>;
};
&
pinctrl
{
state_default
:
pinctrl0
{
gpio
{
ralink
,
group
=
"uart2"
,
"uart3"
,
"jtag"
;
ralink
,
function
=
"gpio"
;
};
};
};
&
pcie
{
status
=
"okay"
;
pcie0
{
mt76
@
0
,
0
{
reg
=
<
0x0000
0
0
0
0
>;
device_type
=
"pci"
;
mediatek
,
mtd
-
eeprom
=
<&
Factory
0x0
>;
};
};
};
&
xhci
{
status
=
"disabled"
;
};
target/linux/ramips/dts/mt7621.dtsi
浏览文件 @
fc170dfd
...
...
@@ -6,16 +6,23 @@
compatible = "mediatek,mt7621-soc";
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu@0 {
device_type = "cpu";
compatible = "mips,mips1004Kc";
reg = <0x0>;
};
cpu@1 {
device_type = "cpu";
compatible = "mips,mips1004Kc";
reg = <0x1>;
};
};
cpuintc: cpuintc
@0
{
cpuintc: cpuintc {
#address-cells = <0>;
#interrupt-cells = <1>;
interrupt-controller;
...
...
@@ -26,7 +33,7 @@
serial0 = &uartlite;
};
cpuclock: cpuclock
@0
{
cpuclock: cpuclock {
#clock-cells = <0>;
compatible = "fixed-clock";
...
...
@@ -34,7 +41,7 @@
clock-frequency = <880000000>;
};
sysclock: sysclock
@0
{
sysclock: sysclock {
#clock-cells = <0>;
compatible = "fixed-clock";
...
...
@@ -457,8 +464,6 @@
#address-cells = <3>;
#size-cells = <2>;
device_type = "pci";
};
pcie1 {
...
...
@@ -466,8 +471,6 @@
#address-cells = <3>;
#size-cells = <2>;
device_type = "pci";
};
pcie2 {
...
...
@@ -475,8 +478,6 @@
#address-cells = <3>;
#size-cells = <2>;
device_type = "pci";
};
};
};
target/linux/ramips/files-4.14/drivers/mmc/host/mtk-mmc/sd.c
浏览文件 @
fc170dfd
...
...
@@ -2209,7 +2209,23 @@ static int msdc_drv_probe(struct platform_device *pdev)
// Set the pins for sdxc to sdxc mode
//FIXME: this should be done by pinctl and not by the sd driver
reg
=
sdr_read32
((
void
__iomem
*
)(
RALINK_SYSCTL_BASE
+
0x60
))
&
~
(
0x3
<<
18
);
if
(
ralink_soc
==
MT762X_SOC_MT7620A
||
ralink_soc
==
MT762X_SOC_MT7621AT
)
{
reg
=
sdr_read32
((
void
__iomem
*
)(
RALINK_SYSCTL_BASE
+
0x60
))
&
~
(
0x3
<<
18
);
if
(
ralink_soc
==
MT762X_SOC_MT7620A
)
reg
|=
0x1
<<
18
;
}
else
{
reg
=
sdr_read32
((
void
__iomem
*
)(
RALINK_SYSCTL_BASE
+
0x3c
));
reg
|=
0x1e
<<
16
;
sdr_write32
((
void
__iomem
*
)(
RALINK_SYSCTL_BASE
+
0x3c
),
reg
);
reg
=
sdr_read32
((
void
__iomem
*
)(
RALINK_SYSCTL_BASE
+
0x60
))
&
~
(
0x3
<<
10
);
#if defined(CONFIG_MTK_MMC_EMMC_8BIT)
reg
|=
0x3
<<
26
|
0x3
<<
28
|
0x3
<<
30
;
#endif
}
sdr_write32
((
void
__iomem
*
)(
RALINK_SYSCTL_BASE
+
0x60
),
reg
);
hw
=
&
msdc0_hw
;
...
...
target/linux/ramips/image/mt7621.mk
浏览文件 @
fc170dfd
...
...
@@ -114,6 +114,14 @@ define Device/hc5962
endef
TARGET_DEVICES
+=
hc5962
define
Device/iodata_wn-gx300gr
DTS
:=
WN-GX300GR
IMAGE_SIZE
:=
7798784
DEVICE_TITLE
:=
I-O DATA WN-GX300GR
DEVICE_PACKAGES
:=
kmod-mt7603 wpad-mini
endef
TARGET_DEVICES
+=
iodata_wn-gx300gr
define
Device/k2p
DTS
:=
K2P
IMAGE_SIZE
:=
$(ralink_default_fw_size_16M)
...
...
target/linux/ramips/mt7621/config-4.14
浏览文件 @
fc170dfd
...
...
@@ -227,6 +227,8 @@ CONFIG_RCU_STALL_COMMON=y
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPI=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_RESET_CONTROLLER=y
CONFIG_RFS_ACCEL=y
CONFIG_RPS=y
...
...
target/linux/ramips/patches-4.14/0054-mtd-spi-nor-w25q256-respect-default-mode.patch
0 → 100644
浏览文件 @
fc170dfd
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -142,20 +142,29 @@
static int read_fsr(struct spi_nor *nor)
* location. Return the configuration register value.
* Returns negative if error occurred.
*/
-static int read_cr(struct spi_nor *nor)
+static int _read_cr(struct spi_nor *nor, u8 reg)
{
int ret;
u8 val;
- ret = nor->read_reg(nor, SPINOR_OP_RDCR, &val, 1);
+ ret = nor->read_reg(nor, reg, &val, 1);
if (ret < 0) {
- dev_err(nor->dev, "error %d reading CR\n", ret);
+ dev_err(nor->dev, "error %d reading %s\n", ret,
+ (reg==SPINOR_OP_RDCR)?"CR":"XCR");
return ret;
}
return val;
}
+static inline int read_cr(struct spi_nor *nor) {
+ return _read_cr(nor, SPINOR_OP_RDCR);
+}
+
+static inline int read_xcr(struct spi_nor *nor) {
+ return _read_cr(nor, SPINOR_OP_RDXCR);
+}
+
/*
* Write status register 1 byte
* Returns negative if error occurred.
@@ -2878,9 +2887,16 @@
int spi_nor_scan(struct spi_nor *nor, co
} else if (mtd->size > 0x1000000) {
/* enable 4-byte addressing if the device exceeds 16MiB */
nor->addr_width = 4;
- if (info->flags & SPI_NOR_4B_READ_OP)
- spi_nor_set_4byte_read(nor, info);
- else if (JEDEC_MFR(info) == SNOR_MFR_SPANSION ||
+ if (info->flags & SPI_NOR_4B_READ_OP) {
+ if (JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
+ ret = read_xcr(nor);
+ if (!(ret > 0 && (ret & XCR_DEF_4B_ADDR_MODE)))
+ spi_nor_set_4byte_read(nor, info);
+ else
+ set_4byte(nor, info, 1);
+ } else
+ spi_nor_set_4byte_read(nor, info);
+ } else if (JEDEC_MFR(info) == SNOR_MFR_SPANSION ||
info->flags & SPI_NOR_4B_OPCODES)
spi_nor_set_4byte_opcodes(nor, info);
else
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -103,6 +103,7 @@
#define SPINOR_OP_EN4B 0xb7 /* Enter 4-byte mode */
#define SPINOR_OP_EX4B 0xe9 /* Exit 4-byte mode */
#define SPINOR_OP_WREAR 0xc5 /* Write extended address register */
+#define SPINOR_OP_RDXCR 0x15 /* Read extended configuration register */
/* Used for Spansion flashes only. */
#define SPINOR_OP_BRWR 0x17 /* Bank register write */
@@ -135,6 +136,7 @@
/* Configuration Register bits. */
#define CR_QUAD_EN_SPAN BIT(1) /* Spansion Quad I/O */
+#define XCR_DEF_4B_ADDR_MODE BIT(1) /* Winbond 4B mode default */
/* Status Register 2 bits. */
#define SR2_QUAD_EN_BIT7 BIT(7)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录