diff --git a/patch/kernel/sunxi-dev/general-sunxi-overlays.patch b/patch/kernel/sunxi-dev/general-sunxi-overlays.patch index d17333846..6a730c9a3 100644 --- a/patch/kernel/sunxi-dev/general-sunxi-overlays.patch +++ b/patch/kernel/sunxi-dev/general-sunxi-overlays.patch @@ -5074,12 +5074,12 @@ index 0000000..6e192b5 + test "${param_spinor_spi_bus}" = "0" && setenv tmp_spi_path "spi@1c68000" + test "${param_spinor_spi_bus}" = "1" && setenv tmp_spi_path "spi@1c69000" + fdt set /soc/${tmp_spi_path} status "okay" -+ fdt set /soc/${tmp_spi_path}/spiflash status "okay" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 status "okay" + if test -n "${param_spinor_max_freq}"; then -+ fdt set /soc/${tmp_spi_path}/spiflash spi-max-frequency "<${param_spinor_max_freq}>" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 spi-max-frequency "<${param_spinor_max_freq}>" + fi + if test "${param_spinor_spi_cs}" = "1"; then -+ fdt set /soc/${tmp_spi_path}/spiflash reg "<1>"; ++ fdt set /soc/${tmp_spi_path}/spiflash@0 reg "<1>"; + fi + env delete tmp_spi_path +fi @@ -5316,7 +5316,7 @@ index 0000000..d67a4f6 + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; -+ spiflash { ++ spiflash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <1000000>; @@ -5330,7 +5330,7 @@ index 0000000..d67a4f6 + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; -+ spiflash { ++ spiflash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <1000000>; @@ -5642,12 +5642,12 @@ index 0000000..744889c + test "${param_spinor_spi_bus}" = "0" && setenv tmp_spi_path "spi@1c68000" + test "${param_spinor_spi_bus}" = "1" && setenv tmp_spi_path "spi@1c69000" + fdt set /soc/${tmp_spi_path} status "okay" -+ fdt set /soc/${tmp_spi_path}/spiflash status "okay" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 status "okay" + if test -n "${param_spinor_max_freq}"; then -+ fdt set /soc/${tmp_spi_path}/spiflash spi-max-frequency "<${param_spinor_max_freq}>" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 spi-max-frequency "<${param_spinor_max_freq}>" + fi + if test "${param_spinor_spi_cs}" = "1"; then -+ fdt set /soc/${tmp_spi_path}/spiflash reg "<1>" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 reg "<1>" + fi + env delete tmp_spi_path +fi @@ -6008,7 +6008,7 @@ index 0000000..d4accd9 + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; -+ spiflash { ++ spiflash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <1000000>; @@ -6022,7 +6022,7 @@ index 0000000..d4accd9 + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; -+ spiflash { ++ spiflash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <1000000>; @@ -6497,7 +6497,7 @@ index 0000000..3a2be38 + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; -+ spiflash { ++ spiflash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <1000000>; @@ -6511,7 +6511,7 @@ index 0000000..3a2be38 + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; -+ spiflash { ++ spiflash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <1000000>; @@ -6728,12 +6728,12 @@ index 0000000..fba1c4f + test "${param_spinor_spi_bus}" = "0" && setenv tmp_spi_path "spi@5010000" + test "${param_spinor_spi_bus}" = "1" && setenv tmp_spi_path "spi@5011000" + fdt set /soc/${tmp_spi_path} status "okay" -+ fdt set /soc/${tmp_spi_path}/spiflash status "okay" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 status "okay" + if test -n "${param_spinor_max_freq}"; then -+ fdt set /soc/${tmp_spi_path}/spiflash spi-max-frequency "<${param_spinor_max_freq}>" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 spi-max-frequency "<${param_spinor_max_freq}>" + fi + if test "${param_spinor_spi_cs}" = "1"; then -+ fdt set /soc/${tmp_spi_path}/spiflash reg "<1>" ++ fdt set /soc/${tmp_spi_path}/spiflash@0 reg "<1>" + fi + env delete tmp_spi_path +fi