ramips: mt7621: add patch to setup CM memory region for palmbus
authorJohn Crispin <john@openwrt.org>
Thu, 17 Dec 2015 09:26:28 +0000 (09:26 +0000)
committerJohn Crispin <john@openwrt.org>
Thu, 17 Dec 2015 09:26:28 +0000 (09:26 +0000)
This is tested and works on ubnt-erx.

Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
SVN-Revision: 47903

target/linux/ramips/patches-4.3/0060-mt7621-set-up-palmbus-memory-region.patch [new file with mode: 0644]

diff --git a/target/linux/ramips/patches-4.3/0060-mt7621-set-up-palmbus-memory-region.patch b/target/linux/ramips/patches-4.3/0060-mt7621-set-up-palmbus-memory-region.patch
new file mode 100644 (file)
index 0000000..ba462bf
--- /dev/null
@@ -0,0 +1,36 @@
+--- a/arch/mips/include/asm/mach-ralink/mt7621.h
++++ b/arch/mips/include/asm/mach-ralink/mt7621.h
+@@ -13,6 +13,9 @@
+ #ifndef _MT7621_REGS_H_
+ #define _MT7621_REGS_H_
++#define MT7621_PALMBUS_BASE           0x1C000000
++#define MT7621_PALMBUS_SIZE           0x03FFFFFF
++
+ #define MT7621_SYSC_BASE              0x1E000000
+ #define SYSC_REG_CHIP_NAME0           0x00
+--- a/arch/mips/ralink/mt7621.c
++++ b/arch/mips/ralink/mt7621.c
+@@ -204,6 +204,21 @@ void prom_soc_init(struct ralink_soc_inf
+       mips_cm_probe();
+       mips_cpc_probe();
++      if (mips_cm_numiocu()) {
++              /* mips_cm_probe() wipes out bootloader
++                 config for CM regions and we have to configure them
++                 again. This SoC cannot talk to pamlbus devices
++                 witout proper iocu region set up.
++
++                 FIXME: it would be better to do this with values
++                 from DT, but we need this very early because
++                 without this we cannot talk to pretty much anything
++                 including serial.
++              */
++              write_gcr_reg0_base(MT7621_PALMBUS_BASE);
++              write_gcr_reg0_mask(~MT7621_PALMBUS_SIZE | CM_GCR_REGn_MASK_CMTGT_IOCU0);
++      }
++
+       if (!register_cps_smp_ops())
+               return;
+       if (!register_cmp_smp_ops())