PORT_GP_CFG_21(7,       fn, sfx, CFG_FLAGS),                                    \
        PORT_GP_CFG_14(8,       fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE_18_33)
 
-#define CPU_ALL_NOGP(fn)                                                                       \
-       PIN_NOGP_CFG(PRESETOUT_N,       "PRESETOUT#",   fn, SH_PFC_PIN_CFG_PULL_UP_DOWN),       \
-       PIN_NOGP_CFG(PRESETOUT0_N,      "PRESETOUT0#",  fn, SH_PFC_PIN_CFG_PULL_DOWN),          \
-       PIN_NOGP_CFG(PRESETOUT1_N,      "PRESETOUT1#",  fn, SH_PFC_PIN_CFG_PULL_DOWN),          \
-       PIN_NOGP_CFG(EXTALR,            "EXTALR",       fn, SH_PFC_PIN_CFG_PULL_UP_DOWN),       \
-       PIN_NOGP_CFG(DCUTRST0_N,        "DCUTRST0#",    fn, SH_PFC_PIN_CFG_PULL_DOWN),          \
-       PIN_NOGP_CFG(DCUTCK0,           "DCUTCK0",      fn, SH_PFC_PIN_CFG_PULL_UP),            \
-       PIN_NOGP_CFG(DCUTMS0,           "DCUTMS0",      fn, SH_PFC_PIN_CFG_PULL_UP),            \
-       PIN_NOGP_CFG(DCUTDI0,           "DCUTDI0",      fn, SH_PFC_PIN_CFG_PULL_UP),            \
-       PIN_NOGP_CFG(DCUTRST1_N,        "DCUTRST1#",    fn, SH_PFC_PIN_CFG_PULL_DOWN),          \
-       PIN_NOGP_CFG(DCUTCK1,           "DCUTCK1",      fn, SH_PFC_PIN_CFG_PULL_UP),            \
-       PIN_NOGP_CFG(DCUTMS1,           "DCUTMS1",      fn, SH_PFC_PIN_CFG_PULL_UP),            \
-       PIN_NOGP_CFG(DCUTDI1,           "DCUTDI1",      fn, SH_PFC_PIN_CFG_PULL_UP),            \
-       PIN_NOGP_CFG(EVTI_N,            "EVTI#",        fn, SH_PFC_PIN_CFG_PULL_UP),            \
-       PIN_NOGP_CFG(MSYN_N,            "MSYN#",        fn, SH_PFC_PIN_CFG_PULL_UP)
-
 /* GPSR0 */
 #define GPSR0_18       F_(MSIOF2_RXD,          IP2SR0_11_8)
 #define GPSR0_17       F_(MSIOF2_SCK,          IP2SR0_7_4)
  */
 enum {
        GP_ASSIGN_LAST(),
-       NOGP_ALL(),
 };
 
 static const struct sh_pfc_pin pinmux_pins[] = {