Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next

1 files changed, 14 insertions, 10 deletions

diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h
index 89c22433b1c6..fc0cf5ac0cf7 100644
--- a/arch/mips/include/uapi/asm/inst.h
+++ b/arch/mips/include/uapi/asm/inst.h
@@ -21,20 +21,20 @@
 enum major_op {
         spec_op, bcond_op, j_op, jal_op,
         beq_op, bne_op, blez_op, bgtz_op,
-        addi_op, addiu_op, slti_op, sltiu_op,
+        addi_op, cbcond0_op = addi_op, addiu_op, slti_op, sltiu_op,
         andi_op, ori_op, xori_op, lui_op,
         cop0_op, cop1_op, cop2_op, cop1x_op,
         beql_op, bnel_op, blezl_op, bgtzl_op,
-        daddi_op, daddiu_op, ldl_op, ldr_op,
+        daddi_op, cbcond1_op = daddi_op, daddiu_op, ldl_op, ldr_op,
         spec2_op, jalx_op, mdmx_op, spec3_op,
         lb_op, lh_op, lwl_op, lw_op,
         lbu_op, lhu_op, lwr_op, lwu_op,
         sb_op, sh_op, swl_op, sw_op,
         sdl_op, sdr_op, swr_op, cache_op,
-        ll_op, lwc1_op, lwc2_op, pref_op,
-        lld_op, ldc1_op, ldc2_op, ld_op,
-        sc_op, swc1_op, swc2_op, major_3b_op,
-        scd_op, sdc1_op, sdc2_op, sd_op
+        ll_op, lwc1_op, lwc2_op, bc6_op = lwc2_op, pref_op,
+        lld_op, ldc1_op, ldc2_op, beqzcjic_op = ldc2_op, ld_op,
+        sc_op, swc1_op, swc2_op, balc6_op = swc2_op, major_3b_op,
+        scd_op, sdc1_op, sdc2_op, bnezcjialc_op = sdc2_op, sd_op
 };
 
 /*
@@ -83,9 +83,12 @@ enum spec3_op {
         swe_op    = 0x1f, bshfl_op  = 0x20,
         swle_op   = 0x21, swre_op   = 0x22,
         prefe_op  = 0x23, dbshfl_op = 0x24,
-        lbue_op   = 0x28, lhue_op   = 0x29,
-        lbe_op    = 0x2c, lhe_op    = 0x2d,
-        lle_op    = 0x2e, lwe_op    = 0x2f,
+        cache6_op = 0x25, sc6_op    = 0x26,
+        scd6_op   = 0x27, lbue_op   = 0x28,
+        lhue_op   = 0x29, lbe_op    = 0x2c,
+        lhe_op    = 0x2d, lle_op    = 0x2e,
+        lwe_op    = 0x2f, pref6_op  = 0x35,
+        ll6_op    = 0x36, lld6_op   = 0x37,
         rdhwr_op  = 0x3b
 };
 
@@ -112,7 +115,8 @@ enum cop_op {
         mfhc_op       = 0x03, mtc_op        = 0x04,
         dmtc_op       = 0x05, ctc_op        = 0x06,
         mthc0_op      = 0x06, mthc_op       = 0x07,
-        bc_op         = 0x08, cop_op        = 0x10,
+        bc_op         = 0x08, bc1eqz_op     = 0x09,
+        bc1nez_op     = 0x0d, cop_op        = 0x10,
         copm_op       = 0x18
 };