This patch adds support for ZyXEL NBG6617
Hardware highlights:
SOC: IPQ4018 / QCA Dakota
CPU: Quad-Core ARMv7 Processor rev 5 (v7l) Cortex-A7
DRAM: 256 MiB DDR3L-1600/1866 Nanya NT5CC128M16IP-DI @ 537 MHz
NOR: 32 MiB Macronix MX25L25635F
ETH: Qualcomm Atheros QCA8075 Gigabit Switch (4 x LAN, 1 x WAN)
USB: 1 x 3.0 (via Synopsys DesignWare DWC3 controller in the SoC)
WLAN1: Qualcomm Atheros QCA4018 2.4GHz 802.11bgn 2:2x2
WLAN2: Qualcomm Atheros QCA4018 5GHz 802.11a/n/ac 2:2x2
INPUT: RESET Button, WIFI/Rfkill Togglebutton, WPS Button
LEDS: Power, WAN, LAN 1-4, WLAN 2.4GHz, WLAN 5GHz, USB, WPS
Serial:
WARNING: The serial port needs a TTL/RS-232 3.3v level converter!
The Serial setting is 115200-8-N-1. The 1x4 .1" header comes
pre-soldered. Pinout:
1. 3v3 (Label printed on the PCB), 2. RX, 3. GND, 4. TX
first install / debricking / restore stock:
0. Have a PC running a tftp-server @ 192.168.1.99/24
1. connect the PC to any LAN-Ports
2. put the openwrt...-factory.bin (or V1.00(ABCT.X).bin for stock) file
into the tftp-server root directory and rename it to just "ras.bin".
3. power-cycle the router and hold down the the WPS button (for 30sek)
4. Wait (for a long time - the serial console provides some progress
reports. The u-boot says it best: "Please be patient".
5. Once the power LED starts to flashes slowly and the USB + WPS LEDs
flashes fast at the same time. You have to reboot the device and
it should then come right up.
Installation via Web-UI:
0. Connect a PC to the powered-on router. It will assign your PC a
IP-address via DHCP
1. Access the Web-UI at 192.168.1.1 (Default Passwort: 1234)
2. Go to the "Expert Mode"
3. Under "Maintenance", select "Firmware-Upgrade"
4. Upload the OpenWRT factory image
5. Wait for the Device to finish.
It will reboot into OpenWRT without any additional actions needed.
To open the ZyXEL NBG6617:
0. remove the four rubber feet glued on the backside
1. remove the four philips screws and pry open the top cover
(by applying force between the plastic top housing from the
backside/lan-port side)
Access the real u-boot shell:
ZyXEL uses a proprietary loader/shell on top of u-boot: "ZyXEL zloader v2.02"
When the device is starting up, the user can enter the the loader shell
by simply pressing a key within the 3 seconds once the following string
appears on the serial console:
| Hit any key to stop autoboot: 3
The user is then dropped to a locked shell.
|NBG6617> HELP
|ATEN x[,y] set BootExtension Debug Flag (y=password)
|ATSE x show the seed of password generator
|ATSH dump manufacturer related data in ROM
|ATRT [x,y,z,u] RAM read/write test (x=level, y=start addr, z=end addr, u=iterations)
|ATGO boot up whole system
|ATUR x upgrade RAS image (filename)
|NBG6617>
In order to escape/unlock a password challenge has to be passed.
Note: the value is dynamic! you have to calculate your own!
First use ATSE $MODELNAME (MODELNAME is the hostname in u-boot env)
to get the challange value/seed.
|NBG6617> ATSE NBG6617
|012345678901
This seed/value can be converted to the password with the help of this
bash script (Thanks to http://www.adslayuda.com/Zyxel650-9.html authors):
- tool.sh -
ror32() {
echo $(( ($1 >> $2) | (($1 << (32 - $2) & (2**32-1)) ) ))
}
v="0x$1"
a="0x${v:2:6}"
b=$(( $a + 0x10F0A563))
c=$(( 0x${v:12:14} & 7 ))
p=$(( $(ror32 $b $c) ^ $a ))
printf "ATEN 1,%X\n" $p
- end of tool.sh -
|# bash ./tool.sh 012345678901
|
|ATEN 1,879C711
copy and paste the result into the shell to unlock zloader.
|NBG6617> ATEN 1,0046B0017430
If the entered code was correct the shell will change to
use the ATGU command to enter the real u-boot shell.
|NBG6617> ATGU
|NBG6617#
Co-authored-by: David Bauer <mail@david-bauer.net>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: David Bauer <mail@david-bauer.net>
master
Christian Lamparter
7 years ago
committed by
John Crispin
parent
ba74b45476
commit
82618062cf
Binary file not shown.
@ -0,0 +1,196 @@ |
||||
#!/usr/bin/env bash |
||||
# |
||||
# --- ZyXEL header format --- |
||||
# Original Version by Benjamin Berg <benjamin@sipsolutions.net> |
||||
# |
||||
# The firmware image prefixed with a header (which is written into the MTD device). |
||||
# The header is one erase block (~64KiB) in size, but the checksum only convers the |
||||
# first 2KiB. Padding is 0xff. All integers are in big-endian. |
||||
# |
||||
# The checksum is always a 16-Bit System V checksum (sum -s) stored in a 32-Bit integer. |
||||
# |
||||
# 4 bytes: checksum of the rootfs image |
||||
# 4 bytes: length of the contained rootfs image file (big endian) |
||||
# 32 bytes: Firmware Version string (NUL terminated, 0xff padded) |
||||
# 4 bytes: checksum over the header partition (big endian - see below) |
||||
# 32 bytes: Model (e.g. "NBG6617", NUL termiated, 0xff padded) |
||||
# 4 bytes: checksum of the kernel partition |
||||
# 4 bytes: length of the contained kernel image file (big endian) |
||||
# rest: 0xff padding |
||||
# |
||||
# The checksums are calculated by adding up all bytes and if a 16bit |
||||
# overflow occurs, one is added and the sum is masked to 16 bit: |
||||
# csum = csum + databyte; if (csum > 0xffff) { csum += 1; csum &= 0xffff }; |
||||
# Should the file have an odd number of bytes then the byte len-0x800 is |
||||
# used additionally. |
||||
# |
||||
# The checksum for the header is calculated over the first 2048 bytes with |
||||
# the rootfs image checksum as the placeholder during calculation. |
||||
# |
||||
# The header is padded with 0xff to the erase block size of the device. |
||||
# |
||||
board="" |
||||
version="" |
||||
kernel="" |
||||
rootfs="" |
||||
outfile="" |
||||
err="" |
||||
|
||||
while [ "$1" ]; do |
||||
case "$1" in |
||||
"--board") |
||||
board="$2" |
||||
shift |
||||
shift |
||||
continue |
||||
;; |
||||
"--version") |
||||
version="$2" |
||||
shift |
||||
shift |
||||
continue |
||||
;; |
||||
"--kernel") |
||||
kernel="$2" |
||||
shift |
||||
shift |
||||
continue |
||||
;; |
||||
"--rootfs") |
||||
rootfs="$2" |
||||
shift |
||||
shift |
||||
continue |
||||
;; |
||||
"--rootfssize") |
||||
rootfssize="$2" |
||||
shift |
||||
shift |
||||
continue |
||||
;; |
||||
*) |
||||
if [ ! "$outfile" ]; then |
||||
outfile=$1 |
||||
shift |
||||
continue |
||||
fi |
||||
;; |
||||
esac |
||||
done |
||||
|
||||
if [ ! -n "$board" -o ! -n "$version" -o ! -r "$kernel" -o ! -r "$rootfs" -o ! "$rootfssize" -o ! "$outfile" ]; then |
||||
echo "syntax: $0 [--board ras-boardname] [--version ras-version] [--kernel kernelimage] [--rootfs rootfs] out" |
||||
exit 1 |
||||
fi |
||||
|
||||
rootfs_len=$(wc -c < "$rootfs") |
||||
|
||||
if [ "$rootfs_len" -lt "$rootfssize" ]; then |
||||
dd if=$rootfs of=$rootfs.new bs=$rootfssize conv=sync |
||||
mv $rootfs.new $rootfs |
||||
fi |
||||
|
||||
if [ ${#version} -ge 28 ]; then |
||||
echo "version: '$version' is too long" |
||||
exit 1 |
||||
fi |
||||
|
||||
tmpdir="$( mktemp -d 2> /dev/null )" |
||||
if [ -z "$tmpdir" ]; then |
||||
# try OSX signature |
||||
tmpdir="$( mktemp -t 'ubitmp' -d )" |
||||
fi |
||||
|
||||
if [ -z "$tmpdir" ]; then |
||||
exit 1 |
||||
fi |
||||
|
||||
to_be() { |
||||
local val="$1" |
||||
local size="$2" |
||||
|
||||
case "$size" in |
||||
4) |
||||
echo $(( "$val" >> 24 | ("$val" & 0xff0000) >> 8 | ("$val" & 0xff00) << 8 | ("$val" & 0xff) << 24 )) |
||||
;; |
||||
2) |
||||
echo $(( "$val" >> 8 | ("$val" & 0xff) << 8)) |
||||
;; |
||||
esac |
||||
} |
||||
|
||||
checksum_file() { |
||||
local file=$1 |
||||
|
||||
# ZyXEL seems to use System V sum mode... Now this is classy, who would have thought?! |
||||
echo $(sum -s ${file} | cut -f1 -d" ") |
||||
} |
||||
|
||||
append_bin() { |
||||
local val=$1 |
||||
local size=$2 |
||||
local file=$3 |
||||
|
||||
while [ "$size" -ne 0 ]; do |
||||
printf \\$(printf %o $(("$val" & 0xff))) >> "$file" |
||||
val=$(($val >> 8)) |
||||
let size-=1 |
||||
done |
||||
return |
||||
} |
||||
|
||||
tf=${tmpdir}/out |
||||
pad=$(printf '%0.1s' $(printf "\xff"){1..64}) |
||||
|
||||
rootfs_header_file="$tmpdir/rootfs_header" |
||||
rootfs_chksum=$(to_be $(checksum_file ${rootfs}) 4) |
||||
rootfs_len=$(to_be $(wc -c < "$rootfs") 4) |
||||
|
||||
versionpadlen=$(( 32 - ( ${#version} + 1) )) |
||||
|
||||
# 4 bytes: checksum of the rootfs image |
||||
append_bin "$rootfs_chksum" 4 "$rootfs_header_file" |
||||
# 4 bytes: length of the contained rootfs image file (big endian) |
||||
append_bin "$rootfs_len" 4 "$rootfs_header_file" |
||||
# 32 bytes: Firmware Version string (NUL terminated, 0xff padded) |
||||
printf "%s\x00%.*s" "$version" "$versionpadlen" "$pad" >> "$rootfs_header_file" |
||||
|
||||
kernel_header_file="$tmpdir/kernel_header" |
||||
kernel_chksum=$(to_be $(checksum_file ${kernel}) 4) |
||||
kernel_len=$(to_be $(wc -c < "$kernel") 4) |
||||
|
||||
# 4 bytes: checksum of the kernel image |
||||
append_bin "$kernel_chksum" 4 "$kernel_header_file" |
||||
# 4 bytes: length of the contained kernel image file (big endian) |
||||
append_bin "$kernel_len" 4 "$kernel_header_file" |
||||
|
||||
board_header_file="$tmpdir/board_header" |
||||
board_file="$tmpdir/board" |
||||
boardpadlen=$(( 64 - ( ${#board} + 1) )) |
||||
# 32 bytes: Model (e.g. "NBG6617", NUL termiated, 0xff padded) |
||||
printf "%s\x00%.*s" "$board" "$boardpadlen" "$pad" > "$board_file" |
||||
cat "$kernel_header_file" >> "$board_file" |
||||
printf "%.12s" "$pad" >> "$board_file" |
||||
# rest: 0xff padding |
||||
for i in {1..511}; do |
||||
printf "%s%s" "$pad" "$pad" >> "$board_file" |
||||
done |
||||
|
||||
tmp_board_file="$tmpdir/tmp_board_file" |
||||
cat "$rootfs_header_file" > "$tmp_board_file" |
||||
|
||||
# The checksum for the header is calculated over the first 2048 bytes with |
||||
# the rootfs image checksum as the placeholder during calculation. |
||||
append_bin "$rootfs_chksum" 4 "$tmp_board_file" |
||||
cat "$board_file" >> "$tmp_board_file" |
||||
|
||||
truncate -s 2048 $tmp_board_file |
||||
board_chksum=$(to_be $(checksum_file ${tmp_board_file}) 4) |
||||
|
||||
# 4 bytes: checksum over the header partition (big endian) |
||||
append_bin "$board_chksum" 4 "$board_header_file" |
||||
cat "$board_file" >> "$board_header_file" |
||||
|
||||
cat "$rootfs_header_file" "$board_header_file" "$rootfs" "$kernel" > "$outfile" |
||||
|
||||
rm -rf "$tmpdir" |
||||
@ -0,0 +1,19 @@ |
||||
#!/bin/sh |
||||
|
||||
set_preinit_iface() { |
||||
. /lib/functions.sh |
||||
|
||||
case $(board_name) in |
||||
asus,rt-ac58u| \ |
||||
avm,fritzbox-4040| \ |
||||
glinet,gl-b1300| \ |
||||
meraki,mr33| \ |
||||
zyxel,nbg6617) |
||||
ifname=eth0 |
||||
;; |
||||
*) |
||||
;; |
||||
esac |
||||
} |
||||
|
||||
boot_hook_add preinit_main set_preinit_iface |
||||
@ -0,0 +1,321 @@ |
||||
/* Copyright (c) 2015, The Linux Foundation. All rights reserved. |
||||
* |
||||
* Permission to use, copy, modify, and/or distribute this software for any |
||||
* purpose with or without fee is hereby granted, provided that the above |
||||
* copyright notice and this permission notice appear in all copies. |
||||
* |
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
||||
* |
||||
*/ |
||||
|
||||
#include "qcom-ipq4019.dtsi" |
||||
#include "qcom-ipq4019-bus.dtsi" |
||||
#include <dt-bindings/gpio/gpio.h> |
||||
#include <dt-bindings/input/input.h> |
||||
#include <dt-bindings/input/linux-event-codes.h> |
||||
#include <dt-bindings/soc/qcom,tcsr.h> |
||||
|
||||
/ { |
||||
model = "ZyXEL NBG6617"; |
||||
compatible = "zyxel,nbg6617", "qcom,ipq4019"; |
||||
|
||||
chosen { |
||||
/* |
||||
* the vendor u-boot adds root and mtdparts cmdline parameters |
||||
* which we don't want... but we have to overwrite them or else |
||||
* the kernel will take them at face value. |
||||
*/ |
||||
bootargs-append = " mtdparts= root=31:13"; |
||||
}; |
||||
|
||||
aliases { |
||||
led-boot = &power; |
||||
led-failsafe = &power; |
||||
led-running = &power; |
||||
led-upgrade = &power; |
||||
}; |
||||
|
||||
soc { |
||||
mdio@90000 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
ess-psgmii@98000 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
tcsr@1949000 { |
||||
compatible = "qcom,tcsr"; |
||||
reg = <0x1949000 0x100>; |
||||
qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>; |
||||
}; |
||||
|
||||
tcsr@194b000 { |
||||
compatible = "qcom,tcsr"; |
||||
reg = <0x194b000 0x100>; |
||||
qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>; |
||||
}; |
||||
|
||||
ess_tcsr@1953000 { |
||||
compatible = "qcom,tcsr"; |
||||
reg = <0x1953000 0x1000>; |
||||
qcom,ess-interface-select = <TCSR_ESS_PSGMII>; |
||||
}; |
||||
|
||||
tcsr@1957000 { |
||||
compatible = "qcom,tcsr"; |
||||
reg = <0x1957000 0x100>; |
||||
qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>; |
||||
}; |
||||
|
||||
usb2@60f8800 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
serial@78af000 { |
||||
pinctrl-0 = <&serial_pins>; |
||||
pinctrl-names = "default"; |
||||
status = "okay"; |
||||
}; |
||||
|
||||
usb3@8af8800 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
crypto@8e3a000 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
watchdog@b017000 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
ess-switch@c000000 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
edma@c080000 { |
||||
status = "okay"; |
||||
}; |
||||
}; |
||||
|
||||
gpio-keys { |
||||
compatible = "gpio-keys"; |
||||
|
||||
wlan { |
||||
label = "wlan"; |
||||
gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>; |
||||
linux,code = <KEY_RFKILL>; |
||||
linux,input-type = <EV_SW>; |
||||
}; |
||||
|
||||
wps { |
||||
label = "wps"; |
||||
gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; |
||||
linux,code = <KEY_WPS_BUTTON>; |
||||
}; |
||||
|
||||
reset { |
||||
label = "reset"; |
||||
gpios = <&tlmm 4 GPIO_ACTIVE_LOW>; |
||||
linux,code = <KEY_RESTART>; |
||||
}; |
||||
}; |
||||
|
||||
gpio-leds { |
||||
compatible = "gpio-leds"; |
||||
pinctrl-0 = <&led_pins>; |
||||
pinctrl-names = "default"; |
||||
|
||||
power: power { |
||||
label = "nbg6617:green:power"; |
||||
gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>; |
||||
}; |
||||
|
||||
usb { |
||||
label = "nbg6617:green:usb"; |
||||
gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; |
||||
}; |
||||
|
||||
wlan2G { |
||||
label = "nbg6617:green:wlan2G"; |
||||
gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>; |
||||
}; |
||||
|
||||
wlan5G { |
||||
label = "nbg6617:green:wlan5G"; |
||||
gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; |
||||
}; |
||||
|
||||
wps { |
||||
label = "nbg6617:green:wps"; |
||||
gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
&tlmm { |
||||
serial_pins: serial_pinmux { |
||||
mux { |
||||
pins = "gpio60", "gpio61"; |
||||
function = "blsp_uart0"; |
||||
bias-disable; |
||||
}; |
||||
}; |
||||
spi_0_pins: spi_0_pinmux { |
||||
mux { |
||||
function = "blsp_spi0"; |
||||
pins = "gpio55", "gpio56", "gpio57"; |
||||
drive-strength = <12>; |
||||
bias-disable; |
||||
}; |
||||
|
||||
mux_cs { |
||||
function = "gpio"; |
||||
pins = "gpio54"; |
||||
drive-strength = <2>; |
||||
bias-disable; |
||||
output-low; |
||||
}; |
||||
}; |
||||
led_pins: led_pinmux { |
||||
mux { |
||||
pins = "gpio0", "gpio1", "gpio3", "gpio5", "gpio58"; |
||||
drive-strength = <0x8>; |
||||
bias-disable; |
||||
output-low; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
&spi_0 { /* BLSP1 QUP1 */ |
||||
pinctrl-0 = <&spi_0_pins>; |
||||
pinctrl-names = "default"; |
||||
status = "okay"; |
||||
cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>; |
||||
|
||||
mx25l25635f@0 { |
||||
compatible = "mx25l25635f", "jedec,spi-nor"; |
||||
#address-cells = <1>; |
||||
#size-cells = <0>; |
||||
reg = <0>; |
||||
spi-max-frequency = <24000000>; |
||||
status = "okay"; |
||||
m25p,fast-read; |
||||
|
||||
partitions { |
||||
compatible = "fixed-partitions"; |
||||
#address-cells = <1>; |
||||
#size-cells = <1>; |
||||
|
||||
partition0@0 { |
||||
label = "SBL1"; |
||||
reg = <0x00000000 0x00040000>; |
||||
read-only; |
||||
}; |
||||
partition1@40000 { |
||||
label = "MIBIB"; |
||||
reg = <0x00040000 0x00020000>; |
||||
read-only; |
||||
}; |
||||
partition2@60000 { |
||||
label = "QSEE"; |
||||
reg = <0x00060000 0x00060000>; |
||||
read-only; |
||||
}; |
||||
partition3@c0000 { |
||||
label = "CDT"; |
||||
reg = <0x000c0000 0x00010000>; |
||||
read-only; |
||||
}; |
||||
partition4@d0000 { |
||||
label = "DDRPARAMS"; |
||||
reg = <0x000d0000 0x00010000>; |
||||
read-only; |
||||
}; |
||||
partition5@e0000 { |
||||
label = "APPSBL"; /* u-boot */ |
||||
reg = <0x000e0000 0x00080000>; |
||||
/* U-Boot Standalone App "zloader" is located at 0x64000 */ |
||||
read-only; |
||||
}; |
||||
partition6@160000 { |
||||
label = "APPSBLENV"; /* u-boot env */ |
||||
reg = <0x00160000 0x00010000>; |
||||
}; |
||||
partition7@170000 { |
||||
/* make a backup of this partition! */ |
||||
label = "ART"; |
||||
reg = <0x00170000 0x00010000>; |
||||
read-only; |
||||
}; |
||||
partition8@180000 { |
||||
label = "kernel"; |
||||
reg = <0x00180000 0x00400000>; |
||||
}; |
||||
partition9@580000 { |
||||
label = "dualflag"; |
||||
reg = <0x00580000 0x00010000>; |
||||
read-only; |
||||
}; |
||||
partition10@590000 { |
||||
label = "header"; |
||||
reg = <0x00590000 0x00010000>; |
||||
}; |
||||
partition11@5a0000 { |
||||
label = "romd"; |
||||
reg = <0x005a0000 0x00100000>; |
||||
read-only; |
||||
}; |
||||
partition12@6a0000 { |
||||
label = "not_root_data"; |
||||
/* |
||||
* for some strange reason, someone at ZyXEL |
||||
* had the "great" idea to put the rootfs_data |
||||
* in front of rootfs... Don't do that! |
||||
* As a result this one, full MebiByte remains |
||||
* unused. |
||||
*/ |
||||
reg = <0x006a0000 0x00100000>; |
||||
}; |
||||
partition13@7a0000 { |
||||
label = "rootfs"; |
||||
reg = <0x007a0000 0x01860000>; |
||||
}; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
&cryptobam { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
&blsp_dma { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
&wifi0 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
&wifi1 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
&usb3_ss_phy { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
&usb3_hs_phy { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
&usb2_hs_phy { |
||||
status = "okay"; |
||||
}; |
||||
@ -0,0 +1,64 @@ |
||||
Index: linux-4.14.50/drivers/mtd/spi-nor/spi-nor.c
|
||||
===================================================================
|
||||
--- linux-4.14.50.orig/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ linux-4.14.50/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -1025,6 +1025,7 @@ static const struct flash_info spi_nor_i
|
||||
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
|
||||
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
|
||||
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
+ { "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
|
||||
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
|
||||
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
||||
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
@@ -1189,11 +1190,12 @@ static const struct flash_info spi_nor_i
|
||||
{ },
|
||||
};
|
||||
|
||||
-static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
|
||||
+static const struct flash_info *spi_nor_read_id(struct spi_nor *nor,
|
||||
+ const char *name)
|
||||
{
|
||||
int tmp;
|
||||
u8 id[SPI_NOR_MAX_ID_LEN];
|
||||
- const struct flash_info *info;
|
||||
+ const struct flash_info *info, *first_match = NULL;
|
||||
|
||||
tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
|
||||
if (tmp < 0) {
|
||||
@@ -1204,10 +1206,16 @@ static const struct flash_info *spi_nor_
|
||||
for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
|
||||
info = &spi_nor_ids[tmp];
|
||||
if (info->id_len) {
|
||||
- if (!memcmp(info->id, id, info->id_len))
|
||||
- return &spi_nor_ids[tmp];
|
||||
+ if (!memcmp(info->id, id, info->id_len)) {
|
||||
+ if (!name || !strcmp(name, info->name))
|
||||
+ return info;
|
||||
+ if (!first_match)
|
||||
+ first_match = info;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
+ if (first_match)
|
||||
+ return first_match;
|
||||
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
|
||||
id[0], id[1], id[2]);
|
||||
return ERR_PTR(-ENODEV);
|
||||
@@ -2667,7 +2675,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
info = spi_nor_match_id(name);
|
||||
/* Try to auto-detect if chip name wasn't specified or not found */
|
||||
if (!info)
|
||||
- info = spi_nor_read_id(nor);
|
||||
+ info = spi_nor_read_id(nor, NULL);
|
||||
if (IS_ERR_OR_NULL(info))
|
||||
return -ENOENT;
|
||||
|
||||
@@ -2678,7 +2686,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
if (name && info->id_len) {
|
||||
const struct flash_info *jinfo;
|
||||
|
||||
- jinfo = spi_nor_read_id(nor);
|
||||
+ jinfo = spi_nor_read_id(nor, name);
|
||||
if (IS_ERR(jinfo)) {
|
||||
return PTR_ERR(jinfo);
|
||||
} else if (jinfo != info) {
|
||||
Loading…
Reference in new issue