| Message ID | 1516350961-17194-2-git-send-email-kysonlok@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Piotr Dymacz |
| Headers | show |
| Series | [LEDE-DEV,v3,1/2] ar71xx: uniform GL iNet products mach name | expand |
Hello Kyson, Thank you for your patch, I merged it into my staging tree: https://git.openwrt.org/openwrt/staging/pepe2k.git
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c index 9824bb8..9febc7a 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c @@ -122,4 +122,4 @@ static void __init gl_ar150_setup(void) ath79_register_wmac(art + GL_AR150_CALDATA_OFFSET, art + GL_AR150_WMAC_MAC_OFFSET); } -MIPS_MACHINE(ATH79_MACH_GL_AR150, "GL-AR150", "GL-AR150",gl_ar150_setup); +MIPS_MACHINE(ATH79_MACH_GL_AR150, "GL-AR150", "GL.iNet GL-AR150", gl_ar150_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c index ae96635..1708d69 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c @@ -100,4 +100,4 @@ static void __init gl_ar300_setup(void) ath79_register_wmac(art + GL_AR300_CALDATA_OFFSET, art + GL_AR300_WMAC_MAC_OFFSET); } -MIPS_MACHINE(ATH79_MACH_GL_AR300, "GL-AR300", "GL-AR300",gl_ar300_setup); +MIPS_MACHINE(ATH79_MACH_GL_AR300, "GL-AR300", "GL.iNet GL-AR300", gl_ar300_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c index c4e537f..2a2d270 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c @@ -162,5 +162,4 @@ static void __init gl_ar300m_setup(void) ath79_register_pci(); } -MIPS_MACHINE(ATH79_MACH_GL_AR300M, "GL-AR300M", "GL-AR300M", - gl_ar300m_setup); +MIPS_MACHINE(ATH79_MACH_GL_AR300M, "GL-AR300M", "GL.iNet GL-AR300M", gl_ar300m_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c index 412c562..9f8ca2f 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c @@ -111,4 +111,4 @@ static void __init gl_mifi_setup(void) ath79_register_wmac(art + GL_MIFI_CALDATA_OFFSET, art + GL_MIFI_WMAC_MAC_OFFSET); } -MIPS_MACHINE(ATH79_MACH_GL_MIFI, "GL-MIFI", "GL-MIFI",gl_mifi_setup); +MIPS_MACHINE(ATH79_MACH_GL_MIFI, "GL-MIFI", "GL.iNet GL-MIFI", gl_mifi_setup);
This patch include GL.iNet vendor name in the machine name for GL.iNet vendor products. Signed-off-by: Kyson Lok <kysonlok@gmail.com> --- target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c | 2 +- target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c | 2 +- target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c | 3 +-- target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)